diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ include(SetKexiCMakePolicies NO_POLICY_SCOPE) include(SetKexiVersionInfo) -project(Kexi VERSION ${PROJECT_VERSION}) +project(KEXI VERSION ${PROJECT_VERSION}) include(KexiAddTests) kexi_add_tests(OFF) @@ -125,14 +125,14 @@ find_package(KDEWin REQUIRED) endif() -# set custom Kexi plugin installdir +# set custom KEXI plugin installdir set(KEXI_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/${KEXI_BASE_PATH}) simple_option(BUILD_EXAMPLES "Build and install examples" ON) macro_bool_to_01(BUILD_EXAMPLES COMPILING_EXAMPLES) -# set custom Kexi examples installdir +# set custom KEXI examples installdir set(KEXI_EXAMPLES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/${KEXI_BASE_PATH}/examples) # TEMPORARY: for initial Qt5/KF5 build porting phase deprecation warnings are only annoying noise @@ -152,23 +152,23 @@ ## ## Test for KDb ## -simple_option(KEXI_DEBUG_GUI "Debugging GUI for Kexi (requires KDB_DEBUG_GUI to be set too)" OFF) +simple_option(KEXI_DEBUG_GUI "Debugging GUI for KEXI (requires KDB_DEBUG_GUI to be set too)" OFF) if(KEXI_DEBUG_GUI) set(KDB_REQUIRED_COMPONENTS DEBUG_GUI) endif() find_package(KDb ${KEXI_LIBS_MIN_VERSION} REQUIRED COMPONENTS ${KDB_REQUIRED_COMPONENTS}) set_package_properties(KDb PROPERTIES TYPE REQUIRED - PURPOSE "Required by Kexi for data handling") + PURPOSE "Required by KEXI for data handling") ## ## Test for KReport ## find_package(KReport ${KEXI_LIBS_MIN_VERSION}) set_package_properties(KReport PROPERTIES TYPE REQUIRED - PURPOSE "Required by Kexi for report handling") + PURPOSE "Required by KEXI for report handling") if (KReport_FOUND) if(NOT KREPORT_SCRIPTING) - message(FATAL_ERROR "Kexi requires KReport package with scripting support enabled (KREPORT_SCRIPTING)") + message(FATAL_ERROR "KEXI requires KReport package with scripting support enabled (KREPORT_SCRIPTING)") endif() endif() @@ -178,11 +178,11 @@ if(SHOULD_BUILD_KEXI_DESKTOP_APP) find_package(KPropertyWidgets ${KEXI_LIBS_MIN_VERSION} REQUIRED COMPONENTS KF) set_package_properties(KPropertyWidgets PROPERTIES TYPE REQUIRED - PURPOSE "Required by Kexi for handling properties") + PURPOSE "Required by KEXI for handling properties") else() # only KPropertyCore find_package(KPropertyCore ${KEXI_LIBS_MIN_VERSION} REQUIRED COMPONENTS KF) set_package_properties(KPropertyCore PROPERTIES TYPE REQUIRED - PURPOSE "Required by Kexi for handling properties") + PURPOSE "Required by KEXI for handling properties") endif() include(CheckIfQtGuiCanBeExecuted) @@ -204,7 +204,7 @@ DESCRIPTION "KDE World Globe Widget library" URL "https://marble.kde.org" TYPE RECOMMENDED - PURPOSE "Required by Kexi form map widget" + PURPOSE "Required by KEXI form map widget" ) if(NOT MARBLE_FOUND) set(MARBLE_INCLUDE_DIR "") @@ -221,12 +221,12 @@ set_package_properties(Qt5WebKit PROPERTIES DESCRIPTION "Webkit for Qt, the HTML engine." URL "http://qt.io" - TYPE RECOMMENDED PURPOSE "Required by Kexi web form widget" + TYPE RECOMMENDED PURPOSE "Required by KEXI web form widget" ) set_package_properties(Qt5WebKitWidgets PROPERTIES DESCRIPTION "QWidgets module for Webkit, the HTML engine." URL "http://qt.io" - TYPE RECOMMENDED PURPOSE "Required by Kexi web form widget" + TYPE RECOMMENDED PURPOSE "Required by KEXI web form widget" ) ################## diff --git a/KexiProducts.cmake b/KexiProducts.cmake --- a/KexiProducts.cmake +++ b/KexiProducts.cmake @@ -1,7 +1,7 @@ ### DEFINITION OF PRODUCTS, FEATURES AND PRODUCTSETS #################################################### -# When building Kexi a lot of different things are created and installed. To +# When building KEXI a lot of different things are created and installed. To # describe them and their internal dependencies the concepts of "product", # "feature" and "product set" are used. @@ -60,12 +60,13 @@ # See APP_CONVERTER, FILEMANAGER_* # products -calligra_define_product(KEXI_CORE_APP "Kexi core app" REQUIRES) -calligra_define_product(KEXI_DESKTOP_APP "Kexi for desktop" REQUIRES KEXI_CORE_APP) -calligra_define_product(KEXI_MOBILE_APP "Kexi for mobile" REQUIRES KEXI_CORE_APP) +calligra_define_product(KEXI_CORE_APP "KEXI core app" REQUIRES) +calligra_define_product(KEXI_DESKTOP_APP "KEXI for desktop" REQUIRES KEXI_CORE_APP) +calligra_define_product(KEXI_MOBILE_APP "KEXI for mobile" REQUIRES KEXI_CORE_APP) # more plugins -calligra_define_product(PLUGIN_KEXI_SPREADSHEETMIGRATION "Import from ODS plugin for Kexi" UNPORTED REQUIRES KEXI_CORE_APP) +calligra_define_product(PLUGIN_KEXI_SPREADSHEETMIGRATION "Import from ODS plugin for KEXI" + UNPORTED REQUIRES KEXI_CORE_APP) ############################################# #### Product set definitions #### diff --git a/cmake/modules/KexiGenerateDependencyGraph.cmake b/cmake/modules/KexiGenerateDependencyGraph.cmake --- a/cmake/modules/KexiGenerateDependencyGraph.cmake +++ b/cmake/modules/KexiGenerateDependencyGraph.cmake @@ -20,7 +20,7 @@ set(_dot_file ${_graph_dir}/graph.dot) set(_image_file "dependency-graph-${CMAKE_PROJECT_NAME}.png") -simple_option(${PROJECT_NAME_UPPER}_DEPENDENCY_GRAPH_INCLUDE_KEXI_FRAMEWORKS "Include Kexi frameworks in the dependency graph" ON) +simple_option(${PROJECT_NAME_UPPER}_DEPENDENCY_GRAPH_INCLUDE_KEXI_FRAMEWORKS "Include KEXI frameworks in the dependency graph" ON) simple_option(${PROJECT_NAME_UPPER}_DEPENDENCY_GRAPH_INCLUDE_ALL_LIBS "Include all libs in the dependency graph" OFF) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeGraphVizOptions.cmake.in diff --git a/cmake/modules/SetKexiVersionInfo.cmake b/cmake/modules/SetKexiVersionInfo.cmake --- a/cmake/modules/SetKexiVersionInfo.cmake +++ b/cmake/modules/SetKexiVersionInfo.cmake @@ -3,7 +3,7 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# Define common versions of Kexi components used to generate KexiVersion.h +# Define common versions of KEXI components used to generate KexiVersion.h # update these version for every release: set(PROJECT_VERSION_STRING "3.2 Alpha") # Custom name such as "3.1 Alpha" set(PROJECT_STABLE_VERSION_MAJOR 3) # 3 for 3.x, 4 for 4.x, etc. @@ -17,7 +17,7 @@ # -- do not edit below this line -- set(KEXI_CUSTOM_DISTRIBUTION_VERSION "" CACHE STRING - "Custom name of Kexi version useful to construct co-installabile releases. Any nonempty directory name is accepted. If specified it will be used in KEXI_DISTRIBUTION_VERSION. If not specified, KEXI_DISTRIBUTION_VERSION will be set to PROJECT_STABLE_VERSION_MAJOR.PROJECT_STABLE_VERSION_MINOR.") + "Custom name of KEXI version useful to construct co-installabile releases. Any nonempty directory name is accepted. If specified it will be used in KEXI_DISTRIBUTION_VERSION. If not specified, KEXI_DISTRIBUTION_VERSION will be set to PROJECT_STABLE_VERSION_MAJOR.PROJECT_STABLE_VERSION_MINOR.") if(KEXI_CUSTOM_DISTRIBUTION_VERSION STREQUAL "") set(KEXI_DISTRIBUTION_VERSION "${PROJECT_STABLE_VERSION_MAJOR}.${PROJECT_STABLE_VERSION_MINOR}") @@ -61,11 +61,11 @@ set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_RELEASE}) -message(STATUS "Kexi version \"${PROJECT_VERSION_STRING}\" (${PROJECT_VERSION}), distribution version \"${KEXI_DISTRIBUTION_VERSION}\"") +message(STATUS "KEXI version \"${PROJECT_VERSION_STRING}\" (${PROJECT_VERSION}), distribution version \"${KEXI_DISTRIBUTION_VERSION}\"") -# Define the generic version of the Kexi libraries here -# This makes it easy to advance it when the next Kexi release comes. -# 14 was the last GENERIC_PROJECT_LIB_VERSION_MAJOR of the previous Kexi series +# Define the generic version of the KEXI libraries here +# This makes it easy to advance it when the next KEXI release comes. +# 14 was the last GENERIC_PROJECT_LIB_VERSION_MAJOR of the previous KEXI series # (2.x) so we're starting with 15 in 3.x series. if(PROJECT_STABLE_VERSION_MAJOR EQUAL 3) math(EXPR GENERIC_PROJECT_LIB_VERSION_MAJOR "${PROJECT_STABLE_VERSION_MINOR} + 15") diff --git a/kundo2_aware_xgettext.sh b/kundo2_aware_xgettext.sh --- a/kundo2_aware_xgettext.sh +++ b/kundo2_aware_xgettext.sh @@ -1,5 +1,5 @@ # -# Helper function for extracting translatable messages from Kexi source code. +# Helper function for extracting translatable messages from KEXI source code. # Usage: kundo2_aware_xgettext # If there are no messages or the is empty, the pot file is deleted. # diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,56 +2,58 @@ check_function_exists("uname" HAVE_UNAME) -simple_option(KEXI_SHOW_UNFINISHED "Show unfinished features in Kexi. Thus is useful for testing but may confuse end-user." OFF) -simple_option(KEXI_SHOW_UNIMPLEMENTED "Forces to show menu entries and dialogs just to give impression about development plans for Kexi. Only recommended for test/development versions." OFF) +simple_option(KEXI_SHOW_UNFINISHED "Show unfinished features in KEXI. Thus is useful for testing \ +but may confuse end-user." OFF) +simple_option(KEXI_SHOW_UNIMPLEMENTED "Forces to show menu entries and dialogs just to give \ +impression about development plans for KEXI. Only recommended for test/development versions." OFF) # Extra GUI features if(NOT KEXI_MOBILE) - simple_option(KEXI_AUTORISE_TABBED_TOOLBAR "Experimental: Autorise the main tabbed toolbar in Kexi" OFF) + simple_option(KEXI_AUTORISE_TABBED_TOOLBAR "Experimental: Autorise the main tabbed toolbar in KEXI" OFF) if(WIN32 OR APPLE) set(_KEXI_USE_KFILEWIDGET_DEFAULT OFF) else() set(_KEXI_USE_KFILEWIDGET_DEFAULT ON) endif() - simple_option(KEXI_USE_KFILEWIDGET "Use KFileWidget-based inline file browser in Kexi. If OFF, a simple \ + simple_option(KEXI_USE_KFILEWIDGET "Use KFileWidget-based inline file browser in KEXI. If OFF, a simple \ replacement file widget with native file dialogs is used. ON by default on UNIX, OFF by default on Windows \ and macOS. \ Note: Non-plasma Linux desktops still default to the simple replacement at runtime." ${_KEXI_USE_KFILEWIDGET_DEFAULT} ) endif(NOT KEXI_MOBILE) # Experimental: -simple_option(KEXI_SCRIPTS_SUPPORT "Experimental: Enable scripting in Kexi" OFF) +simple_option(KEXI_SCRIPTS_SUPPORT "Experimental: Enable scripting in KEXI" OFF) if(KEXI_SCRIPTS_SUPPORT) set(REQUIRED_QTQML_VERSION 5.8.0) # >= 5.8 because of QJSEngine::newQMetaObject() find_package(Qt5Qml ${REQUIRED_QTQML_VERSION} REQUIRED) set_package_properties(Qt5Qml PROPERTIES DESCRIPTION "A framework for developing applications and libraries with the QML and JavaScript language." URL "http://qt.io" - TYPE REQUIRED PURPOSE "Required by Kexi scripting (JavaScript)" + TYPE REQUIRED PURPOSE "Required by KEXI scripting (JavaScript)" ) endif() # Broken: simple_option(KEXI_FORM_CURSOR_PROPERTY_SUPPORT "Broken: Enable \"cursor\" property in the form designer" OFF) -simple_option(KEXI_SHOW_CONTEXT_HELP "Broken: Enable context help in Kexi main window" OFF) +simple_option(KEXI_SHOW_CONTEXT_HELP "Broken: Enable context help in KEXI main window" OFF) simple_option(KEXI_QUICK_PRINTING_SUPPORT "Broken: Enable print/print preview/print setup for tables/queries in the project navigator" OFF) simple_option(KEXI_AUTOFIELD_FORM_WIDGET_SUPPORT "Broken: Enable \"auto field\" form widget in the form designer" OFF) # OFF because we need to replace it with QTreeWidget which uses very different API compared to Q3ListView. Re-add QTreeWidget? simple_option(KEXI_LIST_FORM_WIDGET_SUPPORT "Broken: Enable \"list\" form widget in the form designer" OFF) simple_option(KEXI_PIXMAP_COLLECTIONS_SUPPORT "Broken: Enable support for pixmap collections" OFF) # Not available: -simple_option(KEXI_MACROS_SUPPORT "Experimental: Enable macros in Kexi" OFF) +simple_option(KEXI_MACROS_SUPPORT "Experimental: Enable macros in KEXI" OFF) if(KEXI_MACROS_SUPPORT) # temp. message(FATAL_ERROR "Macros are not yet available.") endif() -simple_option(KEXI_TABLE_PRINT_SUPPORT "Experimental: Enable printing of tabular view in Kexi" OFF) # broken since Kexi 2 +simple_option(KEXI_TABLE_PRINT_SUPPORT "Experimental: Enable printing of tabular view in KEXI" OFF) # broken since KEXI 2 if(KEXI_TABLE_PRINT_SUPPORT) # temp. message(FATAL_ERROR "Table printing is not yet available.") endif() -simple_option(KEXI_PROJECT_TEMPLATES "Experimental: Enable support for project templates in Kexi" OFF) # broken since Kexi 2 +simple_option(KEXI_PROJECT_TEMPLATES "Experimental: Enable support for project templates in KEXI" OFF) # broken since KEXI 2 if(KEXI_PROJECT_TEMPLATES) # temp. message(FATAL_ERROR "Project templates are not yet available.") endif() diff --git a/src/KexiVersion.h.cmake b/src/KexiVersion.h.cmake --- a/src/KexiVersion.h.cmake +++ b/src/KexiVersion.h.cmake @@ -1,5 +1,5 @@ /* This file is part of the KDE project - Copyright (c) 2003-2016 Kexi Team + Copyright (c) 2003-2016 KEXI Team Version information based on calligraversion.h, Copyright (c) 2003 David Faure @@ -31,19 +31,17 @@ class QString; -#define KEXI_APP_NAME "Kexi" - /** * @def KEXI_VERSION_STRING * @ingroup KexiMacros -* @brief Version of Kexi as string, at compile time +* @brief Version of KEXI as string, at compile time * -* This macro contains the Kexi version in string form. As it is a macro, +* This macro contains the KEXI version in string form. As it is a macro, * it contains the version at compile time. See Kexi::versionString() if you need * a version used at runtime. * * @note The version string might contain spaces and special characters, -* especially for development versions of Kexi. +* especially for development versions of KEXI. * If you use that macro directly for a file format (e.g. OASIS Open Document) * or for a protocol (e.g. http) be careful that it is appropriate. * (Fictional) example: "3.0 Alpha" @@ -54,9 +52,9 @@ * @def KEXI_VERSION_MAJOR_MINOR_RELEASE * @ingroup KexiMacros * @brief Version string containing "major.minor.release" -* @brief Version of Kexi as string, at compile time +* @brief Version of KEXI as string, at compile time * -* This macro contains the Kexi version in string form. As it is a macro, +* This macro contains the KEXI version in string form. As it is a macro, * it contains the version at compile time. * * @note The version string never contains spaces or special characters. @@ -66,15 +64,15 @@ /** * @def KEXI_STABLE_VERSION_MAJOR * @ingroup KexiMacros - * @brief Major version of stable Kexi, at compile time + * @brief Major version of stable KEXI, at compile time * KEXI_VERSION_MAJOR is computed based on this value. */ #define KEXI_STABLE_VERSION_MAJOR @PROJECT_STABLE_VERSION_MAJOR@ /** * @def KEXI_VERSION_MAJOR * @ingroup KexiMacros - * @brief Major version of Kexi, at compile time + * @brief Major version of KEXI, at compile time * * Generally it's the same as KEXI_STABLE_VERSION_MAJOR but for unstable x.0 * x is decreased by one, e.g. 3.0 Beta is 2.99. @@ -84,15 +82,15 @@ /** * @def KEXI_STABLE_VERSION_MINOR * @ingroup KexiMacros - * @brief Minor version of stable Kexi, at compile time + * @brief Minor version of stable KEXI, at compile time * KEXI_VERSION_MINOR is computed based on this value. */ #define KEXI_STABLE_VERSION_MINOR @PROJECT_STABLE_VERSION_MINOR@ /** * @def KEXI_VERSION_MINOR * @ingroup KexiMacros - * @brief Minor version of Kexi, at compile time + * @brief Minor version of KEXI, at compile time * * Generally it's equal to KEXI_STABLE_VERSION_MINOR for stable releases, * equal to 99 for x.0 unstable releases (e.g. it's 3.0 Beta has minor version 99), @@ -103,118 +101,118 @@ /** * @def KEXI_VERSION_RELEASE * @ingroup KexiMacros - * @brief Release version of Kexi, at compile time. + * @brief Release version of KEXI, at compile time. * 89 for Alpha. */ #define KEXI_VERSION_RELEASE @PROJECT_VERSION_RELEASE@ /** * @def KEXI_STABLE_VERSION_RELEASE * @ingroup KexiMacros - * @brief Release version of Kexi, at compile time. + * @brief Release version of KEXI, at compile time. * * Equal to KEXI_VERSION_RELEASE for stable releases and 0 for unstable ones. */ #define KEXI_STABLE_VERSION_RELEASE @PROJECT_STABLE_VERSION_RELEASE@ /** * @def KEXI_ALPHA * @ingroup KexiMacros - * @brief If defined (1..9), indicates at compile time that Kexi is in alpha stage + * @brief If defined (1..9), indicates at compile time that KEXI is in alpha stage */ #cmakedefine KEXI_ALPHA @KEXI_ALPHA@ /** * @def KEXI_BETA * @ingroup KexiMacros - * @brief If defined (1..9), indicates at compile time that Kexi is in beta stage + * @brief If defined (1..9), indicates at compile time that KEXI is in beta stage */ #cmakedefine KEXI_BETA @KEXI_BETA@ /** * @def KEXI_RC * @ingroup KexiMacros - * @brief If defined (1..9), indicates at compile time that Kexi is in "release candidate" stage + * @brief If defined (1..9), indicates at compile time that KEXI is in "release candidate" stage */ #cmakedefine KEXI_RC @KEXI_RC@ /** * @def KEXI_STABLE * @ingroup KexiMacros - * @brief If defined, indicates at compile time that Kexi is in stable stage + * @brief If defined, indicates at compile time that KEXI is in stable stage */ #cmakedefine KEXI_STABLE @KEXI_STABLE@ /** * @ingroup KexiMacros - * @brief Make a number from the major, minor and release number of a Kexi version + * @brief Make a number from the major, minor and release number of a KEXI version * * This function can be used for preprocessing when KEXI_IS_VERSION is not * appropriate. */ #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) /** * @ingroup KexiMacros - * @brief Version of Kexi as number, at compile time + * @brief Version of KEXI as number, at compile time * - * This macro contains the Kexi version in number form. As it is a macro, + * This macro contains the KEXI version in number form. As it is a macro, * it contains the version at compile time. See version() if you need - * the Kexi version used at runtime. + * the KEXI version used at runtime. */ #define KEXI_VERSION \ KEXI_MAKE_VERSION(KEXI_VERSION_MAJOR,KEXI_VERSION_MINOR,KEXI_VERSION_RELEASE) /** * @ingroup KexiMacros - * @brief Check if the Kexi version matches a certain version or is higher + * @brief Check if the KEXI version matches a certain version or is higher * * This macro is typically used to compile conditionally a part of code: * @code * #if KEXI_IS_VERSION(2,3,0) - * // Code for Kexi 2.3.0 + * // Code for KEXI 2.3.0 * #else - * // Code for older Kexi + * // Code for older KEXI * #endif * @endcode * - * @warning Especially during development phases of Kexi, be careful + * @warning Especially during development phases of KEXI, be careful * when choosing the version number that you are checking against. - * Otherwise you might risk to break the next Kexi release. + * Otherwise you might risk to break the next KEXI release. * Therefore be careful that development version have a * version number lower than the released version, so do not check - * e.g. for Kexi 4.3 with KEXI_IS_VERSION(4,3,0) + * e.g. for KEXI 4.3 with KEXI_IS_VERSION(4,3,0) * but with the actual version number at a time a needed feature was introduced, e.g. 4.3.2. */ #define KEXI_IS_VERSION(a,b,c) ( KEXI_VERSION >= KEXI_MAKE_VERSION(a,b,c) ) /** * @def KEXI_YEAR * @ingroup KexiMacros - * @brief Year of the Kexi release, set at compile time + * @brief Year of the KEXI release, set at compile time * * This macro is used in "About application" dialog for strings such as "© 2012-..., The Author Team". */ #cmakedefine KEXI_YEAR "@KEXI_YEAR@" /** * @def KEXI_GIT_SHA1_STRING * @ingroup KexiMacros - * @brief Indicates the git sha1 commit which was used for compilation of Kexi + * @brief Indicates the git sha1 commit which was used for compilation of KEXI */ #cmakedefine KEXI_GIT_SHA1_STRING "@KEXI_GIT_SHA1_STRING@" /** * @def KEXI_GIT_BRANCH_STRING * @ingroup KexiMacros - * @brief Indicates the git branch name which was used for compilation of Kexi + * @brief Indicates the git branch name which was used for compilation of KEXI */ #cmakedefine KEXI_GIT_BRANCH_STRING "@KEXI_GIT_BRANCH_STRING@" /** * @def KEXI_DISTRIBUTION_VERSION * @ingroup KexiMacros - * @brief Name of Kexi version useful to construct co-installabile releases + * @brief Name of KEXI version useful to construct co-installabile releases * By default is it equal to KEXI_STABLE_VERSION_MAJOR.KEXI_STABLE_VERSION_MINOR. * It can be changed at configure stage by setting the KEXI_CUSTOM_DISTRIBUTION_VERSION * CMake variable. @@ -231,80 +229,80 @@ #cmakedefine KEXI_BASE_PATH "@KEXI_BASE_PATH@" /** - * Namespace for general Kexi functions. + * Namespace for general KEXI functions. */ namespace Kexi { /** - * Returns the encoded number of Kexi's version, see the KEXI_VERSION macro. + * Returns the encoded number of KEXI version, see the KEXI_VERSION macro. * In contrary to that macro this function returns the number of the actually - * installed Kexi version, not the number of the Kexi version that was + * installed KEXI version, not the number of the KEXI version that was * installed when the program was compiled. * @return the version number, encoded in a single int */ KEXICORE_EXPORT unsigned int version(); /** - * Returns the major number of Kexi's version, e.g. - * 1 for Kexi 1.2.3. + * Returns the major number of KEXI version, e.g. + * 1 for KEXI 1.2.3. * @return the major version number */ KEXICORE_EXPORT unsigned int versionMajor(); /** - * Returns the minor number of Kexi's version, e.g. - * 2 for Kexi 1.2.3. + * Returns the minor number of KEXI version, e.g. + * 2 for KEXI 1.2.3. * @return the minor version number */ KEXICORE_EXPORT unsigned int versionMinor(); /** - * Returns the release of Kexi's version, e.g. - * 3 for Kexi 1.2.3. + * Returns the release of KEXI version, e.g. + * 3 for KEXI 1.2.3. * @return the release number */ KEXICORE_EXPORT unsigned int versionRelease(); /** - * Returns the Kexi version as string, e.g. "1.2.3" + * Returns the KEXI version as string, e.g. "1.2.3" * Sometimes it may be even something like "1.2.3 beta 2" - * @return the Kexi version. You can keep the string forever + * @return the KEXI version. You can keep the string forever */ KEXICORE_EXPORT const char *versionString(); /** - * @return the Kexi version string (versionString()) but appends extra information + * @return the KEXI version string (versionString()) but appends extra information * such as "(git 4e06281 master)" if available. */ KEXICORE_EXPORT const char *fullVersionString(); /** - * Returns the encoded number of stable Kexi's version. + * Returns the encoded number of stable KEXI version. * For 2.3.1 it returns 2.3.1, for 2.5.70 returns 2.6.0, for 2.9.70 returns 3.0.0. * In contrary to KEXI_STABLE_VERSION macro this function returns the number - * of the actually installed Kexi version, not the number of the Kexi version that was + * of the actually installed KEXI version, not the number of the KEXI version that was * installed when the program was compiled. * @return the version number, encoded in a single int * @see Kexi::version() * @see KEXI_STABLE_VERSION */ KEXICORE_EXPORT unsigned int stableVersion(); /** - * Returns the major number of stable Kexi's version, e.g. - * 1 for Kexi 1.2.3. + * Returns the major number of stable KEXI version, e.g. + * 1 for KEXI 1.2.3. * @return the major stable version number */ KEXICORE_EXPORT unsigned int stableVersionMajor(); /** - * Returns the minor number of stable Kexi's version, e.g. - * 2 for Kexi 1.2.3. + * Returns the minor number of stable KEXI version, e.g. + * 2 for KEXI 1.2.3. * @return the minor stable version number */ KEXICORE_EXPORT unsigned int stableVersionMinor(); /** - * Returns the release of stable Kexi's version, e.g. - * 3 for Kexi 1.2.3. + * Returns the release of stable KEXI version, e.g. + * 3 for KEXI 1.2.3. * @return the release stable version number */ KEXICORE_EXPORT unsigned int stableVersionRelease(); /** - * Returns the stable Kexi version as string, e.g. "1.2.3" + * Returns the stable KEXI version as string, e.g. "1.2.3" * It never contains alpha, beta or rc part. - * @return the stable Kexi version. + * @return the stable KEXI version. */ KEXICORE_EXPORT QString stableVersionString(); } diff --git a/src/config-kexi.h.cmake b/src/config-kexi.h.cmake --- a/src/config-kexi.h.cmake +++ b/src/config-kexi.h.cmake @@ -23,17 +23,17 @@ /* config-kexi.h. Generated by cmake from config-kexi.h.cmake */ /*! @file config-kexi.h - Global Kexi configuration (build time) + Global KEXI configuration (build time) */ #include //! @def KEXI_DESKTOP -//! @brief If defined, a desktop version of Kexi is compiled +//! @brief If defined, a desktop version of KEXI is compiled #cmakedefine KEXI_DESKTOP //! @def KEXI_MOBILE -//! @brief If defined, a mobile version of Kexi is compiled +//! @brief If defined, a mobile version of KEXI is compiled #cmakedefine KEXI_MOBILE /* define if you have libreadline available */ @@ -67,7 +67,7 @@ #cmakedefine COMPILING_EXAMPLES //! @def KEXI_DEBUG_GUI -//! @brief If defined, a debugging GUI for Kexi is enabled +//! @brief If defined, a debugging GUI for KEXI is enabled #cmakedefine KEXI_DEBUG_GUI #if defined KEXI_DEBUG_GUI && !defined KDB_DEBUG_GUI @@ -81,33 +81,33 @@ /* -- Experimental -- */ //! @def KEXI_SCRIPTS_SUPPORT -//! @brief If defined, scripting GUI plugin is enabled in Kexi +//! @brief If defined, scripting GUI plugin is enabled in KEXI #cmakedefine KEXI_SCRIPTS_SUPPORT //! @def KEXI_MACROS_SUPPORT -//! @brief If defined, macro GUI plugin is enabled in Kexi +//! @brief If defined, macro GUI plugin is enabled in KEXI #cmakedefine KEXI_MACROS_SUPPORT //! @def KEXI_SHOW_UNFINISHED -//! @brief If defined unfinished features are enabled and presented in Kexi. +//! @brief If defined unfinished features are enabled and presented in KEXI. //! This is useful for testing but may confuse end-users. #cmakedefine KEXI_SHOW_UNFINISHED //! @def KEXI_SHOW_UNIMPLEMENTED -//! @brief If defined show menu entries and dialogs just to give impression about development plans for Kexi +//! @brief If defined show menu entries and dialogs just to give impression about development plans for KEXI //! Only recommended for test/development versions. #cmakedefine KEXI_SHOW_UNIMPLEMENTED //! @def KEXI_PROJECT_TEMPLATES -//! @brief If defined, support for project templates is enabled in Kexi +//! @brief If defined, support for project templates is enabled in KEXI #cmakedefine KEXI_PROJECT_TEMPLATES //! @def KEXI_AUTORISE_TABBED_TOOLBAR -//! @brief If defined, tabs in the main tabbed toolbar autorise in Kexi +//! @brief If defined, tabs in the main tabbed toolbar autorise in KEXI #cmakedefine KEXI_AUTORISE_TABBED_TOOLBAR //! @def KEXI_USE_KFILEWIDGET -//! @brief If defined, KFileWidget-based inline file browser is used in Kexi. Otherwise a simple +//! @brief If defined, KFileWidget-based inline file browser is used in KEXI. Otherwise a simple //! replacement file widget with native file dialogs is used. ON by default on UNIX, OFF by default //! on Windows and macOS. //! @note Non-plasma Linux desktops still default to the simple replacement at runtime. @@ -118,7 +118,7 @@ #cmakedefine KEXI_FORM_CURSOR_PROPERTY_SUPPORT //! @def KEXI_SHOW_CONTEXT_HELP -//! @brief If defined, context help is displayed in Kexi main window +//! @brief If defined, context help is displayed in KEXI main window #cmakedefine KEXI_SHOW_CONTEXT_HELP //! @def KEXI_QUICK_PRINTING_SUPPORT diff --git a/src/core/KexiCommandLineOptions.h b/src/core/KexiCommandLineOptions.h --- a/src/core/KexiCommandLineOptions.h +++ b/src/core/KexiCommandLineOptions.h @@ -28,7 +28,7 @@ class QCommandLineParser; -//! Command line options for Kexi +//! Command line options for KEXI class KEXICORE_EXPORT KexiCommandLineOptions { public: diff --git a/src/core/KexiCommandLineOptions.cpp b/src/core/KexiCommandLineOptions.cpp --- a/src/core/KexiCommandLineOptions.cpp +++ b/src/core/KexiCommandLineOptions.cpp @@ -85,7 +85,7 @@ "Start project in Design Mode, regardless of the project settings.")), showNavigator("show-navigator", xi18nc("'show-navigator' command line option", - "Show the Project Navigator side pane even if Kexi runs in User Mode.")), + "Show the Project Navigator side pane even if KEXI runs in User Mode.")), hideMenu("hide-menu", xi18nc("'hide-menu' command line option", "Hide the main menu (the tabbed toolbar) completely. A number of commands " @@ -97,7 +97,7 @@ "Open object of type 'object_type' and name 'object_name' from specified " "project on application start. 'object_type' is optional, if omitted - %1 " "type is assumed. Other object types can be %2, %3, %4, %5. " - "There may by more or less types available depending on Kexi plugins " + "There may by more or less types available depending on KEXI plugins " "installed.\n" "Use \"\" characters to specify names containing spaces.\n" "Examples: --open MyTable, --open %2:\"My very big query\"", @@ -116,7 +116,7 @@ "Start execution of object of type 'object_type' and name 'object_name' on " "application start. 'object_type' is optional, if omitted - %1 type is " "assumed. Object type can be also %2. There may by more or less types " - "available depending on Kexi plugins installed.\n" + "available depending on KEXI plugins installed.\n" "Use \"\" characters to specify names containing spaces.", "macro", "script"), "[object_type:]object_name"), @@ -177,15 +177,15 @@ "when opening .kexic or .kexis shortcut files.")), fullScreen(QStringList() << "f" << "fullscreen", xi18nc("'fullscreen' command line option", - "Start Kexi in full screen mode to occupy the whole screen area by hiding " + "Start KEXI in full screen mode to occupy the whole screen area by hiding " "window decorations such as title bars.")), - // Options that display configuration or state of Kexi installation. - // When used, Kexi immediately exits without showing the GUI even if other options + // Options that display configuration or state of KEXI installation. + // When used, KEXI immediately exits without showing the GUI even if other options // or arguments are present. listPlugins("list-plugins", xi18nc("'list-plugins' command line option", - "Displays list of plugins available for Kexi with their name, description, " + "Displays list of plugins available for KEXI with their name, description, " "version and filenames.")) { Q_UNUSED(parser); diff --git a/src/core/KexiFileFilters.h b/src/core/KexiFileFilters.h --- a/src/core/KexiFileFilters.h +++ b/src/core/KexiFileFilters.h @@ -28,7 +28,7 @@ class QString; class QStringList; -//! A tool for handling file filters for Kexi +//! A tool for handling file filters for KEXI class KEXICORE_EXPORT KexiFileFilters { public: diff --git a/src/core/KexiMainWindowIface.h b/src/core/KexiMainWindowIface.h --- a/src/core/KexiMainWindowIface.h +++ b/src/core/KexiMainWindowIface.h @@ -190,7 +190,7 @@ * In implementations 0 should be returned if there is no such Kexi object * in the current project or if the object's window is not opened or if * the window contains no edited query at the moment. - * If the query is "unsaved" the window displaying the corresponding Kexi object is marked as "dirty". + * If the query is "unsaved" the window displaying the corresponding KEXI object is marked as "dirty". * Currently supported type of Kexi objects are only queries being in data view. * See KexiQueryPart::unsavedQuery(int) for this implementation. * The query schema returned by this method can be used for example by data diff --git a/src/core/kexi.h b/src/core/kexi.h --- a/src/core/kexi.h +++ b/src/core/kexi.h @@ -164,7 +164,7 @@ //! @return @c true if this is a Kexi app instance //! @c false is returned e.g. for test apps that are based on Kexi. //! This function is useful to decide if certain actions should be performed that only -//! belong to the "real" Kexi app, for example updating a list of recent documents +//! belong to the "real" KEXI app, for example updating a list of recent documents //! or collecting usage information. //! The check is performed by comparing component name of KAboutData to the string "kexi". KEXICORE_EXPORT bool isKexiInstance(); diff --git a/src/core/kexi.cpp b/src/core/kexi.cpp --- a/src/core/kexi.cpp +++ b/src/core/kexi.cpp @@ -340,12 +340,12 @@ { if (feature_name.isEmpty()) *line1 = xi18n("This function is not available for version %1 of %2 application.", - QString(KEXI_VERSION_STRING), QString(KEXI_APP_NAME)); + QString(KEXI_VERSION_STRING), QApplication::applicationDisplayName()); else { QString feature_name_(feature_name); *line1 = xi18nc("@info", "%1 function is not available for version %2 of %3 application.", - feature_name_.remove('&'), QString(KEXI_VERSION_STRING), QString(KEXI_APP_NAME)); + feature_name_.remove('&'), QString(KEXI_VERSION_STRING), QApplication::applicationDisplayName()); } *line2 = extra_text; diff --git a/src/core/kexiaboutdata.cpp b/src/core/kexiaboutdata.cpp --- a/src/core/kexiaboutdata.cpp +++ b/src/core/kexiaboutdata.cpp @@ -30,12 +30,12 @@ KexiAboutData::KexiAboutData() : KAboutData( "kexi", - KEXI_APP_NAME, + "KEXI", Kexi::fullVersionString(), xi18n(description), KAboutLicense::LGPL_V2, - xi18n("© 2002-%1, The Kexi Team", QLatin1String(KEXI_YEAR)), - xi18n("This software is developed by Kexi Team - an international group " + xi18n("© 2002-%1, The KEXI Team", QLatin1String(KEXI_YEAR)), + xi18n("This software is developed by KEXI Team - an international group " "of independent developers. They form a part of the Calligra Project."), "https://www.kexi-project.org", "submit@bugs.kde.org" @@ -57,7 +57,7 @@ addAuthor( xi18n("Roman Shtemberko"), xi18n("Features and bug fixes"), "shtemberko@gmail.com"); addAuthor( - xi18n("Dimitrios T. Tanis"), xi18n("Users Manual for Kexi 2, main window improvements, numerous bug reports"), "dimitrios.tanis@kdemail.net"); + xi18n("Dimitrios T. Tanis"), xi18n("Users Manual for KEXI 2, main window improvements, numerous bug reports"), "dimitrios.tanis@kdemail.net"); addAuthor( xi18n("Oleg Kukharchuk"), xi18n("Several form widgets, porting to Qt 4, stabilization"), "oleg.kuh@gmail.com"); addAuthor( diff --git a/src/core/kexipartmanager.cpp b/src/core/kexipartmanager.cpp --- a/src/core/kexipartmanager.cpp +++ b/src/core/kexipartmanager.cpp @@ -109,8 +109,9 @@ KPluginFactory *factory = qobject_cast(info->instantiate()); if (!factory) { m_result = KDbResult(ERR_CANNOT_LOAD_OBJECT, - xi18nc("@info", "Could not load Kexi plugin file %1.", - info->fileName())); + xi18nc("@info", "Could not load plugin file %1 " + "for %2.", + info->fileName(), QApplication::applicationDisplayName())); QPluginLoader loader(info->fileName()); // use this to get the message (void)loader.load(); m_result.setServerMessage(loader.errorString()); @@ -120,9 +121,12 @@ } p = factory->create(this); if (!p) { - m_result = KDbResult(ERR_CANNOT_LOAD_OBJECT, - xi18nc("@info", - "Could not open Kexi plugin %1.").arg(info->fileName())); + m_result = KDbResult( + ERR_CANNOT_LOAD_OBJECT, + xi18nc( + "@info", + "Could not open plugin %1 for %2.", + info->fileName(), QApplication::applicationDisplayName())); qWarning() << m_result.message(); return 0; } @@ -221,10 +225,13 @@ qDeleteAll(offers); offers.clear(); if (d->partsByPluginId.isEmpty()) { - m_result = KDbResult( - xi18nc("@info", "Could not find any Kexi plugins, e.g. for tables or forms. " - "Kexi would not be functional so it will exit." - "Please check if Kexi is properly installed.")); + m_result = KDbResult(xi18nc( + "@info", "Could not find any plugins for %1, e.g. for " + "tables or forms. " + "%1 would not be functional so it will exit." + "Please check if %2 is properly " + "installed.", + QApplication::applicationDisplayName())); return false; } diff --git a/src/core/kexiproject.h b/src/core/kexiproject.h --- a/src/core/kexiproject.h +++ b/src/core/kexiproject.h @@ -331,7 +331,7 @@ (on open) within a project made with previous Kexi version not supporting all currently defined structurtes. We're trying to be here as much backward compatible as possible. For this purpose, here's the complete list of currently created objects: - - "kexi__blobs" - a table containing BLOBs data that can be accessed globally at Kexi projects + - "kexi__blobs" - a table containing BLOBs data that can be accessed globally at KEXI projects from within any database-aware view (table views, forms, reports, etc.) @param insideTransaction Embed entire creation process inside a transaction diff --git a/src/doc/dev/compile_time_options.txt b/src/doc/dev/compile_time_options.txt --- a/src/doc/dev/compile_time_options.txt +++ b/src/doc/dev/compile_time_options.txt @@ -20,7 +20,7 @@ Type: defined/undefined Default: undefined Description: If defined, forces to show menu entries and dialogs just to give -impression about development plans of Kexi Team. +impression about development plans of KEXI Team. Only recommended for test/development versions. * KEXI_SCRIPTS_SUPPORT diff --git a/src/doc/dev/naming_conventions.txt b/src/doc/dev/naming_conventions.txt --- a/src/doc/dev/naming_conventions.txt +++ b/src/doc/dev/naming_conventions.txt @@ -1,11 +1,11 @@ --------------------------------------------------------- Kexi Naming Conventions - These rules apply to Kexi Team developers + These rules apply to KEXI Team developers There are also guidelines for future naming decissions. Started: 2003-10-17 - Copyright (C) 2003 Kexi Team + Copyright (C) 2003 KEXI Team Kexi home page: http://www.kexi-project.org/ --------------------------------------------------- diff --git a/src/formeditor/widgetlibrary.cpp b/src/formeditor/widgetlibrary.cpp --- a/src/formeditor/widgetlibrary.cpp +++ b/src/formeditor/widgetlibrary.cpp @@ -92,8 +92,8 @@ // by providing this in propeditor m_advancedProperties.insert("minimumSize"); m_advancedProperties.insert("maximumSize"); - m_advancedProperties.insert("clickMessage"); // for backward compatibility Kexi projects created with Qt < 4.7 - m_advancedProperties.insert("showClearButton"); // for backward compatibility Kexi projects created with Qt 4 + m_advancedProperties.insert("clickMessage"); // for backward compatibility KEXI projects created with Qt < 4.7 + m_advancedProperties.insert("showClearButton"); // for backward compatibility KEXI projects created with Qt 4 #ifndef KEXI_SHOW_UNFINISHED /*! @todo reenable */ m_advancedProperties.insert("accel"); @@ -247,19 +247,22 @@ WidgetFactory *loadFactory(KexiFormWidgetsPluginMetaData *pluginMetaData) { KPluginFactory *factory = qobject_cast(pluginMetaData->instantiate()); if (!factory) { - q->m_result = KDbResult(ERR_CANNOT_LOAD_OBJECT, - xi18nc("@info", "Could not load Kexi Form Widgets plugin file %1.", - pluginMetaData->fileName())); + q->m_result = KDbResult( + ERR_CANNOT_LOAD_OBJECT, + xi18nc("@info", "Could not load Form Widgets plugin file %1 " + "for %2.", + pluginMetaData->fileName(), QApplication::applicationDisplayName())); q->setErrorMessage(pluginMetaData, q->result().message()); qWarning() << q->result().message(); return 0; } WidgetFactory *widgetFactory = factory->create(q); if (!widgetFactory) { - q->m_result = KDbResult(ERR_CANNOT_LOAD_OBJECT, - xi18nc("@info", - "Could not open Kexi Form Widgets plugin %1.", - pluginMetaData->fileName())); + q->m_result = KDbResult( + ERR_CANNOT_LOAD_OBJECT, + xi18nc("@info", "Could not open Form Widgets plugin %1 for " + "%2.", + pluginMetaData->fileName(), QApplication::applicationDisplayName())); qWarning() << q->m_result.message(); return 0; } diff --git a/src/kexi_global.h b/src/kexi_global.h --- a/src/kexi_global.h +++ b/src/kexi_global.h @@ -1,5 +1,5 @@ /* This file is part of the KDE project - Copyright (c) 2003-2007 Kexi Team + Copyright (c) 2003-2007 KEXI Team This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/src/main/KexiBugReportDialog.cpp b/src/main/KexiBugReportDialog.cpp --- a/src/main/KexiBugReportDialog.cpp +++ b/src/main/KexiBugReportDialog.cpp @@ -110,9 +110,9 @@ //! own Bug Report GUI and communicates using RPC. QString desc; if (0 != qstrcmp(Kexi::fullVersionString(), Kexi::versionString())) { - desc += futureI18nc("Full version of Kexi app", "Full version: %1", Kexi::fullVersionString()); + desc += futureI18nc("Full version of KEXI app", "Full version: %1", Kexi::fullVersionString()); } - body += futureI18n("(filed directly from Kexi app)"); + body += futureI18n("(filed directly from KEXI app)"); query.addQueryItem("comment", m_aboutData->version()); #endif query.addQueryItem("op_sys", m_op_sys); diff --git a/src/main/KexiMainWindow.cpp b/src/main/KexiMainWindow.cpp --- a/src/main/KexiMainWindow.cpp +++ b/src/main/KexiMainWindow.cpp @@ -331,7 +331,7 @@ if (!style || style->objectName() != name) { qWarning() << qPrintable(QString("Could not find application style %1. " - "Kexi will not start. Please check if Kexi is properly installed. ") + "Kexi will not start. Please check if KEXI is properly installed. ") .arg(name)); return false; } @@ -637,7 +637,8 @@ ac->addAction("quit", action = new KexiMenuWidgetAction(KStandardAction::Quit, this)); connect(action, SIGNAL(triggered()), this, SLOT(slotProjectQuit())); - action->setWhatsThis(xi18n("Quits Kexi application.")); + action->setWhatsThis(xi18nc("@info:whatsthis", "Quits %1 application.", + QApplication::applicationDisplayName())); setupMainMenuActionShortcut(action); #ifdef KEXI_SHOW_UNIMPLEMENTED @@ -653,9 +654,9 @@ #endif d->action_tools_import_project = addAction("tools_import_project", KexiIcon("database-import"), xi18n("&Import Database...")); - d->action_tools_import_project->setToolTip(xi18n("Import entire database as a Kexi project")); + d->action_tools_import_project->setToolTip(xi18n("Import entire database as a KEXI project")); d->action_tools_import_project->setWhatsThis( - xi18n("Imports entire database as a Kexi project.")); + xi18n("Imports entire database as a KEXI project.")); connect(d->action_tools_import_project, SIGNAL(triggered()), this, SLOT(slotToolsImportProject())); @@ -1037,8 +1038,8 @@ KStandardAction::Preferences, this)); action->setObjectName("settings"); action->setText(futureI18n("Settings...")); - action->setToolTip(futureI18n("Show Kexi settings")); - action->setWhatsThis(futureI18n("Shows Kexi settings.")); + action->setToolTip(futureI18n("Show KEXI settings")); + action->setWhatsThis(futureI18n("Shows KEXI settings.")); connect(action, SIGNAL(triggered()), this, SLOT(slotSettings())); setupMainMenuActionShortcut(action); #else @@ -1400,9 +1401,10 @@ if (incompatibleWithKexi) { if (KMessageBox::Yes == KMessageBox::questionYesNo(this, xi18nc("@info (don't add tags around %1, it's done already)", - "Database project %1 does not appear to have been created using Kexi." - "Do you want to import it as a new Kexi project?", - projectData.infoString()), + "Database project %1 does not appear to have been created using " + "%2." + "Do you want to import it as a new KEXI project?", + projectData.infoString(), QApplication::applicationDisplayName()), QString(), KGuiItem(xi18nc("@action:button Import Database", "&Import..."), KexiIconName("database-import")), KStandardGuiItem::cancel())) { @@ -2029,7 +2031,7 @@ if (pointSizeF > 0.0) { f.setPointSizeF(pointSizeF); } else { - const int pixelSize = propertyEditorGroup.readEntry("FontSize", -1); // compatibility with Kexi 2.x + const int pixelSize = propertyEditorGroup.readEntry("FontSize", -1); // compatibility with KEXI 2.x if (pixelSize > 0) { f.setPixelSize(pixelSize); } diff --git a/src/main/KexiMainWindow_p.cpp b/src/main/KexiMainWindow_p.cpp --- a/src/main/KexiMainWindow_p.cpp +++ b/src/main/KexiMainWindow_p.cpp @@ -661,19 +661,25 @@ d->ac->addAction(help_report_bug_action->objectName(), help_report_bug_action); QObject::disconnect(help_report_bug_action, 0, 0, 0); QObject::connect(help_report_bug_action, SIGNAL(triggered()), mainWin, SLOT(slotReportBug())); - help_report_bug_action->setText(xi18nc("Report a bug or wish for Kexi application", "Report a &Bug or Wish...")); + help_report_bug_action->setText(xi18nc("Report a bug or wish for KEXI application", "Report a &Bug or Wish...")); help_report_bug_action->setIcon(koIcon("tools-report-bug")); // good icon for toolbar - help_report_bug_action->setWhatsThis(xi18n("Files a bug or wish for Kexi application.")); + help_report_bug_action->setWhatsThis(xi18nc( + "@info:whatsthis", "Files a bug or wish for %1 application.", + QApplication::applicationDisplayName())); QAction* help_whats_this_action = d->helpMenu->action(KHelpMenu::menuWhatsThis); d->ac->addAction(help_whats_this_action->objectName(), help_whats_this_action); help_whats_this_action->setWhatsThis(xi18n("Activates a \"What's This?\" tool.")); QAction* help_contents_action = d->helpMenu->action(KHelpMenu::menuHelpContents); d->ac->addAction(help_contents_action->objectName(), help_contents_action); help_contents_action->setText(xi18n("Help")); - help_contents_action->setWhatsThis(xi18n("Shows Kexi Handbook.")); + help_contents_action->setWhatsThis(xi18nc("@info:whatsthis", + "Shows %1 Handbook.", + QApplication::applicationDisplayName())); QAction* help_about_app_action = d->helpMenu->action(KHelpMenu::menuAboutApp); d->ac->addAction(help_about_app_action->objectName(), help_about_app_action); - help_about_app_action->setWhatsThis(xi18n("Shows information about Kexi application.")); + help_about_app_action->setWhatsThis( + xi18nc("@info:whatsthis", "Shows information about %1 application.", + QApplication::applicationDisplayName())); QAction* help_about_kde_action = d->helpMenu->action(KHelpMenu::menuAboutKDE); d->ac->addAction(help_about_kde_action->objectName(), help_about_kde_action); help_about_kde_action->setWhatsThis(xi18n("Shows information about KDE.")); @@ -1350,7 +1356,7 @@ void KexiMainWindow::Private::showStartProcessMsg(const QStringList& args) { wnd->showErrorMessage(xi18nc("@info", "Could not start %1 application.", - QString::fromLatin1(KEXI_APP_NAME)), + QApplication::applicationDisplayName()), xi18nc("@info", "Command %1 failed.", args.join(" "))); } diff --git a/src/main/KexiRegisterResource_p.h b/src/main/KexiRegisterResource_p.h --- a/src/main/KexiRegisterResource_p.h +++ b/src/main/KexiRegisterResource_p.h @@ -143,9 +143,9 @@ #else *errorMessage = kxi18nc("@info", "Could not open icon resource file %1." - "Kexi will not start. " - "Please check if Kexi is properly installed.") - .subs(QFileInfo(path).fileName()); + "%2 will not start. " + "Please check if it is properly installed.") + .subs(QFileInfo(path).fileName()).subs(QApplication::applicationDisplayName()); *detailsErrorMessage = kxi18nc("@info Tried to find files in ", "Tried to find in %1.").subs(triedLocationsString); #endif diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp --- a/src/main/startup/KexiNewProjectAssistant.cpp +++ b/src/main/startup/KexiNewProjectAssistant.cpp @@ -70,11 +70,14 @@ // ---- -KexiTemplateSelectionPage::KexiTemplateSelectionPage(QWidget* parent) - : KexiAssistantPage(xi18nc("@title:window", "New Project"), - xi18nc("@info", "Kexi will create a new database project. Select blank database."), - //! @todo Change to this when templates work: "Kexi will create a new database project. Select blank database or template.", - parent) +KexiTemplateSelectionPage::KexiTemplateSelectionPage(QWidget *parent) + : KexiAssistantPage(xi18nc("@title:window", "New Project"), + xi18nc("@info", "%1 will create a new database " + "project. Select blank database.", + QApplication::applicationDisplayName()), + //! @todo Change to this when templates work: "Kexi will create a new + //! database project. Select blank database or template.", + parent) { m_templatesList = new KexiCategorizedView; setFocusWidget(m_templatesList); @@ -320,7 +323,7 @@ : KexiAssistantPage(xi18nc("@title:window", "Database Connection"), xi18nc("@info", "Select database server's connection you wish to use to " - "create a new Kexi project." + "create a new KEXI project." "Here you may also add, edit or delete connections " "from the list."), parent) diff --git a/src/main/startup/KexiOpenExistingFile.ui b/src/main/startup/KexiOpenExistingFile.ui --- a/src/main/startup/KexiOpenExistingFile.ui +++ b/src/main/startup/KexiOpenExistingFile.ui @@ -27,7 +27,7 @@ - <b>Select existing Kexi project file to open:</b> + <b>Select existing KEXI project file to open:</b> diff --git a/src/main/startup/KexiStartup.cpp b/src/main/startup/KexiStartup.cpp --- a/src/main/startup/KexiStartup.cpp +++ b/src/main/startup/KexiStartup.cpp @@ -258,10 +258,10 @@ // 1. Kexi plugins if (Kexi::partManager().infoList()->isEmpty()) { - out << i18n("No Kexi plugins found.") << endl; + out << i18n("No KEXI plugins found.") << endl; } else { - out << i18n("Kexi plugins (%1):", Kexi::partManager().infoList()->count()) << endl; + out << i18n("KEXI plugins (%1):", Kexi::partManager().infoList()->count()) << endl; foreach(const KexiPart::Info *info, *Kexi::partManager().infoList()) { prettyPrintPluginMetaData(maxWidth, labels, &out, *info); } @@ -413,7 +413,8 @@ const bool openExisting = !createDB && !isSet(options().dropDb); bool readOnly = isSet(options().readOnly); const QString couldnotMsg = QString::fromLatin1("\n") - + xi18n("Could not start Kexi application this way."); + + xi18nc("@info", "Could not start %1 application this way.", + QApplication::applicationDisplayName()); if (createDB && isSet(options().dropDb)) { KMessageBox::sorry(0, @@ -893,7 +894,7 @@ if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo( parent, xi18nc("@info", "%1 is an external file of type %2." - "Do you want to import the file as a Kexi project?", + "Do you want to import the file as a KEXI project?", QDir::toNativeSeparators(databaseName), mime.comment()), xi18n("Open External File"), KGuiItem(xi18nc("@action:button Import File", "Import..."), @@ -955,8 +956,9 @@ const QString comment(mime.comment().isEmpty() ? QString() : QString::fromLatin1(" (%1)").arg(mime.comment())); KMessageBox::detailedSorry(parent, xi18nc("@info", - "The file %1 is not recognized as being supported by Kexi.", - QDir::toNativeSeparators(databaseName)), + "The file %1 is not recognized as being supported by " + "%1.", + QDir::toNativeSeparators(databaseName), QApplication::applicationDisplayName()), possibleProblemsMessage.isEmpty() ? xi18nc("@info", "Could not find plugin supporting for this file type." diff --git a/src/main/startup/KexiWelcomeAssistant.cpp b/src/main/startup/KexiWelcomeAssistant.cpp --- a/src/main/startup/KexiWelcomeAssistant.cpp +++ b/src/main/startup/KexiWelcomeAssistant.cpp @@ -44,7 +44,7 @@ KexiMainWelcomePage::KexiMainWelcomePage( KexiWelcomeAssistant* assistant, QWidget* parent) - : KexiAssistantPage(xi18nc("@title:window", "Welcome to Kexi"), + : KexiAssistantPage(xi18nc("@title:window", "Welcome to KEXI"), xi18nc("@info", "Select one of the recently used projects to open."), parent) , m_assistant(assistant) diff --git a/src/main/startup/KexiWelcomeStatusBar.cpp b/src/main/startup/KexiWelcomeStatusBar.cpp --- a/src/main/startup/KexiWelcomeStatusBar.cpp +++ b/src/main/startup/KexiWelcomeStatusBar.cpp @@ -933,12 +933,12 @@ return; } if (KMessageBox::Yes != KMessageBox::questionYesNo(this, - xi18nc("@info donate to the project", "Kexi may be totally free, but its development is costly." + xi18nc("@info donate to the project", "KEXI may be totally free, but its development is costly." "Power, hardware, office space, internet access, traveling for meetings - everything costs." - "Direct donation is the easiest and fastest way to efficiently support the Kexi Project. " + "Direct donation is the easiest and fastest way to efficiently support the KEXI Project. " "Everyone, regardless of any degree of involvement can do so." - "What do you receive for your donation? Kexi will become more feature-full and stable as " - "contributors will be able to devote more time to Kexi. Not only you can " + "What do you receive for your donation? KEXI will become more feature-full and stable as " + "contributors will be able to devote more time to KEXI. Not only you can " "expect new features, but you can also have an influence on what features are added!" "Currently we are accepting donations through BountySource (a funding platform " "for open-source software) using secure PayPal, Bitcoin and Google Wallet transfers." diff --git a/src/main/status/contribution_details.ui b/src/main/status/contribution_details.ui --- a/src/main/status/contribution_details.ui +++ b/src/main/status/contribution_details.ui @@ -37,7 +37,7 @@ - Share usage info for Kexi + Share usage info for KEXI true @@ -58,7 +58,7 @@ Qt::StrongFocus - <a href="show_info">Show what info is shared with the Kexi Project community to improve the application &raquo;</a> + <a href="show_info">Show what info is shared with the KEXI Project community to improve the application &raquo;</a> true @@ -128,7 +128,7 @@ - Kexi version: + KEXI version: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -295,7 +295,7 @@ - Enabling this will include your usage of Kexi in the global statistics. + Enabling this will include your usage of KEXI in the global statistics. true @@ -340,7 +340,7 @@ - Enabling this helps the Kexi Project to identify typical operating systems and hardware that should be supported. Recommended. + Enabling this helps the KEXI Project to identify typical operating systems and hardware that should be supported. Recommended. true @@ -575,7 +575,7 @@ - Enabling this helps Kexi Project to better know real display parameters used with Kexi, so it can become better optimized. Recommended. + Enabling this helps KEXI Project to better know real display parameters used with KEXI, so it can become better optimized. Recommended. true @@ -693,7 +693,7 @@ - Enabling this helps Kexi Project to know how wide support for regional settings should be. Recommended. + Enabling this helps KEXI Project to know how wide support for regional settings should be. Recommended. true @@ -946,7 +946,7 @@ QGroupBox { border:none; } - Donations to the Kexi project + Donations to the KEXI project true @@ -1058,7 +1058,7 @@ Qt::StrongFocus - This section only informs about known visits to the Donation web page from this computer. Kexi app has no access to real donation information. + This section only informs about known visits to the Donation web page from this computer. KEXI app has no access to real donation information. true diff --git a/src/main/status/contribution_help.ui b/src/main/status/contribution_help.ui --- a/src/main/status/contribution_help.ui +++ b/src/main/status/contribution_help.ui @@ -21,8 +21,8 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nokia Pure Text'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; font-weight:600;">Your Support for the Kexi Project.<br />In No Time. At No Cost.</span> </p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Most products appreciate your close participation during beta testing stages of development. In the Kexi Project you can participate at any stage, it does not matter if it is a shiny final release or early beta, you can join us to influence the shape of your software. </p> +<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:x-large; font-weight:600;">Your Support for the KEXI Project.<br />In No Time. At No Cost.</span> </p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Most products appreciate your close participation during beta testing stages of development. In the KEXI Project you can participate at any stage, it does not matter if it is a shiny final release or early beta, you can join us to influence the shape of your software. </p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Before going further please note one thing, this application is developed by its community, its creators <span style=" font-weight:600;">and</span> users are one group, they are not separate. We refer to this group as the Project. </p> <p style=" margin-top:14px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:large; font-weight:600;">Power to You</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">You can have substantial influence on the future releases of this software by: </p> @@ -56,7 +56,7 @@ <li style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">No limits for computers. You can use multiple computers and operating systems and use the same participant's nickname or name. You can enable participation from one computer (e.g. at home) and decide not to participate from another computer (e.g. at work).</li> <li style=" margin-top:0px; margin-bottom:10px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Only for one purpose. The collected data is used only to improve the Project. </li></ul> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:1; text-indent:0px;">We plan to improve and extend ways of participation so stay tuned. Feel free to share you ideas on the matter by sending feedback to <a href="mailto:calligra-devel@kde.org"><span style=" text-decoration: underline; color:#0057ae;">calligra-devel@kde.org</span></a>. This is another good way to start participation!</p> -<p style=" margin-top:20px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">-- Love, the Kexi Project Team</span> </p> +<p style=" margin-top:20px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">-- Love, the KEXI Project Team</span> </p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> diff --git a/src/main/status/status.ui b/src/main/status/status.ui --- a/src/main/status/status.ui +++ b/src/main/status/status.ui @@ -34,7 +34,7 @@ - You in Kexi Project + You in KEXI Project @@ -309,7 +309,7 @@ Qt::StrongFocus - <span style="color:gray;">Thank you for being part of Kexi!</span> + <span style="color:gray;">Thank you for being part of KEXI!</span> true @@ -408,7 +408,7 @@ Qt::StrongFocus - Visit http://kexi-project home page + Visit KEXI home page <a href="http://kexi-project.org"><nobr><b>Home page &raquo;</b></nobr></a> diff --git a/src/main/status/status_strings.ui b/src/main/status/status_strings.ui --- a/src/main/status/status_strings.ui +++ b/src/main/status/status_strings.ui @@ -23,7 +23,7 @@ - <br><b>Do you want to share Kexi usage info?</b> + <br><b>Do you want to share KEXI usage info?</b> <p></p> <p>Click &quot;Help&quot; button for details.</p> diff --git a/src/migration/importtablewizard.cpp b/src/migration/importtablewizard.cpp --- a/src/migration/importtablewizard.cpp +++ b/src/migration/importtablewizard.cpp @@ -167,7 +167,7 @@ lblIntro->setText( xi18nc("@info", "Table Importing Assistant allows you to import a table from an existing " - "database into the current Kexi project." + "database into the current KEXI project." "Click Next button to continue or " "Cancel button to exit this assistant.")); vbox->addWidget(lblIntro); diff --git a/src/migration/importwizard.cpp b/src/migration/importwizard.cpp --- a/src/migration/importwizard.cpp +++ b/src/migration/importwizard.cpp @@ -240,7 +240,7 @@ if (d->predefinedConnectionData) { //predefined import: server source msg = xi18nc("@info", "Database Importing Assistant is about to import %1 database " - "(connection %2) into a Kexi project.", + "(connection %2) into a KEXI project.", d->predefinedDatabaseName, d->predefinedConnectionData->toUserVisibleString()); } else if (!d->predefinedDatabaseName.isEmpty()) { //predefined import: file source //! @todo this message is currently ok for files only @@ -252,13 +252,13 @@ d->driverIdForSelectedSource = driverIdForMimeType(mime); msg = xi18nc("@info", "Database Importing Assistant is about to import %1 file " - "of type %2 into a Kexi project.", + "of type %2 into a KEXI project.", QDir::toNativeSeparators(d->predefinedDatabaseName), mime.isValid() ? mime.comment() : "???"); } else { msg = xi18nc("@info", "Database Importing Assistant allows you to import an existing database " - "into a Kexi project."); + "into a KEXI project."); } // note: we're using .arg() here because the msg argument is already in rich-text format QString finalMessage = xi18nc("@info", @@ -1029,7 +1029,7 @@ if (true == res) { d->finishLbl->setText( xi18nc("@info", - "Database has been imported into Kexi project %1.", + "Database has been imported into KEXI project %1.", d->dstNewDBNameLineEdit->text())); button(QDialogButtonBox::Cancel)->setEnabled(false); backButton()->setEnabled(false); diff --git a/src/migration/mdb/src/keximdb/keximigrate_mdb.json b/src/migration/mdb/src/keximdb/keximigrate_mdb.json --- a/src/migration/mdb/src/keximdb/keximigrate_mdb.json +++ b/src/migration/mdb/src/keximdb/keximigrate_mdb.json @@ -3,7 +3,7 @@ "Authors": [ { "Email": "kexi@kde.org", - "Name": "Kexi Team", + "Name": "KEXI Team", "Name[ca@valencia]": "L'equip del Kexi", "Name[ca]": "L'equip del Kexi", "Name[cs]": "Tým Kexi", @@ -27,7 +27,7 @@ ], "Category": "", "Dependencies": [], - "Description": "MS Access (MDB) import plugin for Kexi", + "Description": "MS Access (MDB) import plugin for KEXI", "Description[ca@valencia]": "Connector d'importació del MS Access (MDB) pel Kexi", "Description[ca]": "Connector d'importació del MS Access (MDB) pel Kexi", "Description[cs]": "Modul Kexi pro import MS Access (MDB)", diff --git a/src/migration/mysql/keximigrate_mysql.json b/src/migration/mysql/keximigrate_mysql.json --- a/src/migration/mysql/keximigrate_mysql.json +++ b/src/migration/mysql/keximigrate_mysql.json @@ -3,7 +3,7 @@ "Authors": [ { "Email": "kexi@kde.org", - "Name": "Kexi Team", + "Name": "KEXI Team", "Name[ca@valencia]": "L'equip del Kexi", "Name[ca]": "L'equip del Kexi", "Name[cs]": "Tým Kexi", @@ -29,7 +29,7 @@ "Dependencies": [ "org.kde.kdb.mysql" ], - "Description": "MySQL database import plugin for Kexi", + "Description": "MySQL database import plugin for KEXI", "Description[ca@valencia]": "Connector d'importació de la base de dades MySQL pel Kexi", "Description[ca]": "Connector d'importació de la base de dades MySQL pel Kexi", "Description[cs]": "Modul Kexi pro import databáze MySQL", diff --git a/src/migration/postgresql/keximigrate_postgresql.json b/src/migration/postgresql/keximigrate_postgresql.json --- a/src/migration/postgresql/keximigrate_postgresql.json +++ b/src/migration/postgresql/keximigrate_postgresql.json @@ -3,7 +3,7 @@ "Authors": [ { "Email": "kexi@kde.org", - "Name": "Kexi Team", + "Name": "KEXI Team", "Name[ca@valencia]": "L'equip del Kexi", "Name[ca]": "L'equip del Kexi", "Name[cs]": "Tým Kexi", @@ -29,7 +29,7 @@ "Dependencies": [ "org.kde.kdb.postgresql" ], - "Description": "PostgreSQL database import plugin for Kexi", + "Description": "PostgreSQL database import plugin for KEXI", "Description[ca@valencia]": "Connector d'importació de la base de dades PostgreSQL pel Kexi", "Description[ca]": "Connector d'importació de la base de dades PostgreSQL pel Kexi", "Description[cs]": "Modul Kexi pro import databáze PostgreSQL", diff --git a/src/migration/tests/keximigratetest.cpp b/src/migration/tests/keximigratetest.cpp --- a/src/migration/tests/keximigratetest.cpp +++ b/src/migration/tests/keximigratetest.cpp @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - KAboutData aboutData("keximigratetest", xi18n("Kexi Migrate Test"), "2.0", QString(), + KAboutData aboutData("keximigratetest", xi18n("KEXI Migrate Test"), "2.0", QString(), KAboutLicense::GPL_V2); KAboutData::setApplicationData(aboutData); diff --git a/src/migration/tsv/keximigrate_tsv.json b/src/migration/tsv/keximigrate_tsv.json --- a/src/migration/tsv/keximigrate_tsv.json +++ b/src/migration/tsv/keximigrate_tsv.json @@ -3,7 +3,7 @@ "Authors": [ { "Email": "kexi@kde.org", - "Name": "Kexi Team", + "Name": "KEXI Team", "Name[ca@valencia]": "L'equip del Kexi", "Name[ca]": "L'equip del Kexi", "Name[cs]": "Tým Kexi", @@ -27,13 +27,13 @@ ], "Category": "", "Dependencies": [], - "Description": "Tab Separated Values (TSV) file import plugin for Kexi", + "Description": "Tab Separated Values (TSV) file import plugin for KEXI", "Description[ca@valencia]": "Connector d'importació de fitxers amb valors separats per tabulacions (TSV) pel Kexi", "Description[ca]": "Connector d'importació de fitxers amb valors separats per tabulacions (TSV) pel Kexi", "Description[cs]": "Importní modul Kexi pro hodnoty oddělené tabulátorem (Tab Separated Values - TSV)", "Description[de]": "„Durch Tabulator getrennte Werte“-(TSV)-Datei-Importmodul für Kexi", "Description[es]": "Complemento de importación de archivos de valores separados por tabuladores (TSV) para Kexi", - "Description[fr]": "Module d'importation de ficher « séparations par tabulation » pour Kexi", + "Description[fr]": "Module d'importation de ficher « séparations par tabulation » pour Kexi", "Description[gl]": "Complemento para Kexi de importación de ficheiros de valores separados por tabulacións (TSV)", "Description[it]": "Estensione di importazione di file con valori separati da tabulazioni (TSV) per Kexi", "Description[nl]": "Plug-in voor importeren van bestand met Tab Separated Values (TSV) voor Kexi", diff --git a/src/mobile/main.cpp b/src/mobile/main.cpp --- a/src/mobile/main.cpp +++ b/src/mobile/main.cpp @@ -26,8 +26,8 @@ int main(int argc, char** argv) { KAboutData aboutData( "keximobile", "keximobile", - kxi18n("Kexi Mobile"), "0.2", - kxi18n("A mobile optimized version of Kexi from Calligra Suite"), + kxi18n("KEXI Mobile"), "0.2", + kxi18n("A mobile optimized version of KEXI"), KAboutData::License_LGPL, kxi18n("Copyright (c) 2014 Adam Pigg") ); KCmdLineArgs::init( argc, argv, &aboutData ); diff --git a/src/plugins/forms/kexi_formplugin.desktop b/src/plugins/forms/kexi_formplugin.desktop --- a/src/plugins/forms/kexi_formplugin.desktop +++ b/src/plugins/forms/kexi_formplugin.desktop @@ -47,7 +47,7 @@ X-KDE-Library=kexi_formplugin X-KDE-ServiceTypes=Kexi/Viewer,Kexi/Designer -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.form X-KDE-PluginInfo-Version=3.2 diff --git a/src/plugins/forms/widgets/kexidbautofield.h b/src/plugins/forms/widgets/kexidbautofield.h --- a/src/plugins/forms/widgets/kexidbautofield.h +++ b/src/plugins/forms/widgets/kexidbautofield.h @@ -35,7 +35,7 @@ class QLabel; -//! Universal "Auto Field" widget for Kexi forms +//! Universal "Auto Field" widget for KEXI forms /*! It acts as a container for most data-aware widgets. */ class KEXIFORMUTILS_EXPORT KexiDBAutoField : public QWidget, diff --git a/src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json b/src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json --- a/src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json +++ b/src/plugins/forms/widgets/main/kexiforms_mainwidgetsplugin.json @@ -3,7 +3,7 @@ "Authors": [ { "Email": "kexi@kde.org", - "Name": "Kexi Team", + "Name": "KEXI Team", "Name[ca@valencia]": "L'equip del Kexi", "Name[ca]": "L'equip del Kexi", "Name[cs]": "Tým Kexi", @@ -27,7 +27,7 @@ ], "Category": "", "Dependencies": [], - "Description": "Kexi plugin providing database form widgets", + "Description": "KEXI plugin providing database form widgets", "Description[ca@valencia]": "Connector del Kexi que proporciona estris de formularis de bases de dades", "Description[ca]": "Connector del Kexi que proporciona estris de formularis de bases de dades", "Description[de]": "Kexi-Modul, das Datenbankbedienelemente bereitstellt", diff --git a/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop b/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop --- a/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop +++ b/src/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop @@ -41,7 +41,7 @@ X-KDE-Library=kexiforms_mapwidgetplugin X-KDE-ServiceTypes=Kexi/FormWidgets -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.form.widgets.map X-KDE-PluginInfo-Version=3.2 diff --git a/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json b/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json --- a/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json +++ b/src/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.json @@ -3,7 +3,7 @@ "Authors": [ { "Email": "kexi@kde.org", - "Name": "Kexi Team", + "Name": "KEXI Team", "Name[ca@valencia]": "L'equip del Kexi", "Name[ca]": "L'equip del Kexi", "Name[cs]": "Tým Kexi", @@ -27,7 +27,7 @@ ], "Category": "", "Dependencies": [], - "Description": "Kexi plugin providing web browser form widget", + "Description": "KEXI plugin providing web browser form widget", "Description[ca@valencia]": "Connector del Kexi que proporciona estris de formularis de navegació web", "Description[ca]": "Connector del Kexi que proporciona estris de formularis de navegació web", "Description[de]": "Kexi-Modul, das ein Webbrowser-Bedienelement bereitstellt", diff --git a/src/plugins/importexport/csv/kexi_csvimportexportplugin.desktop b/src/plugins/importexport/csv/kexi_csvimportexportplugin.desktop --- a/src/plugins/importexport/csv/kexi_csvimportexportplugin.desktop +++ b/src/plugins/importexport/csv/kexi_csvimportexportplugin.desktop @@ -7,7 +7,7 @@ Name[en_GB]=CSV import/export Name[es]=Importar/exportar CSV Name[fi]=CSV-tuonti/vienti -Name[fr]=Importation / exportation CSV +Name[fr]=Importation / exportation CSV Name[gl]=Importar ou exportar CSV Name[it]=Importazione/esportazione CSV Name[nl]=CSV importeren/exporteren @@ -27,7 +27,7 @@ Comment[en_GB]=Kexi Plugin for CSV data import/export Comment[es]=Complemento de Kexi para importar y exportar datos CSV Comment[fi]=Kexi-liitännäinen CSV-tietojen tuontiin ja vientiin -Comment[fr]=Module Kexi pour l'importation / exportation de données CSV +Comment[fr]=Module Kexi pour l'importation / exportation de données CSV Comment[gl]=Complemento para Kexi de importación e exportación de datos CSV. Comment[it]=Estensione di importazione ed esportazione di dati CSV di Kexi Comment[nl]=Kexi-plug-in voor importeren/exporteren van CSV-gegevens @@ -44,7 +44,7 @@ X-KDE-Library=kexi_csvimportexportplugin X-KDE-ServiceTypes=Kexi/Internal -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.importexport.csv X-KDE-PluginInfo-Version=3.2 diff --git a/src/plugins/migration/kexi_migrationplugin.desktop b/src/plugins/migration/kexi_migrationplugin.desktop --- a/src/plugins/migration/kexi_migrationplugin.desktop +++ b/src/plugins/migration/kexi_migrationplugin.desktop @@ -41,7 +41,7 @@ X-KDE-Library=kexi_migrationplugin X-KDE-ServiceTypes=Kexi/Internal -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.migration X-KDE-PluginInfo-Version=3.2 diff --git a/src/plugins/queries/kexi_queryplugin.desktop b/src/plugins/queries/kexi_queryplugin.desktop --- a/src/plugins/queries/kexi_queryplugin.desktop +++ b/src/plugins/queries/kexi_queryplugin.desktop @@ -47,7 +47,7 @@ X-KDE-Library=kexi_queryplugin X-KDE-ServiceTypes=Kexi/Viewer,Kexi/Designer,Kexi/Editor -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.query X-KDE-PluginInfo-Version=3.2 diff --git a/src/plugins/reports/kexi_reportplugin.desktop b/src/plugins/reports/kexi_reportplugin.desktop --- a/src/plugins/reports/kexi_reportplugin.desktop +++ b/src/plugins/reports/kexi_reportplugin.desktop @@ -46,7 +46,7 @@ X-KDE-Library=kexi_reportplugin X-KDE-ServiceTypes=Kexi/Viewer,Kexi/Designer -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.report X-KDE-PluginInfo-Version=3.2 diff --git a/src/plugins/reports/kexireportdesignview.cpp b/src/plugins/reports/kexireportdesignview.cpp --- a/src/plugins/reports/kexireportdesignview.cpp +++ b/src/plugins/reports/kexireportdesignview.cpp @@ -226,7 +226,7 @@ QDomDocument dd; QDomElement conndata = dd.createElement("connection"); conndata.setAttribute("type", "internal"); // for backward compatibility, currently always - // internal, we used to have "external" in old Kexi + // internal, we used to have "external" in old KEXI conndata.setAttribute("source", m_sourceSelector->selectedName()); conndata.setAttribute("class", m_sourceSelector->selectedPluginId()); return conndata; diff --git a/src/plugins/scripting/kexiscripting/kexi_scriptplugin.desktop b/src/plugins/scripting/kexiscripting/kexi_scriptplugin.desktop --- a/src/plugins/scripting/kexiscripting/kexi_scriptplugin.desktop +++ b/src/plugins/scripting/kexiscripting/kexi_scriptplugin.desktop @@ -54,7 +54,7 @@ X-KDE-Library=kexi_scriptplugin X-KDE-ServiceTypes=Kexi/Editor -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.script X-KDE-PluginInfo-Version=3.2 diff --git a/src/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/src/plugins/scripting/kexiscripting/kexiscripteditor.cpp --- a/src/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/src/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -62,7 +62,7 @@ "This is Technology Preview (BETA) version of scripting\n" "support in Kexi. The scripting API may change in details\n" - "in the next Kexi version.\n" + "in the next KEXI version.\n" "For more information and documentation see\n%1", "http://www.kexi-project.org/scripting/"), true).join("\n# ") + "\n"; #endif diff --git a/src/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/src/plugins/scripting/kexiscripting/kexiscriptpart.cpp --- a/src/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/src/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -104,7 +104,7 @@ if (result.isError()) { QString errormessage = result.toString(); long lineno = result.property("lineNumber").toInt(); - QMessageBox mb(xi18n("Kexi Script"), xi18n("Error executing script at line %1:\n%2").arg(lineno).arg(errormessage), QMessageBox::Critical, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + QMessageBox mb(xi18n("KEXI Script"), xi18n("Error executing script at line %1:\n%2").arg(lineno).arg(errormessage), QMessageBox::Critical, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb.exec(); return false; } diff --git a/src/plugins/tables/kexi_tableplugin.desktop b/src/plugins/tables/kexi_tableplugin.desktop --- a/src/plugins/tables/kexi_tableplugin.desktop +++ b/src/plugins/tables/kexi_tableplugin.desktop @@ -47,7 +47,7 @@ X-KDE-Library=kexi_tableplugin X-KDE-ServiceTypes=Kexi/Viewer,Kexi/Designer -X-KDE-PluginInfo-Author=Kexi Team +X-KDE-PluginInfo-Author=KEXI Team X-KDE-PluginInfo-Email=kexi@kde.org X-KDE-PluginInfo-Name=org.kexi-project.table X-KDE-PluginInfo-Version=3.2 diff --git a/src/tests/migration/readertest.cpp b/src/tests/migration/readertest.cpp --- a/src/tests/migration/readertest.cpp +++ b/src/tests/migration/readertest.cpp @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) { - KAboutData aboutData("keximigratetest", 0, kxi18n("Kexi Migrate Test"), "2.0"); + KAboutData aboutData("keximigratetest", 0, kxi18n("KEXI Migrate Test"), "2.0"); KCmdLineArgs::init(argc, argv, &aboutData); KApplication app; diff --git a/src/tests/newapi/main.cpp b/src/tests/newapi/main.cpp --- a/src/tests/newapi/main.cpp +++ b/src/tests/newapi/main.cpp @@ -90,7 +90,7 @@ KAboutData aboutData(prgname, 0, kxi18n("KexiDBTest"), KEXI_VERSION_STRING, KLocalizedString(), KAboutData::License_GPL, - kxi18n("(c) 2003-2010, Kexi Team\n" + kxi18n("(c) 2003-2010, KEXI Team\n" "(c) 2003-2006, OpenOffice Software.\n"), KLocalizedString(), "http://www.kexi-project.org", diff --git a/src/widget/KexiConnectionSelector.ui b/src/widget/KexiConnectionSelector.ui --- a/src/widget/KexiConnectionSelector.ui +++ b/src/widget/KexiConnectionSelector.ui @@ -46,7 +46,7 @@ <title>Select Existing Database Server's Connection From the List Below</title> -<para>You will see existing Kexi projects available for the selected connection. Here you may also add, edit or delete connections from the list.</para> +<para>You will see existing KEXI projects available for the selected connection. Here you may also add, edit or delete connections from the list.</para> diff --git a/src/widget/KexiProjectSelector.ui b/src/widget/KexiProjectSelector.ui --- a/src/widget/KexiProjectSelector.ui +++ b/src/widget/KexiProjectSelector.ui @@ -29,7 +29,7 @@ - <b>There are Kexi projects you have recently opened.</b> Select one you wish to open: + <b>There are KEXI projects you have recently opened.</b> Select one you wish to open: