[PATCH 3 of 3] Merged

Wald Commits scm-commit at wald.intevation.org
Tue Jul 15 15:45:00 CEST 2014


# HG changeset patch
# User Sascha Wilde <wilde at intevation.de>
# Date 1405431893 -7200
# Node ID 4538cda1062ceb846b2aba56ffb311d38914a349
# Parent  8fad91c654e208df84122b29987ab0cd00f63b93
# Parent  2518c19239b968bd5e70a90d3f6d0460a07530ad
Merged

diff -r 8fad91c654e2 -r 4538cda1062c packaging/linux-installer.inc.in
--- a/packaging/linux-installer.inc.in	Tue Jul 15 15:22:35 2014 +0200
+++ b/packaging/linux-installer.inc.in	Tue Jul 15 15:44:53 2014 +0200
@@ -82,19 +82,16 @@
 
 usage()
 {
-  cat <<EOF
-Usage: $ME [OPTION]...
-Install TrustBridge.
-
-Options:
-  -p, --prefix=PATH  install files in PATH
-  -f, --force        install to given prefix, even when a current
-                     installation with different prefix exists.
-  -d, --deinstall    deinstall files from current installation
-  -s, --system=PATH  create a system wide (de)installation
-      --help         display this help and exit
-      --version      output version information and exit
-EOF
+  getxt "Usage: %s [OPTION]...\n" "$ME"
+  getxt "Install TrustBridge.\n\n"
+  getxt "Options:\n"
+  getxt "  -p, --prefix=PATH  install files in PATH\n"
+  getxt "  -f, --force        install to given prefix, even when a current\n"
+  getxt "                     installation with different prefix exists.\n"
+  getxt "  -d, --deinstall    deinstall files from current installation\n"
+  getxt "  -s, --system       create a system wide (de)installation\n"
+  getxt "      --help         display this help and exit\n"
+  getxt "      --version      output version information and exit\n"
   exit $1
 }
 
diff -r 8fad91c654e2 -r 4538cda1062c packaging/linux-installer.l10n-de
--- a/packaging/linux-installer.l10n-de	Tue Jul 15 15:22:35 2014 +0200
+++ b/packaging/linux-installer.l10n-de	Tue Jul 15 15:44:53 2014 +0200
@@ -1,4 +1,11 @@
 L10N_DE=(
+  ["                     installation with different prefix exists.\n"]="                     bereits eine Installation in einem andern Pfad existiert.\n"
+  ["      --help         display this help and exit\n"]="      --help         diese Hilfe anzeigen und beenden\n"
+  ["      --version      output version information and exit\n"]="      --version      Versions-Information ausgeben und beenden\n"
+  ["  -d, --deinstall    deinstall files from current installation\n"]="  -d, --deinstall    vorhandene Installation deinstallieren\n"
+  ["  -f, --force        install to given prefix, even when a current\n"]="  -f, --force        installiere in den angegebenen Installations-Pfad auch wenn\n"
+  ["  -p, --prefix=PATH  install files in PATH\n"]="  -p, --prefix=PATH  den Installations-Pfad PATH verwenden\n"
+  ["  -s, --system       create a system wide (de)installation\n"]="  -s, --system       eine systemweite (De)Installation durchführen\n"
   ["An existing installation (v%s) was detected!\n"]="Es wurde eine vorhandene Installation (v%s) gefunden!\n"
   ["Answer [Y]es or [N]o:\n"]="Bitte [J]a oder [N]ein eingeben:\n"
   ["Could not create '%s'!\n"]="Konnte '%s' nicht erstellen!\n"
@@ -9,11 +16,13 @@
   ["Deleting empty directory '%s' ...\n"]="Lösche das leere Verzeichnis '%s' ...\n"
   ["Failed to create autostart directory: '%s'\n"]="Konnte das autostart-Verzeichnis '%s' nicht erstellen\n"
   ["For a new prefix you should deinstall first!\n"]="Um einen neuen Installations-Pfad zu verwenden bitte erst deinstallieren!\n"
+  ["Install TrustBridge.\n\n"]="Installiere TrustBridge.\n\n"
   ["Installation failed.\n"]="Installation fehlgeschlagen.\n"
   ["Installing to '%s':\n"]="Installiere in '%s':\n"
   ["It is HIGHLY RECOMMENDED to accept the default prefix\n"]="Es wird DRINGEND EMPFOHLEN die Vorgabe zu akzeptieren\n"
   ["No certificate list found.  Nothing to do.\n"]="Keine Zertifikatsliste gefunden.  Es muss nichts getan werden.\n"
   ["No current installation found!  No harm done.\n"]="Keine vorhandene Installation gefunden!\n"
+  ["Options:\n"]="Optionen:\n"
   ["Prefix differs from current installation (%s).  Aborting!\n"]="Installations-Pfad weicht von vorhandener Installation (%s) ab.\nVorgang abgebrochen!\n"
   ["Preparing trustbridge-tray-starter ...\n"]="Bereite trustbridge-tray-starter vor ...\n"
   ["Reading '%s' ...\n"]="Lese '%s' ...\n"
@@ -28,6 +37,7 @@
   ["Setting up cronjob ...\n"]="Konfiguriere den Cron-Job ...\n"
   ["System wide installation requires root privileges!\n"]="Für die systemweite Installation werden root-Rechte benötigt!\n"
   ["Uninstalling certificates ...\n"]="Deinstalliere Zertifikate ...\n"
+  ["Usage: %s [OPTION]...\n"]="Aufruf:  %s [OPTION]...\n"
   ["Using certificate list '%s'.\n"]="Die Zertifikatsliste '%s' wird verwendet.\n"
   ["WARNING: Could not delete: '%s'!\n"]="WARNUNG: Konnte '%s' nicht löschen!\n"
   ["WARNING: can't execute %s for certificate deinstallation.\n"]="WARNUNG: '%s' kann nicht zum deinstallieren der Zertifikate ausgeführt werden.\n"
diff -r 8fad91c654e2 -r 4538cda1062c ui/l10n/administrator_de_DE.ts
--- a/ui/l10n/administrator_de_DE.ts	Tue Jul 15 15:22:35 2014 +0200
+++ b/ui/l10n/administrator_de_DE.ts	Tue Jul 15 15:44:53 2014 +0200
@@ -130,24 +130,40 @@
     </message>
     <message>
         <location filename="../administratorwindow.cpp" line="267"/>
+        <source>signing certificate: 
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="270"/>
+        <source>
+new certificates:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../administratorwindow.cpp" line="284"/>
+        <source>certificates marked to remove:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>signing certificate: 
 </source>
-        <translation>Signaturzertifikat: 
+        <translation type="vanished">Signaturzertifikat: 
 </translation>
     </message>
     <message>
-        <location filename="../administratorwindow.cpp" line="270"/>
         <source>
 new certificates:
 </source>
-        <translation>Neue Zertifikate:
+        <translation type="vanished">Neue Zertifikate:
 </translation>
     </message>
     <message>
-        <location filename="../administratorwindow.cpp" line="284"/>
         <source>certificates marked to remove:
 </source>
-        <translation>Zertifikate zum löschen markiert:
+        <translation type="vanished">Zertifikate zum löschen markiert:
 </translation>
     </message>
     <message>


More information about the Trustbridge-commits mailing list