Usage message translations.

Adds a new `_print` function to print strings without coloring or other stuff added by the `_msg` function. It's used for the usage message, letting it be translated. The usage messages have been split into one-line strings, and added back to the tomb.pot and *.po files.
2025-01-22 14:38:25 +00:00 · 2014-09-13 16:55:03 +02:00 · 2014-09-13 16:55:03 +02:00 · 0d76ccc2df
commit 0d76ccc2df
parent 55f6a0a927
10 changed files with 904 additions and 239 deletions
--- a/extras/po/de.help
+++ b/extras/po/de.help
@ -1,41 +0,0 @@
-Syntax : tomb [Optionen] Befehl [Argumente]
-
-Befehle :
-
-// Erstellen :
-dig     Neues GRAB erstellen mit der Größe -s Mb
-forge   Neuen SCHLÜSSEL erstellen und Passwort zuweisen
-lock    GRAB mit einem SCHLÜSSEL zusperren
-
-// Gräber bearbeiten :
-open    Vorhandenens GRAB öffnen
-index   Den Suchindex der Gräber aktualisieren
-search  Sucht nach Dateinamen welche Textmustern entsprechen
-list    Liste geöffneter GRÄBER mit Infos
-close   Schliesst das angegebene GRAB (oder \"all\")
- slam    Knallt ein GRAB zu und bricht alle dazugehörende Programme ab"
-resize  Größe eines Grabes ändern zu -s Mb (nur vergrößern möglich)
-
-// Schlüssel bearbeiten :
-passwd  Passwort eines SCHLÜSSELS ändern
-setkey  SCHLÜSSEL eines GRABES ändern
-engrave Erstellt einen QR-Code eines SCHLÜSSELS zum ausdrucken
-bury    versteckt einen SCHLÜSSEL in einer JPEG Datei
-exhume  extrahiert den SCHLÜSSEL aus einer JPEG-Datei
-
-Optionen :
-
-s        Größe eines Grabes (beim Erstellen/neue Größe zuweisen) (in Mb)
-k        Dateipfad zum Schlüssel ('-k -' um ihn aus der Standarteingabe einzulesen)
-n        'Hooks' im Grab nicht benutzen
-o        Mount Optionen beim Öffnen (Standart : rw,noatime,nodev)
-f        Vorgang erzwingen (z.B. falls Swap-Datei aktiv)
--kdf     Gegen Wörterbuchattacken gefeite Passwörter erstellen
-
-h        Anzeigen dieses Hilfetextes
-v        Anzeigen der Version, Lizenzen und vorhandeners Verschlüsslungsmethoden
-q        Still ablaufen lassen ohne Infos anzuzeigen
-D        Debug-Infos beim Ablauf anzeigen
-
-Für mehr Informationen siehe : man tomb
-Bug-Reports bitte an <https://github.com/dyne/tomb/issues>..
--- a/extras/po/de.po
+++ b/extras/po/de.po
@ -7,6 +7,174 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"

+#: _print
+msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
+msgstr ""
+
+#: _print
+msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
+msgstr ""
+
+#: _print
+msgid " This is free software: you are free to change and redistribute it"
+msgstr ""
+
+#: _print
+msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
+msgstr ""
+
+#: _print
+msgid " This source code is distributed in the hope that it will be useful,"
+msgstr ""
+
+#: _print
+msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
+msgstr ""
+
+#: _print
+msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+msgstr ""
+
+#: _print
+msgid " Please refer to the GNU Public License for more details."
+msgstr ""
+
+#: _print
+msgid " System utils:"
+msgstr ""
+
+#: _print
+msgid "Syntax: tomb [options] command [arguments]"
+msgstr "Syntax : tomb [Optionen] Befehl [Argumente]"
+
+#: _print
+msgid "Commands:"
+msgstr "Befehle :"
+
+#: _print
+msgid " // Creation:"
+msgstr " // Erstellen :"
+
+#: _print
+msgid " dig     create a new empty TOMB file of size -s in MB"
+msgstr " dig     Neues GRAB erstellen mit der Größe -s Mb"
+
+#: _print
+msgid " forge   create a new KEY file and set its password"
+msgstr " forge   Neuen SCHLÜSSEL erstellen und Passwort zuweisen"
+
+#: _print
+msgid " lock    installs a lock on a TOMB to use it with KEY"
+msgstr " lock    GRAB mit einem SCHLÜSSEL zusperren"
+
+#: _print
+msgid " // Operations on tombs:"
+msgstr " // Gräber bearbeiten :"
+
+#: _print
+msgid " open    open an existing TOMB"
+msgstr " open    Vorhandenens GRAB öffnen"
+
+#: _print
+msgid " index   update the search indexes of tombs"
+msgstr " index   Den Suchindex der Gräber aktualisieren"
+
+#: _print
+msgid " search  looks for filenames matching text patterns"
+msgstr " search  Sucht nach Dateinamen welche Textmustern entsprechen"
+
+#: _print
+msgid " list    list of open TOMBs and information on them"
+msgstr " list    Liste geöffneter GRÄBER mit Infos"
+
+#: _print
+msgid " close   close a specific TOMB (or 'all')"
+msgstr " close   Schliesst das angegebene GRAB (oder \"all\")"
+
+#: _print
+msgid " slam    slam a TOMB killing all programs using it"
+msgstr " slam    Knallt ein GRAB zu und bricht alle dazugehörende Programme ab"
+
+#: _print
+msgid " resize  resize a TOMB to a new size -s (can only grow)"
+msgstr " resize  Größe eines Grabes ändern zu -s Mb (nur vergrößern möglich)"
+
+#: _print
+msgid " // Operations on keys:"
+msgstr " // Schlüssel bearbeiten :"
+
+#: _print
+msgid " passwd  change the password of a KEY"
+msgstr " passwd  Passwort eines SCHLÜSSELS ändern"
+
+#: _print
+msgid " setkey  change the KEY locking a TOMB (needs old one)"
+msgstr " setkey  SCHLÜSSEL eines GRABES ändern"
+
+#: _print
+msgid " engrave makes a QR code of a KEY to be saved on paper"
+msgstr " engrave Erstellt einen QR-Code eines SCHLÜSSELS zum ausdrucken"
+
+#: _print
+msgid " bury    hide a KEY inside a JPEG image"
+msgstr " bury    versteckt einen SCHLÜSSEL in einer JPEG Datei"
+
+#: _print
+msgid " exhume  extract a KEY from a JPEG image"
+msgstr " exhume  extrahiert den SCHLÜSSEL aus einer JPEG-Datei"
+
+#: _print
+msgid "Options:"
+msgstr "Optionen :"
+
+#: _print
+msgid " -s     size of the tomb file when creating/resizing one (in MB)"
+msgstr " -s        Größe eines Grabes (beim Erstellen/neue Größe zuweisen) (in Mb)"
+
+#: _print
+msgid " -k     path to the key to be used ('-k -' to read from stdin)"
+msgstr " -k        Dateipfad zum Schlüssel ('-k -' um ihn aus der Standarteingabe einzulesen)"
+
+#: _print
+msgid " -n     don't process the hooks found in tomb"
+msgstr " -n        'Hooks' im Grab nicht benutzen"
+
+#: _print
+msgid " -o     mount options used to open (default: rw,noatime,nodev)"
+msgstr " -o        Mount Optionen beim Öffnen (Standart : rw,noatime,nodev)"
+
+#: _print
+msgid " -f     force operation (i.e. even if swap is active)"
+msgstr " -f        Vorgang erzwingen (z.B. falls Swap-Datei aktiv)"
+
+#: _print
+msgid " --kdf  generate passwords armored against dictionary attacks"
+msgstr " --kdf     Gegen Wörterbuchattacken gefeite Passwörter erstellen"
+
+#: _print
+msgid " -h     print this help"
+msgstr " -h        Anzeigen dieses Hilfetextes"
+
+#: _print
+msgid " -v     print version, license and list of available ciphers"
+msgstr " -v        Anzeigen der Version, Lizenzen und vorhandeners Verschlüsslungsmethoden"
+
+#: _print
+msgid " -q     run quietly without printing informations"
+msgstr " -q        Still ablaufen lassen ohne Infos anzuzeigen"
+
+#: _print
+msgid " -D     print debugging information at runtime"
+msgstr " -D        Debug-Infos beim Ablauf anzeigen"
+
+#: _print
+msgid "For more informations on Tomb read the manual: man tomb"
+msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."
+
+#: _print
+msgid "Please report bugs on <http://github.com/dyne/tomb/issues>."
+msgstr "Bug-Reports bitte an <https://github.com/dyne/tomb/issues>.."
+
 #: _verbose
 #, fuzzy
 msgid "Created tempfile: ::1 temp file::"
--- a/extras/po/es.help
+++ b/extras/po/es.help
@ -1,41 +0,0 @@
-Sintaxis: tomb [opciones] comando [argumentos]\n
-\n
-Comandos:\n
-\n
-// Creación:\n
-dig   crear una nueva TUMBA vacía de tamaño -s en MB\n
-forge   crear una nueva  CLAVE y especificar su contraseña\n
-lock   instala un candado en una TUMBA para usarlo con la CLAVE\n
-\n
-// Operaciones en tumbas:\n
-open   abrir una TUMBA existente\n
-index   actualiza los índices de búsqueda de las tumbas\n
-search   busca nombres de fichero que coincidan con patrones de texto\n
-list   lista de TUMBAs abierta e información acerca de ellas\n
-close   cerrar una TUMBA específica o todas ('all')\n
-slam   cerrar una TUMBA de un portazo, matando todos los programas que la usan\n
-resize   cambia el tamaño de una TUMBA al tamaño -s (sólo puede aumentar)\n
-\n
-// Operaciones en claves:\n
-passwd   cambia la contraseña de una CLAVE\n
-setkey   cambia la CLAVE que asegura una TUMBA (necesita la vieja)\n
-engrave   crea un código QR de una CLAVE para guardarla en un papel\n
-bury   esconde una CLAVE dentro de una imagen JPEG\n
-exhume   extrae una CLAVE de una imagen JPEG\n
-\n
-Opciones:\n
-\n
-s     tamaño de la fichero tumba al crearlo o cambiar su tamaño (en MB)\n
-k     ruta a la clave a utilizar ('-k -' para leerla de stdin)\n
-n     no procesar los hooks encontrados en la tumba\n
-o     opciones de montaje usadas al abrir (por defecto: rw,noatime,nodev)\n
-f     forzar operación (incluso si la memoria de intercambio está activa)\n
--kdf  generar contraseñas blindadas contra ataques de diccionario\n
-\n
-h     imprimir este mensaje de ayuda\n
-v     imprimir versión, licencia y lista de cifrados disponibles\n
-q     correr silenciosamente sin imprimir información\n
-D     imprimir información de debugging al correr\n
-\n
-Para más información acerca de Tomb lee el manual: man tomb\n
-Por favor, reporta los bugs en <http://github.com/dyne/tomb/issues>.
--- a/extras/po/es.po
+++ b/extras/po/es.po
@ -15,6 +15,174 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

+#: _print
+msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
+msgstr ""
+
+#: _print
+msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
+msgstr ""
+
+#: _print
+msgid " This is free software: you are free to change and redistribute it"
+msgstr ""
+
+#: _print
+msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
+msgstr ""
+
+#: _print
+msgid " This source code is distributed in the hope that it will be useful,"
+msgstr ""
+
+#: _print
+msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
+msgstr ""
+
+#: _print
+msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+msgstr ""
+
+#: _print
+msgid " Please refer to the GNU Public License for more details."
+msgstr ""
+
+#: _print
+msgid " System utils:"
+msgstr ""
+
+#: _print
+msgid "Syntax: tomb [options] command [arguments]"
+msgstr "Sintaxis: tomb [opciones] comando [argumentos]"
+
+#: _print
+msgid "Commands:"
+msgstr "Comandos:"
+
+#: _print
+msgid " // Creation:"
+msgstr "// Creación:"
+
+#: _print
+msgid " dig     create a new empty TOMB file of size -s in MB"
+msgstr " dig   crear una nueva TUMBA vacía de tamaño -s en MB"
+
+#: _print
+msgid " forge   create a new KEY file and set its password"
+msgstr " forge   crear una nueva  CLAVE y especificar su contraseña"
+
+#: _print
+msgid " lock    installs a lock on a TOMB to use it with KEY"
+msgstr " lock   instala un candado en una TUMBA para usarlo con la CLAVE"
+
+#: _print
+msgid " // Operations on tombs:"
+msgstr "// Operaciones en tumbas:"
+
+#: _print
+msgid " open    open an existing TOMB"
+msgstr " open   abrir una TUMBA existente"
+
+#: _print
+msgid " index   update the search indexes of tombs"
+msgstr " index   actualiza los índices de búsqueda de las tumbas"
+
+#: _print
+msgid " search  looks for filenames matching text patterns"
+msgstr " search   busca nombres de fichero que coincidan con patrones de texto"
+
+#: _print
+msgid " list    list of open TOMBs and information on them"
+msgstr " list   lista de TUMBAs abierta e información acerca de ellas"
+
+#: _print
+msgid " close   close a specific TOMB (or 'all')"
+msgstr " close   cerrar una TUMBA específica o todas ('all')"
+
+#: _print
+msgid " slam    slam a TOMB killing all programs using it"
+msgstr " slam   cerrar una TUMBA de un portazo, matando todos los programas que la usan"
+
+#: _print
+msgid " resize  resize a TOMB to a new size -s (can only grow)"
+msgstr " resize   cambia el tamaño de una TUMBA al tamaño -s (sólo puede aumentar)"
+
+#: _print
+msgid " // Operations on keys:"
+msgstr "// Operaciones en claves:"
+
+#: _print
+msgid " passwd  change the password of a KEY"
+msgstr " passwd   cambia la contraseña de una CLAVE"
+
+#: _print
+msgid " setkey  change the KEY locking a TOMB (needs old one)"
+msgstr " setkey   cambia la CLAVE que asegura una TUMBA (necesita la vieja)"
+
+#: _print
+msgid " engrave makes a QR code of a KEY to be saved on paper"
+msgstr " engrave   crea un código QR de una CLAVE para guardarla en un papel"
+
+#: _print
+msgid " bury    hide a KEY inside a JPEG image"
+msgstr " bury   esconde una CLAVE dentro de una imagen JPEG"
+
+#: _print
+msgid " exhume  extract a KEY from a JPEG image"
+msgstr " exhume   extrae una CLAVE de una imagen JPEG"
+
+#: _print
+msgid "Options:"
+msgstr "Opciones:"
+
+#: _print
+msgid " -s     size of the tomb file when creating/resizing one (in MB)"
+msgstr " -s     tamaño de la fichero tumba al crearlo o cambiar su tamaño (en MB)"
+
+#: _print
+msgid " -k     path to the key to be used ('-k -' to read from stdin)"
+msgstr " -k     ruta a la clave a utilizar ('-k -' para leerla de stdin)"
+
+#: _print
+msgid " -n     don't process the hooks found in tomb"
+msgstr " -n     no procesar los hooks encontrados en la tumba"
+
+#: _print
+msgid " -o     mount options used to open (default: rw,noatime,nodev)"
+msgstr " -o     opciones de montaje usadas al abrir (por defecto: rw,noatime,nodev)"
+
+#: _print
+msgid " -f     force operation (i.e. even if swap is active)"
+msgstr " -f     forzar operación (incluso si la memoria de intercambio está activa)"
+
+#: _print
+msgid " --kdf  generate passwords armored against dictionary attacks"
+msgstr " --kdf  generar contraseñas blindadas contra ataques de diccionario"
+
+#: _print
+msgid " -h     print this help"
+msgstr " -h     imprimir este mensaje de ayuda"
+
+#: _print
+msgid " -v     print version, license and list of available ciphers"
+msgstr " -v     imprimir versión, licencia y lista de cifrados disponibles"
+
+#: _print
+msgid " -q     run quietly without printing informations"
+msgstr " -q     correr silenciosamente sin imprimir información"
+
+#: _print
+msgid " -D     print debugging information at runtime"
+msgstr " -D     imprimir información de debugging al correr"
+
+#: _print
+msgid "For more informations on Tomb read the manual: man tomb"
+msgstr "Para más información acerca de Tomb lee el manual: man tomb"
+
+#: _print
+msgid "Please report bugs on <http://github.com/dyne/tomb/issues>."
+msgstr "Por favor, reporta los bugs en <http://github.com/dyne/tomb/issues>."
+
 #: _verbose
 msgid "Created tempfile: ::1 temp file::"
 msgstr ""
--- a/extras/po/fr.help
+++ b/extras/po/fr.help
@ -1,40 +0,0 @@
-Syntaxe : tomb [options] commande [arguments]
-
-Commandes :
-
-// Création :
-dig        (creuser)   Créer une nouvelle TOMBE de taille -s Mo
-forge    (forger)      Créer une nouvelle CLÉ et lui assigner un mot de passe
-lock      (vérouiller) Vérouiller une TOMBE avec une CLÉ
-
-// Opérations sur les tombes :
-open    (ouvrir)         Ouvrir une TOMBE existante
-index   (indéxer)       Mettre à jour les indices de recherche des tombes
-search (rechercher) Rechercher des noms de fichiers selon des motifs textuels
-list       (énumérer)   Établir une liste informative des TOMBES ouvertes
-close   (fermer)        Sceller une TOMBE en fermant tous les programmes associés
-resize  (élargir)        Augmenter la taille d'une TOMBE à -s Mo
-
-// Opération sur les clés :
-passwd                    Modifier le mot de passe d'une CLÉ
-setkey                      Changer le verrou d'une TOMBE (à l'aide de la CLÉ existante)
-engrave (graver)     Grave une empreinte de la CLÉ pour impression papier au format QR code
-bury       (enterrer)   Cacher la CLÉ dans une image JPEG (stéganographie)
-exhume (exhumer)  Extraire une CLÉ cachée dans une image JPEG (stéganographie)
-
-Options :
-
-s        taille de la tombe lors de sa création ou son agrandissement (en Mo)
-k        chemin de la clé à utiliser ('-k -' pour la lire depuis l'entrée standard)
-n        ne pas utiliser les 'crochets' trouvés dans la tombe
-o        options de montage à l'ouverture (par défaut : rw,noatime,nodev)
-f         forcer l'opération (c-à-d même si la partition d'échange est activée)
--kdf    générer des mots de passe protégés contre les attaques par dictionnaire
-
-h        imprimer cette aide
-v        imprimer la version, la licence, et la liste des codes disponibles
-q       exécuter silencieusement sans imprimer les informations
-D       imprimer les information de débogage durant l'exécution
-
-Pour de plus amples information sur Tomb, se reporter au manuel : man tomb
-Merci de rapporter les erreurs sur <https://github.com/dyne/tomb/issues>.
--- a/extras/po/fr.po
+++ b/extras/po/fr.po
@ -7,6 +7,174 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"

