[PATCH 7 of 7] merged

Wald Commits scm-commit at wald.intevation.org
Thu Apr 17 09:30:21 CEST 2014


# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1397716904 -7200
# Node ID 1be8826207ca52e40d2b99976f6e61bf535056dc
# Parent  03c562b1a3ea9ca19fdc3d746db03c921c1bc8c9
# Parent  413b29f6758fbaa654e6b4f9d87308aa5dc8b73a
merged.

diff -r 03c562b1a3ea -r 1be8826207ca ui/CMakeLists.txt
--- a/ui/CMakeLists.txt	Wed Apr 16 17:46:40 2014 +0200
+++ b/ui/CMakeLists.txt	Thu Apr 17 08:41:44 2014 +0200
@@ -10,6 +10,8 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../common)
 add_definitions(${Qt5Widgets_DEFINITIONS})
 
+find_package(Qt5LinguistTools)
+
 set(CERTIFICATELIST_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/certificatelist.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/certificate.cpp
@@ -108,7 +110,14 @@
 
 set(ADMINSTRATOR_SOURCES_WITH_RESOURCES ${ADMINSTRATOR_SOURCES})
 qt5_add_resources(ADMINSTRATOR_SOURCES_WITH_RESOURCES ${ADMINSTRATOR_RESOURCES})
-add_executable(administrator ${ADMINSTRATOR_SOURCES_WITH_RESOURCES})
+
+if(Qt5LinguistTools_FOUND)
+   qt5_create_translation(ADMINISTRATOR_TRANSLATION ${ADMINSTRATOR_SOURCES_WITH_RESOURCES}
+      ${CMAKE_CURRENT_SOURCE_DIR}/l10n/administrator.ts)
+  add_executable(administrator ${ADMINSTRATOR_SOURCES_WITH_RESOURCES} ${ADMINISTRATOR_TRANSLATION})
+else()
+   message (STATUS "WARNING: Could not find qt linguist tools. Translation will not be included.")
+endif()
 
 target_link_libraries(administrator Qt5::Widgets
    trustbridge_common
diff -r 03c562b1a3ea -r 1be8826207ca ui/l10n/administrator.ts
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/l10n/administrator.ts	Thu Apr 17 08:41:44 2014 +0200
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
+<context>
+    <name>AdministratorWindow</name>
+    <message>
+        <location filename="../administratorwindow.cpp" line="49"/>
+        <source>Menu</source>
+        <translation>Menü</translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="51"/>
+        <source>Create Installer</source>
+        <translation>Installationspaket erstellen</translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="52"/>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="54"/>
+        <source>Help</source>
+        <translation>Hilfe</translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="55"/>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="57"/>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="79"/>
+        <source>Managed Certificates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="102"/>
+        <source>Administrator Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="113"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="115"/>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="117"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="119"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="144"/>
+        <source>Select certificate file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="165"/>
+        <source>Select certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CertificateTabelModel</name>
+    <message>
+        <location filename="../certificatetablemodel.cpp" line="16"/>
+        <source>Subject CN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificatetablemodel.cpp" line="17"/>
+        <source>Subject O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificatetablemodel.cpp" line="18"/>
+        <source>Issuer CN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificatetablemodel.cpp" line="19"/>
+        <source>Issuer O</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificatetablemodel.cpp" line="20"/>
+        <source>valid from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificatetablemodel.cpp" line="21"/>
+        <source>valid to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificatetablemodel.cpp" line="22"/>
+        <source>SHA1 Fingerprint</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CertificateTableDelegate</name>
+    <message>
+        <location filename="../certificatetabledelegate.cpp" line="51"/>
+        <source>add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificatetabledelegate.cpp" line="54"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CreateCertListDialog</name>
+    <message>
+        <location filename="../createcertlistdialog.cpp" line="21"/>
+        <source>adminstrator - Create signed certificate list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createcertlistdialog.cpp" line="35"/>
+        <source>Create a new, signed certificate list.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createcertlistdialog.cpp" line="63"/>
+        <source>Create List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createcertlistdialog.cpp" line="81"/>
+        <source>Select certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createcertlistdialog.cpp" line="88"/>
+        <source>Select target location</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CreateInstallerDialog</name>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="21"/>
+        <source>adminstrator - Create signed installer binary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="36"/>
+        <source>Create a new signed installer binary.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="75"/>
+        <source>Create Installer</source>
+        <translation type="unfinished">Installationspaket erstellen</translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="93"/>
+        <source>Select certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="100"/>
+        <source>Select source archive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../createinstallerdialog.cpp" line="107"/>
+        <source>Select target location</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../certificate.cpp" line="75"/>
+        <source>Certificate:
+    <bold>%1</bold>
+    %2, %3
+
+Serial number:
+%4
+Valid from: <bold>%5</bold> to <bold>%6</bold>
+
+Issued by: ..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../certificate.cpp" line="129"/>
+        <source>Failed to parse certificate</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>


More information about the Trustbridge-commits mailing list