changeset 1169:882df57bdaf6

Merged.
author Emanuel Schuetze <emanuel@intevation.de>
date Fri, 19 Sep 2014 11:54:16 +0200
parents d5c80c7cd7a3 (diff) d824e6890a43 (current diff)
children 37672abf0ca0 3e7ac50b04da
files
diffstat 2 files changed, 42 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/ui/l10n/administrator_de_DE.ts	Fri Sep 19 11:38:27 2014 +0200
+++ b/ui/l10n/administrator_de_DE.ts	Fri Sep 19 11:54:16 2014 +0200
@@ -152,40 +152,25 @@
     </message>
     <message>
         <location filename="../administratorwindow.cpp" line="275"/>
-        <source>signing certificate: 
+        <source>signing certificate: 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Signaturzertifikat:
+</translation>
     </message>
     <message>
         <location filename="../administratorwindow.cpp" line="278"/>
-        <source>
-new certificates:
+        <source>
+new certificates:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>
+Neues Zertifikat:
+</translation>
     </message>
     <message>
         <location filename="../administratorwindow.cpp" line="292"/>
-        <source>certificates marked to remove:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>signing certificate: 
-</source>
-        <translation type="obsolete">Signaturzertifikat: 
-</translation>
-    </message>
-    <message>
-        <source>
-new certificates:
-</source>
-        <translation type="obsolete">Neue Zertifikate:
-</translation>
-    </message>
-    <message>
         <source>certificates marked to remove:
 </source>
-        <translation type="obsolete">Zertifikate zum löschen markiert:
+        <translation>Zertifikate zum Löschen markiert:
 </translation>
     </message>
     <message>
@@ -564,6 +549,13 @@
         <translation>Keine lesbare *.sh Datei in &apos;%1&apos; gefunden.</translation>
     </message>
     <message>
+        <location filename="../createinstallerdialog.cpp" line="437"/>
+        <source>Failed to sign binaries with osslsigncode.
+Please check that %1 is a valid code signing certificate and that osslsigncode can be found in the PATH.</source>
+        <translation>Fehler beim Signieren der Binärpakete mit osslsigncode.
+Bitte prüfen Sie, dass %1 ein gültiges Code-Signing-Zertifikat ist und osslsigncode im PATH gefunden wird.</translation>
+    </message>
+    <message>
         <source>Unexpected additional .sh files in: %1</source>
         <translation type="vanished">Mehrere .sh Dateien in: %1</translation>
     </message>
@@ -609,11 +601,10 @@
         <translation>Fehler beim Kopieren der Binärdaten in temporären Ort.</translation>
     </message>
     <message>
-        <location filename="../createinstallerdialog.cpp" line="437"/>
         <source>Failed to sign binaries with osslsigncode.
 Please check that %1 is a valid code signing certificate and thatosslsigncode can be found in the PATH.</source>
         <translatorcomment>TODO: missing blank in EN string</translatorcomment>
-        <translation>Fehler beim Signieren der Binärpakete mit osslsigncode.
+        <translation type="vanished">Fehler beim Signieren der Binärpakete mit osslsigncode.
 Bitte prüfen Sie, dass %1 ein gültiges Code-Signing-Zertifikat ist und osslsigncode im PATH gefunden wird.</translation>
     </message>
     <message>
--- a/ui/l10n/trustbridge_de_DE.ts	Fri Sep 19 11:38:27 2014 +0200
+++ b/ui/l10n/trustbridge_de_DE.ts	Fri Sep 19 11:54:16 2014 +0200
@@ -140,58 +140,58 @@
 <context>
     <name>InstallWrapper</name>
     <message>
-        <location filename="../installwrapper.cpp" line="73"/>
+        <location filename="../installwrapper.cpp" line="71"/>
         <source>Could not find certificate installation process.</source>
         <translation>Der Zertifikatsinstallations-Prozess konnte nicht gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="78"/>
+        <location filename="../installwrapper.cpp" line="76"/>
         <source>Failed to write temporary file.</source>
         <translation>Fehler beim Schreiben der temporären Datei.</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="87"/>