+#: _print
+msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
+msgstr ""
+
+#: _print
+msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
+msgstr ""
+
+#: _print
+msgid " This is free software: you are free to change and redistribute it"
+msgstr ""
+
+#: _print
+msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
+msgstr ""
+
+#: _print
+msgid " This source code is distributed in the hope that it will be useful,"
+msgstr ""
+
+#: _print
+msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
+msgstr ""
+
+#: _print
+msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+msgstr ""
+
+#: _print
+msgid " Please refer to the GNU Public License for more details."
+msgstr ""
+
+#: _print
+msgid " System utils:"
+msgstr ""
+
+#: _print
+msgid "Syntax: tomb [options] command [arguments]"
+msgstr "Syntaxe : tomb [options] commande [arguments]"
+
+#: _print
+msgid "Commands:"
+msgstr "Commandes :"
+
+#: _print
+msgid " // Creation:"
+msgstr " // Création :"
+
+#: _print
+msgid " dig     create a new empty TOMB file of size -s in MB"
+msgstr " dig        (creuser)   Créer une nouvelle TOMBE de taille -s Mo"
+
+#: _print
+msgid " forge   create a new KEY file and set its password"
+msgstr " forge    (forger)      Créer une nouvelle CLÉ et lui assigner un mot de passe"
+
+#: _print
+msgid " lock    installs a lock on a TOMB to use it with KEY"
+msgstr " lock      (vérouiller) Vérouiller une TOMBE avec une CLÉ"
+
+#: _print
+msgid " // Operations on tombs:"
+msgstr " // Opérations sur les tombes :"
+
+#: _print
+msgid " open    open an existing TOMB"
+msgstr " open    (ouvrir)         Ouvrir une TOMBE existante"
+
+#: _print
+msgid " index   update the search indexes of tombs"
+msgstr " index   (indéxer)       Mettre à jour les indices de recherche des tombes"
+
+#: _print
+msgid " search  looks for filenames matching text patterns"
+msgstr " search (rechercher) Rechercher des noms de fichiers selon des motifs textuels"
+
+#: _print
+msgid " list    list of open TOMBs and information on them"
+msgstr " list       (énumérer)   Établir une liste informative des TOMBES ouvertes"
+
+#: _print
+msgid " close   close a specific TOMB (or 'all')"
+msgstr " close   (fermer)        Sceller une TOMBE en fermant tous les programmes associés"
+
+#: _print
+msgid " slam    slam a TOMB killing all programs using it"
+msgstr ""
+
+#: _print
+msgid " resize  resize a TOMB to a new size -s (can only grow)"
+msgstr " resize  (élargir)        Augmenter la taille d'une TOMBE à -s Mo"
+
+#: _print
+msgid " // Operations on keys:"
+msgstr " // Opération sur les clés :"
+
+#: _print
+msgid " passwd  change the password of a KEY"
+msgstr " passwd                    Modifier le mot de passe d'une CLÉ"
+
+#: _print
+msgid " setkey  change the KEY locking a TOMB (needs old one)"
+msgstr " setkey                      Changer le verrou d'une TOMBE (à l'aide de la CLÉ existante)"
+
+#: _print
+msgid " engrave makes a QR code of a KEY to be saved on paper"
+msgstr " engrave (graver)     Grave une empreinte de la CLÉ pour impression papier au format QR code"
+
+#: _print
+msgid " bury    hide a KEY inside a JPEG image"
+msgstr " bury       (enterrer)   Cacher la CLÉ dans une image JPEG (stéganographie)"
+
+#: _print
+msgid " exhume  extract a KEY from a JPEG image"
+msgstr " exhume (exhumer)  Extraire une CLÉ cachée dans une image JPEG (stéganographie)"
+
+#: _print
+msgid "Options:"
+msgstr "Options :"
+
+#: _print
+msgid " -s     size of the tomb file when creating/resizing one (in MB)"
+msgstr " -s        taille de la tombe lors de sa création ou son agrandissement (en Mo)"
+
+#: _print
+msgid " -k     path to the key to be used ('-k -' to read from stdin)"
+msgstr " -k        chemin de la clé à utiliser ('-k -' pour la lire depuis l'entrée standard)"
+
+#: _print
+msgid " -n     don't process the hooks found in tomb"
+msgstr " -n        ne pas utiliser les 'crochets' trouvés dans la tombe"
+
+#: _print
+msgid " -o     mount options used to open (default: rw,noatime,nodev)"
+msgstr " -o        options de montage à l'ouverture (par défaut : rw,noatime,nodev)"
+
+#: _print
+msgid " -f     force operation (i.e. even if swap is active)"
+msgstr " -f         forcer l'opération (c-à-d même si la partition d'échange est activée)"
+
+#: _print
+msgid " --kdf  generate passwords armored against dictionary attacks"
+msgstr " --kdf    générer des mots de passe protégés contre les attaques par dictionnaire"
+
+#: _print
+msgid " -h     print this help"
+msgstr " -h        imprimer cette aide"
+
+#: _print
+msgid " -v     print version, license and list of available ciphers"
+msgstr " -v        imprimer la version, la licence, et la liste des codes disponibles"
+
+#: _print
+msgid " -q     run quietly without printing informations"
+msgstr " -q       exécuter silencieusement sans imprimer les informations"
+
+#: _print
+msgid " -D     print debugging information at runtime"
+msgstr " -D       imprimer les information de débogage durant l'exécution"
+
+#: _print
+msgid "For more informations on Tomb read the manual: man tomb"
+msgstr "Pour de plus amples information sur Tomb, se reporter au manuel : man tomb"
+
+#: _print
+msgid "Please report bugs on <http://github.com/dyne/tomb/issues>."
+msgstr "Merci de rapporter les erreurs sur <https://github.com/dyne/tomb/issues>."
+
 #: _verbose
 #, fuzzy
 msgid "Created tempfile: ::1 temp file::"
