Mercurial > trustbridge
changeset 520:09077eca0b0d
Rename administrator to trustbridge-admin
author | Andre Heinecke <aheinecke@intevation.de> |
---|---|
date | Tue, 29 Apr 2014 09:33:22 +0000 |
parents | 6e11dc2f70d3 |
children | fd29ab9cadaf |
files | ui/CMakeLists.txt ui/administrator.cpp ui/l10n/administrator_de_DE.ts |
diffstat | 3 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/ui/CMakeLists.txt Tue Apr 29 09:26:24 2014 +0000 +++ b/ui/CMakeLists.txt Tue Apr 29 09:33:22 2014 +0000 @@ -12,7 +12,7 @@ find_package(Qt5LinguistTools) -# Common code is used in either the client or the administrat +# Common code is used in either the client or the administrator # application or in unit tests. set(UICOMMON_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/certificatelist.cpp @@ -126,7 +126,7 @@ qt5_add_resources(ADMINISTRATOR_L10N ${CMAKE_CURRENT_BINARY_DIR}/administrator.qrc) qt5_create_translation(ADMINISTRATOR_TRANSLATION ${ADMINSTRATOR_SOURCES_WITH_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/l10n/administrator_de_DE.ts) - add_executable(administrator + add_executable(trustbridge-admin ${_add_executable_params} ${ADMINSTRATOR_SOURCES_WITH_RESOURCES} ${ADMINISTRATOR_L10N} @@ -146,7 +146,7 @@ else() message (STATUS "WARNING: Could not find qt linguist tools. Translation will not be included.") - add_executable(administrator + add_executable(trustbridge-admin ${_add_executable_params} ${ADMINSTRATOR_SOURCES_WITH_RESOURCES}) add_executable(trustbridge @@ -156,7 +156,7 @@ add_library(ui_common STATIC ${UICOMMON_SOURCES}) -target_link_libraries(administrator Qt5::Widgets +target_link_libraries(trustbridge-admin Qt5::Widgets ui_common trustbridge_common ${POLARSSL_LIBRARIES} @@ -175,4 +175,4 @@ add_subdirectory(tests) install(TARGETS trustbridge DESTINATION bin) -install(TARGETS administrator DESTINATION bin) +install(TARGETS trustbridge-admin DESTINATION bin)
--- a/ui/administrator.cpp Tue Apr 29 09:26:24 2014 +0000 +++ b/ui/administrator.cpp Tue Apr 29 09:33:22 2014 +0000 @@ -19,7 +19,7 @@ #endif #ifndef APPNAME -#define APPNAME "trustbridge-administration" +#define APPNAME "trustbridge-admin" #endif #ifndef ORGANIZATION
--- a/ui/l10n/administrator_de_DE.ts Tue Apr 29 09:26:24 2014 +0000 +++ b/ui/l10n/administrator_de_DE.ts Tue Apr 29 09:33:22 2014 +0000 @@ -243,8 +243,8 @@ <context> <name>CreateInstallerDialog</name> <message> - <location filename="../createinstallerdialog.cpp" line="26"/> - <location filename="../createinstallerdialog.cpp" line="51"/> + <location filename="../createinstallerdialog.cpp" line="25"/> + <location filename="../createinstallerdialog.cpp" line="50"/> <source>Create binary installer</source> <translation>Installationspaket erstellen</translation> </message> @@ -261,77 +261,77 @@ <translation type="vanished">Code Signing Zertifikat auswählen (privater Schlüssel):</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="53"/> + <location filename="../createinstallerdialog.cpp" line="52"/> <source>Create and sign a TrustBridge binary installer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="64"/> + <location filename="../createinstallerdialog.cpp" line="63"/> <source>Select binary folder:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="65"/> + <location filename="../createinstallerdialog.cpp" line="64"/> <source>Select code signing certificate:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="66"/> + <location filename="../createinstallerdialog.cpp" line="65"/> <source>Select output folder:</source> <translation>Ausgabeverzeichnis auswählen:</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="95"/> + <location filename="../createinstallerdialog.cpp" line="94"/> <source>Create installer</source> <translation>Installationspaket erzeugen</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="97"/> + <location filename="../createinstallerdialog.cpp" line="96"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="117"/> + <location filename="../createinstallerdialog.cpp" line="116"/> <source>Creating installer package...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="129"/> + <location filename="../createinstallerdialog.cpp" line="128"/> <source>Select certificate</source> <translation>Zertifikat auswählen</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="140"/> + <location filename="../createinstallerdialog.cpp" line="139"/> <source>Select binary folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="158"/> + <location filename="../createinstallerdialog.cpp" line="157"/> <source>Error!</source> <translation type="unfinished">Fehler!</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="178"/> + <location filename="../createinstallerdialog.cpp" line="177"/> <source>Please select an existing input folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="182"/> + <location filename="../createinstallerdialog.cpp" line="181"/> <source>Please select a codesigning certificate.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="186"/> + <location filename="../createinstallerdialog.cpp" line="185"/> <source>Please select a output folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="193"/> + <location filename="../createinstallerdialog.cpp" line="192"/> <source>Folder %1 does not appear to contain a meta.ini</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="218"/> + <location filename="../createinstallerdialog.cpp" line="217"/> <source>Failed to start makensis. Please ensure that makensis is installed and in your PATH variable.</source> <translation type="unfinished"></translation> @@ -341,7 +341,7 @@ <translation type="vanished">Archiv auswählen</translation> </message> <message> - <location filename="../createinstallerdialog.cpp" line="150"/> + <location filename="../createinstallerdialog.cpp" line="149"/> <source>Select target location</source> <translation>Zielort auswählen</translation> </message>