+        <location filename="../installwrapper.cpp" line="85"/>
         <source>Integrity check of the certificate installation process failed. </source>
         <translation>Integritätsprüfung des Zertifikatsinstallationsprozesses fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="88"/>
+        <location filename="../installwrapper.cpp" line="86"/>
         <source>Please reinstall the software.</source>
         <translation>Bitte installieren Sie die Software neu.</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="128"/>
+        <location filename="../installwrapper.cpp" line="126"/>
         <source>Error executing process: %1</source>
         <translation>Auführungsfehler: %1</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="147"/>
+        <location filename="../installwrapper.cpp" line="145"/>
         <source>Error monitoring process: %1</source>
         <translation>Fehlerüberwachung: %1</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="151"/>
+        <location filename="../installwrapper.cpp" line="149"/>
         <source>Certificate installation timed out.</source>
         <translation>Zeitüberschreitung bei der Zertifikatsinstallation.</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="165"/>
+        <location filename="../installwrapper.cpp" line="163"/>
         <source>Failed to check process status: %1</source>
         <translation>Fehler in der Prozess-Statusprüfung: %1</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="175"/>
+        <location filename="../installwrapper.cpp" line="173"/>
         <source>The process failed with return code. %1</source>
         <translation>Der Prozess ist fehlgeschlagen. Fehlercode: %1</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="221"/>
+        <location filename="../installwrapper.cpp" line="219"/>
         <source>Failed to start installer process.</source>
         <translation>Fehler beim Starten des Installer-Prozess.</translation>
     </message>
     <message>
-        <location filename="../installwrapper.cpp" line="230"/>
-        <location filename="../installwrapper.cpp" line="235"/>
+        <location filename="../installwrapper.cpp" line="228"/>
+        <location filename="../installwrapper.cpp" line="233"/>
         <source>Failed to complete installation.</source>
         <translation>Fehler beim Abschließen der Installation.</translation>
     </message>
@@ -389,7 +389,7 @@
     <message>
         <location filename="../mainwindow.cpp" line="180"/>
         <source>Show recommendations</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfehlungen anzeigen</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="282"/>
@@ -416,17 +416,17 @@
     <message>
         <location filename="../mainwindow.cpp" line="337"/>
         <source>Failed to create update process.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Starten des Installer-Prozesses.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="338"/>
         <source>This could be caused by not enough disk space or invalid permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ursache dafür könnte nicht genügend Speicherplatz oder ungültige Berechtigungen sein.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="526"/>
         <source>Downloading update...</source>
-        <translation type="unfinished"></translation>
+        <translation>Software-Aktualisierung wird heruntergeladen...</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="585"/>
@@ -607,19 +607,19 @@
         <location filename="../mainwindow.cpp" line="1286"/>
         <location filename="../mainwindow.cpp" line="1498"/>
         <source>Certificate will be installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat wird installiert.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1235"/>
         <location filename="../mainwindow.cpp" line="1275"/>
         <source>Certifcate is not installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat ist nicht installiert.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1237"/>
         <location filename="../mainwindow.cpp" line="1274"/>
         <source>Certificate is installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat ist installiert.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1238"/>
@@ -628,29 +628,29 @@
         <location filename="../mainwindow.cpp" line="1320"/>
         <location filename="../mainwindow.cpp" line="1499"/>
         <source>Certificate will be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat wird entfernt.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1250"/>
         <location filename="../mainwindow.cpp" line="1303"/>
         <source>Certificate has not been removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat wurde nicht entfernt.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1257"/>
         <location filename="../mainwindow.cpp" line="1310"/>
         <source>Certificate has been removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat wurde entfernt.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1287"/>
         <source>Certificate will not be installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat wird nicht installiert.</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1321"/>
         <source>Certificate will not be removed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zertifikat wird nicht entfernt.</translation>
     </message>
     <message>
         <source>You should apply the following, recommended changes to your certificate stores.</source>
@@ -800,7 +800,7 @@
         <location filename="../mainwindow.cpp" line="315"/>
         <source>TrustBridge-Updater</source>
         <comment>Used as filename for the updater. Only use ASCII please.</comment>
-        <translation type="unfinished"></translation>
+        <translation>TrustBridge-Updater</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="1566"/>

http://wald.intevation.org/projects/trustbridge/