--- a/extras/po/ru.help
+++ b/extras/po/ru.help
@ -1,39 +0,0 @@
-Синтаксис: tomb [опции] команда [аргументы]
-
-Команды:
-
-// Создание: 
-dig     создать новый пустой файл ГРОБНИЦЫ размером -s Мб 
-forge   создать новый файл КЛЮЧА и задать его пароль 
-lock    установить замок на ГРОБНИЦУ, используя КЛЮЧ 
-
-// Операции над гробницами: 
-open    открыть существующую ГРОБНИЦУ 
-index   обновить поисковый индекс гробниц 
-search  ищет имена файлов, соответствующие шаблону 
-list    список открытых ГРОБНИЦ и информация о них 
-close   закрыть определенную ГРОБНИЦУ (или 'all' для всех) 
-slam    захлопнуть ГРОБНИЦУ, убив все программы, использующие ее 
-resize  привести размер гробницы к -s Мб (можно только увеличить) 
-
-// Операции с ключами: 
-passwd  изменить пароль КЛЮЧА 
-setkey  изменить КЛЮЧ для закрытия ГРОБНИЦЫ (нужен старый ключ) 
-engrave создает штрих-код для хранения КЛЮЧА на бумаге 
-bury    спрятать КЛЮЧ в JPEG изображении exhume  извлечь КЛЮЧ из JPEG изображения 
-
-Опции: 
-
-s     размер файла гробницы при создании/изменении размера (в Мб) 
-k     путь к ключу ('-k -' для чтения из stdin) 
-n     не обрабатывать события, найденные в гробнице 
-o     параметры монтирования при открытии (по умолчанию rw,noatime,nodev) 
-f     форсировать операцию (например, даже при активном swap) 
--kdf  сгенерировать пароли, устойчивые к атакам по словарю 
-h     показать эту справку 
-v     показать версию, лицензию и доступные шифры 
-q     выполнение без вывода информации на экран 
-D     вывести отладочную информацию при запуске
-
-Больше информации по Tomb вы можете найти в руководстве: man tomb
-Пожалуйста, сообщайте о найденных ошибках на <http://github.com/dyne/tomb/issues>.
--- a/extras/po/ru.po
+++ b/extras/po/ru.po
@ -7,6 +7,174 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"

+#: _print
+msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
+msgstr ""
+
+#: _print
+msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
+msgstr ""
+
+#: _print
+msgid " This is free software: you are free to change and redistribute it"
+msgstr ""
+
+#: _print
+msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
+msgstr ""
+
+#: _print
+msgid " This source code is distributed in the hope that it will be useful,"
+msgstr ""
+
+#: _print
+msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
+msgstr ""
+
+#: _print
+msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+msgstr ""
+
+#: _print
+msgid " Please refer to the GNU Public License for more details."
+msgstr ""
+
+#: _print
+msgid " System utils:"
+msgstr ""
+
+#: _print
+msgid "Syntax: tomb [options] command [arguments]"
+msgstr "Синтаксис: tomb [опции] команда [аргументы]"
+
+#: _print
+msgid "Commands:"
+msgstr "Команды:"
+
+#: _print
+msgid " // Creation:"
+msgstr " // Создание: "
+
+#: _print
+msgid " dig     create a new empty TOMB file of size -s in MB"
+msgstr " dig     создать новый пустой файл ГРОБНИЦЫ размером -s Мб "
+
+#: _print
+msgid " forge   create a new KEY file and set its password"
+msgstr " forge   создать новый файл КЛЮЧА и задать его пароль "
+
+#: _print
+msgid " lock    installs a lock on a TOMB to use it with KEY"
+msgstr " lock    установить замок на ГРОБНИЦУ, используя КЛЮЧ "
+
+#: _print
+msgid " // Operations on tombs:"
+msgstr " // Операции над гробницами: "
+
+#: _print
+msgid " open    open an existing TOMB"
+msgstr " open    открыть существующую ГРОБНИЦУ "
+
+#: _print
+msgid " index   update the search indexes of tombs"
+msgstr " index   обновить поисковый индекс гробниц "
+
+#: _print
+msgid " search  looks for filenames matching text patterns"
+msgstr " search  ищет имена файлов, соответствующие шаблону "
+
+#: _print
+msgid " list    list of open TOMBs and information on them"
+msgstr " list    список открытых ГРОБНИЦ и информация о них "
+
+#: _print
+msgid " close   close a specific TOMB (or 'all')"
+msgstr " close   закрыть определенную ГРОБНИЦУ (или 'all' для всех) "
+
+#: _print
+msgid " slam    slam a TOMB killing all programs using it"
+msgstr " slam    захлопнуть ГРОБНИЦУ, убив все программы, использующие ее "
+
+#: _print
+msgid " resize  resize a TOMB to a new size -s (can only grow)"
+msgstr " resize  привести размер гробницы к -s Мб (можно только увеличить) "
+
+#: _print
+msgid " // Operations on keys:"
+msgstr " // Операции с ключами: "
+
+#: _print
+msgid " passwd  change the password of a KEY"
+msgstr " passwd  изменить пароль КЛЮЧА "
+
+#: _print
+msgid " setkey  change the KEY locking a TOMB (needs old one)"
+msgstr " setkey  изменить КЛЮЧ для закрытия ГРОБНИЦЫ (нужен старый ключ) "
+
+#: _print
+msgid " engrave makes a QR code of a KEY to be saved on paper"
+msgstr " engrave создает штрих-код для хранения КЛЮЧА на бумаге "
+
+#: _print
+msgid " bury    hide a KEY inside a JPEG image"
+msgstr " bury    спрятать КЛЮЧ в JPEG изображении exhume  извлечь КЛЮЧ из JPEG изображения "
+
+#: _print
+msgid " exhume  extract a KEY from a JPEG image"
+msgstr ""
+
+#: _print
+msgid "Options:"
+msgstr "Опции: "
+
+#: _print
+msgid " -s     size of the tomb file when creating/resizing one (in MB)"
+msgstr " -s     размер файла гробницы при создании/изменении размера (в Мб) "
+
+#: _print
+msgid " -k     path to the key to be used ('-k -' to read from stdin)"
+msgstr " -k     путь к ключу ('-k -' для чтения из stdin) "
+
+#: _print
+msgid " -n     don't process the hooks found in tomb"
+msgstr " -n     не обрабатывать события, найденные в гробнице "
+
+#: _print
+msgid " -o     mount options used to open (default: rw,noatime,nodev)"
+msgstr " -o     параметры монтирования при открытии (по умолчанию rw,noatime,nodev) "
+
+#: _print
+msgid " -f     force operation (i.e. even if swap is active)"
+msgstr " -f     форсировать операцию (например, даже при активном swap) "
+
+#: _print
+msgid " --kdf  generate passwords armored against dictionary attacks"
+msgstr " --kdf  сгенерировать пароли, устойчивые к атакам по словарю "
+
+#: _print
+msgid " -h     print this help"
+msgstr " -h     показать эту справку "
+
+#: _print
+msgid " -v     print version, license and list of available ciphers"
+msgstr " -v     показать версию, лицензию и доступные шифры "
+
+#: _print
+msgid " -q     run quietly without printing informations"
+msgstr " -q     выполнение без вывода информации на экран "
+
+#: _print
+msgid " -D     print debugging information at runtime"
+msgstr " -D     вывести отладочную информацию при запуске"
+
+#: _print
+msgid "For more informations on Tomb read the manual: man tomb"
+msgstr "Больше информации по Tomb вы можете найти в руководстве: man tomb"
+
+#: _print
+msgid "Please report bugs on <http://github.com/dyne/tomb/issues>."
+msgstr "Пожалуйста, сообщайте о найденных ошибках на <http://github.com/dyne/tomb/issues>."
+
 #: _verbose
 #, fuzzy
 msgid "Created tempfile: ::1 temp file::"
--- a/extras/po/tomb.pot
+++ b/extras/po/tomb.pot
@ -14,9 +14,173 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#
-# tomb internal messages
-#
+#: _print
+msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
+msgstr ""
+
+#: _print
+msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
+msgstr ""
+
+#: _print
+msgid " This is free software: you are free to change and redistribute it"
+msgstr ""
+
+#: _print
+msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
+msgstr ""
+
+#: _print
+msgid " This source code is distributed in the hope that it will be useful,"
+msgstr ""
+
+#: _print
+msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
+msgstr ""
+
+#: _print
+msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+msgstr ""
+
+#: _print
+msgid " Please refer to the GNU Public License for more details."
+msgstr ""
+
+#: _print
+msgid " System utils:"
+msgstr ""
+
+#: _print
+msgid "Syntax: tomb [options] command [arguments]"
+msgstr ""
+
+#: _print
+msgid "Commands:"
+msgstr ""
+
+#: _print
+msgid " // Creation:"
+msgstr ""
+
+#: _print
+msgid " dig     create a new empty TOMB file of size -s in MB"
+msgstr ""
+
+#: _print
+msgid " forge   create a new KEY file and set its password"
+msgstr ""
+
+#: _print
+msgid " lock    installs a lock on a TOMB to use it with KEY"
+msgstr ""
+
+#: _print
+msgid " // Operations on tombs:"
+msgstr ""
+
+#: _print
+msgid " open    open an existing TOMB"
+msgstr ""
+
+#: _print
+msgid " index   update the search indexes of tombs"
+msgstr ""
+
+#: _print
+msgid " search  looks for filenames matching text patterns"
+msgstr ""
+
+#: _print
+msgid " list    list of open TOMBs and information on them"
+msgstr ""
+
+#: _print
+msgid " close   close a specific TOMB (or 'all')"
+msgstr ""
+
+#: _print
+msgid " slam    slam a TOMB killing all programs using it"
+msgstr ""
+
+#: _print
+msgid " resize  resize a TOMB to a new size -s (can only grow)"
+msgstr ""
+
+#: _print
+msgid " // Operations on keys:"
+msgstr ""
+
+#: _print
+msgid " passwd  change the password of a KEY"
+msgstr ""
+
+#: _print
+msgid " setkey  change the KEY locking a TOMB (needs old one)"
+msgstr ""
+
+#: _print
+msgid " engrave makes a QR code of a KEY to be saved on paper"
+msgstr ""
+
+#: _print
+msgid " bury    hide a KEY inside a JPEG image"
+msgstr ""
+
+#: _print
+msgid " exhume  extract a KEY from a JPEG image"
+msgstr ""
+
+#: _print
+msgid "Options:"
+msgstr ""
+
+#: _print
+msgid " -s     size of the tomb file when creating/resizing one (in MB)"
+msgstr ""
+
+#: _print
+msgid " -k     path to the key to be used ('-k -' to read from stdin)"
+msgstr ""
+
+#: _print
+msgid " -n     don't process the hooks found in tomb"
+msgstr ""
+
+#: _print
+msgid " -o     mount options used to open (default: rw,noatime,nodev)"
+msgstr ""
+
+#: _print
+msgid " -f     force operation (i.e. even if swap is active)"
+msgstr ""
+
+#: _print
+msgid " --kdf  generate passwords armored against dictionary attacks"
+msgstr ""
+
+#: _print
+msgid " -h     print this help"
+msgstr ""
+
+#: _print
+msgid " -v     print version, license and list of available ciphers"
+msgstr ""
+
+#: _print
+msgid " -q     run quietly without printing informations"
+msgstr ""
+
+#: _print
+msgid " -D     print debugging information at runtime"
+msgstr ""
+
+#: _print
+msgid "For more informations on Tomb read the manual: man tomb"
+msgstr ""
+
+#: _print
+msgid "Please report bugs on <http://github.com/dyne/tomb/issues>."
+msgstr ""

 #: _verbose
 msgid "Created tempfile: ::1 temp file::"
--- a/140
+++ b/140
@ -393,75 +393,58 @@ dump_secrets() {
 # {{{ Commandline interaction

 usage() {
-    cat <<EOF
-
-Syntax: tomb [options] command [arguments]
-
-Commands:
-
- // Creation:
- dig     create a new empty TOMB file of size -s in MB
- forge   create a new KEY file and set its password
- lock    installs a lock on a TOMB to use it with KEY
-
- // Operations on tombs:
- open    open an existing TOMB
- index   update the search indexes of tombs
- search  looks for filenames matching text patterns
- list    list of open TOMBs and information on them
- close   close a specific TOMB (or 'all')
- slam    slam a TOMB killing all programs using it
-EOF
+_print "Syntax: tomb [options] command [arguments]"
+_print "\000"
+_print "Commands:"
+_print "\000"
+_print " // Creation:"
+_print " dig     create a new empty TOMB file of size -s in MB"
+_print " forge   create a new KEY file and set its password"
+_print " lock    installs a lock on a TOMB to use it with KEY"
+_print "\000"
+_print " // Operations on tombs:"
+_print " open    open an existing TOMB"
+_print " index   update the search indexes of tombs"
+_print " search  looks for filenames matching text patterns"
+_print " list    list of open TOMBs and information on them"
+_print " close   close a specific TOMB (or 'all')"
+_print " slam    slam a TOMB killing all programs using it"
    if [ "$RESIZER" = 1 ]; then
-        cat <<EOF
- resize  resize a TOMB to a new size -s (can only grow)
-EOF
+_print " resize  resize a TOMB to a new size -s (can only grow)"
    fi
-cat <<EOF
-
- // Operations on keys:
- passwd  change the password of a KEY
- setkey  change the KEY locking a TOMB (needs old one)
-EOF
-
+_print "\000"
+_print " // Operations on keys:"
+_print " passwd  change the password of a KEY"
+_print " setkey  change the KEY locking a TOMB (needs old one)"
+_print "\000"
    { test "$QRENCODE" = "1" } && {
-        cat <<EOF
- engrave makes a QR code of a KEY to be saved on paper
-EOF
+_print " engrave makes a QR code of a KEY to be saved on paper"
    }
-
+_print "\000"
    if [ "$STEGHIDE" = 1 ]; then
-        cat <<EOF
- bury    hide a KEY inside a JPEG image
- exhume  extract a KEY from a JPEG image
-EOF
+_print " bury    hide a KEY inside a JPEG image"
+_print " exhume  extract a KEY from a JPEG image"
    fi
-    cat <<EOF
-
-Options:
-
- -s     size of the tomb file when creating/resizing one (in MB)
- -k     path to the key to be used ('-k -' to read from stdin)
- -n     don't process the hooks found in tomb
- -o     mount options used to open (default: rw,noatime,nodev)
- -f     force operation (i.e. even if swap is active)
-EOF
+_print "\000"
+_print "Options:"
+_print "\000"
+_print " -s     size of the tomb file when creating/resizing one (in MB)"
+_print " -k     path to the key to be used ('-k -' to read from stdin)"
+_print " -n     don't process the hooks found in tomb"
+_print " -o     mount options used to open (default: rw,noatime,nodev)"
+_print " -f     force operation (i.e. even if swap is active)"
    { test "$KDF" = 1 } && {
-        cat <<EOF
- --kdf  generate passwords armored against dictionary attacks
-EOF
+_print " --kdf  generate passwords armored against dictionary attacks"
    }

-cat <<EOF
-
- -h     print this help
- -v     print version, license and list of available ciphers
- -q     run quietly without printing informations
- -D     print debugging information at runtime
-
-For more informations on Tomb read the manual: man tomb
-Please report bugs on <http://github.com/dyne/tomb/issues>.
-EOF
+_print "\000"
+_print " -h     print this help"
+_print " -v     print version, license and list of available ciphers"
+_print " -q     run quietly without printing informations"
+_print " -D     print debugging information at runtime"
+_print "\000"
+_print "For more informations on Tomb read the manual: man tomb"
+_print "Please report bugs on <http://github.com/dyne/tomb/issues>."
 }


@ -522,6 +505,9 @@ function _msg() {
            pchars="[E]"; pcolor="red"; message="$fg_no_bold[$pcolor]$msg$reset_color"
            returncode=1
            ;;
+        print)
+            progname=""
+            ;;
        *)
            pchars="[F]"; pcolor="red"
            message="Developer oops!  Usage: _msg MESSAGE_TYPE \"MESSAGE_CONTENT\""
@ -561,6 +547,11 @@ function _failure die() {
    exit $exitcode
 }

+function _print() {
+    option_is_set -q || _msg print $@
+    return 0
+}
+
 # Print out progress to inform GUI caller applications (--batch mode)
 progress() {
    #      $1 is "what is progressing"
@ -2526,22 +2517,21 @@ main() {
        askpass)    ask_password $PARAM[1] $PARAM[2] ;;

        __default)
-            cat <<EOF
-Tomb $VERSION - a strong and gentle undertaker for your secrets
-
- Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+
- This is free software: you are free to change and redistribute it
- The latest Tomb sourcecode is published on <http://tomb.dyne.org>
-EOF
+_print "Tomb ::1 version:: - a strong and gentle undertaker for your secrets" $VERSION
+_print "\000"
+_print " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
+_print " This is free software: you are free to change and redistribute it"
+_print " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
+_print "\000"
            option_is_set -v && {
-                cat <<EOF
- This source code is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- Please refer to the GNU Public License for more details.
-
-System utils:
-
+_print " This source code is distributed in the hope that it will be useful,"
+_print " but WITHOUT ANY WARRANTY; without even the implied warranty of"
+_print " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+_print " Please refer to the GNU Public License for more details."
+_print "\000"
+_print "System utils:"
+_print "\000"
+cat <<EOF
 `sudo -V | head -n1`
 `cryptsetup --version`
 `pinentry --version`