tomb

the crypto undertaker
git clone git://parazyd.org/tomb.git
Log | Files | Refs | README | LICENSE
commit c7009e5c1be838bfe3e27df8a8351e5ef3255009
parent 79181618032d1c7f9ba0fa7a0979c8b57e4a17c5
Author: Jaromil <jaromil@dyne.org>
Date:   Tue, 16 Sep 2014 18:56:45 +0200

Merge pull request #132 from gdrooid/i18n

Internationalization of all human language in Tomb using gettext
Diffstat:

M.gitignore | 1+


Mextras/po/Makefile | 11++++++++++-


Mextras/po/de.po | 1344+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------


Mextras/po/es.po | 1245++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------


Mextras/po/fr.po | 1381++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------


Mextras/po/generate_translatable_strings.sh | 70+++++++++++++++++++++++++++++++++++++++-------------------------------


Mextras/po/ru.po | 1273+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------


Mextras/po/tomb.pot | 854++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------


Mtomb | 467+++++++++++++++++++++++++++++++++++++++----------------------------------------


9 files changed, 4894 insertions(+), 1752 deletions(-)

diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ doc/web/public
 doc/web/dyne
 share/gtkrc
 .*.sw?
+*.mo
diff --git a/extras/po/Makefile b/extras/po/Makefile
@@ -5,11 +5,20 @@ all:
 	@rm -f tomb.pot
 	@./generate_translatable_strings.sh > tomb.pot
 	@echo "Strings generated in tomb.pot"
+	@echo "\n WARNING!\n This script makes some mistakes you MUST fix by hand:\n * Reapeated msgids: remove them\n * msgids with \\\": They are most probably broken, look\n                   for the full strings in ../../tomb\n                   and replace them."
 
-install: es.mo ru.mo fr.mo
+
+.PHONY: install
+install: es.mo ru.mo fr.mo de.mo
 	@install -Dm644 es.mo ${LOCALEDIR}/es/${TOMBFILE}
 	@install -Dm644 ru.mo ${LOCALEDIR}/ru/${TOMBFILE}
 	@install -Dm644 fr.mo ${LOCALEDIR}/fr/${TOMBFILE}
+	@install -Dm644 de.mo ${LOCALEDIR}/de/${TOMBFILE}
+	@echo "Translations installed."
 
 %.mo: %.po
 	msgfmt -o $@ $<
+
+.PHONY: clean
+clean:
+	@rm -f *.mo
diff --git a/extras/po/de.po b/extras/po/de.po
@@ -1,108 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Tomb the Crypto Undertaker\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Tomb the Crypto Undertaker\n"
-"Language: de\n"
 
-#: commandline help
-msgid "Syntax: tomb [options] command [arguments]\n"
-"\n"
-"Commands:\n"
-"\n"
-" // Creation:\n"
-" dig     create a new empty TOMB file of size -s in MB\n"
-" forge   create a new KEY file and set its password\n"
-" lock    installs a lock on a TOMB to use it with KEY\n"
-"\n"
-" // Operations on tombs:\n"
-" open    open an existing TOMB\n"
-" index   update the search indexes of tombs\n"
-" search  looks for filenames matching text patterns\n"
-" list    list of open TOMBs and information on them\n"
-" close   close a specific TOMB (or 'all')\n"
-" slam    slam a TOMB killing all programs using it\n"
-" resize  resize a TOMB to a new size -s (can only grow)\n"
-"\n"
-" // Operations on keys:\n"
-" passwd  change the password of a KEY\n"
-" setkey  change the KEY locking a TOMB (needs old one)\n"
-" engrave makes a QR code of a KEY to be saved on paper\n"
-" bury    hide a KEY inside a JPEG image\n"
-" exhume  extract a KEY from a JPEG image\n"
-"\n"
-"Options:\n"
-"\n"
-" -s     size of the tomb file when creating/resizing one (in MB)\n"
-" -k     path to the key to be used ('-k -' to read from stdin)\n"
-" -n     don't process the hooks found in tomb\n"
-" -o     mount options used to open (default: rw,noatime,nodev)\n"
-" -f     force operation (i.e. even if swap is active)\n"
-" --kdf  generate passwords armored against dictionary attacks\n"
-"\n"
-" -h     print this help\n"
-" -v     print version, license and list of available ciphers\n"
-" -q     run quietly without printing informations\n"
-" -D     print debugging information at runtime\n"
-"\n"
-"For more informations on Tomb read the manual: man tomb\n"
-"Please report bugs on <http://github.com/dyne/tomb/issues>."
-msgstr "Syntax : tomb [Optionen] Befehl [Argumente]\n"
-"\n"
-"Befehle :\n"
-"\n"
-"// Erstellen :\n"
-"dig     Neues GRAB erstellen mit der Größe -s Mb\n"
-"forge   Neuen SCHLÜSSEL erstellen und Passwort zuweisen\n"
-"lock    GRAB mit einem SCHLÜSSEL zusperren\n"
-"\n"
-"// Gräber bearbeiten :\n"
-"open    Vorhandenens GRAB öffnen\n"
-"index   Den Suchindex der Gräber aktualisieren\n"
-"search  Sucht nach Dateinamen welche Textmustern entsprechen\n"
-"list    Liste geöffneter GRÄBER mit Infos\n"
-"close   Schliesst das angegebene GRAB (oder \"all\")\n"
- slam    Knallt ein GRAB zu und bricht alle dazugehörende Programme ab\n"
-"resize  Größe eines Grabes ändern zu -s Mb (nur vergrößern möglich)\n"
-"\n"
-"// Schlüssel bearbeiten :\n"
-"passwd  Passwort eines SCHLÜSSELS ändern\n"
-"setkey  SCHLÜSSEL eines GRABES ändern\n"
-"engrave Erstellt einen QR-Code eines SCHLÜSSELS zum ausdrucken\n"
-"bury    versteckt einen SCHLÜSSEL in einer JPEG Datei\n"
-"exhume  extrahiert den SCHLÜSSEL aus einer JPEG-Datei\n"
-"\n"
-"Optionen :\n"
-"\n"
-"-s        Größe eines Grabes (beim Erstellen/neue Größe zuweisen) (in Mb)\n"
-"-k        Dateipfad zum Schlüssel ('-k -' um ihn aus der Standarteingabe einzulesen)\n"
-"-n        'Hooks' im Grab nicht benutzen\n"
-"-o        Mount Optionen beim Öffnen (Standart : rw,noatime,nodev)\n"
-"-f        Vorgang erzwingen (z.B. falls Swap-Datei aktiv)\n"
-"--kdf     Gegen Wörterbuchattacken gefeite Passwörter erstellen\n"
-"\n"
-"-h        Anzeigen dieses Hilfetextes\n"
-"-v        Anzeigen der Version, Lizenzen und vorhandeners Verschlüsslungsmethoden\n"
-"-q        Still ablaufen lassen ohne Infos anzuzeigen\n"
-"-D        Debug-Infos beim Ablauf anzeigen\n"
-"\n"
-"Für mehr Informationen siehe : man tomb\n"
-"Bug-Reports bitte an <https://github.com/dyne/tomb/issues>.."
-
-#. tomb internal messages
-#: _warning
-msgid "WARNING: we cannot ensure we're running in RAM."
-msgstr "ACHTUNG : Das Ausführen im Wechselspeicher kann nicht garantiert werden."
-
-#: _warning
-msgid "WARNING: no RAM available for me to run safely."
-msgstr "ACHTUNG : Unzureichender Wechselspeicher verfügbar zur sicheren Ausführung"
-
-#: _failure
-msgid "No access to shared memory on this system, sorry."
-msgstr "Kein Zugriff auf geteilten Speicher möglich.."
+#: _verbose
+#, fuzzy
+msgid "Created tempfile: ::1 temp file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
 
 #: _success
 msgid "All your swaps are belong to crypt.  Good."
@@ -112,41 +20,336 @@ msgstr "Alle geteilten Speicher gehören crypt.  Gut."
 msgid "Operation aborted."
 msgstr "Vorgang abgebrochen."
 
+#: _verbose
+msgid "exec_as_user '::1 user::': ::2::"
+msgstr ""
+
+#: _verbose
+msgid "Using sudo for root execution of '::1 exec:: ::2 args::'."
+msgstr ""
+
+#: _verbose
+msgid "Escalating privileges using sudo-pwd."
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "is_valid_tomb ::1 tomb file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _warning
+msgid "Tomb file is missing from arguments."
+msgstr ""
+
+#: _warning
+#, fuzzy
+msgid "Tomb file not found: ::1 tomb file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is not a regular file: ::1 tomb file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is empty (zero length): ::1 tomb file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is not writable: ::1 tomb file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "File is not yet a tomb: ::1 tomb file::"
+msgstr "Grab ::1 tomb file:: wird geöffnet"
+
 #: _warning
-msgid "Loop mount of volumes is not supported on this machine, this error"
+#, fuzzy
+msgid "Tomb is currently in use: ::1 tomb name::"
+msgstr "Schließen des Grabes ::1 tomb name::"
+
+#: _message
+msgid "Valid tomb file found: ::1 tomb file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _failure
+msgid "Loopback mount called on invalid tomb: ::1 path::"
+msgstr ""
+
+#: _warning
+#, fuzzy
+msgid "Loop mount of volumes is not possible on this machine, this error"
 msgstr "Loop-Mount der Laufwerke nicht unterstützt, dieser Fehler"
 
 #: _warning
 msgid "often occurs on VPS and kernels that don't provide the loop module."
-msgstr "tritt oft in virtuellen Maschinen auf oder mit Kerneln ohne Loop-Modul."
+msgstr ""
+"tritt oft in virtuellen Maschinen auf oder mit Kerneln ohne Loop-Modul."
 
 #: _warning
 msgid "It is impossible to use Tomb on this machine at this conditions."
-msgstr "Es ist unmöglich Tomb unter diesen Umständen auf dieser Maschine zu benutzen."
+msgstr ""
+"Es ist unmöglich Tomb unter diesen Umständen auf dieser Maschine zu benutzen."
+
+#: _verbose
+msgid "lo_preserve on ::1 path::"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_file: ::1 tomb file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _verbose
+msgid "tomb_key: ::1 key:: chars long"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_key_file: ::1 key::"
+msgstr "Alter Schlüssel : ::1 key::"
+
+#: _verbose
+msgid "tomb_secret: ::1 secret:: chars long"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_password: ::1 tomb pass::"
+msgstr "Grab unauffindbar : ::1 tomb name::"
+
+#: _verbose
+#, fuzzy
+msgid "tomb_tempfiles: ::1 temp files::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _verbose
+msgid "tomb_loopdevs: ::1 loopdevs::"
+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>.."
+
+#: _failure
+msgid "Cannot find ::1::. It's a requirement to use Tomb, please install it."
+msgstr ""
+
+#: _verbose
+msgid "is_valid_key"
+msgstr ""
+
+#: _warning
+msgid "is_valid_key() called without argument."
+msgstr ""
 
 #: _message
-msgid "Valid tomb file found: $1"
-msgstr "Gültige Grab-Datei gefunden : $1"
+msgid "Key is an image, it might be valid."
+msgstr ""
 
-#: _message -n
-msgid "Waiting for the key to be piped from stdin... "
-msgstr "Warten auf den Schlüssel auf der Standarteingabe... "
+#: _message
+msgid "Key is valid."
+msgstr ""
+
+#: _warning
+msgid "Attempting key recovery."
+msgstr ""
 
 #: _failure
 msgid "This operation requires a key file to be specified using the -k option."
-msgstr "Diese Operation benötigt das angeben eines Schlüssels durch die -k Option."
+msgstr ""
+"Diese Operation benötigt das angeben eines Schlüssels durch die -k Option."
+
+#: _verbose
+msgid "load_key reading from stdin."
+msgstr ""
+
+#: _message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr "Warten auf den Schlüssel auf der Standarteingabe... "
+
+#: _verbose
+msgid "load_key argument: ::1 opt::"
+msgstr ""
 
 #: _warning
 msgid "Key not found, specify one using -k."
 msgstr "Schlüssel nicht gefunden, bitte mit -k einen Schlüssel angeben."
 
+#: _verbose
+#, fuzzy
+msgid "load_key: ::1 key::"
+msgstr "Alter Schlüssel : ::1 key::"
+
 #: _warning
-msgid "The key seems invalid, the application/pgp header is missing."
-msgstr "Der Schlüssel scheint ungültig. Dateikopf \"application/pgp\" fehlt."
+msgid ""
+"The key seems invalid or its format is not known by this version of Tomb."
+msgstr ""
+
+#: _verbose
+msgid "GnuPG is version 1.4.11 - adopting status fix."
+msgstr ""
+
+#: _verbose
+msgid "get_lukskey"
+msgstr ""
+
+#: _verbose
+msgid "KDF: ::1 kdf::"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "No suitable program for KDF ::1 program::."
+msgstr "Kein gültiges Programm zur Schlüsselableitung ::1 kdf::."
+
+#: _verbose
+msgid "get_lukskey returns ::1::"
+msgstr ""
+
+#: _failure
+msgid "Internal error: ask_key_password() called before load_key()."
+msgstr ""
 
 #: _message
-msgid "A password is required to use key ${keyname}"
-msgstr "Ein Passwort ist zur Benutzung des Schlüssels ${keyname} erforderlich"
+msgid "A password is required to use key ::1 key::"
+msgstr "Ein Passwort ist zur Benutzung des Schlüssels ::1 key:: erforderlich"
 
 #: _warning
 msgid "User aborted password dialog."
@@ -156,13 +359,31 @@ msgstr "Benutzer hat den Passwortdialog abgebrochen."
 msgid "Password OK."
 msgstr "Passwort OK."
 
+#: _verbose
+msgid "ask_key_password with tombpass: ::1 tomb pass::"
+msgstr ""
+
 #: _message
-msgid "Commanded to change password for tomb key $1"
-msgstr "Benutzer hat Passwort für Schlüssel $1 gewechselt."
+msgid "Commanded to change password for tomb key ::1 key::"
+msgstr "Benutzer hat Passwort für Schlüssel ::1 key:: gewechselt."
 
 #: _success
-msgid "Changing password for $keyfile"
-msgstr "Passwort gewechselt für $keyfile."
+#, fuzzy
+msgid "Changing password for ::1 key file::"
+msgstr "Passwort gewechselt für ::1 key::."
+
+#: _verbose
+msgid "tomb-old-pwd = ::1 old pass::"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "No valid password supplied."
+msgstr "Das eingegebene Passwort ist falsch."
+
+#: _verbose
+msgid "tomb-pwd = ::1 new pass::"
+msgstr ""
 
 #: _failure
 msgid "Error: the newly generated keyfile does not seem valid."
@@ -172,26 +393,6 @@ msgstr "Fehler : Der neu erstellte Schlüssel scheint nicht gültig zu sein."
 msgid "Your passphrase was successfully updated."
 msgstr "Ihr Passwort wurde erfolgreich geändert."
 
-#: _message
-msgid "Removing key temporarily stored from stdin"
-msgstr "Temporär gespeicherter. von Standarteingebe übernommener Schlüssel, wurde gelöscht."
-
-#: _message
-msgid "Valid key file found: $1"
-msgstr "Gültiger Schlüssel wurde gefunden : $1"
-
-#: _warning
-msgid "Key data found with missing headers, attempting recovery."
-msgstr "Schlüsseldatei ohne Dateikopf gefunden, versuche Wiederherstellung."
-
-#: _warning
-msgid "Invalid key format: $1"
-msgstr "Ungültiges Dateiformat für Schlüssel : $1"
-
-#: _failure
-msgid "No suitable program for KDF `cut -f 3 <<<$firstline`."
-msgstr "Kein gültiges Programm zur Schlüsselableitung `cut -f 3 <<<$firstline`."
-
 #: _failure
 msgid "User aborted."
 msgstr "Vom Benutzer abgebrochen."
@@ -200,133 +401,206 @@ msgstr "Vom Benutzer abgebrochen."
 msgid "You set empty password, which is not possible."
 msgstr "Fehler: Passwort nicht gesetzt."
 
+#: _verbose
+msgid "gen_key takes tombpass from CLI argument: ::1 tomb pass::"
+msgstr ""
+
 #: _failure
-msgid "Wrong argument for --kdf: must be an integer number (iteration seconds)."
+msgid ""
+"Wrong argument for --kdf: must be an integer number (iteration seconds)."
 msgstr "Ungültiges Argument für --kdf : dies muss eine Ganzzahl sein."
 
 #: _success
-msgid "Using KDF, iterations: $microseconds"
-msgstr "$microsecondes Wiederholungen zur Schlüsselableitung."
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr "::1 microseconds:: Wiederholungen zur Schlüsselableitung."
+
+#: _message
+msgid "generating salt"
+msgstr ""
+
+#: _message
+msgid "calculating iterations"
+msgstr ""
+
+#: _message
+msgid "encoding the password"
+msgstr ""
 
 #: _failure
 msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
-msgstr "gpg (GnuPG) welches zur Funktion von Tomb notwendig ist, nicht gefunden."
+msgstr ""
+"gpg (GnuPG) welches zur Funktion von Tomb notwendig ist, nicht gefunden."
+
+#: _failure
+#, fuzzy
+msgid "Bury failed for invalid key: ::1 key::"
+msgstr "Gültiger Schlüssel wurde gefunden : ::1 key::"
 
 #: _warning
-msgid "Encode failed: $imagefile is not a jpeg image."
-msgstr "Verschlüsselung fehlgeschlagen : $imagefile ist keine JPEG-Datei."
+msgid "Encode failed: ::1 image file:: is not a jpeg image."
+msgstr ""
+"Verschlüsselung fehlgeschlagen : ::1 image file:: ist keine JPEG-Datei."
 
 #: _success
-msgid "Encoding key $tombkey inside image $imagefile"
-msgstr "Verschlüssleung des Schlüssels $tombkey im Bild $imagefile"
+#, fuzzy
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+msgstr "Verschlüssleung des Schlüssels ::1 key:: im Bild ::2 image file::"
 
 #: _message
 msgid "Please confirm the key password for the encoding"
 msgstr "Bitte bestätigen Sie das Passwort zur Verschlüsselung"
 
+#: _verbose
+#, fuzzy
+msgid "tomb-pwd = ::1 tomb pass::"
+msgstr "Schließen des Grabes ::1 tomb name::"
+
 #: _warning
 msgid "Wrong password supplied."
 msgstr "Das eingegebene Passwort ist falsch."
 
 #: _failure
 msgid "You shall not bury a key whose password is unknown to you."
-msgstr "Sie dürfen keinen Schlüssel vergraben, von dem Sie das Passwort nicht kennen."
+msgstr ""
+"Sie dürfen keinen Schlüssel vergraben, von dem Sie das Passwort nicht kennen."
 
 #: _warning
 msgid "Encoding error: steghide reports problems."
 msgstr "Fehler beim Verschlüsseln : steghide meldet Fehler."
 
 #: _success
-msgid "Tomb key encoded succesfully into image ${imagefile}"
-msgstr "Der Schlüssel des Grabes wurde erfolgreich im Bild ${imagefile} verschlüsselt."
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr ""
+"Der Schlüssel des Grabes wurde erfolgreich im Bild ::1 image file:: "
+"verschlüsselt."
+
+#: _message
+msgid "printing exhumed key on stdout"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "Exhume failed, image file not found: ::1 image file::"
+msgstr "Gültige Grab-Datei gefunden : ::1 tomb file::"
+
+#: _failure
+#, fuzzy
+msgid "Exhume failed: ::1 image file:: is not a jpeg image."
+msgstr ""
+"Verschlüsselung fehlgeschlagen : ::1 image file:: ist keine JPEG-Datei."
+
+#: _failure
+msgid "Wrong password or no steganographic key found"
+msgstr ""
 
 #: _warning
-msgid "File exists: $tombkey"
-msgstr "Datei existiert : $tombkey"
+#, fuzzy
+msgid "File exists: ::1 tomb key::"
+msgstr "Datei existiert : ::1 key::"
 
 #: _warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Benutzen sie --force um ein Überschreiben zu erzwingen."
 
+#: _failure
+#, fuzzy
+msgid "Refusing to overwrite file. Operation aborted."
+msgstr ""
+"Das ausheben dieses Grabes würde eine existierende Datei überschreiben. "
+"Vorgang abgebrochen."
+
 #: _warning
 msgid "Use of --force selected: overwriting."
 msgstr "--force wurde benutzt, wird überschrieben."
 
 #: _message
-msgid "Trying to exhume a key out of image $imagefile"
-msgstr "Versuche Schlüssel aus $imagefile zu exhumieren"
+msgid "Trying to exhume a key out of image ::1 image file::"
+msgstr "Versuche Schlüssel aus ::1 image file:: zu exhumieren"
 
-#: _success
-msgid "${tombkey} succesfully decoded."
-msgstr "${tombkey} wurde erfolgreich decodiert."
+msgid "Key succesfully exhumed to ::1 key::."
+msgstr ""
 
 #: _warning
-msgid "Nothing found in $imagefile"
-msgstr "Nichts gefunden in $imagefile"
+msgid "Nothing found in ::1 image file::"
+msgstr "Nichts gefunden in ::1 image file::"
+
+#: _failure
+msgid "No key specified."
+msgstr ""
 
 #: _success
-msgid "Rendering a printable QRCode for key: $tombkey"
-msgstr "$tomkey wird in QR-Code umgewandelt"
+#, fuzzy
+msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+msgstr "::1 key:: wird in QR-Code umgewandelt"
+
+#: _failure
+msgid "QREncode reported an error."
+msgstr ""
 
 #: _success
 msgid "Operation successful:"
 msgstr "Vorgang erfolgreich : "
 
-#: _message
-msgid "`ls -lh $pngname`"
-msgstr "`ls -lh $pngname`"
-
-#: _message
-msgid "`file $pngname`"
-msgstr "`file $pngname`"
-
 #: _warning
 msgid "A filename needs to be specified using -k to forge a new key."
-msgstr "Um einen neuen Schlüssel anzugeben muss ein Dateiname mit -k angegeben werden."
+msgstr ""
+"Um einen neuen Schlüssel anzugeben muss ein Dateiname mit -k angegeben "
+"werden."
 
 #: _message
-msgid "Commanded to forge key $destkey"
-msgstr "$destkey wird geschmiedet"
+msgid "Commanded to forge key ::1 key::"
+msgstr "::1 key:: wird geschmiedet"
 
 #: _warning
 msgid "Forging this key would overwrite an existing file. Operation aborted."
-msgstr "Diesen Schlüssel zu schmieden würde eine existierende Datei überschreiben. Aktion abgebrochen."
+msgstr ""
+"Diesen Schlüssel zu schmieden würde eine existierende Datei überschreiben. "
+"Aktion abgebrochen."
 
 #: _failure
-msgid "Error creating temp dir."
-msgstr "Fehler beim Erstellen eines temporären Ordners."
-
-#: _warning
-msgid "Cannot mount tmpfs filesystem in volatile memory."
-msgstr "Temporärer Ordner kann nicht in den Zwischenpeicher geladen werden."
+msgid "`ls -lh $destkey`"
+msgstr ""
 
 #: _message
-msgid "Commanded to forge key $destkey with cipher algorithm $algo"
-msgstr "Der Schlüssel $destkey wird mit dem Verschlüsselungsalgorithmus $algo geschmiedet."
+msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
+msgstr ""
+"Der Schlüssel ::1 key:: wird mit dem Verschlüsselungsalgorithmus ::2 "
+"algorithm:: geschmiedet."
 
 #: _message
 msgid "This operation takes time, keep using this computer on other tasks,"
-msgstr "Dieser Vorgang braucht Zeit, benutzen Sie den Computer für andere Aufgaben,"
+msgstr ""
+"Dieser Vorgang braucht Zeit, benutzen Sie den Computer für andere Aufgaben,"
 
 #: _message
 msgid "once done you will be asked to choose a password for your tomb."
-msgstr "wenn der Vorgang einmal abgeschlossen ist, werden Sie gefragt ein Passwort für ihr Grab anzugeben."
+msgstr ""
+"wenn der Vorgang einmal abgeschlossen ist, werden Sie gefragt ein Passwort "
+"für ihr Grab anzugeben."
 
 #: _message
 msgid "To make it faster you can move the mouse around."
-msgstr "Um den Vorgang zu Beschleunigen können sie die Maus hin und her bewegen."
+msgstr ""
+"Um den Vorgang zu Beschleunigen können sie die Maus hin und her bewegen."
 
 #: _message
 msgid "If you are on a server, you can use an Entropy Generation Daemon."
-msgstr "Falls sie auf einem Server sind können sie einen Daemon benutzen um Entropie zu erstellen."
+msgstr ""
+"Falls sie auf einem Server sind können sie einen Daemon benutzen um Entropie "
+"zu erstellen."
+
+#: _verbose
+msgid "Data dump using ::1:: from ::2 source::"
+msgstr ""
 
 #: _warning
 msgid "Cannot generate encryption key."
 msgstr "Verschlüsselungsschlüssel konnte nicht erstellt werden."
 
 #: _success
-msgid "Choose the password of your key: ${tombkey}"
-msgstr "Wählen sie ein Passwort für ihren Schlüssel : ${tombkey}"
+#, fuzzy
+msgid "Choose the  password of your key: ::1 tomb key::"
+msgstr "Wählen sie ein Passwort für ihren Schlüssel : ::1 key::"
 
 #: _message
 msgid "(You can also change it later using 'tomb passwd'.)"
@@ -345,16 +619,17 @@ msgid "--"
 msgstr "--"
 
 #: _message
-msgid "Done forging $tombkey"
-msgstr "Der Schlüssel $tombkey wurde geschmiedet"
+msgid "Done forging ::1 key::"
+msgstr "Der Schlüssel ::1 key:: wurde geschmiedet"
 
 #: _success
 msgid "Your key is ready:"
 msgstr "Ihr Schlüssel ist bereit :"
 
 #: _message
-msgid "Commanded to dig tomb $1"
-msgstr "Das Grab $1 wird ausgehoben"
+#, fuzzy
+msgid "Commanded to dig tomb ::1 tomb name::"
+msgstr "Das Grab ::1 tomb file:: wird ausgehoben"
 
 #: _warning
 msgid "No tomb name specified for creation."
@@ -378,35 +653,46 @@ msgstr "Es existiert bereits ein Grab. Hier grabe ich nicht:"
 
 #: _warning
 msgid " `ls -lh ${tombdir}/${tombfile}`"
-msgstr " `ls -lh ${tombdir}/${tombfile}`"
+msgstr ""
 
 #: _success
-msgid "Creating a new tomb in ${tombdir}/${tombfile}"
-msgstr "Neues Grab in ${tombdir}/${tombfile}"
+#, fuzzy
+msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+msgstr "Neues Grab in ::1 dir::/::2 tomb file::"
 
 #: _message
-msgid "Generating ${tombfile} of ${tombsize}MiB"
-msgstr "Grab ${tombfile} wird erstellt, mit der Größe ${tombsize}Mb"
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Grab ::1 tomb file:: wird erstellt, mit der Größe ::2 size::Mb"
+
+#: _verbose
+msgid "Data dump using ::1:: from /dev/urandom"
+msgstr ""
 
 #: _failure
-msgid "Error creating the tomb ${tombdir}/${tombfile}, operation aborted."
-msgstr "Fehler beim erstellen des Grabes ${tombdir}/${tombsize}. Vorgang abgebrochen."
+#, fuzzy
+msgid ""
+"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+msgstr ""
+"Fehler beim Erstellen des Grabes ::1 dir::/::2 tomb file::. Vorgang "
+"abgebrochen."
 
 #: _success
-msgid "Done digging $tombname"
-msgstr "Das Grab $tombname wurde ausgehoben."
+msgid "Done digging ::1 tomb name::"
+msgstr "Das Grab ::1 tomb name:: wurde ausgehoben."
 
 #: _message
 msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
-msgstr "Ihr Grab ist noch nicht bereit, erst müssen sie einen Schlüssel schmieden und es abschließen :"
+msgstr ""
+"Ihr Grab ist noch nicht bereit, erst müssen sie einen Schlüssel schmieden "
+"und es abschließen :"
 
 #: _message
-msgid "tomb forge ${tombname}.tomb.key"
-msgstr "tomb forge ${tombname}.tomb.key"
+msgid "tomb forge ::1 tomb name::.tomb.key"
+msgstr "tomb forge ::1 tomb name::.tomb.key"
 
 #: _message
-msgid "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
-msgstr "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
+msgid "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
+msgstr "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
 
 #: _warning
 msgid "No tomb specified for locking."
@@ -417,36 +703,55 @@ msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Gebrauch : tomb lock file.tomb file.tomb.key"
 
 #: _message
-msgid "Commanded to lock tomb ${tombfile}"
-msgstr "Grab ${tombfile} wird verschlossen"
+msgid "Commanded to lock tomb ::1 tomb file::"
+msgstr "Grab ::1 tomb file:: wird verschlossen"
 
 #: _failure
 msgid "There is no tomb here. You have to it dig first."
 msgstr "Es ist kein Grab an diesem Ort. Sie müssen erst eins graben ('dig')."
 
+#: _verbose
+#, fuzzy
+msgid "Tomb found: ::1 tomb dir::/::2 tomb file::"
+msgstr "Neues Grab in ::1 dir::/::2 tomb file::"
+
+#: _verbose
+#, fuzzy
+msgid "Loop mounted on ::1 mount point::"
+msgstr "::1 mount point:: kann nicht abrupt geschlossen werden."
+
 #: _message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
-msgstr "Am kontrollieren ob Grab leer ist (wir würden nie fremde Knochen stören)."
+msgstr ""
+"Am kontrollieren ob Grab leer ist (wir würden nie fremde Knochen stören)."
 
 #: _warning
 msgid "The tomb was already locked with another key."
 msgstr "Grab ist schon mit anderem Schlüssel verschlossen."
 
 #: _failure
-msgid "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
-msgstr "Vorgang abgebrochen. Ich kann kein bereits abgeschlossenes Grab nochmal abschließen. Graben Sie ein neues (mit 'dig')."
+msgid ""
+"Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
+msgstr ""
+"Vorgang abgebrochen. Ich kann kein bereits abgeschlossenes Grab nochmal "
+"abschließen. Graben Sie ein neues (mit 'dig')."
 
 #: _message
 msgid "Fine, this tomb seems empty."
 msgstr "Gut, dieses Grab scheint leer."
 
+#: _failure
+msgid "Aborting operations: error loading key."
+msgstr ""
+
 #: _message
-msgid "Locking using cipher: $cipher"
-msgstr "Abschließen mit Chiffre : $cipher"
+msgid "Locking using cipher: ::1 cipher::"
+msgstr "Abschließen mit Chiffre : ::1 cipher::"
 
 #: _success
-msgid "Locking ${tombfile} with ${tombkey}"
-msgstr "Abschließen von ${tombfile} mit ${tombkey}"
+#, fuzzy
+msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+msgstr "Abschließen von ::1 tomb file:: mit ::1 key::"
 
 #: _message
 msgid "Formatting Luks mapped device."
@@ -456,6 +761,11 @@ msgstr "Formatieren des Luks Gerätes."
 msgid "cryptsetup luksFormat returned an error."
 msgstr "'cryptsetup luksFormat' hat einen Fehler ausgegeben"
 
+#: _warning
+#, fuzzy
+msgid "cryptsetup luksOpen returned an error."
+msgstr "'cryptsetup luksFormat' hat einen Fehler ausgegeben"
+
 #: _message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Ihr Grab wird mit Ext3/Ext4 formatiert."
@@ -465,140 +775,298 @@ msgid "Tomb format returned an error."
 msgstr "Beim Formatieren ist ein Fehler aufgetreten."
 
 #: _warning
-msgid "Your tomb ${tombfile} may be corrupted."
-msgstr "Ihr Grab ${tombfile} könnte korrumpiert sein."
+msgid "Your tomb ::1 tomb file:: may be corrupted."
+msgstr "Ihr Grab ::1 tomb file:: könnte korrumpiert sein."
 
 #: _message
-msgid "Done locking $tombname using Luks dm-crypt ${create_cipher}"
-msgstr "Grab ${tombname} wurde erfolgreich verschlüsselt mit LUKS dm-crypt ${create_cipher}"
+#, fuzzy
+msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
+msgstr ""
+"Grab ::1 tomb name:: wurde erfolgreich verschlüsselt mit LUKS dm-crypt ::1 "
+"cipher::"
 
 #: _success
-msgid "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombkey}"
-msgstr "Ihr Grab ist unter ${tombdir}/${tombfile} bereit und mit Schlüssel ${tombkey} geschützt"
+#, fuzzy
+msgid ""
+"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
+"key ::3 tomb key::"
+msgstr ""
+"Ihr Grab ist unter ::1 dir::/::2 tomb file:: bereit und mit Schlüssel ::1 "
+"key:: geschützt"
 
 #: _message
-msgid "Commanded to reset key for tomb $2"
-msgstr "Schlüssel wird geändert für Grab $2"
+#, fuzzy
+msgid "Commanded to reset key for tomb ::1 tomb name::"
+msgstr "Schlüssel wird geändert für Grab ::1 tomb file::"
+
+#: _warning
+msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
+msgstr ""
+
+#: _warning
+msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "Execution aborted."
+msgstr "Vorgang abgebrochen."
+
+#: _failure
+#, fuzzy
+msgid "Not a valid LUKS encrypted volume: ::1 volume::"
+msgstr "Dieses Grab ist ein gültiges LUKS verschlüsseltes Gerät."
+
+#: _failure
+msgid "Aborting operations: error loading old key from arguments"
+msgstr ""
 
 #: _success
-msgid "Changing lock on tomb $tombname"
-msgstr "Ändern des Schlosses für das Grab $tombname"
+msgid "Changing lock on tomb ::1 tomb name::"
+msgstr "Ändern des Schlosses für das Grab ::1 tomb name::"
 
 #: _message
-msgid "Old key: $oldkey"
-msgstr "Alter Schlüssel : $oldkey"
+#, fuzzy
+msgid "Old key: ::1 old key::"
+msgstr "Alter Schlüssel : ::1 key::"
+
+#: _failure
+msgid "No valid password supplied for the old key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksOpen."
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading new key from -k"
+msgstr ""
 
 #: _message
-msgid "New key: $newkey"
-msgstr "Neuer Schlüssel : $newkey"
+msgid "New key: ::1 key::"
+msgstr "Neuer Schlüssel : ::1 key::"
+
+#: _failure
+msgid "No valid password supplied for the new key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksChangeKey."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksClose."
+msgstr ""
 
 #: _success
-msgid "Succesfully changed key for tomb: $2"
-msgstr "Das Schloss wurde erfolgreich gewechselt am Grab $2"
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
+msgstr "Das Schloss wurde erfolgreich gewechselt am Grab ::1 tomb file::"
 
 #: _message
-msgid "The new key is: $newkey"
-msgstr "Der neue Schlüssel ist : $newkey"
+#, fuzzy
+msgid "The new key is: ::1 new key::"
+msgstr "Der neue Schlüssel ist : ::1 key::"
+
+#: _verbose
+msgid "create_tomb(): ::1:: ::2::"
+msgstr ""
 
 #: _warning
-msgid "Creating this tomb would overwrite an existing file. Operation aborted."
-msgstr "Das ausheben dieses Grabes würde eine existierende Datei überschreiben. Vorgang abgebrochen."
+#, fuzzy
+msgid "Creating this tomb would overwrite an existing file."
+msgstr ""
+"Das ausheben dieses Grabes würde eine existierende Datei überschreiben. "
+"Vorgang abgebrochen."
+
+#: _failure
+msgid "Failed to forge key, operation aborted."
+msgstr ""
+
+#: _failure
+msgid "Failed to lock tomb with key, operation aborted."
+msgstr ""
 
 #: _success
-msgid "Tomb $tombname succesfully created."
-msgstr "Das Grab $tombname wurde erfolgreich erstellt."
+msgid "Tomb ::1 tomb name:: succesfully created."
+msgstr "Das Grab ::1 tomb name:: wurde erfolgreich erstellt."
 
 #: _message
-msgid "Commanded to open tomb $1"
-msgstr "Grab $1 wird geöffnet"
+#, fuzzy
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Grab ::1 tomb file:: wird geöffnet"
+
+#: _warning
+#, fuzzy
+msgid "No tomb name specified for opening."
+msgstr "Bitte geben sie den Namen des zu vergrössernden Grabes an."
+
+#: _warning
+#, fuzzy
+msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+msgstr "::1 tomb file:: ist kein gültiges Luks verschlüsseltes Gerät."
+
+#: _failure
+msgid "Aborting operations: error loading key ::1 key::"
+msgstr ""
 
 #: _message
-msgid "Mountpoint not specified, using default: $tombmount"
-msgstr "Mountpoint nicht angegeben, $tombmount wird benutzt"
+msgid "Mountpoint not specified, using default: ::1 mount point::"
+msgstr "Mountpoint nicht angegeben, ::1 mount point:: wird benutzt"
 
 #: _warning
-msgid "$tombname is already open."
-msgstr "$tombname ist bereits geöffnet."
+msgid "::1 tomb name:: is already open."
+msgstr "::1 tomb name:: ist bereits geöffnet."
 
 #: _message
 msgid "Here below its status is reported:"
 msgstr "Zustand des Grabes wie folgt :"
 
 #: _success
-msgid "Opening $tombfile on $tombmount"
-msgstr "$tombfile geöffnet in $tombmount"
-
-#: _failure
-msgid "Too many tombs open. Please close any of them to open another tomb."
-msgstr "Zu viele Gräber stehen offen. Bitte schließen sie eins damit ein anderes geöffnet werden kann."
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
+msgstr "::1 tomb file:: geöffnet in ::2 mount point::"
 
 #: _warning
-msgid "$tombfile is not a valid Luks encrypted storage file."
-msgstr "$tombfile ist kein gültiges Luks verschlüsseltes Gerät."
+msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
+msgstr "::1 tomb file:: ist kein gültiges Luks verschlüsseltes Gerät."
 
 #: _message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Dieses Grab ist ein gültiges LUKS verschlüsseltes Gerät."
 
 #: _message
-msgid "Cipher is \"$tombdump[1]\" mode \"$tombdump[2]\" hash \"$tombdump[3]\""
-msgstr "Verschlüsselung \"$tombdump[1]\" im Modus \"$tombdump[2]\" und der Hashfunktion \"$tombdump[3]\"."
+msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
+msgstr ""
+"Verschlüsselung \"::1 cipher::\" im Modus \"::2 mode::\" und der "
+"Hashfunktion \"::3 hash::\"."
+
+#: _warning
+msgid ""
+"Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "dev mapper device: ::1 mapper::"
+msgstr "e2fsck konnte ::1 mapper:: nicht verifizieren"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb key: ::1 key::"
+msgstr "Alter Schlüssel : ::1 key::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb name: ::1 tomb name:: (to be engraved)"
+msgstr "Das Grab ::1 tomb name:: wurde erfolgreich erstellt."
 
 #: _failure
 msgid "Failure mounting the encrypted file."
 msgstr "Fehler beim Einhängen des verschlüsselten Gerätes."
 
 #: _success
-msgid "Success unlocking tomb $tombname"
-msgstr "$tombname wurde erfolgreich aufgeschlossen."
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr "::1 tomb name:: wurde erfolgreich aufgeschlossen."
+
+#: _verbose
+msgid "Key size is ::1 size:: for cipher ::2 cipher::"
+msgstr ""
 
 #: _message
-msgid "Checking filesystem via $tombstat[3]"
-msgstr "Dateisystem kontrollieren mit $tombstat[3]"
+msgid "Checking filesystem via ::1::"
+msgstr "Dateisystem kontrollieren mit ::1::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb engraved as ::1 tomb name::"
+msgstr "Schließen des Grabes ::1 tomb name::"
 
 #: _success
-msgid "Success opening $tombfile on $fg_bold[white]$tombmount$fg_no_bold[white]"
-msgstr "Das Grab $tombfile ist geöffnet in $fg_bold[white]$tombmount$fg_no_bold[white]"
+#, fuzzy
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+msgstr "::1 tomb file:: geöffnet in ::2 mount point::"
 
 #: _message
-msgid "Last visit by $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] from $fg_bold[white]$tombtty$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
-msgstr "Letzter Besuch von $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] seit $fg_bold[white]$tombtty$fg_no_bold[white] auf $fg_bold[white]$tombhost$fg_no_bold[white]"
+msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
+msgstr ""
 
 #: _message
-msgid "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
-msgstr "am Datum  $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+msgid "on date ::1 date::"
+msgstr ""
 
 #: _warning
 msgid "How pitiful!  A tomb, and no HOME."
-msgstr "Wie bedaurndswert ! Ein Grab aber kein Zuhause (HOME ist nicht definiert)."
+msgstr ""
+"Wie bedaurndswert ! Ein Grab aber kein Zuhause (HOME ist nicht definiert)."
 
 #: _warning
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr "'Bind hooks' kann nicht benutzt werden ohne eingehängtes Grab."
 
+#: _verbose
+#, fuzzy
+msgid "bind-hooks not found in ::1 mount point::"
+msgstr ""
+"'bind-hooks' Quelle nicht in Grab gefunden, ::1 mount point::/::2 dir:: wird "
+"ignoriert."
+
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME"
+#, fuzzy
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
 msgstr "'bind hooks' format : lokal/zu/Grab lokal/zu/HOME"
 
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME.  Rolling back"
-msgstr "'bind-hooks' format : lokal/zu/Grab lokal/zu/HOME.  Wird rückgängig gemacht"
+#, fuzzy
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
+msgstr ""
+"'bind-hooks' format : lokal/zu/Grab lokal/zu/HOME.  Wird rückgängig gemacht"
 
 #: _warning
-msgid "bind-hook target not existent, skipping $HOME/${maps[$dir]}"
-msgstr "'bind-hooks' Ziel ungültig,  $HOME/${maps[$dir]} wird ignoriert."
+#, fuzzy
+msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
+msgstr "'bind-hooks' Ziel ungültig,  ::1 home::/::2 dir:: wird ignoriert."
 
 #: _warning
-msgid "bind-hook source not found in tomb, skipping ${MOUNTPOINT}/${dir}"
-msgstr "'bind-hooks' Quelle nicht in Grab gefunden, ${MOUNTPOINT}/${dir} wird ignoriert."
+#, fuzzy
+msgid ""
+"bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
+msgstr ""
+"'bind-hooks' Quelle nicht in Grab gefunden, ::1 mount point::/::2 dir:: wird "
+"ignoriert."
 
 #: _success
-msgid "Post hooks found, executing as user $SUDO_USER."
-msgstr "'Post hooks' gefunden, werden als $SUDO_USER ausgeführt."
+#, fuzzy
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr "'Post hooks' gefunden, werden als ::1 user:: ausgeführt."
+
+#: _failure
+#, fuzzy
+msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
+msgstr "Kein Grab geöffnet. Mögen sie alle in Frieden ruhen."
+
+#: _failure
+msgid "Internal error: list_tomb_binds called without argument."
+msgstr ""
 
 #: _failure
-msgid "There seems to be no open tomb engraved as [$1]"
-msgstr "Es scheint kein Grab [$1] offen zu sein"
+msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
+msgstr ""
+
+#: _warning
+msgid "Cannot use GNU findutils for index/search commands."
+msgstr ""
+
+#: _failure
+msgid "Index command needs 'mlocate' to be installed."
+msgstr ""
+
+#: _verbose
+msgid "$updatedbver"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "There seems to be no open tomb engraved as [::1::]"
+msgstr "Es scheint kein Grab [::1 tomb name::] offen zu sein"
 
 #: _failure
 msgid "I can't see any open tomb, may they all rest in peace."
@@ -608,41 +1076,57 @@ msgstr "Kein Grab geöffnet. Mögen sie alle in Frieden ruhen."
 msgid "Creating and updating search indexes."
 msgstr "Erstellen und aktualisieren des Such-Indexes."
 
+#: _verbose
+msgid "unoconv listener launched."
+msgstr ""
+
 #: _message
-msgid "Skipping $tombname (.noindex found)."
-msgstr "Überspringen von $tombname (.noindex gefunden)."
+msgid "Skipping ::1 tomb name:: (.noindex found)."
+msgstr "Überspringen von ::1 tomb name:: (.noindex gefunden)."
 
 #: _message
-msgid "Indexing $tombname filenames..."
-msgstr "Indexieren der Dateinamen von $tombname im Gange..."
+msgid "Indexing ::1 tomb name:: filenames..."
+msgstr "Indexieren der Dateinamen von ::1 tomb name:: im Gange..."
 
 #: _message
-msgid "Indexing $tombname contents..."
-msgstr "Indexieren der Inhalte von $tombname im Gange..."
+#, fuzzy
+msgid "Indexing ::1 tomb name:: contents..."
+msgstr "Indexieren der Inhalte von ::1 tomb name:: im Gange..."
+
+#: _verbose
+#, fuzzy
+msgid "Using swish-e to create index."
+msgstr "Führen Sie 'tomb index' aus um Suchindexe zu erstellen."
 
 #: _message
 msgid "Search index updated."
 msgstr "Such-Index aktualisiert."
 
 #: _success
-msgid "Searching for: $fg_bold[white]${(f)@}$fg_no_bold[white]"
-msgstr "Suche läuft : $fg_bold[white]${(f)@}$fg_no_bold[white]"
+#, fuzzy
+msgid "Searching for: ::1::"
+msgstr "Dateisystem kontrollieren mit ::1::"
+
+#: _verbose
+#, fuzzy
+msgid "Checking for index: ::1::"
+msgstr "Dateisystem kontrollieren mit ::1::"
 
 #: _message
-msgid "Searching filenames in tomb $tombname"
-msgstr "Suche in den Dateinamen von $tombname"
+msgid "Searching filenames in tomb ::1 tomb name::"
+msgstr "Suche in den Dateinamen von ::1 tomb name::"
 
 #: _message
-msgid "Matches found: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
-msgstr "Ergebnisse : `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
+msgid "Matches found: ::1 matches::"
+msgstr "Ergebnisse : ::1 matches::"
 
 #: _message
-msgid "Searching contents in tomb $tombname"
-msgstr "Suche in den Inhalten von $tombname"
+msgid "Searching contents in tomb ::1 tomb name::"
+msgstr "Suche in den Inhalten von ::1 tomb name::"
 
 #: _warning
-msgid "Skipping tomb $tombname: not indexed."
-msgstr "Das Grab $tombname ist nicht indexiert und wird ignoriert."
+msgid "Skipping tomb ::1 tomb name::: not indexed."
+msgstr "Das Grab ::1 tomb name:: ist nicht indexiert und wird ignoriert."
 
 #: _warning
 msgid "Run 'tomb index' to create indexes."
@@ -653,24 +1137,29 @@ msgid "Search completed."
 msgstr "Suche abgeschlossen."
 
 #: _message
-msgid "Commanded to resize tomb $1 to $opts[-s] megabytes."
-msgstr "Grab $1 wird auf $opts[-s] Mb vergrössert."
+#, fuzzy
+msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
+msgstr "Grab ::1 tomb file:: wird auf ::2 size:: Mb vergrössert."
 
 #: _failure
 msgid "No tomb name specified for resizing."
 msgstr "Bitte geben sie den Namen des zu vergrössernden Grabes an."
 
 #: _failure
-msgid "Cannot find $1"
-msgstr "$1 nicht gefunden."
+msgid "Cannot find ::1::"
+msgstr "::1:: nicht gefunden."
+
+#: _failure
+msgid "Aborting operations: new size was not specified, use -s"
+msgstr ""
 
 #: _failure
-msgid "The tomb $tombname is open, to resize it it needs to be closed."
-msgstr "Grab $tombname ist geöffnet, zum Vergrössern bitte schließen."
+msgid "The tomb ::1 tomb name:: is open, to resize it it needs to be closed."
+msgstr "Grab ::1 tomb name:: ist geöffnet, zum Vergrössern bitte schließen."
 
 #: _failure
-msgid "You must specify the new size of $tombname"
-msgstr "Sie müssen die neue Grösse von $tombname angeben"
+msgid "You must specify the new size of ::1 tomb name::"
+msgstr "Sie müssen die neue Grösse von ::1 tomb name:: angeben"
 
 #: _failure
 msgid "Size is not an integer."
@@ -680,21 +1169,22 @@ msgstr "Die Grösse muss eine Ganzzahl sein."
 msgid "The new size must be greater then old tomb size."
 msgstr "Die neue Grösse muss grösser sein als die alte."
 
-#: _message -n
-msgid "Generating ${tombfile} of ${newtombsize}MiB"
-msgstr "Erstelle ${tombfile} mit der Grösse ${newtombsize}Mo."
+#: _failure
+msgid "Error creating the extra resize ::1 size::, operation aborted."
+msgstr ""
 
 #: _failure
-msgid "Too many tombs opened. Please close any of them to open another tomb."
-msgstr "Zu viele Gräber geöffnet. Bitte schließen sie eins um dieses zu öffnen."
+#, fuzzy
+msgid "cryptsetup failed to resize ::1 mapper::"
+msgstr "resize2fs konnte ::1 mapper:: nicht vergrössern"
 
 #: _failure
-msgid "e2fsck failed to check $mapper"
-msgstr "e2fsck konnte $mapper nicht verifizieren"
+msgid "e2fsck failed to check ::1 mapper::"
+msgstr "e2fsck konnte ::1 mapper:: nicht verifizieren"
 
 #: _failure
-msgid "resize2fs failed to resize $mapper"
-msgstr "resize2fs konnte $mapper nicht vergrössern"
+msgid "resize2fs failed to resize ::1 mapper::"
+msgstr "resize2fs konnte ::1 mapper:: nicht vergrössern"
 
 #: _warning
 msgid "There is no open tomb to be closed."
@@ -702,93 +1192,285 @@ msgstr "Es gibt kein zu schließendes Grab."
 
 #: _warning
 msgid "Too many tombs mounted, please specify one (see tomb list)"
-msgstr "Zu viele Gräber geöffnet, bitte geben sie ein Grab an (siehe 'tomb list')"
+msgstr ""
+"Zu viele Gräber geöffnet, bitte geben sie ein Grab an (siehe 'tomb list')"
 
 #: _warning
 msgid "or issue the command 'tomb close all' to close them all."
 msgstr "oder 'tomb close all' ausführen um alle zu schließen."
 
 #: _message
-msgid "Tomb close $1"
-msgstr "Schließen des Grabes $1"
+#, fuzzy
+msgid "Tomb close ::1::"
+msgstr "Schließen des Grabes ::1 tomb name::"
+
+#: _verbose
+#, fuzzy
+msgid "Name: ::1 tomb name::"
+msgstr "Schließen des Grabes ::1 tomb name::"
+
+#: _verbose
+msgid "Mount: ::1 mount point::"
+msgstr ""
+
+#: _verbose
+msgid "Mapper: ::1 mapper::"
+msgstr ""
 
 #: _warning
-msgid "Tomb not found: $1"
-msgstr "Grab unauffindbar : $1"
+#, fuzzy
+msgid "Tomb not found: ::1 tomb file::"
+msgstr "Grab unauffindbar : ::1 tomb name::"
 
 #: _warning
 msgid "Please specify an existing tomb."
 msgstr "Bitte geben sie ein existierendes Grab an."
 
 #: _success
-msgid "Slamming tomb $tombname mounted on $tombmount"
-msgstr "Das Grab $tombname eingehängt auf $tombmount wurde abrupt geschlossen."
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr ""
+"Das Grab ::1 tomb name:: eingehängt auf ::2 mount point:: wurde abrupt "
+"geschlossen."
 
 #: _message
 msgid "Kill all processes busy inside the tomb."
-msgstr "Abbrechen aller laufender Prozesse im Grab."
+msgstr "Abbrechen aller laufenden Prozesse im Grab."
 
 #: _warning
-msgid "Cannot slam the tomb $tombname"
-msgstr "$tombname kann nicht abrupt geschlossen werden !"
+msgid "Cannot slam the tomb ::1 tomb name::"
+msgstr "::1 tomb name:: kann nicht abrupt geschlossen werden !"
 
 #: _message
-msgid "Closing tomb $tombname mounted on $tombmount"
-msgstr "Grab $tombname eingehängt in $tombmount wird geschlossen."
+msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr "Grab ::1 tomb name:: eingehängt in ::2 mount point:: wird geschlossen."
 
 #: _message
-msgid "Closing tomb bind hook: $bind_mount"
-msgstr "Schliessen des Einhängepunkts : $bind_hook"
+msgid "Closing tomb bind hook: ::1 hook::"
+msgstr "Schliessen des Einhängepunkts : ::1 hook::"
 
 #: _success
 msgid "Slamming tomb: killing all processes using this hook."
 msgstr "Abruptes Schließen, abbrechen aller Prozesse die diesen Hook benutzen."
 
 #: _warning
-msgid "Cannot slam the bind hook $bind_mount"
-msgstr "$bind_mount kann nicht abrupt geschlossen werden."
+#, fuzzy
+msgid "Cannot slam the bind hook ::1 hook::"
+msgstr "::1 mount point:: kann nicht abrupt geschlossen werden."
 
 #: _warning
-msgid "Tomb bind hook $bind_mount is busy, cannot close tomb."
-msgstr "Der Einhängepunkt $bind_mount ist beschäftigt und kann nicht geschlossen werden."
+#, fuzzy
+msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
+msgstr ""
+"Der Einhängepunkt ::1 mount point:: ist beschäftigt und kann nicht "
+"geschlossen werden."
+
+#: _verbose
+#, fuzzy
+msgid "Performing umount of ::1 mount point::"
+msgstr "::1 mount point:: kann nicht abrupt geschlossen werden."
 
 #: _warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "Grab ist beschäftigt und kann nicht ausgehänkt werden !"
 
 #: _warning
-msgid "Error occurred in cryptsetup luksClose ${mapper}"
-msgstr "Ein Fehler ist beim Ausführen von 'cryptsetup luksClose ${mapper}' aufgetreten."
+msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
+msgstr ""
+"Ein Fehler ist beim Ausführen von 'cryptsetup luksClose ::1 mapper::' "
+"aufgetreten."
 
 #: _success
-msgid "Tomb $tombname closed: your bones will rest in peace."
-msgstr "Das Grab $tombname ist abgeschlossen, mögen ihre Knochen in Frieden ruhen."
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr ""
+"Das Grab ::1 tomb name:: ist abgeschlossen, mögen ihre Knochen in Frieden "
+"ruhen."
+
+#: _verbose
+msgid "Sending ::1:: to processes inside the tomb:"
+msgstr ""
 
 #: _failure
 msgid "Error parsing."
 msgstr "Syntax-Fehler."
 
 #: _warning
-msgid "There's no such command \"$subcommand\"."
-msgstr "Der Befehl \"$subcommand\" existiert nicht."
+msgid "There's no such command \"::1 subcommand::\"."
+msgstr "Der Befehl \"::1 subcommand::\" existiert nicht."
+
+#: _failure
+#, fuzzy
+msgid "Please try -h for help."
+msgstr "Versuchen Sie -h um Hilfe zu erhalten."
 
 #: _warning
 msgid "Some error occurred during option processing."
 msgstr "Fehler beim interpretieren der Optionen"
 
+#: _failure
+msgid "See \"tomb help\" for more info."
+msgstr ""
+
+#: _failure
+msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
+msgstr ""
+
+#: _failure
+msgid ""
+"You specified option ::1 option::, which is DANGEROUS and should only be "
+"used for testing\n"
+"If you really want so, add --unsecure-dev-mode"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "Tomb command: ::1 subcommand:: ::2 param::"
+msgstr "Der Befehl \"::1 subcommand::\" existiert nicht."
+
+#: _verbose
+msgid "Caller: uid[::1 uid::], gid[::2 gid::], tty[::3 tty::]."
+msgstr ""
+
+#: _failure
+msgid "QREncode not installed: cannot engrave keys on paper."
+msgstr ""
+
 #: _warning
-msgid "The create command is deprecated, please use dig, forge and lock instead."
-msgstr "Der Befehl \"create\" ist veraltet, benutzen Sie \"dig\", \"forge\", und \"lock\"."
+msgid ""
+"The create command is deprecated, please use dig, forge and lock instead."
+msgstr ""
+"Der Befehl \"create\" ist veraltet, benutzen Sie \"dig\", \"forge\", und "
+"\"lock\"."
 
 #: _warning
 msgid "For more informations see Tomb's manual page (man tomb)."
 msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."
 
+#: _failure
+msgid "Steghide not installed: cannot bury keys into images."
+msgstr ""
+
+#: _failure
+msgid "Steghide not installed: cannot exhume keys from images."
+msgstr ""
+
+#: _failure
+msgid "Resize2fs not installed: cannot resize tombs."
+msgstr ""
+
+#: _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 ""
+
 #: _warning
-msgid "Command \"$subcommand\" not recognized."
-msgstr "Der befehl \"$subcommand\" wurde nicht erkannt."
+msgid "Command \"::1 subcommand::\" not recognized."
+msgstr "Der Befehl \"::1 subcommand::\" wurde nicht erkannt."
 
 #: _message
 msgid "Try -h for help."
 msgstr "Versuchen Sie -h um Hilfe zu erhalten."
 
+#~ msgid ""
+#~ "Success opening ::1 tomb file:: on $fg_bold[white]::2 mount point::"
+#~ "$fg_no_bold[white]"
+#~ msgstr ""
+#~ "Das Grab ::1 tomb file:: ist geöffnet in $fg_bold[white]::2 mount point::"
+#~ "$fg_no_bold[white]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Last visit by $fg_bold[white]::1 user::(::2 tomb "
+#~ "build::)$fg_no_bold[white] from $fg_bold[white]::3 tty::"
+#~ "$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
+#~ msgstr ""
+#~ "Letzter Besuch von $fg_bold[white]::1 user::(::2 "
+#~ "build::)$fg_no_bold[white] seit $fg_bold[white]::3 tty::"
+#~ "$fg_no_bold[white] auf $fg_bold[white]::4 host::$fg_no_bold[white]"
+
+#, fuzzy
+#~ msgid "on date $fg_bold[white]::1 date::$fg_no_bold[white]"
+#~ msgstr "Suche läuft : $fg_bold[white]::1::$fg_no_bold[white]"
+
+#~ msgid "Searching for: $fg_bold[white]::1::$fg_no_bold[white]"
+#~ msgstr "Suche läuft : $fg_bold[white]::1::$fg_no_bold[white]"
+
+#~ msgid "WARNING: we cannot ensure we're running in RAM."
+#~ msgstr ""
+#~ "ACHTUNG : Das Ausführen im Wechselspeicher kann nicht garantiert werden."
+
+#~ msgid "WARNING: no RAM available for me to run safely."
+#~ msgstr ""
+#~ "ACHTUNG : Unzureichender Wechselspeicher verfügbar zur sicheren Ausführung"
+
+#~ msgid "No access to shared memory on this system, sorry."
+#~ msgstr "Kein Zugriff auf geteilten Speicher möglich.."
+
+#~ msgid "The key seems invalid, the application/pgp header is missing."
+#~ msgstr ""
+#~ "Der Schlüssel scheint ungültig. Dateikopf \"application/pgp\" fehlt."
+
+#~ msgid "Removing key temporarily stored from stdin"
+#~ msgstr ""
+#~ "Temporär gespeicherter. von Standarteingebe übernommener Schlüssel, wurde "
+#~ "gelöscht."
+
+#~ msgid "Key data found with missing headers, attempting recovery."
+#~ msgstr "Schlüsseldatei ohne Dateikopf gefunden, versuche Wiederherstellung."
+
+#~ msgid "Invalid key format: ::1 key::"
+#~ msgstr "Ungültiges Dateiformat für Schlüssel : ::1 key::"
+
+#~ msgid "::1 key:: succesfully decoded."
+#~ msgstr "::1 key:: wurde erfolgreich decodiert."
+
+#~ msgid "Error creating temp dir."
+#~ msgstr "Fehler beim Erstellen eines temporären Ordners."
+
+#~ msgid "Cannot mount tmpfs filesystem in volatile memory."
+#~ msgstr "Temporärer Ordner kann nicht in den Zwischenpeicher geladen werden."
+
+#~ msgid "Too many tombs open. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Zu viele Gräber stehen offen. Bitte schließen sie eins damit ein anderes "
+#~ "geöffnet werden kann."
+
+#~ msgid ""
+#~ "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+#~ msgstr ""
+#~ "am Datum  $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+
+#~ msgid ""
+#~ "Too many tombs opened. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Zu viele Gräber geöffnet. Bitte schließen sie eins um dieses zu öffnen."
diff --git a/extras/po/es.po b/extras/po/es.po
@@ -1,108 +1,23 @@
+# Tomb - The Crypto Undertaker.
+# Copyright (C) 2007-2013 Dyne.org Foundation
+# Denis Roio <jaromil@dyne.org>, 2013.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"Project-Id-Version: Tomb \n"
+"PO-Revision-Date: sáb ago 30 20:56:52 CEST 2014\n"
+"Last-Translator: Dani \"GDrooid\" <gdrooid@openmailbox.org>\n"
+"Language: Spanish\n"
+"Language-Team: Tomb developers <crypto@lists.dyne.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: POEditor.com\n"
-"Project-Id-Version: Tomb the Crypto Undertaker\n"
-"Language: es\n"
-
-#: commandline help
-msgid "Syntax: tomb [options] command [arguments]\n"
-"\n"
-"Commands:\n"
-"\n"
-" // Creation:\n"
-" dig     create a new empty TOMB file of size -s in MB\n"
-" forge   create a new KEY file and set its password\n"
-" lock    installs a lock on a TOMB to use it with KEY\n"
-"\n"
-" // Operations on tombs:\n"
-" open    open an existing TOMB\n"
-" index   update the search indexes of tombs\n"
-" search  looks for filenames matching text patterns\n"
-" list    list of open TOMBs and information on them\n"
-" close   close a specific TOMB (or 'all')\n"
-" slam    slam a TOMB killing all programs using it\n"
-" resize  resize a TOMB to a new size -s (can only grow)\n"
-"\n"
-" // Operations on keys:\n"
-" passwd  change the password of a KEY\n"
-" setkey  change the KEY locking a TOMB (needs old one)\n"
-" engrave makes a QR code of a KEY to be saved on paper\n"
-" bury    hide a KEY inside a JPEG image\n"
-" exhume  extract a KEY from a JPEG image\n"
-"\n"
-"Options:\n"
-"\n"
-" -s     size of the tomb file when creating/resizing one (in MB)\n"
-" -k     path to the key to be used ('-k -' to read from stdin)\n"
-" -n     don't process the hooks found in tomb\n"
-" -o     mount options used to open (default: rw,noatime,nodev)\n"
-" -f     force operation (i.e. even if swap is active)\n"
-" --kdf  generate passwords armored against dictionary attacks\n"
-"\n"
-" -h     print this help\n"
-" -v     print version, license and list of available ciphers\n"
-" -q     run quietly without printing informations\n"
-" -D     print debugging information at runtime\n"
-"\n"
-"For more informations on Tomb read the manual: man tomb\n"
-"Please report bugs on <http://github.com/dyne/tomb/issues>."
-msgstr "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>."
-
-#. tomb internal messages
-#: _warning
-msgid "WARNING: we cannot ensure we're running in RAM."
-msgstr "ADVERTENCIA: no podemos asegurar que estemos corriendo en RAM."
-
-#: _warning
-msgid "WARNING: no RAM available for me to run safely."
-msgstr "ADVERTENCIA: no hay RAM disponible para correr de forma segura."
-
-#: _failure
-msgid "No access to shared memory on this system, sorry."
-msgstr "No hay acceso a memoria compartida en este sistema, lo siento."
+
+#: _verbose
+msgid "Created tempfile: ::1 temp file::"
+msgstr ""
 
 #: _success
 msgid "All your swaps are belong to crypt.  Good."
@@ -112,41 +27,324 @@ msgstr "Toda tu memoria de intercambio pertenece a la cripta. Bien."
 msgid "Operation aborted."
 msgstr "Operación abortada."
 
+#: _verbose
+msgid "exec_as_user '::1 user::': ::2::"
+msgstr ""
+
+#: _verbose
+msgid "Using sudo for root execution of '::1 exec:: ::2 args::'."
+msgstr ""
+
+#: _verbose
+msgid "Escalating privileges using sudo-pwd."
+msgstr ""
+
+#: _verbose
+msgid "is_valid_tomb ::1 tomb file::"
+msgstr ""
+
+#: _warning
+msgid "Tomb file is missing from arguments."
+msgstr ""
+
+#: _warning
+msgid "Tomb file not found: ::1 tomb file::"
+msgstr "No se encontró la tumba: ::1 tumba::"
+
+#: _warning
+msgid "Tomb file is not a regular file: ::1 tomb file::"
+msgstr ""
+
+#: _warning
+msgid "Tomb file is empty (zero length): ::1 tomb file::"
+msgstr ""
+
+#: _warning
+msgid "Tomb file is not writable: ::1 tomb file::"
+msgstr ""
+
+#: _warning
+msgid "File is not yet a tomb: ::1 tomb file::"
+msgstr ""
+
 #: _warning
-msgid "Loop mount of volumes is not supported on this machine, this error"
-msgstr "No hay soporte para el montaje en loop de volúmenes en esta máquina, este error"
+msgid "Tomb is currently in use: ::1 tomb name::"
+msgstr ""
+
+#: _message
+msgid "Valid tomb file found: ::1 tomb file::"
+msgstr "Fichero tomb válido encontrado: ::1 fichero::"
+
+#: _failure
+msgid "Loopback mount called on invalid tomb: ::1 path::"
+msgstr ""
+
+#: _warning
+msgid "Loop mount of volumes is not possible on this machine, this error"
+msgstr ""
+"No hay soporte para el montaje en loop de volúmenes en esta máquina, este "
+"error"
 
 #: _warning
 msgid "often occurs on VPS and kernels that don't provide the loop module."
-msgstr "ocurre frecuentemente en VPS y kernels que no proveen el módulo 'loop'."
+msgstr ""
+"ocurre frecuentemente en VPS y kernels que no proveen el módulo 'loop'."
 
 #: _warning
 msgid "It is impossible to use Tomb on this machine at this conditions."
 msgstr "Es imposible usar Tomb en esta máquina en estas condiciones."
 
+#: _verbose
+msgid "lo_preserve on ::1 path::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_file: ::1 tomb file::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_key: ::1 key:: chars long"
+msgstr ""
+
+#: _verbose
+msgid "tomb_key_file: ::1 key::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_secret: ::1 secret:: chars long"
+msgstr ""
+
+#: _verbose
+msgid "tomb_password: ::1 tomb pass::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_tempfiles: ::1 temp files::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_loopdevs: ::1 loopdevs::"
+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>."
+
+#: _failure
+msgid "Cannot find ::1::. It's a requirement to use Tomb, please install it."
+msgstr ""
+
+#: _verbose
+msgid "is_valid_key"
+msgstr ""
+
+#: _warning
+msgid "is_valid_key() called without argument."
+msgstr ""
+
 #: _message
-msgid "Valid tomb file found: $1"
-msgstr "Fichero tomb válido encontrado: $1"
+msgid "Key is an image, it might be valid."
+msgstr ""
 
-#: _message -n
-msgid "Waiting for the key to be piped from stdin... "
-msgstr "Esperando a recibir la clave a través de un pipe de stdin... "
+#: _message
+msgid "Key is valid."
+msgstr ""
+
+#: _warning
+msgid "Attempting key recovery."
+msgstr ""
 
 #: _failure
 msgid "This operation requires a key file to be specified using the -k option."
-msgstr "Esta operación requiere que se especifique un fichero clave con la opción -k."
+msgstr ""
+"Esta operación requiere que se especifique un fichero clave con la opción -k."
+
+#: _verbose
+msgid "load_key reading from stdin."
+msgstr ""
+
+#: _message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr "Esperando a recibir la clave a través de un pipe de stdin... "
+
+#: _verbose
+msgid "load_key argument: ::1 opt::"
+msgstr ""
 
 #: _warning
 msgid "Key not found, specify one using -k."
 msgstr "Clave no encontrada, especifica una usando -k."
 
+#: _verbose
+msgid "load_key: ::1 key::"
+msgstr ""
+
 #: _warning
-msgid "The key seems invalid, the application/pgp header is missing."
-msgstr "La clave parece inválida, falta el encabezado application/pgp."
+msgid ""
+"The key seems invalid or its format is not known by this version of Tomb."
+msgstr ""
+
+#: _verbose
+msgid "GnuPG is version 1.4.11 - adopting status fix."
+msgstr ""
+
+#: _verbose
+msgid "get_lukskey"
+msgstr ""
+
+#: _verbose
+msgid "KDF: ::1 kdf::"
+msgstr ""
+
+#: _failure
+msgid "No suitable program for KDF ::1 program::."
+msgstr ""
+
+#: _verbose
+msgid "get_lukskey returns ::1::"
+msgstr ""
+
+#: _failure
+msgid "Internal error: ask_key_password() called before load_key()."
+msgstr ""
 
 #: _message
-msgid "A password is required to use key ${keyname}"
-msgstr "Se requiere una contraseña para usar la clave $(keyname)"
+msgid "A password is required to use key ::1 key::"
+msgstr "Se requiere una contraseña para usar la clave ::1 clave::"
 
 #: _warning
 msgid "User aborted password dialog."
@@ -156,13 +354,29 @@ msgstr "El usuario ha abortado el diálogo de contraseña."
 msgid "Password OK."
 msgstr "Contraseña OK."
 
+#: _verbose
+msgid "ask_key_password with tombpass: ::1 tomb pass::"
+msgstr ""
+
 #: _message
-msgid "Commanded to change password for tomb key $1"
-msgstr "Se ordenó cambiar la contraseña de la clave $1"
+msgid "Commanded to change password for tomb key ::1 key::"
+msgstr "Se ordenó cambiar la contraseña de la clave ::1 clave::"
 
 #: _success
-msgid "Changing password for $keyfile"
-msgstr "Cambiando contraseña para $keyfile"
+msgid "Changing password for ::1 key file::"
+msgstr "Cambiando contraseña para ::1 clave::"
+
+#: _verbose
+msgid "tomb-old-pwd = ::1 old pass::"
+msgstr ""
+
+#: _failure
+msgid "No valid password supplied."
+msgstr "Contraseña incorrecta."
+
+#: _verbose
+msgid "tomb-pwd = ::1 new pass::"
+msgstr ""
 
 #: _failure
 msgid "Error: the newly generated keyfile does not seem valid."
@@ -172,26 +386,6 @@ msgstr "Error: el fichero clave recién generado no parece válido."
 msgid "Your passphrase was successfully updated."
 msgstr "Tu contraseña ha sido actualizada con éxito."
 
-#: _message
-msgid "Removing key temporarily stored from stdin"
-msgstr "Eliminando clave temporalmente almacenada de stdin"
-
-#: _message
-msgid "Valid key file found: $1"
-msgstr "Fichero clave válido encontrado: $1"
-
-#: _warning
-msgid "Key data found with missing headers, attempting recovery."
-msgstr "Se encontraron datos de clave sin cabeceras, intentando recuperación."
-
-#: _warning
-msgid "Invalid key format: $1"
-msgstr "Formato de clave inválido: $1"
-
-#: _failure
-msgid "No suitable program for KDF `cut -f 3 <<<$firstline`."
-msgstr "No hay un programa adecuado para KDF `cut -f 3 <<<$firstline`."
-
 #: _failure
 msgid "User aborted."
 msgstr "El usuario ha abortado."
@@ -200,30 +394,57 @@ msgstr "El usuario ha abortado."
 msgid "You set empty password, which is not possible."
 msgstr "Has fijado una contraseña vacía, lo que no es posible."
 
+#: _verbose
+msgid "gen_key takes tombpass from CLI argument: ::1 tomb pass::"
+msgstr ""
+
 #: _failure
-msgid "Wrong argument for --kdf: must be an integer number (iteration seconds)."
-msgstr "Argumento incorrecto para --kdf: debe ser un número entero (segundos por iteración)."
+msgid ""
+"Wrong argument for --kdf: must be an integer number (iteration seconds)."
+msgstr ""
+"Argumento incorrecto para --kdf: debe ser un número entero (segundos por "
+"iteración)."
 
 #: _success
-msgid "Using KDF, iterations: $microseconds"
-msgstr "Usando KDF, iteraciones: $microseconds"
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr ""
+
+#: _message
+msgid "generating salt"
+msgstr ""
+
+#: _message
+msgid "calculating iterations"
+msgstr ""
+
+#: _message
+msgid "encoding the password"
+msgstr ""
 
 #: _failure
 msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
 msgstr "No se encuentra gpg (GnuPG), Tomb no puede funcionar sin ello."
 
+#: _failure
+msgid "Bury failed for invalid key: ::1 key::"
+msgstr ""
+
 #: _warning
-msgid "Encode failed: $imagefile is not a jpeg image."
-msgstr "La codificación falló: $imagefile no es una imagen jpeg."
+msgid "Encode failed: ::1 image file:: is not a jpeg image."
+msgstr "La codificación falló: ::1 fichero:: no es una imagen jpeg."
 
 #: _success
-msgid "Encoding key $tombkey inside image $imagefile"
-msgstr "Codificando clave $tombkey en la imagen $imagefile"
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+msgstr "Codificando clave ::1 clave:: en la imagen ::2 fichero::"
 
 #: _message
 msgid "Please confirm the key password for the encoding"
 msgstr "Por favor, confirma la contraseña de la clave para la codificación"
 
+#: _verbose
+msgid "tomb-pwd = ::1 tomb pass::"
+msgstr ""
+
 #: _warning
 msgid "Wrong password supplied."
 msgstr "Contraseña incorrecta."
@@ -237,76 +458,98 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Error en la codficación: steghide reporta problemas."
 
 #: _success
-msgid "Tomb key encoded succesfully into image ${imagefile}"
-msgstr "Clave tomb codificada con éxito en la imagen $(imagefile)"
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr "Clave tomb codificada con éxito en la imagen ::1 fichero::"
+
+#: _message
+msgid "printing exhumed key on stdout"
+msgstr ""
+
+#: _failure
+msgid "Exhume failed, image file not found: ::1 image file::"
+msgstr ""
+
+#: _failure
+msgid "Exhume failed: ::1 image file:: is not a jpeg image."
+msgstr ""
+
+#: _failure
+msgid "Wrong password or no steganographic key found"
+msgstr ""
 
 #: _warning
-msgid "File exists: $tombkey"
-msgstr "El fichero existe: $tombkey"
+msgid "File exists: ::1 tomb key::"
+msgstr "El fichero existe: ::1 clave::"
 
 #: _warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Usa --force para sobreescribir."
 
+#: _failure
+msgid "Refusing to overwrite file. Operation aborted."
+msgstr ""
+"Crear esta tumba sobreescribiría un fichero existente. Operación abortada."
+
 #: _warning
 msgid "Use of --force selected: overwriting."
 msgstr "Usando --force: sobreescribiendo."
 
 #: _message
-msgid "Trying to exhume a key out of image $imagefile"
-msgstr "Intentando exhumar una clave de la imagen $imagefile"
+msgid "Trying to exhume a key out of image ::1 image file::"
+msgstr "Intentando exhumar una clave de la imagen ::1 fichero::"
 
-#: _success
-msgid "${tombkey} succesfully decoded."
-msgstr "$(tombkey) decodificado con éxito."
+msgid "Key succesfully exhumed to ::1 key::."
+msgstr ""
 
 #: _warning
-msgid "Nothing found in $imagefile"
-msgstr "No se encontró nada en $imagefile"
+msgid "Nothing found in ::1 image file::"
+msgstr "No se encontró nada en ::1 fichero::"
+
+#: _failure
+msgid "No key specified."
+msgstr ""
 
 #: _success
-msgid "Rendering a printable QRCode for key: $tombkey"
-msgstr "Creando un código QR imprimible para la clave: $tombkey"
+msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+msgstr "Creando un código QR imprimible para la clave: ::1 clave::"
+
+#: _failure
+msgid "QREncode reported an error."
+msgstr ""
 
 #: _success
 msgid "Operation successful:"
 msgstr "Operación exitosa:"
 
-#: _message
-msgid "`ls -lh $pngname`"
-msgstr "`ls -lh $pngname`"
-
-#: _message
-msgid "`file $pngname`"
-msgstr "`file $pngname`"
-
 #: _warning
 msgid "A filename needs to be specified using -k to forge a new key."
-msgstr "Es necesario especificar un nombre de fichero usando -k para forgar una clave nueva."
+msgstr ""
+"Es necesario especificar un nombre de fichero usando -k para forgar una "
+"clave nueva."
 
 #: _message
-msgid "Commanded to forge key $destkey"
-msgstr "Se ordenó forjar la clave $destkey"
+msgid "Commanded to forge key ::1 key::"
+msgstr "Se ordenó forjar la clave ::1 clave::"
 
 #: _warning
 msgid "Forging this key would overwrite an existing file. Operation aborted."
-msgstr "Forjar esta clave sobreescribiría un fichero existente. Operación abortada."
+msgstr ""
+"Forjar esta clave sobreescribiría un fichero existente. Operación abortada."
 
 #: _failure
-msgid "Error creating temp dir."
-msgstr "Error al crear un directorio temporal."
-
-#: _warning
-msgid "Cannot mount tmpfs filesystem in volatile memory."
-msgstr "No se puede montar el sistema de ficheros tmpfs en memoria volatil."
+msgid "`ls -lh $destkey`"
+msgstr ""
 
 #: _message
-msgid "Commanded to forge key $destkey with cipher algorithm $algo"
-msgstr "Se ordenó forjar la clave $destkey con el algoritmo de cifrado $algo"
+msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
+msgstr ""
+"Se ordenó forjar la clave ::1 clave:: con el algoritmo de cifrado ::2 "
+"algorítmo::"
 
 #: _message
 msgid "This operation takes time, keep using this computer on other tasks,"
-msgstr "Esta operación necesita tiempo, sigue usando el ordenador en otras tareas,"
+msgstr ""
+"Esta operación necesita tiempo, sigue usando el ordenador en otras tareas,"
 
 #: _message
 msgid "once done you will be asked to choose a password for your tomb."
@@ -320,13 +563,17 @@ msgstr "Para acelerarlo puedes mover el ratón por la pantalla."
 msgid "If you are on a server, you can use an Entropy Generation Daemon."
 msgstr "Si estás en un servidor, puede usar un Entropy Generation Daemon."
 
+#: _verbose
+msgid "Data dump using ::1:: from ::2 source::"
+msgstr ""
+
 #: _warning
 msgid "Cannot generate encryption key."
 msgstr "No se puede generar la clave de encriptación."
 
 #: _success
-msgid "Choose the password of your key: ${tombkey}"
-msgstr "Elige una contraseña para tu clave: $(tombkey)"
+msgid "Choose the  password of your key: ::1 tomb key::"
+msgstr "Elige la contraseña para tu clave: ::1 clave::"
 
 #: _message
 msgid "(You can also change it later using 'tomb passwd'.)"
@@ -345,16 +592,16 @@ msgid "--"
 msgstr "--"
 
 #: _message
-msgid "Done forging $tombkey"
-msgstr "Se ha terminado de forjar $tombkey"
+msgid "Done forging ::1 key::"
+msgstr "Se ha terminado de forjar ::1 clave::"
 
 #: _success
 msgid "Your key is ready:"
 msgstr "Tu clave está lista:"
 
 #: _message
-msgid "Commanded to dig tomb $1"
-msgstr "Se ordenó cavar la tumba $1"
+msgid "Commanded to dig tomb ::1 tomb name::"
+msgstr "Se ordenó cavar la tumba ::1 tumba::"
 
 #: _warning
 msgid "No tomb name specified for creation."
@@ -378,35 +625,42 @@ msgstr "Ya existe una tumba. No voy a cavar aquí:"
 
 #: _warning
 msgid " `ls -lh ${tombdir}/${tombfile}`"
-msgstr " `ls -lh ${tombdir}/${tombfile}`"
+msgstr ""
 
 #: _success
-msgid "Creating a new tomb in ${tombdir}/${tombfile}"
-msgstr "Creando una nueva tumba en ${tombdir}/${tombfile}"
+msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+msgstr "Creando una nueva tumba en ::1 directorio::/::2 fichero::"
 
 #: _message
-msgid "Generating ${tombfile} of ${tombsize}MiB"
-msgstr "Generando ${tombfile} de ${tombsize}MiB"
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Generando ::1 tumba:: de ::2 size::MiB"
+
+#: _verbose
+msgid "Data dump using ::1:: from /dev/urandom"
+msgstr ""
 
 #: _failure
-msgid "Error creating the tomb ${tombdir}/${tombfile}, operation aborted."
-msgstr "Error al crear la tumba ${tombdir}/${tombfile}, operación abortada."
+msgid ""
+"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+msgstr ""
+"Error al crear la tumba ::1 directorio::/::2 fichero::, operación abortada."
 
 #: _success
-msgid "Done digging $tombname"
-msgstr "Terminé de cavar $tombname"
+msgid "Done digging ::1 tomb name::"
+msgstr "Terminé de cavar ::1 tumba::"
 
 #: _message
 msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
-msgstr "Tu tumba no está preparada aún, tienes que forjar una clave y asegurarla:"
+msgstr ""
+"Tu tumba no está preparada aún, tienes que forjar una clave y asegurarla:"
 
 #: _message
-msgid "tomb forge ${tombname}.tomb.key"
-msgstr "tomb forge ${tombname}.tomb.key"
+msgid "tomb forge ::1 tomb name::.tomb.key"
+msgstr "tomb forge ::1 tumba::.tomb.key"
 
 #: _message
-msgid "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
-msgstr "tomb lock ${tombname}.tomb -k ${tombnamem}.tomb.key"
+msgid "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
+msgstr "tomb lock ::1 tumba::.tomb -k ::1 tumba::.tomb.key"
 
 #: _warning
 msgid "No tomb specified for locking."
@@ -417,36 +671,53 @@ msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Uso: tomb lock file.tomb file.tomb.key"
 
 #: _message
-msgid "Commanded to lock tomb ${tombfile}"
-msgstr "Se ordenó asegurar la tumba ${tombfile}"
+msgid "Commanded to lock tomb ::1 tomb file::"
+msgstr "Se ordenó asegurar la tumba ::1 tumba::"
 
 #: _failure
 msgid "There is no tomb here. You have to it dig first."
 msgstr "No hay una tomba aquí. Tienes que cavarla primero."
 
+#: _verbose
+msgid "Tomb found: ::1 tomb dir::/::2 tomb file::"
+msgstr ""
+
+#: _verbose
+msgid "Loop mounted on ::1 mount point::"
+msgstr ""
+
 #: _message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
-msgstr "Comprobando que la tumba esté vacía (no queremos pisar los huesos de alguien más)."
+msgstr ""
+"Comprobando que la tumba esté vacía (no queremos pisar los huesos de alguien "
+"más)."
 
 #: _warning
 msgid "The tomb was already locked with another key."
 msgstr "La tumba ya estaba asegurada con otra clave."
 
 #: _failure
-msgid "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
-msgstr "Operación abortada. No puedo asegurar una tumba que ya tiene un candado. Cava una nueva."
+msgid ""
+"Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
+msgstr ""
+"Operación abortada. No puedo asegurar una tumba que ya tiene un candado. "
+"Cava una nueva."
 
 #: _message
 msgid "Fine, this tomb seems empty."
 msgstr "Bien, esta tumba parece vacía."
 
+#: _failure
+msgid "Aborting operations: error loading key."
+msgstr ""
+
 #: _message
-msgid "Locking using cipher: $cipher"
-msgstr "Asegurando usando el cifrado: $cipher"
+msgid "Locking using cipher: ::1 cipher::"
+msgstr "Asegurando usando el cifrado: ::1::"
 
 #: _success
-msgid "Locking ${tombfile} with ${tombkey}"
-msgstr "Asegurando ${tombfile} with ${tombkey}"
+msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+msgstr "Asegurando ::1 tumba:: con ::1 clave::"
 
 #: _message
 msgid "Formatting Luks mapped device."
@@ -456,6 +727,10 @@ msgstr "Formateando dispositivo mapeado con Luks."
 msgid "cryptsetup luksFormat returned an error."
 msgstr "cryptsetup luksFormat devolvió un error."
 
+#: _warning
+msgid "cryptsetup luksOpen returned an error."
+msgstr "cryptsetup luksOpen devolvió un error."
+
 #: _message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Formateando tu tumba con el sistema de ficheros Ext3/Ext4."
@@ -465,108 +740,205 @@ msgid "Tomb format returned an error."
 msgstr "El formateo de la tumba devolvió un error."
 
 #: _warning
-msgid "Your tomb ${tombfile} may be corrupted."
-msgstr "Puede que tu tumba ${tombfile} esté corrupta."
+msgid "Your tomb ::1 tomb file:: may be corrupted."
+msgstr "Puede que tu tumba ::1 tumba:: esté corrupta."
 
 #: _message
-msgid "Done locking $tombname using Luks dm-crypt ${create_cipher}"
-msgstr "Terminé de asegurar $tombname usando Luks dm-crypt ${create_cipher}"
+msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
+msgstr "Terminé de asegurar ::1 tumba:: usando Luks dm-crypt ::2::"
 
 #: _success
-msgid "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombkey}"
-msgstr "Tu tumba está preparada en ${tombdir}/${tombfile} y asegurada con la clave ${tombkey}"
+msgid ""
+"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
+"key ::3 tomb key::"
+msgstr ""
+"Tu tumba está preparada en ::1 directorio::/::2 tumba:: y asegurada con la "
+"clave ::3 clave::"
 
 #: _message
-msgid "Commanded to reset key for tomb $2"
-msgstr "Se ordenó resetear la clave para la tumba $2"
+msgid "Commanded to reset key for tomb ::1 tomb name::"
+msgstr "Se ordenó resetear la clave para la tumba ::1 tumba::"
+
+#: _warning
+msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
+msgstr ""
+
+#: _warning
+msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
+msgstr ""
+
+#: _failure
+msgid "Execution aborted."
+msgstr "Ejecución abortada."
+
+#: _failure
+msgid "Not a valid LUKS encrypted volume: ::1 volume::"
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading old key from arguments"
+msgstr ""
 
 #: _success
-msgid "Changing lock on tomb $tombname"
-msgstr "Cambiando el candado de la tumba $tombname"
+msgid "Changing lock on tomb ::1 tomb name::"
+msgstr "Cambiando el candado de la tumba ::1 tumba::"
 
 #: _message
-msgid "Old key: $oldkey"
-msgstr "Clave vieja: $oldkey"
+msgid "Old key: ::1 old key::"
+msgstr "Clave vieja: ::1 clave::"
+
+#: _failure
+msgid "No valid password supplied for the old key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksOpen."
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading new key from -k"
+msgstr ""
 
 #: _message
-msgid "New key: $newkey"
-msgstr "Clave nueva: $newkey"
+msgid "New key: ::1 key::"
+msgstr "Clave nueva: ::1 clave::"
+
+#: _failure
+msgid "No valid password supplied for the new key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksChangeKey."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksClose."
+msgstr ""
 
 #: _success
-msgid "Succesfully changed key for tomb: $2"
-msgstr "Se ha cambiado la clave con éxito en la tumba: $2"
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
+msgstr "Se ha cambiado la clave con éxito para la tumba: ::1 tumba::"
 
 #: _message
-msgid "The new key is: $newkey"
-msgstr "La nueva clave es: $newkey"
+msgid "The new key is: ::1 new key::"
+msgstr "La nueva clave es: ::1 clave::"
+
+#: _verbose
+msgid "create_tomb(): ::1:: ::2::"
+msgstr ""
 
 #: _warning
-msgid "Creating this tomb would overwrite an existing file. Operation aborted."
-msgstr "Crear esta tumba sobreescribiría un fichero existente. Operación abortada."
+msgid "Creating this tomb would overwrite an existing file."
+msgstr ""
+"Crear esta tumba sobreescribiría un fichero existente. Operación abortada."
+
+#: _failure
+msgid "Failed to forge key, operation aborted."
+msgstr ""
+
+#: _failure
+msgid "Failed to lock tomb with key, operation aborted."
+msgstr ""
 
 #: _success
-msgid "Tomb $tombname succesfully created."
-msgstr "Tumba $tombname creada con éxito."
+msgid "Tomb ::1 tomb name:: succesfully created."
+msgstr "Tumba ::1 tumba:: creada con éxito."
 
 #: _message
-msgid "Commanded to open tomb $1"
-msgstr "Se ordenó abrir la tumba $1"
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Se ordenó abrir la tumba ::1 tumba::"
+
+#: _warning
+msgid "No tomb name specified for opening."
+msgstr ""
+
+#: _warning
+msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading key ::1 key::"
+msgstr ""
 
 #: _message
-msgid "Mountpoint not specified, using default: $tombmount"
-msgstr "Punto de montaje no especificado, utilizando estándar: $tombmount"
+msgid "Mountpoint not specified, using default: ::1 mount point::"
+msgstr ""
+"Punto de montaje no especificado, utilizando estándar: ::1 punto de montaje::"
 
 #: _warning
-msgid "$tombname is already open."
-msgstr "$tombname ya está abierta."
+msgid "::1 tomb name:: is already open."
+msgstr "::1 tumba:: ya está abierta."
 
 #: _message
 msgid "Here below its status is reported:"
 msgstr "Aquí abajo se reporta su estado:"
 
 #: _success
-msgid "Opening $tombfile on $tombmount"
-msgstr "Abriendo $tombfile en $tombmount"
-
-#: _failure
-msgid "Too many tombs open. Please close any of them to open another tomb."
-msgstr "Demasiadas tumbas abiertas. Por favor, cierra cualquiera de ellas para abrir otra tumba."
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Abriendo ::1 tumba:: en ::2 punto de montaje::"
 
 #: _warning
-msgid "$tombfile is not a valid Luks encrypted storage file."
-msgstr "$tombfile no es un fichero encriptado con Luks válido."
+msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
+msgstr "::1 tumba:: no es un fichero encriptado con Luks válido."
 
 #: _message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Esta tumba es un dispositivo encriptado con LUKS válido."
 
 #: _message
-msgid "Cipher is \"$tombdump[1]\" mode \"$tombdump[2]\" hash \"$tombdump[3]\""
-msgstr "El cifrado es \"$tombdump[1]\" en modo \"$tombdump[2]\" hash \"$tombdump[3]\""
+msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
+msgstr ""
+"El cifrado es \"::1 cifrado::\" en modo \"::2 modo::\" hash \"::3 hash::\""
+
+#: _warning
+msgid ""
+"Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
+msgstr ""
+
+#: _verbose
+msgid "dev mapper device: ::1 mapper::"
+msgstr ""
+
+#: _verbose
+msgid "Tomb key: ::1 key::"
+msgstr "Clave de la tumba: ::1 clave::"
+
+#: _verbose
+msgid "Tomb name: ::1 tomb name:: (to be engraved)"
+msgstr ""
 
 #: _failure
 msgid "Failure mounting the encrypted file."
 msgstr "Fallé montando el fichero encriptado."
 
 #: _success
-msgid "Success unlocking tomb $tombname"
-msgstr "Abrí la tumba $tombname con éxito."
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr "Abrí la tumba ::1 tumba:: con éxito."
+
+#: _verbose
+msgid "Key size is ::1 size:: for cipher ::2 cipher::"
+msgstr ""
 
 #: _message
-msgid "Checking filesystem via $tombstat[3]"
-msgstr "Comprobando el sistema de ficheros vía $tombstat[3]"
+msgid "Checking filesystem via ::1::"
+msgstr "Comprobando el sistema de ficheros vía ::1::"
+
+#: _verbose
+msgid "Tomb engraved as ::1 tomb name::"
+msgstr ""
 
 #: _success
-msgid "Success opening $tombfile on $fg_bold[white]$tombmount$fg_no_bold[white]"
-msgstr "Éxito al abrir $tombfile en $fg_bold[white]$tombmount$fg_no_bold[white]"
+#, fuzzy
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Abriendo ::1 tumba:: en ::2 punto de montaje::"
 
 #: _message
-msgid "Last visit by $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] from $fg_bold[white]$tombtty$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
-msgstr "Última visita de $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] desde $fg_bold[white]$tombtty$fg_no_bold[white] en $fg_bold[white]$tombhost$fg_no_bold[white]"
+msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
+msgstr ""
 
 #: _message
-msgid "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
-msgstr "en el $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+msgid "on date ::1 date::"
+msgstr ""
 
 #: _warning
 msgid "How pitiful!  A tomb, and no HOME."
@@ -576,29 +948,63 @@ msgstr "¡Que lamentable! Una tumba, y ningún HOGAR."
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr "No se pueden ejecutar los bind-hooks sin una tumba montada."
 
+#: _verbose
+msgid "bind-hooks not found in ::1 mount point::"
+msgstr ""
+
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME"
-msgstr "Formato de mapeo de los bind-hooks: local/to/tomb local/to/HOME"
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
+msgstr "Formato de mapeo de los bind-hooks: local/to/tomb local/to/$HOME"
 
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME.  Rolling back"
-msgstr "Formato de mapeo de los bind-hooks: local/to/tomb local/to/HOME. Restaurando"
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
+msgstr ""
+"Formato de mapeo de los bind-hooks: local/to/tomb local/to/HOME. Restaurando"
 
 #: _warning
-msgid "bind-hook target not existent, skipping $HOME/${maps[$dir]}"
-msgstr "No existe un objetivo para el bind-hook, omitiendo $HOME/${maps[$dir]}"
+msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
+msgstr ""
+"No existe un objetivo para el bind-hook, omitiendo ::1 hogar::/::2 "
+"directorio::"
 
 #: _warning
-msgid "bind-hook source not found in tomb, skipping ${MOUNTPOINT}/${dir}"
-msgstr "No se encontró fuente para el bind-hook en la tumba, saltando ${MOUNTPOINT}/$dir"
+msgid ""
+"bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
+msgstr ""
+"No se encontró fuente para el bind-hook en la tumba, saltando ::1 punto de "
+"montaje::/::2 directorio::"
 
 #: _success
-msgid "Post hooks found, executing as user $SUDO_USER."
-msgstr "Se encontraron post-hooks, ejecutando como usuario $SUDO_USER."
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr "Se encontraron post-hooks, ejecutando como usuario ::1 usuario::."
+
+#: _failure
+msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
+msgstr "No puedo ver ninguna tumba abierta, ojalá que todos descansen en paz."
 
 #: _failure
-msgid "There seems to be no open tomb engraved as [$1]"
-msgstr "Parece que existe una tumba con el grabado [$1]"
+msgid "Internal error: list_tomb_binds called without argument."
+msgstr ""
+
+#: _failure
+msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
+msgstr ""
+
+#: _warning
+msgid "Cannot use GNU findutils for index/search commands."
+msgstr ""
+
+#: _failure
+msgid "Index command needs 'mlocate' to be installed."
+msgstr ""
+
+#: _verbose
+msgid "$updatedbver"
+msgstr ""
+
+#: _failure
+msgid "There seems to be no open tomb engraved as [::1::]"
+msgstr "Parece que existe una tumba con el grabado [::1::]"
 
 #: _failure
 msgid "I can't see any open tomb, may they all rest in peace."
@@ -608,41 +1014,53 @@ msgstr "No puedo ver ninguna tumba abierta, ojalá que todos descansen en paz."
 msgid "Creating and updating search indexes."
 msgstr "Creando y actualizando índices de búsqueda."
 
+#: _verbose
+msgid "unoconv listener launched."
+msgstr ""
+
 #: _message
-msgid "Skipping $tombname (.noindex found)."
-msgstr "Saltando $tombname (se econtró .noindex)."
+msgid "Skipping ::1 tomb name:: (.noindex found)."
+msgstr "Saltando ::1 tumba:: (se econtró .noindex)."
 
 #: _message
-msgid "Indexing $tombname filenames..."
-msgstr "Indexando los nombre de fichero de $tombname..."
+msgid "Indexing ::1 tomb name:: filenames..."
+msgstr "Indexando los nombre de fichero de ::1 tumba::..."
 
 #: _message
-msgid "Indexing $tombname contents..."
-msgstr "Indexando el contenido de $tombname..."
+msgid "Indexing ::1 tomb name:: contents..."
+msgstr "Indexando el contenido de ::1 tumba::..."
+
+#: _verbose
+msgid "Using swish-e to create index."
+msgstr ""
 
 #: _message
 msgid "Search index updated."
 msgstr "Índice de búsqueda actualizado."
 
 #: _success
-msgid "Searching for: $fg_bold[white]${(f)@}$fg_no_bold[white]"
-msgstr "Buscando: $fg_bold[white]${(f)@}$fg_no_bold[white]"
+msgid "Searching for: ::1::"
+msgstr ""
+
+#: _verbose
+msgid "Checking for index: ::1::"
+msgstr ""
 
 #: _message
-msgid "Searching filenames in tomb $tombname"
-msgstr "Buscando nombres de fichero en la tumba $tombname"
+msgid "Searching filenames in tomb ::1 tomb name::"
+msgstr "Buscando nombres de fichero en la tumba ::1 tumba::"
 
 #: _message
-msgid "Matches found: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
-msgstr "Se contraron coincidencias: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
+msgid "Matches found: ::1 matches::"
+msgstr ""
 
 #: _message
-msgid "Searching contents in tomb $tombname"
-msgstr "Buscando contenido en la tumba $tombname"
+msgid "Searching contents in tomb ::1 tomb name::"
+msgstr "Buscando contenido en la tumba ::1 tumba::"
 
 #: _warning
-msgid "Skipping tomb $tombname: not indexed."
-msgstr "Saltando tumba $tombname: no está indexada."
+msgid "Skipping tomb ::1 tomb name::: not indexed."
+msgstr "Saltando tumba ::1 tomb name::: no está indexada."
 
 #: _warning
 msgid "Run 'tomb index' to create indexes."
@@ -653,24 +1071,31 @@ msgid "Search completed."
 msgstr "Búsqueda completada."
 
 #: _message
-msgid "Commanded to resize tomb $1 to $opts[-s] megabytes."
-msgstr "Se ordenó cambiar el tamaño de la tumba $1 a $opts[-s] megabytes."
+msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
+msgstr ""
+"Se ordenó cambiar el tamaño de la tumba ::1 tumba:: a ::2 tamaño:: megabytes."
 
 #: _failure
 msgid "No tomb name specified for resizing."
 msgstr "No se ha especificado un nombre de tumba a la que cambiar el tamaño."
 
 #: _failure
-msgid "Cannot find $1"
-msgstr "No se puede encontrar $1"
+msgid "Cannot find ::1::"
+msgstr "No se puede encontrar ::1::"
+
+#: _failure
+msgid "Aborting operations: new size was not specified, use -s"
+msgstr ""
 
 #: _failure
-msgid "The tomb $tombname is open, to resize it it needs to be closed."
-msgstr "La tumba $tombname está abierta, necesita estar cerrada para el cambio de tamaño."
+msgid "The tomb ::1 tomb name:: is open, to resize it it needs to be closed."
+msgstr ""
+"La tumba ::1 tumba:: está abierta, necesita estar cerrada para el cambio de "
+"tamaño."
 
 #: _failure
-msgid "You must specify the new size of $tombname"
-msgstr "Debes especificar el nuevo tamaño de $tombname"
+msgid "You must specify the new size of ::1 tomb name::"
+msgstr "Debes especificar el nuevo tamaño de ::1 tumba::"
 
 #: _failure
 msgid "Size is not an integer."
@@ -680,21 +1105,21 @@ msgstr "El tamaño no es un entero."
 msgid "The new size must be greater then old tomb size."
 msgstr "El nuevo tamaño debe ser mayor que el viejo tamaño de la tumba."
 
-#: _message -n
-msgid "Generating ${tombfile} of ${newtombsize}MiB"
-msgstr "Generando ${tombfile} de ${newtombsize}MiB"
+#: _failure
+msgid "Error creating the extra resize ::1 size::, operation aborted."
+msgstr ""
 
 #: _failure
-msgid "Too many tombs opened. Please close any of them to open another tomb."
-msgstr "Demasiadas tumbas abiertas. Por favor, cierra cualquiera de ellas para abrir otra tumba."
+msgid "cryptsetup failed to resize ::1 mapper::"
+msgstr ""
 
 #: _failure
-msgid "e2fsck failed to check $mapper"
-msgstr "e2fsck ha fallado al comprobar $mapper"
+msgid "e2fsck failed to check ::1 mapper::"
+msgstr "e2fsck ha fallado al comprobar ::1::"
 
 #: _failure
-msgid "resize2fs failed to resize $mapper"
-msgstr "resize2fs ha fallado al cambiar el tamaño de $mapper"
+msgid "resize2fs failed to resize ::1 mapper::"
+msgstr "resize2fs ha fallado al cambiar el tamaño de ::1::"
 
 #: _warning
 msgid "There is no open tomb to be closed."
@@ -709,86 +1134,250 @@ msgid "or issue the command 'tomb close all' to close them all."
 msgstr "o utiliza el comando 'tomb close all' para cerrarlas todas."
 
 #: _message
-msgid "Tomb close $1"
-msgstr "Se cerró la tumba $1"
+msgid "Tomb close ::1::"
+msgstr "Se cerró la tumba ::1 tumba::"
+
+#: _verbose
+msgid "Name: ::1 tomb name::"
+msgstr "Nombre: ::1 tumba::"
+
+#: _verbose
+msgid "Mount: ::1 mount point::"
+msgstr ""
+
+#: _verbose
+msgid "Mapper: ::1 mapper::"
+msgstr ""
 
 #: _warning
-msgid "Tomb not found: $1"
-msgstr "No se encontró la tumba: $1"
+msgid "Tomb not found: ::1 tomb file::"
+msgstr "No se encontró la tumba: ::1 tumba::"
 
 #: _warning
 msgid "Please specify an existing tomb."
 msgstr "Por favor, especifica una tumba existente."
 
 #: _success
-msgid "Slamming tomb $tombname mounted on $tombmount"
-msgstr "Cerrando de un portazo la tumba $tombname montada en $tombmount"
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr ""
+"Cerrando de un portazo la tumba ::1 tumba:: montada en ::2 punto de montaje::"
 
 #: _message
 msgid "Kill all processes busy inside the tomb."
 msgstr "Mata todos los procesos ocupados dentro de la tumba."
 
 #: _warning
-msgid "Cannot slam the tomb $tombname"
-msgstr "No se puede cerrar de un portazo la tumba $tombmount"
+msgid "Cannot slam the tomb ::1 tomb name::"
+msgstr "No se puede cerrar de un portazo la tumba ::1 tumba::"
 
 #: _message
-msgid "Closing tomb $tombname mounted on $tombmount"
-msgstr "Cerrando la tumba $tombname montada en $tombmount"
+msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr "Cerrando la tumba ::1 tumba:: montada en ::2 punto de montaje::"
 
 #: _message
-msgid "Closing tomb bind hook: $bind_mount"
-msgstr "Cerrando el bind-hook: $bind_mount"
+msgid "Closing tomb bind hook: ::1 hook::"
+msgstr "Cerrando el bind-hook: ::1::"
 
 #: _success
 msgid "Slamming tomb: killing all processes using this hook."
-msgstr "Cerrando tumba de un portazo: matando todos los procesos que usan este hook."
+msgstr ""
+"Cerrando tumba de un portazo: matando todos los procesos que usan este hook."
 
 #: _warning
-msgid "Cannot slam the bind hook $bind_mount"
-msgstr "No se puede cerrar de un portazo el bind-hook $bind_mount"
+msgid "Cannot slam the bind hook ::1 hook::"
+msgstr "No se puede cerrar de un portazo el bind-hook ::1::"
 
 #: _warning
-msgid "Tomb bind hook $bind_mount is busy, cannot close tomb."
-msgstr "El bind-hook $bind_mount está ocupado, no se puede cerrar la tumba."
+msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
+msgstr "El bind-hook ::1:: está ocupado, no se puede cerrar la tumba."
+
+#: _verbose
+msgid "Performing umount of ::1 mount point::"
+msgstr ""
 
 #: _warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "La tumba está ocupada, ¡no se puede desmontar!"
 
 #: _warning
-msgid "Error occurred in cryptsetup luksClose ${mapper}"
-msgstr "Ocurrió un error en cryptsetup luksClose ${mapper}"
+msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
+msgstr "Ocurrió un error en cryptsetup luksClose ::1::"
 
 #: _success
-msgid "Tomb $tombname closed: your bones will rest in peace."
-msgstr "Tumba $tombname cerrada: tus huesos descansarán en paz."
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr "Tumba ::1 tumba:: cerrada: tus huesos descansarán en paz."
+
+#: _verbose
+msgid "Sending ::1:: to processes inside the tomb:"
+msgstr ""
 
 #: _failure
 msgid "Error parsing."
 msgstr "Error al parsear."
 
 #: _warning
-msgid "There's no such command \"$subcommand\"."
-msgstr "No existe el comando \"$subcommand\"."
+msgid "There's no such command \"::1 subcommand::\"."
+msgstr "No existe el comando \"::1 comando::\"."
+
+#: _failure
+msgid "Please try -h for help."
+msgstr "Prueba -h para obtener ayuda."
 
 #: _warning
 msgid "Some error occurred during option processing."
 msgstr "Ocurrió algún error al procesar las opciones."
 
+#: _failure
+msgid "See \"tomb help\" for more info."
+msgstr ""
+
+#: _failure
+msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
+msgstr ""
+
+#: _failure
+msgid ""
+"You specified option ::1 option::, which is DANGEROUS and should only be "
+"used for testing\n"
+"If you really want so, add --unsecure-dev-mode"
+msgstr ""
+
+#: _verbose
+msgid "Tomb command: ::1 subcommand:: ::2 param::"
+msgstr ""
+
+#: _verbose
+msgid "Caller: uid[::1 uid::], gid[::2 gid::], tty[::3 tty::]."
+msgstr ""
+
+#: _failure
+msgid "QREncode not installed: cannot engrave keys on paper."
+msgstr ""
+
 #: _warning
-msgid "The create command is deprecated, please use dig, forge and lock instead."
-msgstr "El comando create está obsoleto, por favor, usa dig, forge y lock en su lugar."
+msgid ""
+"The create command is deprecated, please use dig, forge and lock instead."
+msgstr ""
+"El comando create está obsoleto, por favor, usa dig, forge y lock en su "
+"lugar."
 
 #: _warning
 msgid "For more informations see Tomb's manual page (man tomb)."
 msgstr "Para más información mira el manual de Tomb (man tomb)."
 
+#: _failure
+msgid "Steghide not installed: cannot bury keys into images."
+msgstr ""
+
+#: _failure
+msgid "Steghide not installed: cannot exhume keys from images."
+msgstr ""
+
+#: _failure
+msgid "Resize2fs not installed: cannot resize tombs."
+msgstr ""
+
+#: _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 ""
+
 #: _warning
-msgid "Command \"$subcommand\" not recognized."
-msgstr "No se reconoció el commando \"$subcommand\"."
+msgid "Command \"::1 subcommand::\" not recognized."
+msgstr "No se reconoció el commando \"::1 comando::\"."
 
 #: _message
 msgid "Try -h for help."
 msgstr "Prueba -h para obtener ayuda."
 
+#~ msgid ""
+#~ "Success opening ::1 tomb file:: on $fg_bold[white]::2 mount point::"
+#~ "$fg_no_bold[white]"
+#~ msgstr ""
+#~ "Éxito al abrir ::1 tumba:: en $fg_bold[white]::2 punto de montaje::"
+#~ "$fg_no_bold[white]"
+
+#~ msgid ""
+#~ "Last visit by $fg_bold[white]::1 user::(::2 tomb "
+#~ "build::)$fg_no_bold[white] from $fg_bold[white]::3 tty::"
+#~ "$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
+#~ msgstr ""
+#~ "Última visita de $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] "
+#~ "desde $fg_bold[white]$tombtty$fg_no_bold[white] en "
+#~ "$fg_bold[white]$tombhost$fg_no_bold[white]"
+
+#~ msgid "Too many tombs open. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Demasiadas tumbas abiertas. Por favor, cierra cualquiera de ellas para "
+#~ "abrir otra tumba."
+
+#~ msgid "::1 tomb key:: succesfully decoded."
+#~ msgstr "::1 clave:: decodificada con éxito."
+
+#~ msgid "WARNING: we cannot ensure we're running in RAM."
+#~ msgstr "ADVERTENCIA: no podemos asegurar que estemos corriendo en RAM."
+
+#~ msgid "WARNING: no RAM available for me to run safely."
+#~ msgstr "ADVERTENCIA: no hay RAM disponible para correr de forma segura."
+
+#~ msgid "No access to shared memory on this system, sorry."
+#~ msgstr "No hay acceso a memoria compartida en este sistema, lo siento."
+
+#~ msgid "The key seems invalid, the application/pgp header is missing."
+#~ msgstr "La clave parece inválida, falta el encabezado application/pgp."
+
+#~ msgid "Removing key temporarily stored from stdin"
+#~ msgstr "Eliminando clave temporalmente almacenada de stdin"
+
+#~ msgid "Key data found with missing headers, attempting recovery."
+#~ msgstr ""
+#~ "Se encontraron datos de clave sin cabeceras, intentando recuperación."
+
+#~ msgid "Invalid key format: ::1 key::"
+#~ msgstr "Formato de clave inválido: ::1 clave::"
+
+#~ msgid "Error creating temp dir."
+#~ msgstr "Error al crear un directorio temporal."
+
+#~ msgid "Cannot mount tmpfs filesystem in volatile memory."
+#~ msgstr "No se puede montar el sistema de ficheros tmpfs en memoria volatil."
+
+#~ msgid "Generating ::1 tomb file:: of ::1 size::MiB"
+#~ msgstr "Generando ::1 tumba:: de ::1 tamaño::MiB"
+
+#~ msgid ""
+#~ "Too many tombs opened. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Demasiadas tumbas abiertas. Por favor, cierra cualquiera de ellas para "
+#~ "abrir otra tumba."
diff --git a/extras/po/fr.po b/extras/po/fr.po
@@ -1,107 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Tomb the Crypto Undertaker\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Tomb the Crypto Undertaker\n"
-"Language: fr\n"
 
-#: commandline help
-msgid "Syntax: tomb [options] command [arguments]\n"
-"\n"
-"Commands:\n"
-"\n"
-" // Creation:\n"
-" dig     create a new empty TOMB file of size -s in MB\n"
-" forge   create a new KEY file and set its password\n"
-" lock    installs a lock on a TOMB to use it with KEY\n"
-"\n"
-" // Operations on tombs:\n"
-" open    open an existing TOMB\n"
-" index   update the search indexes of tombs\n"
-" search  looks for filenames matching text patterns\n"
-" list    list of open TOMBs and information on them\n"
-" close   close a specific TOMB (or 'all')\n"
-" slam    slam a TOMB killing all programs using it\n"
-" resize  resize a TOMB to a new size -s (can only grow)\n"
-"\n"
-" // Operations on keys:\n"
-" passwd  change the password of a KEY\n"
-" setkey  change the KEY locking a TOMB (needs old one)\n"
-" engrave makes a QR code of a KEY to be saved on paper\n"
-" bury    hide a KEY inside a JPEG image\n"
-" exhume  extract a KEY from a JPEG image\n"
-"\n"
-"Options:\n"
-"\n"
-" -s     size of the tomb file when creating/resizing one (in MB)\n"
-" -k     path to the key to be used ('-k -' to read from stdin)\n"
-" -n     don't process the hooks found in tomb\n"
-" -o     mount options used to open (default: rw,noatime,nodev)\n"
-" -f     force operation (i.e. even if swap is active)\n"
-" --kdf  generate passwords armored against dictionary attacks\n"
-"\n"
-" -h     print this help\n"
-" -v     print version, license and list of available ciphers\n"
-" -q     run quietly without printing informations\n"
-" -D     print debugging information at runtime\n"
-"\n"
-"For more informations on Tomb read the manual: man tomb\n"
-"Please report bugs on <http://github.com/dyne/tomb/issues>."
-msgstr "Syntaxe : tomb [options] commande [arguments]\n"
-"\n"
-"Commandes :\n"
-"\n"
-"// Création :\n"
-"dig        (creuser)   Créer une nouvelle TOMBE de taille -s Mo\n"
-"forge    (forger)      Créer une nouvelle CLÉ et lui assigner un mot de passe\n"
-"lock      (vérouiller) Vérouiller une TOMBE avec une CLÉ\n"
-"\n"
-"// Opérations sur les tombes :\n"
-"open    (ouvrir)         Ouvrir une TOMBE existante\n"
-"index   (indéxer)       Mettre à jour les indices de recherche des tombes\n"
-"search (rechercher) Rechercher des noms de fichiers selon des motifs textuels\n"
-"list       (énumérer)   Établir une liste informative des TOMBES ouvertes\n"
-"close   (fermer)        Sceller une TOMBE en fermant tous les programmes associés\n"
-"resize  (élargir)        Augmenter la taille d'une TOMBE à -s Mo\n"
-"\n"
-"// Opération sur les clés :\n"
-"passwd                    Modifier le mot de passe d'une CLÉ\n"
-"setkey                      Changer le verrou d'une TOMBE (à l'aide de la CLÉ existante)\n"
-"engrave (graver)     Grave une empreinte de la CLÉ pour impression papier au format QR code\n"
-"bury       (enterrer)   Cacher la CLÉ dans une image JPEG (stéganographie)\n"
-"exhume (exhumer)  Extraire une CLÉ cachée dans une image JPEG (stéganographie)\n"
-"\n"
-"Options :\n"
-"\n"
-"-s        taille de la tombe lors de sa création ou son agrandissement (en Mo)\n"
-"-k        chemin de la clé à utiliser ('-k -' pour la lire depuis l'entrée standard)\n"
-"-n        ne pas utiliser les 'crochets' trouvés dans la tombe\n"
-"-o        options de montage à l'ouverture (par défaut : rw,noatime,nodev)\n"
-"-f         forcer l'opération (c-à-d même si la partition d'échange est activée)\n"
-"--kdf    générer des mots de passe protégés contre les attaques par dictionnaire\n"
-"\n"
-"-h        imprimer cette aide\n"
-"-v        imprimer la version, la licence, et la liste des codes disponibles\n"
-"-q       exécuter silencieusement sans imprimer les informations\n"
-"-D       imprimer les information de débogage durant l'exécution\n"
-"\n"
-"Pour de plus amples information sur Tomb, se reporter au manuel : man tomb\n"
-"Merci de rapporter les erreurs sur <https://github.com/dyne/tomb/issues>."
-
-#. tomb internal messages
-#: _warning
-msgid "WARNING: we cannot ensure we're running in RAM."
-msgstr "ATTENTION : nous ne pouvons garantir l'exécution du programme en mémoire vive."
-
-#: _warning
-msgid "WARNING: no RAM available for me to run safely."
-msgstr "ATTENTION : la mémoire vive disponible est insuffisante pour l'exécution sûre du programme."
-
-#: _failure
-msgid "No access to shared memory on this system, sorry."
-msgstr "Le programme ne peut pas accéder à la mémoire partagée sur ce système."
+#: _verbose
+#, fuzzy
+msgid "Created tempfile: ::1 temp file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
 
 #: _success
 msgid "All your swaps are belong to crypt.  Good."
@@ -111,41 +20,363 @@ msgstr "Toutes les partitions d'échange sont chiffrées.  C'est bien."
 msgid "Operation aborted."
 msgstr "L'opération est interrompue."
 
+#: _verbose
+msgid "exec_as_user '::1 user::': ::2::"
+msgstr ""
+
+#: _verbose
+msgid "Using sudo for root execution of '::1 exec:: ::2 args::'."
+msgstr ""
+
+#: _verbose
+msgid "Escalating privileges using sudo-pwd."
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "is_valid_tomb ::1 tomb file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
 #: _warning
-msgid "Loop mount of volumes is not supported on this machine, this error"
-msgstr "Le montage en boucle des volumes n'est pas supporté sur cette machine, cette erreur"
+msgid "Tomb file is missing from arguments."
+msgstr ""
+
+#: _warning
+#, fuzzy
+msgid "Tomb file not found: ::1 tomb file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is not a regular file: ::1 tomb file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is empty (zero length): ::1 tomb file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is not writable: ::1 tomb file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "File is not yet a tomb: ::1 tomb file::"
+msgstr "Ouverture de la tombe ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb is currently in use: ::1 tomb name::"
+msgstr "Fermons la tombe ::1 tomb name::"
+
+#: _message
+msgid "Valid tomb file found: ::1 tomb file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _failure
+msgid "Loopback mount called on invalid tomb: ::1 path::"
+msgstr ""
+
+#: _warning
+#, fuzzy
+msgid "Loop mount of volumes is not possible on this machine, this error"
+msgstr ""
+"Le montage en boucle des volumes n'est pas supporté sur cette machine, cette "
+"erreur"
 
 #: _warning
 msgid "often occurs on VPS and kernels that don't provide the loop module."
-msgstr "se produit souvent sur les machines virtuelles et avec les noyaux qui ne fournissent pas le module loop."
+msgstr ""
+"se produit souvent sur les machines virtuelles et avec les noyaux qui ne "
+"fournissent pas le module loop."
 
 #: _warning
 msgid "It is impossible to use Tomb on this machine at this conditions."
-msgstr "Il est impossible d'utiliser Tomb dans les conditions offertes par cette machine."
+msgstr ""
+"Il est impossible d'utiliser Tomb dans les conditions offertes par cette "
+"machine."
+
+#: _verbose
+msgid "lo_preserve on ::1 path::"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_file: ::1 tomb file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _verbose
+msgid "tomb_key: ::1 key:: chars long"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_key_file: ::1 key::"
+msgstr "Clé précédente : ::1 key::"
+
+#: _verbose
+msgid "tomb_secret: ::1 secret:: chars long"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_password: ::1 tomb pass::"
+msgstr "Tombe introuvable : ::1 tomb name::"
+
+#: _verbose
+#, fuzzy
+msgid "tomb_tempfiles: ::1 temp files::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _verbose
+msgid "tomb_loopdevs: ::1 loopdevs::"
+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>."
+
+#: _failure
+msgid "Cannot find ::1::. It's a requirement to use Tomb, please install it."
+msgstr ""
+
+#: _verbose
+msgid "is_valid_key"
+msgstr ""
+
+#: _warning
+msgid "is_valid_key() called without argument."
+msgstr ""
+
+#: _message
+msgid "Key is an image, it might be valid."
+msgstr ""
 
 #: _message
-msgid "Valid tomb file found: $1"
-msgstr "Le fichier valide d'une tombe a été trouvé : $1"
+msgid "Key is valid."
+msgstr ""
 
-#: _message -n
-msgid "Waiting for the key to be piped from stdin... "
-msgstr "En attente d'une clé à lire sur l'entrée standard... "
+#: _warning
+msgid "Attempting key recovery."
+msgstr ""
 
 #: _failure
 msgid "This operation requires a key file to be specified using the -k option."
-msgstr "Cette opération requiert la spécification du chemin de la clé par l'option -k."
+msgstr ""
+"Cette opération requiert la spécification du chemin de la clé par l'option -"
+"k."
+
+#: _verbose
+msgid "load_key reading from stdin."
+msgstr ""
+
+#: _message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr "En attente d'une clé à lire sur l'entrée standard... "
+
+#: _verbose
+msgid "load_key argument: ::1 opt::"
+msgstr ""
 
 #: _warning
 msgid "Key not found, specify one using -k."
 msgstr "Aucune clé n'a été trouvée, merci d'en spécifier une avec -k."
 
+#: _verbose
+#, fuzzy
+msgid "load_key: ::1 key::"
+msgstr "Clé précédente : ::1 key::"
+
 #: _warning
-msgid "The key seems invalid, the application/pgp header is missing."
-msgstr "La clé semble être invalide, l'en-tête \"application/pgp\" manque au fichier."
+msgid ""
+"The key seems invalid or its format is not known by this version of Tomb."
+msgstr ""
+
+#: _verbose
+msgid "GnuPG is version 1.4.11 - adopting status fix."
+msgstr ""
+
+#: _verbose
+msgid "get_lukskey"
+msgstr ""
+
+#: _verbose
+msgid "KDF: ::1 kdf::"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "No suitable program for KDF ::1 program::."
+msgstr "Pas de programme approprié pour la dérivation de clé ::1 kdf::."
+
+#: _verbose
+msgid "get_lukskey returns ::1::"
+msgstr ""
+
+#: _failure
+msgid "Internal error: ask_key_password() called before load_key()."
+msgstr ""
 
 #: _message
-msgid "A password is required to use key ${keyname}"
-msgstr "Un mot de passe est nécessaire pour utiliser la clé ${keyname}"
+msgid "A password is required to use key ::1 key::"
+msgstr "Un mot de passe est nécessaire pour utiliser la clé ::1 key::"
 
 #: _warning
 msgid "User aborted password dialog."
@@ -155,13 +386,32 @@ msgstr "L'utilisateur a interrompu le dialogue du mot de passe."
 msgid "Password OK."
 msgstr "Le mot de passe est valide."
 
+#: _verbose
+msgid "ask_key_password with tombpass: ::1 tomb pass::"
+msgstr ""
+
 #: _message
-msgid "Commanded to change password for tomb key $1"
-msgstr "L'utilisateur a requis un changement du mot de passe de la clé $1."
+msgid "Commanded to change password for tomb key ::1 key::"
+msgstr ""
+"L'utilisateur a requis un changement du mot de passe de la clé ::1 key::."
 
 #: _success
-msgid "Changing password for $keyfile"
-msgstr "Mise à jour du mot de passe de $keyfile."
+#, fuzzy
+msgid "Changing password for ::1 key file::"
+msgstr "Mise à jour du mot de passe de ::1 key::."
+
+#: _verbose
+msgid "tomb-old-pwd = ::1 old pass::"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "No valid password supplied."
+msgstr "Le mot de passe fourni est invalide."
+
+#: _verbose
+msgid "tomb-pwd = ::1 new pass::"
+msgstr ""
 
 #: _failure
 msgid "Error: the newly generated keyfile does not seem valid."
@@ -171,26 +421,6 @@ msgstr "Erreur : le fichier de clé nouvellement créé semble invalide."
 msgid "Your passphrase was successfully updated."
 msgstr "Votre mot de passe a été mis à jour correctement."
 
-#: _message
-msgid "Removing key temporarily stored from stdin"
-msgstr "Effacement de la clé temporaire passée par l'entrée standard."
-
-#: _message
-msgid "Valid key file found: $1"
-msgstr "Une clé valide a été trouvée : $1"
-
-#: _warning
-msgid "Key data found with missing headers, attempting recovery."
-msgstr "Les données d'une clé ont été trouvées sans en-têtes, tentative de récupération en cours."
-
-#: _warning
-msgid "Invalid key format: $1"
-msgstr "Format de clé invalide : $1"
-
-#: _failure
-msgid "No suitable program for KDF `cut -f 3 <<<$firstline`."
-msgstr "Pas de programme approprié pour la dérivation de clé `cut -f 3 <<<$firstline`."
-
 #: _failure
 msgid "User aborted."
 msgstr "L'utilisateur a interrompu l'opération."
@@ -199,30 +429,62 @@ msgstr "L'utilisateur a interrompu l'opération."
 msgid "You set empty password, which is not possible."
 msgstr "Vous ne pouvez pas saisir un mot de passe vide."
 
+#: _verbose
+msgid "gen_key takes tombpass from CLI argument: ::1 tomb pass::"
+msgstr ""
+
 #: _failure
-msgid "Wrong argument for --kdf: must be an integer number (iteration seconds)."
-msgstr "Argument invalide pour --kdf : ce doit être un nombre entier (de secondes d'itérations)."
+msgid ""
+"Wrong argument for --kdf: must be an integer number (iteration seconds)."
+msgstr ""
+"Argument invalide pour --kdf : ce doit être un nombre entier (de secondes "
+"d'itérations)."
 
 #: _success
-msgid "Using KDF, iterations: $microseconds"
-msgstr "$microsecondes itérations pour la dérivation de clé."
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr "::1 microsecondes:: itérations pour la dérivation de clé."
+
+#: _message
+msgid "generating salt"
+msgstr ""
+
+#: _message
+msgid "calculating iterations"
+msgstr ""
+
+#: _message
+msgid "encoding the password"
+msgstr ""
 
 #: _failure
 msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
-msgstr "gpg (GnuPG) n'est pas disponible, mais il est requis pour le fonctionnement de Tomb."
+msgstr ""
+"gpg (GnuPG) n'est pas disponible, mais il est requis pour le fonctionnement "
+"de Tomb."
+
+#: _failure
+#, fuzzy
+msgid "Bury failed for invalid key: ::1 key::"
+msgstr "Une clé valide a été trouvée : ::1 key::"
 
 #: _warning
-msgid "Encode failed: $imagefile is not a jpeg image."
-msgstr "L'encodage a échoué : $imagefile n'est pas une image JPEG."
+msgid "Encode failed: ::1 image file:: is not a jpeg image."
+msgstr "L'encodage a échoué : ::1 image file:: n'est pas une image JPEG."
 
 #: _success
-msgid "Encoding key $tombkey inside image $imagefile"
-msgstr "Inscription de la clé $tombkey dans l'image $imagefile"
+#, fuzzy
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+msgstr "Inscription de la clé ::1 key:: dans l'image ::2 image file::"
 
 #: _message
 msgid "Please confirm the key password for the encoding"
 msgstr "Merci de confirmer le mot de passe de la clé en vue de l'encodage"
 
+#: _verbose
+#, fuzzy
+msgid "tomb-pwd = ::1 tomb pass::"
+msgstr "Fermons la tombe ::1 tomb name::"
+
 #: _warning
 msgid "Wrong password supplied."
 msgstr "Le mot de passe fourni est invalide."
@@ -236,80 +498,107 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Erreur à l'encodage : steghide rapporte des problèmes."
 
 #: _success
-msgid "Tomb key encoded succesfully into image ${imagefile}"
-msgstr "La clé a été correctement inscrite dans l'image ${imagefile}"
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr "La clé a été correctement inscrite dans l'image ::1 image file::"
+
+#: _message
+msgid "printing exhumed key on stdout"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "Exhume failed, image file not found: ::1 image file::"
+msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#: _failure
+#, fuzzy
+msgid "Exhume failed: ::1 image file:: is not a jpeg image."
+msgstr "L'encodage a échoué : ::1 image file:: n'est pas une image JPEG."
+
+#: _failure
+msgid "Wrong password or no steganographic key found"
+msgstr ""
 
 #: _warning
-msgid "File exists: $tombkey"
-msgstr "Le fichier existe : $tombkey"
+#, fuzzy
+msgid "File exists: ::1 tomb key::"
+msgstr "Le fichier existe : ::1 key::"
 
 #: _warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Pour l'ignorer et l'écrire de nouveau, utiliser --force."
 
+#: _failure
+#, fuzzy
+msgid "Refusing to overwrite file. Operation aborted."
+msgstr ""
+"La création de cette tombe écraserait un fichier existant. Opération annulée."
+
 #: _warning
 msgid "Use of --force selected: overwriting."
 msgstr "L'option --force est sélectionnée : ré-écriture en cours."
 
 #: _message
-msgid "Trying to exhume a key out of image $imagefile"
-msgstr "Tentative d'exhumer une clé de l'image $imagefile"
+msgid "Trying to exhume a key out of image ::1 image file::"
+msgstr "Tentative d'exhumer une clé de l'image ::1 image file::"
 
-#: _success
-msgid "${tombkey} succesfully decoded."
-msgstr "${tombkey} a été décodée avec succès."
+msgid "Key succesfully exhumed to ::1 key::."
+msgstr ""
 
 #: _warning
-msgid "Nothing found in $imagefile"
-msgstr "Aucune clé n'a été trouvée dans $imagefile"
+msgid "Nothing found in ::1 image file::"
+msgstr "Aucune clé n'a été trouvée dans ::1 image file::"
+
+#: _failure
+msgid "No key specified."
+msgstr ""
 
 #: _success
-msgid "Rendering a printable QRCode for key: $tombkey"
-msgstr "Conversion en QR code imprimable de la clé : $tombkey"
+#, fuzzy
+msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+msgstr "Conversion en QR code imprimable de la clé : ::1 key::"
+
+#: _failure
+msgid "QREncode reported an error."
+msgstr ""
 
 #: _success
 msgid "Operation successful:"
 msgstr "Succès : "
 
-#: _message
-msgid "`ls -lh $pngname`"
-msgstr "`ls -lh $pngname`"
-
-#: _message
-msgid "`file $pngname`"
-msgstr "`file $pngname`"
-
 #: _warning
 msgid "A filename needs to be specified using -k to forge a new key."
-msgstr "Pour forger une nouvelle clé, vous devez préciser un nom de fichier avec -k."
+msgstr ""
+"Pour forger une nouvelle clé, vous devez préciser un nom de fichier avec -k."
 
 #: _message
-msgid "Commanded to forge key $destkey"
-msgstr "Forge de la clé $destkey"
+msgid "Commanded to forge key ::1 key::"
+msgstr "Forge de la clé ::1 key::"
 
 #: _warning
 msgid "Forging this key would overwrite an existing file. Operation aborted."
 msgstr "Forger cette clé détruirait un fichier existant.  Opération annulée."
 
 #: _failure
-msgid "Error creating temp dir."
-msgstr "Erreur lors de la création du répertoire temporaire."
-
-#: _warning
-msgid "Cannot mount tmpfs filesystem in volatile memory."
-msgstr "Le système de fichier temporaire ne peut être monté en mémoire vive."
+msgid "`ls -lh $destkey`"
+msgstr ""
 
 #: _message
-msgid "Commanded to forge key $destkey with cipher algorithm $algo"
-msgstr "Forge de la clé $destkey avec l'algorithme de chiffrement $algo"
+msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
+msgstr ""
+"Forge de la clé ::1 key:: avec l'algorithme de chiffrement ::2 algorithm::"
 
 #: _message
 msgid "This operation takes time, keep using this computer on other tasks,"
-msgstr "Cette opération prend du temps, continuez à utiliser l'ordinateur pour d'autres tâches,"
+msgstr ""
+"Cette opération prend du temps, continuez à utiliser l'ordinateur pour "
+"d'autres tâches,"
 
 #: _message
 msgid "once done you will be asked to choose a password for your tomb."
-msgstr "une fois l'opération terminée, vous devrez choisir un mot de passe pour votre tombe."
+msgstr ""
+"une fois l'opération terminée, vous devrez choisir un mot de passe pour "
+"votre tombe."
 
 #: _message
 msgid "To make it faster you can move the mouse around."
@@ -317,19 +606,27 @@ msgstr "Vous pouvez accélérer l'opération en bougeant la souris."
 
 #: _message
 msgid "If you are on a server, you can use an Entropy Generation Daemon."
-msgstr "Si vous effectuez l'opération sur un serveur, vous pouvez utiliser un démon générateur d'entropie."
+msgstr ""
+"Si vous effectuez l'opération sur un serveur, vous pouvez utiliser un démon "
+"générateur d'entropie."
+
+#: _verbose
+msgid "Data dump using ::1:: from ::2 source::"
+msgstr ""
 
 #: _warning
 msgid "Cannot generate encryption key."
 msgstr "La clé de chiffrement ne peut être générée."
 
 #: _success
-msgid "Choose the password of your key: ${tombkey}"
-msgstr "Saisir un mot de passe pour votre clé : ${tombkey}"
+#, fuzzy
+msgid "Choose the  password of your key: ::1 tomb key::"
+msgstr "Saisir un mot de passe pour votre clé : ::1 key::"
 
 #: _message
 msgid "(You can also change it later using 'tomb passwd'.)"
-msgstr "(Vous pouvez le modifier ultérieurement avec la commande 'tomb passwd'.)"
+msgstr ""
+"(Vous pouvez le modifier ultérieurement avec la commande 'tomb passwd'.)"
 
 #: _warning
 msgid "The key does not seem to be valid."
@@ -344,16 +641,17 @@ msgid "--"
 msgstr "--"
 
 #: _message
-msgid "Done forging $tombkey"
-msgstr "La clé $tombkey a été forgée"
+msgid "Done forging ::1 key::"
+msgstr "La clé ::1 key:: a été forgée"
 
 #: _success
 msgid "Your key is ready:"
 msgstr "Votre clé est prête :"
 
 #: _message
-msgid "Commanded to dig tomb $1"
-msgstr "Creusement de la tombe $1"
+#, fuzzy
+msgid "Commanded to dig tomb ::1 tomb name::"
+msgstr "Creusement de la tombe ::1 tomb file::"
 
 #: _warning
 msgid "No tomb name specified for creation."
@@ -377,35 +675,46 @@ msgstr "Une tombe existe déjà à cet endroit. Je n'y creuse pas !"
 
 #: _warning
 msgid " `ls -lh ${tombdir}/${tombfile}`"
-msgstr " `ls -lh ${tombdir}/${tombfile}`"
+msgstr ""
 
 #: _success
-msgid "Creating a new tomb in ${tombdir}/${tombfile}"
-msgstr "Nouvelle tombe à ${tombdir}/${tombfile}"
+#, fuzzy
+msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+msgstr "Nouvelle tombe à ::1 dir::/::2 tomb file::"
 
 #: _message
-msgid "Generating ${tombfile} of ${tombsize}MiB"
-msgstr "Tombe en cours de création ${tombfile}, de taille ${tombsize}Mo"
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Tombe en cours de création ::1 tomb file::, de taille ::2 size::Mo"
+
+#: _verbose
+msgid "Data dump using ::1:: from /dev/urandom"
+msgstr ""
 
 #: _failure
-msgid "Error creating the tomb ${tombdir}/${tombfile}, operation aborted."
-msgstr "Erreur lors de la création de la tombe ${tombdir}/${tombsize}. Opération annulée."
+#, fuzzy
+msgid ""
+"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+msgstr ""
+"Erreur lors de la création de la tombe ::1 dir::/::2 tomb file::. Opération "
+"annulée."
 
 #: _success
-msgid "Done digging $tombname"
-msgstr "La tombe $tombname est creusée."
+msgid "Done digging ::1 tomb name::"
+msgstr "La tombe ::1 tomb name:: est creusée."
 
 #: _message
 msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
-msgstr "Votre tombe n'est pas encore prête, vous devez en forger la clé et la vérouiller :"
+msgstr ""
+"Votre tombe n'est pas encore prête, vous devez en forger la clé et la "
+"vérouiller :"
 
 #: _message
-msgid "tomb forge ${tombname}.tomb.key"
-msgstr "tomb forge ${tombname}.tomb.key"
+msgid "tomb forge ::1 tomb name::.tomb.key"
+msgstr "tomb forge ::1 tomb name::.tomb.key"
 
 #: _message
-msgid "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
-msgstr "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
+msgid "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
+msgstr "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
 
 #: _warning
 msgid "No tomb specified for locking."
@@ -416,12 +725,23 @@ msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Usage : tomb lock file.tomb file.tomb.key"
 
 #: _message
-msgid "Commanded to lock tomb ${tombfile}"
-msgstr "Vérouillage de la tombe ${tombfile} en cours"
+msgid "Commanded to lock tomb ::1 tomb file::"
+msgstr "Vérouillage de la tombe ::1 tomb file:: en cours"
 
 #: _failure
 msgid "There is no tomb here. You have to it dig first."
-msgstr "Il n'y a pas de tombe à cet endroit. Vous devez d'abord la creuser ('dig')."
+msgstr ""
+"Il n'y a pas de tombe à cet endroit. Vous devez d'abord la creuser ('dig')."
+
+#: _verbose
+#, fuzzy
+msgid "Tomb found: ::1 tomb dir::/::2 tomb file::"
+msgstr "Nouvelle tombe à ::1 dir::/::2 tomb file::"
+
+#: _verbose
+#, fuzzy
+msgid "Loop mounted on ::1 mount point::"
+msgstr "Quelque chose coince à ::1 mount point::."
 
 #: _message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
@@ -432,20 +752,28 @@ msgid "The tomb was already locked with another key."
 msgstr "La tombe est déjà vérouillée avec une autre clé."
 
 #: _failure
-msgid "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
-msgstr "Opération abandonnée. Je ne peux pas vérouiller une tombe déjà vérouillée. Vous pouvez en creuser une autre (avec 'dig')."
+msgid ""
+"Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
+msgstr ""
+"Opération abandonnée. Je ne peux pas vérouiller une tombe déjà vérouillée. "
+"Vous pouvez en creuser une autre (avec 'dig')."
 
 #: _message
 msgid "Fine, this tomb seems empty."
 msgstr "Bien, la tombe semble être vide."
 
+#: _failure
+msgid "Aborting operations: error loading key."
+msgstr ""
+
 #: _message
-msgid "Locking using cipher: $cipher"
-msgstr "Vérouillage avec l'algorithme de chiffrement : $cipher"
+msgid "Locking using cipher: ::1 cipher::"
+msgstr "Vérouillage avec l'algorithme de chiffrement : ::1 cipher::"
 
 #: _success
-msgid "Locking ${tombfile} with ${tombkey}"
-msgstr "Vérouillage de ${tombfile} avec ${tombkey}"
+#, fuzzy
+msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+msgstr "Vérouillage de ::1 tomb file:: avec ::1 key::"
 
 #: _message
 msgid "Formatting Luks mapped device."
@@ -455,6 +783,11 @@ msgstr "Formatage du dispositif LUKS désigné."
 msgid "cryptsetup luksFormat returned an error."
 msgstr "Une erreur s'est produite à l'exécution de cryptsetup luksFormat"
 
+#: _warning
+#, fuzzy
+msgid "cryptsetup luksOpen returned an error."
+msgstr "Une erreur s'est produite à l'exécution de cryptsetup luksFormat"
+
 #: _message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Formatage de votre tombe avec un système de fichier Ext3/Ext4."
@@ -464,108 +797,223 @@ msgid "Tomb format returned an error."
 msgstr "Une erreur s'est produite à l'exécution du formatage."
 
 #: _warning
-msgid "Your tomb ${tombfile} may be corrupted."
-msgstr "Votre tombe ${tombfile} pourrait être corrompu."
+msgid "Your tomb ::1 tomb file:: may be corrupted."
+msgstr "Votre tombe ::1 tomb file:: pourrait être corrompu."
 
 #: _message
-msgid "Done locking $tombname using Luks dm-crypt ${create_cipher}"
-msgstr "Vérouillage accompli de ${tombname} avec LUKS dm-crypt ${create_cipher}"
+#, fuzzy
+msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
+msgstr ""
+"Vérouillage accompli de ::1 tomb name:: avec LUKS dm-crypt ::1 cipher::"
 
 #: _success
-msgid "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombkey}"
-msgstr "Votre tombe est disponible à ${tombdir}/${tombfile} et protégée par la clé ${tombkey}"
+#, fuzzy
+msgid ""
+"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
+"key ::3 tomb key::"
+msgstr ""
+"Votre tombe est disponible à ::1 dir::/::2 tomb file:: et protégée par la "
+"clé ::1 key::"
 
 #: _message
-msgid "Commanded to reset key for tomb $2"
-msgstr "Changement du verrou sur la tombe $2"
+#, fuzzy
+msgid "Commanded to reset key for tomb ::1 tomb name::"
+msgstr "Changement du verrou sur la tombe ::1 tomb file::"
+
+#: _warning
+msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
+msgstr ""
+
+#: _warning
+msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "Execution aborted."
+msgstr "L'opération est interrompue."
+
+#: _failure
+#, fuzzy
+msgid "Not a valid LUKS encrypted volume: ::1 volume::"
+msgstr "Cette tombe est un dispositif chiffré LUKS valide."
+
+#: _failure
+msgid "Aborting operations: error loading old key from arguments"
+msgstr ""
 
 #: _success
-msgid "Changing lock on tomb $tombname"
-msgstr "Changement du verrou en cours sur $tombname"
+msgid "Changing lock on tomb ::1 tomb name::"
+msgstr "Changement du verrou en cours sur ::1 tomb name::"
 
 #: _message
-msgid "Old key: $oldkey"
-msgstr "Clé précédente : $oldkey"
+#, fuzzy
+msgid "Old key: ::1 old key::"
+msgstr "Clé précédente : ::1 key::"
+
+#: _failure
+msgid "No valid password supplied for the old key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksOpen."
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading new key from -k"
+msgstr ""
 
 #: _message
-msgid "New key: $newkey"
-msgstr "Nouvelle clé : $newkey"
+msgid "New key: ::1 key::"
+msgstr "Nouvelle clé : ::1 key::"
+
+#: _failure
+msgid "No valid password supplied for the new key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksChangeKey."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksClose."
+msgstr ""
 
 #: _success
-msgid "Succesfully changed key for tomb: $2"
-msgstr "Le verrou est changé sur la tombe $2"
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
+msgstr "Le verrou est changé sur la tombe ::1 tomb file::"
 
 #: _message
-msgid "The new key is: $newkey"
-msgstr "La nouvelle clé est : $newkey"
+#, fuzzy
+msgid "The new key is: ::1 new key::"
+msgstr "La nouvelle clé est : ::1 key::"
+
+#: _verbose
+msgid "create_tomb(): ::1:: ::2::"
+msgstr ""
 
 #: _warning
-msgid "Creating this tomb would overwrite an existing file. Operation aborted."
-msgstr "La création de cette tombe écraserait un fichier existant. Opération annulée."
+#, fuzzy
+msgid "Creating this tomb would overwrite an existing file."
+msgstr ""
+"La création de cette tombe écraserait un fichier existant. Opération annulée."
+
+#: _failure
+msgid "Failed to forge key, operation aborted."
+msgstr ""
+
+#: _failure
+msgid "Failed to lock tomb with key, operation aborted."
+msgstr ""
 
 #: _success
-msgid "Tomb $tombname succesfully created."
-msgstr "La tombe $tombname a été créée avec succès."
+msgid "Tomb ::1 tomb name:: succesfully created."
+msgstr "La tombe ::1 tomb name:: a été créée avec succès."
 
 #: _message
-msgid "Commanded to open tomb $1"
-msgstr "Ouverture de la tombe $1"
+#, fuzzy
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Ouverture de la tombe ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "No tomb name specified for opening."
+msgstr "Merci de spécifier le nom de la tombe à agrandir."
+
+#: _warning
+#, fuzzy
+msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+msgstr "::1 tomb file:: n'est pas un fichier chiffré de stockage LUKS valide."
+
+#: _failure
+msgid "Aborting operations: error loading key ::1 key::"
+msgstr ""
 
 #: _message
-msgid "Mountpoint not specified, using default: $tombmount"
-msgstr "Le point de montage n'a pas été précisé, nous utilisons donc $tombmount"
+msgid "Mountpoint not specified, using default: ::1 mount point::"
+msgstr ""
+"Le point de montage n'a pas été précisé, nous utilisons donc ::1 mount "
+"point::"
 
 #: _warning
-msgid "$tombname is already open."
-msgstr "$tombname est déjà ouverte."
+msgid "::1 tomb name:: is already open."
+msgstr "::1 tomb name:: est déjà ouverte."
 
 #: _message
 msgid "Here below its status is reported:"
 msgstr "L'état de la tombe suit :"
 
 #: _success
-msgid "Opening $tombfile on $tombmount"
-msgstr "Ouverture de $tombfile sur $tombmount"
-
-#: _failure
-msgid "Too many tombs open. Please close any of them to open another tomb."
-msgstr "Trop de tombes sont ouvertes. Merci d'en fermer une pour pouvoir ouvrir celle-ci."
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Ouverture de ::1 tomb file:: sur ::2 mount point::"
 
 #: _warning
-msgid "$tombfile is not a valid Luks encrypted storage file."
-msgstr "$tombfile n'est pas un fichier chiffré de stockage LUKS valide."
+msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
+msgstr "::1 tomb file:: n'est pas un fichier chiffré de stockage LUKS valide."
 
 #: _message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Cette tombe est un dispositif chiffré LUKS valide."
 
 #: _message
-msgid "Cipher is \"$tombdump[1]\" mode \"$tombdump[2]\" hash \"$tombdump[3]\""
-msgstr "Algorithme de chiffrement \"$tombdump[1]\" en mode \"$tombdump[2]\" et la fonction de hachage \"$tombdump[3]\"."
+msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
+msgstr ""
+"Algorithme de chiffrement \"::1 cipher::\" en mode \"::2 mode::\" et la "
+"fonction de hachage \"::3 hash::\"."
+
+#: _warning
+msgid ""
+"Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "dev mapper device: ::1 mapper::"
+msgstr "e2fsck n'a pas pu vérifier ::1 mapper::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb key: ::1 key::"
+msgstr "Clé précédente : ::1 key::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb name: ::1 tomb name:: (to be engraved)"
+msgstr "La tombe ::1 tomb name:: a été créée avec succès."
 
 #: _failure
 msgid "Failure mounting the encrypted file."
 msgstr "Le montage du fichier chiffré a échoué."
 
 #: _success
-msgid "Success unlocking tomb $tombname"
-msgstr "La tombe $tombname est à présent dévérouillée."
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr "La tombe ::1 tomb name:: est à présent dévérouillée."
+
+#: _verbose
+msgid "Key size is ::1 size:: for cipher ::2 cipher::"
+msgstr ""
 
 #: _message
-msgid "Checking filesystem via $tombstat[3]"
-msgstr "Vérification du système de fichiers avec $tombstat[3]"
+msgid "Checking filesystem via ::1::"
+msgstr "Vérification du système de fichiers avec ::1::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb engraved as ::1 tomb name::"
+msgstr "Fermons la tombe ::1 tomb name::"
 
 #: _success
-msgid "Success opening $tombfile on $fg_bold[white]$tombmount$fg_no_bold[white]"
-msgstr "La tombe $tombfile est ouverte sur $fg_bold[white]$tombmount$fg_no_bold[white]"
+#, fuzzy
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Ouverture de ::1 tomb file:: sur ::2 mount point::"
 
 #: _message
-msgid "Last visit by $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] from $fg_bold[white]$tombtty$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
-msgstr "Dernière visite par $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] depuis $fg_bold[white]$tombtty$fg_no_bold[white] sur $fg_bold[white]$tombhost$fg_no_bold[white]"
+msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
+msgstr ""
 
 #: _message
-msgid "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
-msgstr "à la date  $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+msgid "on date ::1 date::"
+msgstr ""
 
 #: _warning
 msgid "How pitiful!  A tomb, and no HOME."
@@ -573,31 +1021,80 @@ msgstr "C'est pitoyable ! Une tombe, mais sans abri (HOME n'est pas défini)."
 
 #: _warning
 msgid "Cannot exec bind hooks without a mounted tomb."
-msgstr "L'exécution des ordres de montage ne peut se faire que si la tombe est montée."
+msgstr ""
+"L'exécution des ordres de montage ne peut se faire que si la tombe est "
+"montée."
+
+#: _verbose
+#, fuzzy
+msgid "bind-hooks not found in ::1 mount point::"
+msgstr ""
+"L'origine du point de montage n'est pas relatif à la tombe : le chemin ::1 "
+"mount point::/::2 dir:: est ignoré."
 
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME"
-msgstr "La correspondance de montage suit le format : local/à/la/tombe local/à/HOME"
+#, fuzzy
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
+msgstr ""
+"La correspondance de montage suit le format : local/à/la/tombe local/à/HOME"
 
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME.  Rolling back"
-msgstr "Les montages doivent s'annoncer localement : local/à/la/tombe local/à/HOME. Annulation."
+#, fuzzy
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
+msgstr ""
+"Les montages doivent s'annoncer localement : local/à/la/tombe local/à/HOME. "
+"Annulation."
 
 #: _warning
-msgid "bind-hook target not existent, skipping $HOME/${maps[$dir]}"
-msgstr "La cible du point de montage n'existe pas. Le chemin $HOME/${maps[$dir]} est ignoré."
+#, fuzzy
+msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
+msgstr ""
+"La cible du point de montage n'existe pas. Le chemin ::1 home::/::2 dir:: "
+"est ignoré."
 
 #: _warning
-msgid "bind-hook source not found in tomb, skipping ${MOUNTPOINT}/${dir}"
-msgstr "L'origine du point de montage n'est pas relatif à la tombe : le chemin ${MOUNTPOINT}/${dir} est ignoré."
+#, fuzzy
+msgid ""
+"bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
+msgstr ""
+"L'origine du point de montage n'est pas relatif à la tombe : le chemin ::1 "
+"mount point::/::2 dir:: est ignoré."
 
 #: _success
-msgid "Post hooks found, executing as user $SUDO_USER."
-msgstr "Des hooks post-montage sont présents, et exécutés en tant que $SUDO_USER."
+#, fuzzy
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr ""
+"Des hooks post-montage sont présents, et exécutés en tant que ::1 user::."
+
+#: _failure
+#, fuzzy
+msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
+msgstr "Je ne vois aucune tombe ouverte, qu'ils reposent tous en paix."
+
+#: _failure
+msgid "Internal error: list_tomb_binds called without argument."
+msgstr ""
 
 #: _failure
-msgid "There seems to be no open tomb engraved as [$1]"
-msgstr "Il ne semble pas y avoir de tombe ouverte comme [$1]"
+msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
+msgstr ""
+
+#: _warning
+msgid "Cannot use GNU findutils for index/search commands."
+msgstr ""
+
+#: _failure
+msgid "Index command needs 'mlocate' to be installed."
+msgstr ""
+
+#: _verbose
+msgid "$updatedbver"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "There seems to be no open tomb engraved as [::1::]"
+msgstr "Il ne semble pas y avoir de tombe ouverte comme [::1 tomb name::]"
 
 #: _failure
 msgid "I can't see any open tomb, may they all rest in peace."
@@ -607,41 +1104,58 @@ msgstr "Je ne vois aucune tombe ouverte, qu'ils reposent tous en paix."
 msgid "Creating and updating search indexes."
 msgstr "Création et mise à jour des index de recherche."
 
+#: _verbose
+msgid "unoconv listener launched."
+msgstr ""
+
 #: _message
-msgid "Skipping $tombname (.noindex found)."
-msgstr "$tombname comporte in fichier .noindex : ses fichiers n'apparaîtront pas dans les résultats de recherche."
+msgid "Skipping ::1 tomb name:: (.noindex found)."
+msgstr ""
+"::1 tomb name:: comporte in fichier .noindex : ses fichiers n'apparaîtront "
+"pas dans les résultats de recherche."
 
 #: _message
-msgid "Indexing $tombname filenames..."
-msgstr "Index des fichiers dans $tombname en cours..."
+msgid "Indexing ::1 tomb name:: filenames..."
+msgstr "Index des fichiers dans ::1 tomb name:: en cours..."
 
 #: _message
-msgid "Indexing $tombname contents..."
-msgstr "Index des contenus de $tombname en cours..."
+msgid "Indexing ::1 tomb name:: contents..."
+msgstr "Index des contenus de ::1 tomb name:: en cours..."
+
+#: _verbose
+#, fuzzy
+msgid "Using swish-e to create index."
+msgstr "Exécuter 'tomb index' pour générer les index."
 
 #: _message
 msgid "Search index updated."
 msgstr "L'index de recherche a été mis à jour."
 
 #: _success
-msgid "Searching for: $fg_bold[white]${(f)@}$fg_no_bold[white]"
-msgstr "Recherche en cours : $fg_bold[white]${(f)@}$fg_no_bold[white]"
+#, fuzzy
+msgid "Searching for: ::1::"
+msgstr "Vérification du système de fichiers avec ::1::"
+
+#: _verbose
+#, fuzzy
+msgid "Checking for index: ::1::"
+msgstr "Vérification du système de fichiers avec ::1::"
 
 #: _message
-msgid "Searching filenames in tomb $tombname"
-msgstr "Recherche parmi les fichiers dans la tombe $tombname"
+msgid "Searching filenames in tomb ::1 tomb name::"
+msgstr "Recherche parmi les fichiers dans la tombe ::1 tomb name::"
 
 #: _message
-msgid "Matches found: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
-msgstr "Résultats trouvés : `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
+msgid "Matches found: ::1 matches::"
+msgstr "Résultats trouvés : ::1 matches::"
 
 #: _message
-msgid "Searching contents in tomb $tombname"
-msgstr "Recherche parmi les contenus de la tombe $tombname"
+msgid "Searching contents in tomb ::1 tomb name::"
+msgstr "Recherche parmi les contenus de la tombe ::1 tomb name::"
 
 #: _warning
-msgid "Skipping tomb $tombname: not indexed."
-msgstr "La tombe $tombname n'est pas indexée, et donc ignorée."
+msgid "Skipping tomb ::1 tomb name::: not indexed."
+msgstr "La tombe ::1 tomb name:: n'est pas indexée, et donc ignorée."
 
 #: _warning
 msgid "Run 'tomb index' to create indexes."
@@ -652,24 +1166,31 @@ msgid "Search completed."
 msgstr "La recherche est terminée."
 
 #: _message
-msgid "Commanded to resize tomb $1 to $opts[-s] megabytes."
-msgstr "Agrandissement de la tombe $1 à $opts[-s] Mo."
+#, fuzzy
+msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
+msgstr "Agrandissement de la tombe ::1 tomb file:: ::2 size::s] Mo."
 
 #: _failure
 msgid "No tomb name specified for resizing."
 msgstr "Merci de spécifier le nom de la tombe à agrandir."
 
 #: _failure
-msgid "Cannot find $1"
-msgstr "$1 reste introuvable."
+msgid "Cannot find ::1::"
+msgstr "::1:: reste introuvable."
+
+#: _failure
+msgid "Aborting operations: new size was not specified, use -s"
+msgstr ""
 
 #: _failure
-msgid "The tomb $tombname is open, to resize it it needs to be closed."
-msgstr "La tombe $tombname est ouverte, mais elle doit être fermée pour être agrandie."
+msgid "The tomb ::1 tomb name:: is open, to resize it it needs to be closed."
+msgstr ""
+"La tombe ::1 tomb name:: est ouverte, mais elle doit être fermée pour être "
+"agrandie."
 
 #: _failure
-msgid "You must specify the new size of $tombname"
-msgstr "Vous devez spécifier la nouvelle taille de $tombname"
+msgid "You must specify the new size of ::1 tomb name::"
+msgstr "Vous devez spécifier la nouvelle taille de ::1 tomb name::"
 
 #: _failure
 msgid "Size is not an integer."
@@ -679,21 +1200,25 @@ msgstr "La taille doit être un nombre entier."
 msgid "The new size must be greater then old tomb size."
 msgstr "La nouvelle taille doit être supérieure à l'ancienne."
 
-#: _message -n
-msgid "Generating ${tombfile} of ${newtombsize}MiB"
-msgstr "Génération de ${tombfile} d'une taille de ${newtombsize}Mo."
+#: _failure
+#, fuzzy
+msgid "Error creating the extra resize ::1 size::, operation aborted."
+msgstr ""
+"Erreur lors de la création de la tombe ::1 dir::/::2 tomb file::. Opération "
+"annulée."
 
 #: _failure
-msgid "Too many tombs opened. Please close any of them to open another tomb."
-msgstr "Trop de tombes sont ouvertes. Merci d'en fermer une avant d'ouvrir celle-ci."
+#, fuzzy
+msgid "cryptsetup failed to resize ::1 mapper::"
+msgstr "resize2fs n'a pas pu redimensionner ::1 mapper::"
 
 #: _failure
-msgid "e2fsck failed to check $mapper"
-msgstr "e2fsck n'a pas pu vérifier $mapper"
+msgid "e2fsck failed to check ::1 mapper::"
+msgstr "e2fsck n'a pas pu vérifier ::1 mapper::"
 
 #: _failure
-msgid "resize2fs failed to resize $mapper"
-msgstr "resize2fs n'a pas pu redimensionner $mapper"
+msgid "resize2fs failed to resize ::1 mapper::"
+msgstr "resize2fs n'a pas pu redimensionner ::1 mapper::"
 
 #: _warning
 msgid "There is no open tomb to be closed."
@@ -708,86 +1233,282 @@ msgid "or issue the command 'tomb close all' to close them all."
 msgstr "ou bien exécuter 'tomb close all' pour les fermer toutes."
 
 #: _message
-msgid "Tomb close $1"
-msgstr "Fermons la tombe $1"
+#, fuzzy
+msgid "Tomb close ::1::"
+msgstr "Fermons la tombe ::1 tomb name::"
+
+#: _verbose
+#, fuzzy
+msgid "Name: ::1 tomb name::"
+msgstr "Fermons la tombe ::1 tomb name::"
+
+#: _verbose
+msgid "Mount: ::1 mount point::"
+msgstr ""
+
+#: _verbose
+msgid "Mapper: ::1 mapper::"
+msgstr ""
 
 #: _warning
-msgid "Tomb not found: $1"
-msgstr "Tombe introuvable : $1"
+#, fuzzy
+msgid "Tomb not found: ::1 tomb file::"
+msgstr "Tombe introuvable : ::1 tomb name::"
 
 #: _warning
 msgid "Please specify an existing tomb."
 msgstr "Merci d'indiquer une tombe existante."
 
 #: _success
-msgid "Slamming tomb $tombname mounted on $tombmount"
-msgstr "Fermeture soudaine de la tombe $tombname montée sur $tombmount."
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr ""
+"Fermeture soudaine de la tombe ::1 tomb name:: montée sur ::2 mount point::."
 
 #: _message
 msgid "Kill all processes busy inside the tomb."
 msgstr "Exécution (sommaire) de tous les processus en cours dans la tombe."
 
 #: _warning
-msgid "Cannot slam the tomb $tombname"
-msgstr "La tombe $tombname ne peut pas être fermée !"
+msgid "Cannot slam the tomb ::1 tomb name::"
+msgstr "La tombe ::1 tomb name:: ne peut pas être fermée !"
 
 #: _message
-msgid "Closing tomb $tombname mounted on $tombmount"
-msgstr "Fermeture de la tombe $tombname montée sur $tombmount."
+msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr "Fermeture de la tombe ::1 tomb name:: montée sur ::2 mount point::."
 
 #: _message
-msgid "Closing tomb bind hook: $bind_mount"
-msgstr "Retrait du point de montage : $bind_hook"
+msgid "Closing tomb bind hook: ::1 hook::"
+msgstr "Retrait du point de montage : ::1 hook::"
 
 #: _success
 msgid "Slamming tomb: killing all processes using this hook."
 msgstr "Fermeture soudaine : interruption des processus utilisant ce hook."
 
 #: _warning
-msgid "Cannot slam the bind hook $bind_mount"
-msgstr "Quelque chose coince à $bind_mount."
+#, fuzzy
+msgid "Cannot slam the bind hook ::1 hook::"
+msgstr "Quelque chose coince à ::1 mount point::."
 
 #: _warning
-msgid "Tomb bind hook $bind_mount is busy, cannot close tomb."
-msgstr "Le point de montage $bind_mount est occupé et ne peut pas être fermé."
+#, fuzzy
+msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
+msgstr ""
+"Le point de montage ::1 mount point:: est occupé et ne peut pas être fermé."
+
+#: _verbose
+#, fuzzy
+msgid "Performing umount of ::1 mount point::"
+msgstr "Quelque chose coince à ::1 mount point::."
 
 #: _warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "La tombe est occupée et ne peut pas être démontée !"
 
 #: _warning
-msgid "Error occurred in cryptsetup luksClose ${mapper}"
-msgstr "Une erreur s'est produite lors de l'exécution de cryptsetup luksClose ${mapper}."
+msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
+msgstr ""
+"Une erreur s'est produite lors de l'exécution de cryptsetup luksClose ::1 "
+"mapper::."
 
 #: _success
-msgid "Tomb $tombname closed: your bones will rest in peace."
-msgstr "La tombe $tombname est refermée : vos ossements vont reposer en paix."
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr ""
+"La tombe ::1 tomb name:: est refermée : vos ossements vont reposer en paix."
+
+#: _verbose
+#, fuzzy
+msgid "Sending ::1:: to processes inside the tomb:"
+msgstr "Exécution (sommaire) de tous les processus en cours dans la tombe."
 
 #: _failure
 msgid "Error parsing."
 msgstr "Erreur de syntaxe."
 
 #: _warning
-msgid "There's no such command \"$subcommand\"."
-msgstr "La commande \"$subcommand\" n'est pas implémentée."
+msgid "There's no such command \"::1 subcommand::\"."
+msgstr "La commande \"::1 subcommand::\" n'est pas implémentée."
+
+#: _failure
+#, fuzzy
+msgid "Please try -h for help."
+msgstr "Essayer -h pour obtenir l'aide."
 
 #: _warning
 msgid "Some error occurred during option processing."
 msgstr "L'interprétation des options a échoué."
 
+#: _failure
+msgid "See \"tomb help\" for more info."
+msgstr ""
+
+#: _failure
+msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
+msgstr ""
+
+#: _failure
+msgid ""
+"You specified option ::1 option::, which is DANGEROUS and should only be "
+"used for testing\n"
+"If you really want so, add --unsecure-dev-mode"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "Tomb command: ::1 subcommand:: ::2 param::"
+msgstr "La commande \"::1 subcommand::\" n'est pas implémentée."
+
+#: _verbose
+msgid "Caller: uid[::1 uid::], gid[::2 gid::], tty[::3 tty::]."
+msgstr ""
+
+#: _failure
+msgid "QREncode not installed: cannot engrave keys on paper."
+msgstr ""
+
 #: _warning
-msgid "The create command is deprecated, please use dig, forge and lock instead."
-msgstr "La commande \"create\" est obsolète : il convient à présent d'utiliser \"dig\", \"forge\", et \"lock\"."
+msgid ""
+"The create command is deprecated, please use dig, forge and lock instead."
+msgstr ""
+"La commande \"create\" est obsolète : il convient à présent d'utiliser \"dig"
+"\", \"forge\", et \"lock\"."
 
 #: _warning
 msgid "For more informations see Tomb's manual page (man tomb)."
-msgstr "Pour de plus amples informations, se référer au manuel de Tomb (man tomb)."
+msgstr ""
+"Pour de plus amples informations, se référer au manuel de Tomb (man tomb)."
+
+#: _failure
+msgid "Steghide not installed: cannot bury keys into images."
+msgstr ""
+
+#: _failure
+msgid "Steghide not installed: cannot exhume keys from images."
+msgstr ""
+
+#: _failure
+msgid "Resize2fs not installed: cannot resize tombs."
+msgstr ""
+
+#: _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 ""
 
 #: _warning
-msgid "Command \"$subcommand\" not recognized."
-msgstr "La command \"$subcommand\" n'est pas reconnue."
+msgid "Command \"::1 subcommand::\" not recognized."
+msgstr "La command \"::1 subcommand::\" n'est pas reconnue."
 
 #: _message
 msgid "Try -h for help."
 msgstr "Essayer -h pour obtenir l'aide."
 
+#~ msgid ""
+#~ "Success opening ::1 tomb file:: on $fg_bold[white]::2 mount point::"
+#~ "$fg_no_bold[white]"
+#~ msgstr ""
+#~ "La tombe ::1 tomb file:: est ouverte sur $fg_bold[white]::2 mount point::"
+#~ "$fg_no_bold[white]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Last visit by $fg_bold[white]::1 user::(::2 tomb "
+#~ "build::)$fg_no_bold[white] from $fg_bold[white]::3 tty::"
+#~ "$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
+#~ msgstr ""
+#~ "Dernière visite par $fg_bold[white]::1 user::(::2 "
+#~ "build::)$fg_no_bold[white] depuis $fg_bold[white]::3 tty::"
+#~ "$fg_no_bold[white] sur $fg_bold[white]::4 host::$fg_no_bold[white]"
+
+#, fuzzy
+#~ msgid "on date $fg_bold[white]::1 date::$fg_no_bold[white]"
+#~ msgstr "Recherche en cours : $fg_bold[white]::1::$fg_no_bold[white]"
+
+#~ msgid "Searching for: $fg_bold[white]::1::$fg_no_bold[white]"
+#~ msgstr "Recherche en cours : $fg_bold[white]::1::$fg_no_bold[white]"
+
+#~ msgid "WARNING: we cannot ensure we're running in RAM."
+#~ msgstr ""
+#~ "ATTENTION : nous ne pouvons garantir l'exécution du programme en mémoire "
+#~ "vive."
+
+#~ msgid "WARNING: no RAM available for me to run safely."
+#~ msgstr ""
+#~ "ATTENTION : la mémoire vive disponible est insuffisante pour l'exécution "
+#~ "sûre du programme."
+
+#~ msgid "No access to shared memory on this system, sorry."
+#~ msgstr ""
+#~ "Le programme ne peut pas accéder à la mémoire partagée sur ce système."
+
+#~ msgid "The key seems invalid, the application/pgp header is missing."
+#~ msgstr ""
+#~ "La clé semble être invalide, l'en-tête \"application/pgp\" manque au "
+#~ "fichier."
+
+#~ msgid "Removing key temporarily stored from stdin"
+#~ msgstr "Effacement de la clé temporaire passée par l'entrée standard."
+
+#~ msgid "Key data found with missing headers, attempting recovery."
+#~ msgstr ""
+#~ "Les données d'une clé ont été trouvées sans en-têtes, tentative de "
+#~ "récupération en cours."
+
+#~ msgid "Invalid key format: ::1 key::"
+#~ msgstr "Format de clé invalide : ::1 key::"
+
+#~ msgid "::1 key:: succesfully decoded."
+#~ msgstr "::1 key:: a été décodée avec succès."
+
+#~ msgid "Error creating temp dir."
+#~ msgstr "Erreur lors de la création du répertoire temporaire."
+
+#~ msgid "Cannot mount tmpfs filesystem in volatile memory."
+#~ msgstr ""
+#~ "Le système de fichier temporaire ne peut être monté en mémoire vive."
+
+#~ msgid "Too many tombs open. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Trop de tombes sont ouvertes. Merci d'en fermer une pour pouvoir ouvrir "
+#~ "celle-ci."
+
+#~ msgid ""
+#~ "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+#~ msgstr ""
+#~ "à la date  $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+
+#~ msgid ""
+#~ "Too many tombs opened. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Trop de tombes sont ouvertes. Merci d'en fermer une avant d'ouvrir celle-"
+#~ "ci."
diff --git a/extras/po/generate_translatable_strings.sh b/extras/po/generate_translatable_strings.sh
@@ -9,48 +9,56 @@ cat <<EOF
 msgid ""
 msgstr ""
 "Project-Id-Version: Tomb $VERSION\n"
-"PO-Revision-Date: `date`\n"
+"PO-Revision-Date: `LANG=en date`\n"
 "Last-Translator: Denis Roio <jaromil@dyne.org>\n"
+"Language: English\n"
 "Language-Team: Tomb developers <crypto@lists.dyne.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#
-#: commandline help
-#
-
-msgid ""
-EOF
-
-    ../../tomb help | awk '
-{ print "\"" $0 "\"" }'
-    cat <<EOF
-msgstr ""
-
-#
-# tomb internal messages
-#
-
 EOF
 
     cat ../../tomb | awk '
-/(_verbose|xxx) ".*"$/ { sub( /^(_verbose|xxx)/ , "");
-		 print "#: _verbose"; shift; print "msgid " substr($0, index($0,$2)); print "msgstr \"\"\n" }
+/_verbose ".*"/ {
+    split($0, arr, "\"");
+    print "#: _verbose";
+    print "msgid \"" arr[2] "\"";
+    print "msgstr \"\"\n" }
 
-/(_success|yes) ".*"$/ { sub( /^(_success|yes)/ , "");
-		 print "#: _success"; print "msgid " substr($0, index($0,$2)); print "msgstr \"\"\n" }
+/_success ".*"/ {
+    split($0, arr, "\"");
+    print "#: _success";
+    print "msgid \"" arr[2] "\"";
+    print "msgstr \"\"\n" }
 
-/(_warning|no) ".*"$/ { sub( /^(_warning|no)/ , "");
-		 print "#: _warning"; print "msgid " substr($0, index($0,$2)); print "msgstr \"\"\n" }
+/_warning ".*"/ {
+    split($0, arr, "\"");
+    print "#: _warning";
+    print "msgid \"" arr[2] "\"";
+    print "msgstr \"\"\n" }
 
-/(_failure|die) ".*"$/ { sub( /^(_failure|die)/ , "");
-		 print "#: _failure"; print "msgid " substr($0, index($0,$2)); print "msgstr \"\"\n" }
+/_failure ".*"/ {
+    split($0, arr, "\"");
+    print "#: _failure";
+    print "msgid \"" arr[2] "\"";
+    print "msgstr \"\"\n" }
 
-/(_message|say) ".*"$/ { sub( /^(_message|say)/ , "");
-	      print "#: _message"; print "msgid " substr($0, index($0,$2)); print "msgstr \"\"\n" }
+/_message ".*"/ {
+    split($0, arr, "\"");
+    print "#: _message";
+    print "msgid \"" arr[2] "\"";
+    print "msgstr \"\"\n" }
 
-/(_message -n|act) ".*"$/ { sub( /^(_message -n|act)/ , "");
-	      print "#: _message -n"; print "msgid " substr($0, index($0,$2)); print "msgstr \"\"\n" }
-'
+/_message -n ".*"/ {
+    split($0, arr, "\"");
+    print "#: _message -n";
+    print "msgid \"" arr[2] "\"";
+    print "msgstr \"\"\n" }
 
+/_print ".*"/ {
+    split($0, arr, "\"");
+    print "#: _print";
+    print "msgid \"" arr[2] "\"";
+    print "msgstr \"\"\n" }
+'
diff --git a/extras/po/ru.po b/extras/po/ru.po
@@ -1,107 +1,16 @@
 msgid ""
 msgstr ""
+"Project-Id-Version: Tomb the Crypto Undertaker\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
-"Project-Id-Version: Tomb the Crypto Undertaker\n"
-"Language: ru\n"
 
-#: commandline help
-#, fuzzy
-msgid "Syntax: tomb [options] command [arguments]\n"
-"\n"
-"Commands:\n"
-"\n"
-" // Creation:\n"
-" dig     create a new empty TOMB file of size -s in MB\n"
-" forge   create a new KEY file and set its password\n"
-" lock    installs a lock on a TOMB to use it with KEY\n"
-"\n"
-" // Operations on tombs:\n"
-" open    open an existing TOMB\n"
-" index   update the search indexes of tombs\n"
-" search  looks for filenames matching text patterns\n"
-" list    list of open TOMBs and information on them\n"
-" close   close a specific TOMB (or 'all')\n"
-" slam    slam a TOMB killing all programs using it\n"
-" resize  resize a TOMB to a new size -s (can only grow)\n"
-"\n"
-" // Operations on keys:\n"
-" passwd  change the password of a KEY\n"
-" setkey  change the KEY locking a TOMB (needs old one)\n"
-" engrave makes a QR code of a KEY to be saved on paper\n"
-" bury    hide a KEY inside a JPEG image\n"
-" exhume  extract a KEY from a JPEG image\n"
-"\n"
-"Options:\n"
-"\n"
-" -s     size of the tomb file when creating/resizing one (in MB)\n"
-" -k     path to the key to be used ('-k -' to read from stdin)\n"
-" -n     don't process the hooks found in tomb\n"
-" -o     mount options used to open (default: rw,noatime,nodev)\n"
-" -f     force operation (i.e. even if swap is active)\n"
-" --kdf  generate passwords armored against dictionary attacks\n"
-"\n"
-" -h     print this help\n"
-" -v     print version, license and list of available ciphers\n"
-" -q     run quietly without printing informations\n"
-" -D     print debugging information at runtime\n"
-"\n"
-"For more informations on Tomb read the manual: man tomb\n"
-"Please report bugs on <http://github.com/dyne/tomb/issues>."
-msgstr "Синтаксис: tomb [опции] команда [аргументы]\n"
-"\n"
-"Команды:\n"
-"\n"
-"// Создание: \n"
-"dig     создать новый пустой файл ГРОБНИЦЫ размером -s Мб \n"
-"forge   создать новый файл КЛЮЧА и задать его пароль \n"
-"lock    установить замок на ГРОБНИЦУ, используя КЛЮЧ \n"
-"\n"
-"// Операции над гробницами: \n"
-"open    открыть существующую ГРОБНИЦУ \n"
-"index   обновить поисковый индекс гробниц \n"
-"search  ищет имена файлов, соответствующие шаблону \n"
-"list    список открытых ГРОБНИЦ и информация о них \n"
-"close   закрыть определенную ГРОБНИЦУ (или 'all' для всех) \n"
-"slam    захлопнуть ГРОБНИЦУ, убив все программы, использующие ее \n"
-"resize  привести размер гробницы к -s Мб (можно только увеличить) \n"
-"\n"
-"// Операции с ключами: \n"
-"passwd  изменить пароль КЛЮЧА \n"
-"setkey  изменить КЛЮЧ для закрытия ГРОБНИЦЫ (нужен старый ключ) \n"
-"engrave создает штрих-код для хранения КЛЮЧА на бумаге \n"
-"bury    спрятать КЛЮЧ в JPEG изображении exhume  извлечь КЛЮЧ из JPEG изображения \n"
-"\n"
-"Опции: \n"
-"\n"
-"-s     размер файла гробницы при создании/изменении размера (в Мб) \n"
-"-k     путь к ключу ('-k -' для чтения из stdin) \n"
-"-n     не обрабатывать события, найденные в гробнице \n"
-"-o     параметры монтирования при открытии (по умолчанию rw,noatime,nodev) \n"
-"-f     форсировать операцию (например, даже при активном swap) \n"
-"--kdf  сгенерировать пароли, устойчивые к атакам по словарю \n"
-"-h     показать эту справку \n"
-"-v     показать версию, лицензию и доступные шифры \n"
-"-q     выполнение без вывода информации на экран \n"
-"-D     вывести отладочную информацию при запуске\n"
-"\n"
-"Больше информации по Tomb вы можете найти в руководстве: man tomb\n"
-"Пожалуйста, сообщайте о найденных ошибках на <http://github.com/dyne/tomb/issues>."
-
-#. tomb internal messages
-#: _warning
-msgid "WARNING: we cannot ensure we're running in RAM."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно убедиться, что работа ведется в ОЗУ."
-
-#: _warning
-msgid "WARNING: no RAM available for me to run safely."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: недостаточно ОЗУ для безопасной работы."
-
-#: _failure
-msgid "No access to shared memory on this system, sorry."
-msgstr "Простите, нет доступа к разделяемой памяти на этой системе."
+#: _verbose
+#, fuzzy
+msgid "Created tempfile: ::1 temp file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
 
 #: _success
 msgid "All your swaps are belong to crypt.  Good."
@@ -111,8 +20,68 @@ msgstr "Весь swap принадлежит криптографии. Хоро
 msgid "Operation aborted."
 msgstr "Операция отменена."
 
+#: _verbose
+msgid "exec_as_user '::1 user::': ::2::"
+msgstr ""
+
+#: _verbose
+msgid "Using sudo for root execution of '::1 exec:: ::2 args::'."
+msgstr ""
+
+#: _verbose
+msgid "Escalating privileges using sudo-pwd."
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "is_valid_tomb ::1 tomb file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _warning
+msgid "Tomb file is missing from arguments."
+msgstr ""
+
+#: _warning
+#, fuzzy
+msgid "Tomb file not found: ::1 tomb file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is not a regular file: ::1 tomb file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is empty (zero length): ::1 tomb file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb file is not writable: ::1 tomb file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
 #: _warning
-msgid "Loop mount of volumes is not supported on this machine, this error"
+#, fuzzy
+msgid "File is not yet a tomb: ::1 tomb file::"
+msgstr "Приказано открыть гробницу ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "Tomb is currently in use: ::1 tomb name::"
+msgstr "Закрываю гробницу ::1 tomb name::"
+
+#: _message
+msgid "Valid tomb file found: ::1 tomb file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _failure
+msgid "Loopback mount called on invalid tomb: ::1 path::"
+msgstr ""
+
+#: _warning
+#, fuzzy
+msgid "Loop mount of volumes is not possible on this machine, this error"
 msgstr "Loop-монтирование томов не поддерживается на этой машине, эта ошибка"
 
 #: _warning
@@ -123,29 +92,261 @@ msgstr "часто возникает на VPS и ядрах, которые н
 msgid "It is impossible to use Tomb on this machine at this conditions."
 msgstr "Невозможно использовать Tomb на этой машине при таких условиях."
 
+#: _verbose
+msgid "lo_preserve on ::1 path::"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_file: ::1 tomb file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _verbose
+msgid "tomb_key: ::1 key:: chars long"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_key_file: ::1 key::"
+msgstr "Старый ключ: ::1 key::"
+
+#: _verbose
+msgid "tomb_secret: ::1 secret:: chars long"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "tomb_password: ::1 tomb pass::"
+msgstr "Гробница не найдена: ::1 tomb name::"
+
+#: _verbose
+#, fuzzy
+msgid "tomb_tempfiles: ::1 temp files::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _verbose
+msgid "tomb_loopdevs: ::1 loopdevs::"
+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>."
+
+#: _failure
+msgid "Cannot find ::1::. It's a requirement to use Tomb, please install it."
+msgstr ""
+
+#: _verbose
+msgid "is_valid_key"
+msgstr ""
+
+#: _warning
+msgid "is_valid_key() called without argument."
+msgstr ""
+
 #: _message
-msgid "Valid tomb file found: $1"
-msgstr "Найден верный файл гробницы: $1"
+msgid "Key is an image, it might be valid."
+msgstr ""
 
-#: _message -n
-msgid "Waiting for the key to be piped from stdin... "
-msgstr "Ожидание передачи ключа через stdin..."
+#: _message
+msgid "Key is valid."
+msgstr ""
+
+#: _warning
+msgid "Attempting key recovery."
+msgstr ""
 
 #: _failure
 msgid "This operation requires a key file to be specified using the -k option."
 msgstr "Эта операция требует указания файла ключа с помощью опции -k."
 
+#: _verbose
+msgid "load_key reading from stdin."
+msgstr ""
+
+#: _message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr "Ожидание передачи ключа через stdin..."
+
+#: _verbose
+msgid "load_key argument: ::1 opt::"
+msgstr ""
+
 #: _warning
 msgid "Key not found, specify one using -k."
 msgstr "Ключ не найден, укажите его с помощью опции -k."
 
+#: _verbose
+#, fuzzy
+msgid "load_key: ::1 key::"
+msgstr "Старый ключ: ::1 key::"
+
 #: _warning
-msgid "The key seems invalid, the application/pgp header is missing."
-msgstr "Ключ неверен, отсутствует заголовок application/pgp."
+msgid ""
+"The key seems invalid or its format is not known by this version of Tomb."
+msgstr ""
+
+#: _verbose
+msgid "GnuPG is version 1.4.11 - adopting status fix."
+msgstr ""
+
+#: _verbose
+msgid "get_lukskey"
+msgstr ""
+
+#: _verbose
+msgid "KDF: ::1 kdf::"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "No suitable program for KDF ::1 program::."
+msgstr "Нет подходящей программы для KDF ::1 kdf::."
+
+#: _verbose
+msgid "get_lukskey returns ::1::"
+msgstr ""
+
+#: _failure
+msgid "Internal error: ask_key_password() called before load_key()."
+msgstr ""
 
 #: _message
-msgid "A password is required to use key ${keyname}"
-msgstr "Для использования ключа ${keyname} требуется пароль"
+msgid "A password is required to use key ::1 key::"
+msgstr "Для использования ключа ::1 key:: требуется пароль"
 
 #: _warning
 msgid "User aborted password dialog."
@@ -155,13 +356,31 @@ msgstr "Пользователь отменил диалог пароля."
 msgid "Password OK."
 msgstr "Верный пароль."
 
+#: _verbose
+msgid "ask_key_password with tombpass: ::1 tomb pass::"
+msgstr ""
+
 #: _message
-msgid "Commanded to change password for tomb key $1"
-msgstr "Приказано изменить пароль для ключа $1"
+msgid "Commanded to change password for tomb key ::1 key::"
+msgstr "Приказано изменить пароль для ключа ::1 key::"
 
 #: _success
-msgid "Changing password for $keyfile"
-msgstr "Меняю пароль для $keyfile"
+#, fuzzy
+msgid "Changing password for ::1 key file::"
+msgstr "Меняю пароль для ::1 key::"
+
+#: _verbose
+msgid "tomb-old-pwd = ::1 old pass::"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "No valid password supplied."
+msgstr "Указан неверный пароль."
+
+#: _verbose
+msgid "tomb-pwd = ::1 new pass::"
+msgstr ""
 
 #: _failure
 msgid "Error: the newly generated keyfile does not seem valid."
@@ -171,26 +390,6 @@ msgstr "Ошибка: сгенерированный файл ключа нев
 msgid "Your passphrase was successfully updated."
 msgstr "Ваш пароль успешно обновлен."
 
-#: _message
-msgid "Removing key temporarily stored from stdin"
-msgstr "Удаляю ключ, временно принятый из stdin"
-
-#: _message
-msgid "Valid key file found: $1"
-msgstr "Найден верный файл ключа: $1"
-
-#: _warning
-msgid "Key data found with missing headers, attempting recovery."
-msgstr "Найдены данные ключа с отсутствующими заголовками, пытаюсь восстановить."
-
-#: _warning
-msgid "Invalid key format: $1"
-msgstr "Неверный формат ключа: $1"
-
-#: _failure
-msgid "No suitable program for KDF `cut -f 3 <<<$firstline`."
-msgstr "Нет подходящей программы для KDF `cut -f 3 <<<$firstline`."
-
 #: _failure
 msgid "User aborted."
 msgstr "Отменено пользователем."
@@ -199,30 +398,60 @@ msgstr "Отменено пользователем."
 msgid "You set empty password, which is not possible."
 msgstr "Вы указали пустой пароль, так нельзя."
 
+#: _verbose
+msgid "gen_key takes tombpass from CLI argument: ::1 tomb pass::"
+msgstr ""
+
 #: _failure
-msgid "Wrong argument for --kdf: must be an integer number (iteration seconds)."
-msgstr "Неверный аргумент для --kdf: должно быть указано целое число (секунд итерации)."
+msgid ""
+"Wrong argument for --kdf: must be an integer number (iteration seconds)."
+msgstr ""
+"Неверный аргумент для --kdf: должно быть указано целое число (секунд "
+"итерации)."
 
 #: _success
-msgid "Using KDF, iterations: $microseconds"
-msgstr "Использую KDF, итераций: $microseconds"
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr "Использую KDF, итераций: ::1 microseconds::"
+
+#: _message
+msgid "generating salt"
+msgstr ""
+
+#: _message
+msgid "calculating iterations"
+msgstr ""
+
+#: _message
+msgid "encoding the password"
+msgstr ""
 
 #: _failure
 msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
 msgstr "gpg (GnuPG) не найден, Tomb не может работать без него."
 
+#: _failure
+#, fuzzy
+msgid "Bury failed for invalid key: ::1 key::"
+msgstr "Найден верный файл ключа: ::1 key::"
+
 #: _warning
-msgid "Encode failed: $imagefile is not a jpeg image."
-msgstr "Шифрование не удалось: $imagefile не jpeg-изображение."
+msgid "Encode failed: ::1 image file:: is not a jpeg image."
+msgstr "Шифрование не удалось: ::1 image file:: не jpeg-изображение."
 
 #: _success
-msgid "Encoding key $tombkey inside image $imagefile"
-msgstr "Шифрую ключ $tombkey в изображение $imagefile"
+#, fuzzy
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+msgstr "Шифрую ключ ::1 key:: в изображение ::2 image file::"
 
 #: _message
 msgid "Please confirm the key password for the encoding"
 msgstr "Пожалуйста, подтвердите пароль ключа для шифрования"
 
+#: _verbose
+#, fuzzy
+msgid "tomb-pwd = ::1 tomb pass::"
+msgstr "Закрываю гробницу ::1 tomb name::"
+
 #: _warning
 msgid "Wrong password supplied."
 msgstr "Указан неверный пароль."
@@ -236,72 +465,94 @@ msgid "Encoding error: steghide reports problems."
 msgstr "Ошибка шифрования: steghide сообщает о проблемах."
 
 #: _success
-msgid "Tomb key encoded succesfully into image ${imagefile}"
-msgstr "Ключ от гробницы успешно зашифрован в изображении ${imagefile}"
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr "Ключ от гробницы успешно зашифрован в изображении ::1 image file::"
+
+#: _message
+msgid "printing exhumed key on stdout"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "Exhume failed, image file not found: ::1 image file::"
+msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#: _failure
+#, fuzzy
+msgid "Exhume failed: ::1 image file:: is not a jpeg image."
+msgstr "Шифрование не удалось: ::1 image file:: не jpeg-изображение."
+
+#: _failure
+msgid "Wrong password or no steganographic key found"
+msgstr ""
 
 #: _warning
-msgid "File exists: $tombkey"
-msgstr "Файл существует: $tombkey"
+#, fuzzy
+msgid "File exists: ::1 tomb key::"
+msgstr "Файл существует: ::1 key::"
 
 #: _warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Явно укажите опцию --force для перезаписи."
 
+#: _failure
+#, fuzzy
+msgid "Refusing to overwrite file. Operation aborted."
+msgstr "Создание этой гробницы перепишет существующий файл. Операция отменена."
+
 #: _warning
 msgid "Use of --force selected: overwriting."
 msgstr "Указана опция --force: перезаписываю."
 
 #: _message
-msgid "Trying to exhume a key out of image $imagefile"
-msgstr "Пытаюсь эксгумировать ключ из изображения $imagefile"
+msgid "Trying to exhume a key out of image ::1 image file::"
+msgstr "Пытаюсь эксгумировать ключ из изображения ::1 image file::"
 
-#: _success
-msgid "${tombkey} succesfully decoded."
-msgstr "${tombkey} успешно расшифрован."
+msgid "Key succesfully exhumed to ::1 key::."
+msgstr ""
 
 #: _warning
-msgid "Nothing found in $imagefile"
-msgstr "В $imagefile ничего не найдено"
+msgid "Nothing found in ::1 image file::"
+msgstr "В ::1 image file:: ничего не найдено"
+
+#: _failure
+msgid "No key specified."
+msgstr ""
 
 #: _success
-msgid "Rendering a printable QRCode for key: $tombkey"
-msgstr "Рендерю штрих-код для печати ключа: $tombkey"
+#, fuzzy
+msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+msgstr "Рендерю штрих-код для печати ключа: ::1 key::"
+
+#: _failure
+msgid "QREncode reported an error."
+msgstr ""
 
 #: _success
 msgid "Operation successful:"
 msgstr "Операция успешна:"
 
-#: _message
-msgid "`ls -lh $pngname`"
-msgstr "`ls -lh $pngname`"
-
-#: _message
-msgid "`file $pngname`"
-msgstr "`file $pngname`"
-
 #: _warning
 msgid "A filename needs to be specified using -k to forge a new key."
-msgstr "Необходимо указать имя файла через опцию -k, чтобы выковать новый ключ."
+msgstr ""
+"Необходимо указать имя файла через опцию -k, чтобы выковать новый ключ."
 
 #: _message
-msgid "Commanded to forge key $destkey"
-msgstr "Приказано выковать ключ $destkey"
+msgid "Commanded to forge key ::1 key::"
+msgstr "Приказано выковать ключ ::1 key::"
 
 #: _warning
 msgid "Forging this key would overwrite an existing file. Operation aborted."
 msgstr "Выковка этого ключа перезапишет существующий файл. Операция отменена."
 
 #: _failure
-msgid "Error creating temp dir."
-msgstr "Ошибка создания временной папки."
-
-#: _warning
-msgid "Cannot mount tmpfs filesystem in volatile memory."
-msgstr "Не могу примонтировать tmpfs в энергонезависимую память."
+msgid "`ls -lh $destkey`"
+msgstr ""
 
 #: _message
-msgid "Commanded to forge key $destkey with cipher algorithm $algo"
-msgstr "Приказано выковать ключ $destkey с алгоритмом шифрования $algo"
+msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
+msgstr ""
+"Приказано выковать ключ ::1 key:: с алгоритмом шифрования ::2 algorithm::"
 
 #: _message
 msgid "This operation takes time, keep using this computer on other tasks,"
@@ -319,13 +570,18 @@ msgstr "Чтобы ускорить операцию, подвигайте мы
 msgid "If you are on a server, you can use an Entropy Generation Daemon."
 msgstr "Если Вы на сервере, можно использовать демон генерации энтропии.."
 
+#: _verbose
+msgid "Data dump using ::1:: from ::2 source::"
+msgstr ""
+
 #: _warning
 msgid "Cannot generate encryption key."
 msgstr "Не могу сгенерировать ключ шифрования."
 
 #: _success
-msgid "Choose the password of your key: ${tombkey}"
-msgstr "Выберите пароль для ключа: ${tombkey}"
+#, fuzzy
+msgid "Choose the  password of your key: ::1 tomb key::"
+msgstr "Выберите пароль для ключа: ::1 key::"
 
 #: _message
 msgid "(You can also change it later using 'tomb passwd'.)"
@@ -344,16 +600,17 @@ msgid "--"
 msgstr "--"
 
 #: _message
-msgid "Done forging $tombkey"
-msgstr "Ключ выкован: $tombkey"
+msgid "Done forging ::1 key::"
+msgstr "Ключ выкован: ::1 key::"
 
 #: _success
 msgid "Your key is ready:"
 msgstr "Ваш ключ готов:"
 
 #: _message
-msgid "Commanded to dig tomb $1"
-msgstr "Приказано выкопать гробницу $1"
+#, fuzzy
+msgid "Commanded to dig tomb ::1 tomb name::"
+msgstr "Приказано выкопать гробницу ::1 tomb file::"
 
 #: _warning
 msgid "No tomb name specified for creation."
@@ -377,35 +634,42 @@ msgstr "Гробница существует. Я не буду копать з
 
 #: _warning
 msgid " `ls -lh ${tombdir}/${tombfile}`"
-msgstr " `ls -lh ${tombdir}/${tombfile}`"
+msgstr ""
 
 #: _success
-msgid "Creating a new tomb in ${tombdir}/${tombfile}"
-msgstr "Создаю новую гробницу в ${tombdir}/${tombfile}"
+#, fuzzy
+msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+msgstr "Создаю новую гробницу в ::1 dir::/::2 tomb file::"
 
 #: _message
-msgid "Generating ${tombfile} of ${tombsize}MiB"
-msgstr "Генерирую ${tombfile} размером ${tombsize)Мб"
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Генерирую ::1 tomb file:: размером ::2 size::Мб"
+
+#: _verbose
+msgid "Data dump using ::1:: from /dev/urandom"
+msgstr ""
 
 #: _failure
-msgid "Error creating the tomb ${tombdir}/${tombfile}, operation aborted."
-msgstr "Ошибка создания гробницы ${tombdir}/${tombfile}, операция отменена."
+#, fuzzy
+msgid ""
+"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+msgstr "Ошибка создания гробницы ::1 dir::/::2 tomb file::, операция отменена."
 
 #: _success
-msgid "Done digging $tombname"
-msgstr "Выкопана гробница $tombname"
+msgid "Done digging ::1 tomb name::"
+msgstr "Выкопана гробница ::1 tomb name::"
 
 #: _message
 msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
 msgstr "Ваша гробница пока не готова, необходимо выковать ключ и запереть ее:"
 
 #: _message
-msgid "tomb forge ${tombname}.tomb.key"
-msgstr "tomb forge ${tombname}.tomb.key"
+msgid "tomb forge ::1 tomb name::.tomb.key"
+msgstr "tomb forge ::1 tomb name::.tomb.key"
 
 #: _message
-msgid "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
-msgstr "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
+msgid "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
+msgstr "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
 
 #: _warning
 msgid "No tomb specified for locking."
@@ -416,13 +680,23 @@ msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Использование: tomb lock file.tomb file.tomb.key"
 
 #: _message
-msgid "Commanded to lock tomb ${tombfile}"
-msgstr "Приказано запереть гробницу ${tombfile}"
+msgid "Commanded to lock tomb ::1 tomb file::"
+msgstr "Приказано запереть гробницу ::1 tomb file::"
 
 #: _failure
 msgid "There is no tomb here. You have to it dig first."
 msgstr "Здесь нет гробницы. Сначала выкопайте ее."
 
+#: _verbose
+#, fuzzy
+msgid "Tomb found: ::1 tomb dir::/::2 tomb file::"
+msgstr "Создаю новую гробницу в ::1 dir::/::2 tomb file::"
+
+#: _verbose
+#, fuzzy
+msgid "Loop mounted on ::1 mount point::"
+msgstr "Не могу захлопнуть обработчик ::1 mount point::"
+
 #: _message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
 msgstr "Проверяю, пуста ли гробница (мы никогда не ходим по чужим костям)."
@@ -432,20 +706,27 @@ msgid "The tomb was already locked with another key."
 msgstr "Гробница уже заперта другим ключом."
 
 #: _failure
-msgid "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
-msgstr "Операция отменена. Я не могу запереть уже запертую гробницу. Выкопайте новую."
+msgid ""
+"Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
+msgstr ""
+"Операция отменена. Я не могу запереть уже запертую гробницу. Выкопайте новую."
 
 #: _message
 msgid "Fine, this tomb seems empty."
 msgstr "Так, эта гробница, вроде как, пуста."
 
+#: _failure
+msgid "Aborting operations: error loading key."
+msgstr ""
+
 #: _message
-msgid "Locking using cipher: $cipher"
-msgstr "Запираю, используя шифр $cipher"
+msgid "Locking using cipher: ::1 cipher::"
+msgstr "Запираю, используя шифр ::1 cipher::"
 
 #: _success
-msgid "Locking ${tombfile} with ${tombkey}"
-msgstr "Запираю ${tombfile} ключом ${tombkey}"
+#, fuzzy
+msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+msgstr "Запираю ::1 tomb file:: ключом ::1 key::"
 
 #: _message
 msgid "Formatting Luks mapped device."
@@ -455,6 +736,11 @@ msgstr "Форматирую устройство LUKS."
 msgid "cryptsetup luksFormat returned an error."
 msgstr "cryptsetup luksFormat вернул ошибку."
 
+#: _warning
+#, fuzzy
+msgid "cryptsetup luksOpen returned an error."
+msgstr "cryptsetup luksFormat вернул ошибку."
+
 #: _message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Форматирую Вашу гробницу в файловую систему Ext3/Ext4."
@@ -464,148 +750,292 @@ msgid "Tomb format returned an error."
 msgstr "Tomb format вернул ошибку."
 
 #: _warning
-msgid "Your tomb ${tombfile} may be corrupted."
-msgstr "Ваша гробница ${tombfile} может быть повреждена."
+msgid "Your tomb ::1 tomb file:: may be corrupted."
+msgstr "Ваша гробница ::1 tomb file:: может быть повреждена."
 
 #: _message
-msgid "Done locking $tombname using Luks dm-crypt ${create_cipher}"
-msgstr "Запер $tombname с помощью LUKS dm-cryps ${create_cipher}"
+#, fuzzy
+msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
+msgstr "Запер ::1 tomb name:: с помощью LUKS dm-cryps ::1 cipher::"
 
 #: _success
-msgid "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombkey}"
-msgstr "Ваша гробница подготовлена в ${tombdir}/${tombfile} и охраняется ключом ${tombkey}"
+#, fuzzy
+msgid ""
+"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
+"key ::3 tomb key::"
+msgstr ""
+"Ваша гробница подготовлена в ::1 dir::/::2 tomb file:: и охраняется "
+"ключом ::1 key::"
 
 #: _message
-msgid "Commanded to reset key for tomb $2"
-msgstr "Приказано сбросить ключ для гробницы $2"
+#, fuzzy
+msgid "Commanded to reset key for tomb ::1 tomb name::"
+msgstr "Приказано сбросить ключ для гробницы ::1 tomb file::"
+
+#: _warning
+msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
+msgstr ""
+
+#: _warning
+msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
+msgstr ""
+
+#: _failure
+#, fuzzy
+msgid "Execution aborted."
+msgstr "Операция отменена."
+
+#: _failure
+#, fuzzy
+msgid "Not a valid LUKS encrypted volume: ::1 volume::"
+msgstr "Эта гробница - верное зашифрованное устройство LUKS."
+
+#: _failure
+msgid "Aborting operations: error loading old key from arguments"
+msgstr ""
 
 #: _success
-msgid "Changing lock on tomb $tombname"
-msgstr "Меняю замок на гробнице $tombname"
+msgid "Changing lock on tomb ::1 tomb name::"
+msgstr "Меняю замок на гробнице ::1 tomb name::"
 
 #: _message
-msgid "Old key: $oldkey"
-msgstr "Старый ключ: $oldkey"
+#, fuzzy
+msgid "Old key: ::1 old key::"
+msgstr "Старый ключ: ::1 key::"
+
+#: _failure
+msgid "No valid password supplied for the old key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksOpen."
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading new key from -k"
+msgstr ""
 
 #: _message
-msgid "New key: $newkey"
-msgstr "Новый ключ: $newkey"
+msgid "New key: ::1 key::"
+msgstr "Новый ключ: ::1 key::"
+
+#: _failure
+msgid "No valid password supplied for the new key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksChangeKey."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksClose."
+msgstr ""
 
 #: _success
-msgid "Succesfully changed key for tomb: $2"
-msgstr "Смена ключа успешна для гробницы: $2"
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
+msgstr "Смена ключа успешна для гробницы: ::1 tomb file::"
 
 #: _message
-msgid "The new key is: $newkey"
-msgstr "Новый ключ: $newkey"
+#, fuzzy
+msgid "The new key is: ::1 new key::"
+msgstr "Новый ключ: ::1 key::"
+
+#: _verbose
+msgid "create_tomb(): ::1:: ::2::"
+msgstr ""
 
 #: _warning
-msgid "Creating this tomb would overwrite an existing file. Operation aborted."
+#, fuzzy
+msgid "Creating this tomb would overwrite an existing file."
 msgstr "Создание этой гробницы перепишет существующий файл. Операция отменена."
 
+#: _failure
+msgid "Failed to forge key, operation aborted."
+msgstr ""
+
+#: _failure
+msgid "Failed to lock tomb with key, operation aborted."
+msgstr ""
+
 #: _success
-msgid "Tomb $tombname succesfully created."
-msgstr "Гробница $tombname успешно создана."
+msgid "Tomb ::1 tomb name:: succesfully created."
+msgstr "Гробница ::1 tomb name:: успешно создана."
 
 #: _message
-msgid "Commanded to open tomb $1"
-msgstr "Приказано открыть гробницу $1"
+#, fuzzy
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Приказано открыть гробницу ::1 tomb file::"
+
+#: _warning
+#, fuzzy
+msgid "No tomb name specified for opening."
+msgstr "Не указано имя гробницы для изменения размера."
+
+#: _warning
+#, fuzzy
+msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+msgstr "::1 tomb file:: - неверное зашифрованное устройство LUSK."
+
+#: _failure
+msgid "Aborting operations: error loading key ::1 key::"
+msgstr ""
 
 #: _message
-msgid "Mountpoint not specified, using default: $tombmount"
-msgstr "Не указана точка монтирования, использую точку по умолчанию: $tombmount"
+msgid "Mountpoint not specified, using default: ::1 mount point::"
+msgstr ""
+"Не указана точка монтирования, использую точку по умолчанию: ::1 mount "
+"point::"
 
 #: _warning
-msgid "$tombname is already open."
-msgstr "$tombname уже открыт."
+msgid "::1 tomb name:: is already open."
+msgstr "::1 tomb name:: уже открыт."
 
 #: _message
 msgid "Here below its status is reported:"
 msgstr "Ниже назодится отчет о его статусе:"
 
 #: _success
-msgid "Opening $tombfile on $tombmount"
-msgstr "Открываю $tombfile в $tombmount"
-
-#: _failure
-msgid "Too many tombs open. Please close any of them to open another tomb."
-msgstr "Открыто слишком много гробниц. Пожалуйста, закройте какие-нибудь, чтобы открыть еще одну."
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Открываю ::1 tomb file:: в ::2 mount point::"
 
 #: _warning
-msgid "$tombfile is not a valid Luks encrypted storage file."
-msgstr "$tombfile - неверное зашифрованное устройство LUSK."
+msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
+msgstr "::1 tomb file:: - неверное зашифрованное устройство LUSK."
 
 #: _message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Эта гробница - верное зашифрованное устройство LUKS."
 
 #: _message
-msgid "Cipher is \"$tombdump[1]\" mode \"$tombdump[2]\" hash \"$tombdump[3]\""
-msgstr "Шифр \"$tombdump[1]\", режим \"$tombdump[2]\", хеш \"$tombdump[3]\""
+#, fuzzy
+msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
+msgstr "Шифр \"::1 cipher::\", режим \"::2 mode::\", хеш \"::3 hash::\""
+
+#: _warning
+msgid ""
+"Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "dev mapper device: ::1 mapper::"
+msgstr "e2fsck не смог проверить ::1 mapper::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb key: ::1 key::"
+msgstr "Старый ключ: ::1 key::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb name: ::1 tomb name:: (to be engraved)"
+msgstr "Гробница ::1 tomb name:: успешно создана."
 
 #: _failure
 msgid "Failure mounting the encrypted file."
 msgstr "Не удалось примонтировать зашифрованный файл."
 
 #: _success
-msgid "Success unlocking tomb $tombname"
-msgstr "Успешно открыта гробница $tombname"
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr "Успешно открыта гробница ::1 tomb name::"
+
+#: _verbose
+msgid "Key size is ::1 size:: for cipher ::2 cipher::"
+msgstr ""
 
 #: _message
-msgid "Checking filesystem via $tombstat[3]"
-msgstr "Проверк файловой системы через $tombstat[3]"
+msgid "Checking filesystem via ::1::"
+msgstr "Проверк файловой системы через ::1::"
+
+#: _verbose
+#, fuzzy
+msgid "Tomb engraved as ::1 tomb name::"
+msgstr "Закрываю гробницу ::1 tomb name::"
 
 #: _success
-msgid "Success opening $tombfile on $fg_bold[white]$tombmount$fg_no_bold[white]"
-msgstr "Успешно открыт $tombfile в $fg_bold[white]$tombmount$fg_no_bold[white]"
+#, fuzzy
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Открываю ::1 tomb file:: в ::2 mount point::"
 
 #: _message
-msgid "Last visit by $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] from $fg_bold[white]$tombtty$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
-msgstr "Последнее посещение: $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] из $fg_bold[white]$tombtty$fg_no_bold[white] на $fg_bold[white]$tombhost$fg_no_bold[white]"
+msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
+msgstr ""
 
 #: _message
-msgid "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
-msgstr "дата: $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+msgid "on date ::1 date::"
+msgstr ""
 
 #: _warning
 msgid "How pitiful!  A tomb, and no HOME."
 msgstr "Как жаль! Гробница есть, но нет HOME."
 
-#. Don't know how to correctly translate "bind hook".
 #: _warning
 #, fuzzy
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr "Невозможно выполнить обработчик события без примонтированной гробницы."
 
+#: _verbose
+#, fuzzy
+msgid "bind-hooks not found in ::1 mount point::"
+msgstr ""
+"Источник bind-hook не найден в гробнице,пропускаю ::1 mount point::/::2 dir::"
+
 #: _warning
 #, fuzzy
-msgid "bind-hooks map format: local/to/tomb local/to/HOME"
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
 msgstr "Формат bind-hooks: local/to/tomb local/to/HOME"
 
 #: _warning
 #, fuzzy
-msgid "bind-hooks map format: local/to/tomb local/to/HOME.  Rolling back"
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
 msgstr "Формат bind-hooks: local/to/tomb local/to/HOME.  Откат"
 
 #: _warning
 #, fuzzy
-msgid "bind-hook target not existent, skipping $HOME/${maps[$dir]}"
-msgstr "Цель bind-hook не существует, пропускаю $HOME/${maps[$dir]}"
+msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
+msgstr "Цель bind-hook не существует, пропускаю ::1 home::/::2 dir::"
 
 #: _warning
 #, fuzzy
-msgid "bind-hook source not found in tomb, skipping ${MOUNTPOINT}/${dir}"
-msgstr "Источник bind-hook не найден в гробнице,пропускаю ${MOUNTPOINT}/${dir}"
+msgid ""
+"bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
+msgstr ""
+"Источник bind-hook не найден в гробнице,пропускаю ::1 mount point::/::2 dir::"
 
 #: _success
 #, fuzzy
-msgid "Post hooks found, executing as user $SUDO_USER."
-msgstr "Найден пост-обработчик, выполняю от имени пользователя $SUDO_USER."
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr "Найден пост-обработчик, выполняю от имени пользователя ::1 user::."
+
+#: _failure
+#, fuzzy
+msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
+msgstr "Я не вижу открытых гробниц, да упокоятся они все с миром."
+
+#: _failure
+msgid "Internal error: list_tomb_binds called without argument."
+msgstr ""
+
+#: _failure
+msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
+msgstr ""
+
+#: _warning
+msgid "Cannot use GNU findutils for index/search commands."
+msgstr ""
+
+#: _failure
+msgid "Index command needs 'mlocate' to be installed."
+msgstr ""
+
+#: _verbose
+msgid "$updatedbver"
+msgstr ""
 
 #: _failure
 #, fuzzy
-msgid "There seems to be no open tomb engraved as [$1]"
-msgstr "Не похоже, что открыта гробница, гравированная как [$1]"
+msgid "There seems to be no open tomb engraved as [::1::]"
+msgstr "Не похоже, что открыта гробница, гравированная как [::1 tomb name::]"
 
 #: _failure
 msgid "I can't see any open tomb, may they all rest in peace."
@@ -615,41 +1045,56 @@ msgstr "Я не вижу открытых гробниц, да упокоятс
 msgid "Creating and updating search indexes."
 msgstr "Создаю и обновляю поисковые индексы."
 
+#: _verbose
+msgid "unoconv listener launched."
+msgstr ""
+
 #: _message
-msgid "Skipping $tombname (.noindex found)."
-msgstr "Пропускаю $tombname (найден файл .noindex)."
+msgid "Skipping ::1 tomb name:: (.noindex found)."
+msgstr "Пропускаю ::1 tomb name:: (найден файл .noindex)."
 
 #: _message
-msgid "Indexing $tombname filenames..."
-msgstr "Индексирую имена в $tombname..."
+msgid "Indexing ::1 tomb name:: filenames..."
+msgstr "Индексирую имена в ::1 tomb name::..."
 
 #: _message
-msgid "Indexing $tombname contents..."
-msgstr "Индексирую содержимое $tombname..."
+msgid "Indexing ::1 tomb name:: contents..."
+msgstr "Индексирую содержимое ::1 tomb name::..."
+
+#: _verbose
+#, fuzzy
+msgid "Using swish-e to create index."
+msgstr "Запустите 'tomb index' для создания индексов."
 
 #: _message
 msgid "Search index updated."
 msgstr "Поисковый индекс обновлен."
 
 #: _success
-msgid "Searching for: $fg_bold[white]${(f)@}$fg_no_bold[white]"
-msgstr "В поисках: $fg_bold[white]${(f)@}$fg_no_bold[white]"
+#, fuzzy
+msgid "Searching for: ::1::"
+msgstr "Проверк файловой системы через ::1::"
+
+#: _verbose
+#, fuzzy
+msgid "Checking for index: ::1::"
+msgstr "Проверк файловой системы через ::1::"
 
 #: _message
-msgid "Searching filenames in tomb $tombname"
-msgstr "Ищу в именах файлов гробницы $tombname"
+msgid "Searching filenames in tomb ::1 tomb name::"
+msgstr "Ищу в именах файлов гробницы ::1 tomb name::"
 
 #: _message
-msgid "Matches found: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
-msgstr "Найдены совпадения: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
+msgid "Matches found: ::1 matches::"
+msgstr "Найдены совпадения: ::1 matches::"
 
 #: _message
-msgid "Searching contents in tomb $tombname"
-msgstr "Ищу в содержимом гробницы $tombname"
+msgid "Searching contents in tomb ::1 tomb name::"
+msgstr "Ищу в содержимом гробницы ::1 tomb name::"
 
 #: _warning
-msgid "Skipping tomb $tombname: not indexed."
-msgstr "Пропускаю гробницу $tombname: она не индексирована."
+msgid "Skipping tomb ::1 tomb name::: not indexed."
+msgstr "Пропускаю гробницу ::1 tomb name::: она не индексирована."
 
 #: _warning
 msgid "Run 'tomb index' to create indexes."
@@ -660,24 +1105,33 @@ msgid "Search completed."
 msgstr "Поиск завершен."
 
 #: _message
-msgid "Commanded to resize tomb $1 to $opts[-s] megabytes."
-msgstr "Приказано изменить размер гробницы $1. Новый размер: $opts[-s] Мб."
+#, fuzzy
+msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
+msgstr ""
+"Приказано изменить размер гробницы ::1 tomb file::. Новый размер: ::2 size:: "
+"Мб."
 
 #: _failure
 msgid "No tomb name specified for resizing."
 msgstr "Не указано имя гробницы для изменения размера."
 
 #: _failure
-msgid "Cannot find $1"
-msgstr "Не могу найти $1"
+msgid "Cannot find ::1::"
+msgstr "Не могу найти ::1::"
 
 #: _failure
-msgid "The tomb $tombname is open, to resize it it needs to be closed."
-msgstr "Гробница $tombname открыта, для изменения ее размера ее необходимо закрыть."
+msgid "Aborting operations: new size was not specified, use -s"
+msgstr ""
+
+#: _failure
+msgid "The tomb ::1 tomb name:: is open, to resize it it needs to be closed."
+msgstr ""
+"Гробница ::1 tomb name:: открыта, для изменения ее размера ее необходимо "
+"закрыть."
 
 #: _failure
-msgid "You must specify the new size of $tombname"
-msgstr "Вы должны указать новый размер для $tombname"
+msgid "You must specify the new size of ::1 tomb name::"
+msgstr "Вы должны указать новый размер для ::1 tomb name::"
 
 #: _failure
 msgid "Size is not an integer."
@@ -687,21 +1141,23 @@ msgstr "Размер не целое число."
 msgid "The new size must be greater then old tomb size."
 msgstr "Новый размер гробницы должен быть больше старого."
 
-#: _message -n
-msgid "Generating ${tombfile} of ${newtombsize}MiB"
-msgstr "Генерирую ${tombfile} размеров ${newtombsize} Мб"
+#: _failure
+#, fuzzy
+msgid "Error creating the extra resize ::1 size::, operation aborted."
+msgstr "Ошибка создания гробницы ::1 dir::/::2 tomb file::, операция отменена."
 
 #: _failure
-msgid "Too many tombs opened. Please close any of them to open another tomb."
-msgstr "Открыто слишком много гробниц. Пожалуйста, закройте какие-нибудь, чтобы открыть новую."
+#, fuzzy
+msgid "cryptsetup failed to resize ::1 mapper::"
+msgstr "resize2fs не смог изменить размер ::1 mapper::"
 
 #: _failure
-msgid "e2fsck failed to check $mapper"
-msgstr "e2fsck не смог проверить $mapper"
+msgid "e2fsck failed to check ::1 mapper::"
+msgstr "e2fsck не смог проверить ::1 mapper::"
 
 #: _failure
-msgid "resize2fs failed to resize $mapper"
-msgstr "resize2fs не смог изменить размер $mapper"
+msgid "resize2fs failed to resize ::1 mapper::"
+msgstr "resize2fs не смог изменить размер ::1 mapper::"
 
 #: _warning
 msgid "There is no open tomb to be closed."
@@ -709,95 +1165,280 @@ msgstr "Нет открытой гробницы для закрытия."
 
 #: _warning
 msgid "Too many tombs mounted, please specify one (see tomb list)"
-msgstr "Примонтировано слишком много гробниц, пожалуйста, укажите точнее (см. tomb list)"
+msgstr ""
+"Примонтировано слишком много гробниц, пожалуйста, укажите точнее (см. tomb "
+"list)"
 
 #: _warning
 msgid "or issue the command 'tomb close all' to close them all."
 msgstr "или выполните команду 'tomb close all', чтобы закрыть их все."
 
 #: _message
-msgid "Tomb close $1"
-msgstr "Закрываю гробницу $1"
+#, fuzzy
+msgid "Tomb close ::1::"
+msgstr "Закрываю гробницу ::1 tomb name::"
+
+#: _verbose
+#, fuzzy
+msgid "Name: ::1 tomb name::"
+msgstr "Закрываю гробницу ::1 tomb name::"
+
+#: _verbose
+msgid "Mount: ::1 mount point::"
+msgstr ""
+
+#: _verbose
+msgid "Mapper: ::1 mapper::"
+msgstr ""
 
 #: _warning
-msgid "Tomb not found: $1"
-msgstr "Гробница не найдена: $1"
+#, fuzzy
+msgid "Tomb not found: ::1 tomb file::"
+msgstr "Гробница не найдена: ::1 tomb name::"
 
 #: _warning
 msgid "Please specify an existing tomb."
 msgstr "Пожалуйста, укажите существующую гробницу."
 
 #: _success
-msgid "Slamming tomb $tombname mounted on $tombmount"
-msgstr "Захлопываю гробницу $tombname, примонтированную на $tombmount"
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr ""
+"Захлопываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
 
 #: _message
 msgid "Kill all processes busy inside the tomb."
 msgstr "Убиваю все процессы, занятые в гробнице"
 
 #: _warning
-msgid "Cannot slam the tomb $tombname"
-msgstr "Не могу захлопнуть гробницу $tombname"
+msgid "Cannot slam the tomb ::1 tomb name::"
+msgstr "Не могу захлопнуть гробницу ::1 tomb name::"
 
 #: _message
-msgid "Closing tomb $tombname mounted on $tombmount"
-msgstr "Закрываю гробницу $tombname, примонтированную на $tombmount"
+msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr ""
+"Закрываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
 
 #: _message
 #, fuzzy
-msgid "Closing tomb bind hook: $bind_mount"
-msgstr "Закрываю обработчик событий гробницы: $bind_mount"
+msgid "Closing tomb bind hook: ::1 hook::"
+msgstr "Закрываю обработчик событий гробницы: ::1 hook::"
 
 #: _success
 #, fuzzy
 msgid "Slamming tomb: killing all processes using this hook."
-msgstr "Захлопываю гробницу: убиваю все процессы, использующие этот обработчик."
+msgstr ""
+"Захлопываю гробницу: убиваю все процессы, использующие этот обработчик."
 
 #: _warning
-msgid "Cannot slam the bind hook $bind_mount"
-msgstr "Не могу захлопнуть обработчик $bind_mount"
+#, fuzzy
+msgid "Cannot slam the bind hook ::1 hook::"
+msgstr "Не могу захлопнуть обработчик ::1 mount point::"
 
 #: _warning
-msgid "Tomb bind hook $bind_mount is busy, cannot close tomb."
-msgstr "Обработчик гробницы $bind_mount занят, не могу закрыть гробницу."
+#, fuzzy
+msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
+msgstr "Обработчик гробницы ::1 mount point:: занят, не могу закрыть гробницу."
+
+#: _verbose
+#, fuzzy
+msgid "Performing umount of ::1 mount point::"
+msgstr "Не могу захлопнуть обработчик ::1 mount point::"
 
 #: _warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "Гробница занята, не могу отмонтировать!"
 
 #: _warning
-msgid "Error occurred in cryptsetup luksClose ${mapper}"
-msgstr "Произошла ошибка cryptsetup luksClose ${mapper}"
+msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
+msgstr "Произошла ошибка cryptsetup luksClose ::1 mapper::"
 
 #: _success
-msgid "Tomb $tombname closed: your bones will rest in peace."
-msgstr "Гробница $tombname закрыта: пусть земля Вашим костям будет пухом."
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr ""
+"Гробница ::1 tomb name:: закрыта: пусть земля Вашим костям будет пухом."
+
+#: _verbose
+#, fuzzy
+msgid "Sending ::1:: to processes inside the tomb:"
+msgstr "Убиваю все процессы, занятые в гробнице"
 
 #: _failure
 msgid "Error parsing."
 msgstr "Ошибка парсинга."
 
 #: _warning
-msgid "There's no such command \"$subcommand\"."
-msgstr "Нет такой команды \"$subcommand\"."
+msgid "There's no such command \"::1 subcommand::\"."
+msgstr "Нет такой команды \"::1 subcommand::\"."
+
+#: _failure
+#, fuzzy
+msgid "Please try -h for help."
+msgstr "Используйте -h для вызова справки."
 
 #: _warning
 msgid "Some error occurred during option processing."
 msgstr "Произошла какая-то ошибка при обработке опций."
 
+#: _failure
+msgid "See \"tomb help\" for more info."
+msgstr ""
+
+#: _failure
+msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
+msgstr ""
+
+#: _failure
+msgid ""
+"You specified option ::1 option::, which is DANGEROUS and should only be "
+"used for testing\n"
+"If you really want so, add --unsecure-dev-mode"
+msgstr ""
+
+#: _verbose
+#, fuzzy
+msgid "Tomb command: ::1 subcommand:: ::2 param::"
+msgstr "Нет такой команды \"::1 subcommand::\"."
+
+#: _verbose
+msgid "Caller: uid[::1 uid::], gid[::2 gid::], tty[::3 tty::]."
+msgstr ""
+
+#: _failure
+msgid "QREncode not installed: cannot engrave keys on paper."
+msgstr ""
+
 #: _warning
-msgid "The create command is deprecated, please use dig, forge and lock instead."
+msgid ""
+"The create command is deprecated, please use dig, forge and lock instead."
 msgstr "Команда create устарела, пожалуйста, используйте dig, forge и lock."
 
 #: _warning
 msgid "For more informations see Tomb's manual page (man tomb)."
 msgstr "Для большей информации обратитесь к руководству Tomb (man tomb)."
 
+#: _failure
+msgid "Steghide not installed: cannot bury keys into images."
+msgstr ""
+
+#: _failure
+msgid "Steghide not installed: cannot exhume keys from images."
+msgstr ""
+
+#: _failure
+msgid "Resize2fs not installed: cannot resize tombs."
+msgstr ""
+
+#: _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 ""
+
 #: _warning
-msgid "Command \"$subcommand\" not recognized."
-msgstr "Команда \"$subcommand\" не распознана."
+msgid "Command \"::1 subcommand::\" not recognized."
+msgstr "Команда \"::1 subcommand::\" не распознана."
 
 #: _message
 msgid "Try -h for help."
 msgstr "Используйте -h для вызова справки."
 
+#~ msgid ""
+#~ "Success opening ::1 tomb file:: on $fg_bold[white]::2 mount point::"
+#~ "$fg_no_bold[white]"
+#~ msgstr ""
+#~ "Успешно открыт ::1 tomb file:: в $fg_bold[white]::2 mount point::"
+#~ "$fg_no_bold[white]"
+
+#, fuzzy
+#~ msgid ""
+#~ "Last visit by $fg_bold[white]::1 user::(::2 tomb "
+#~ "build::)$fg_no_bold[white] from $fg_bold[white]::3 tty::"
+#~ "$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
+#~ msgstr ""
+#~ "Последнее посещение: $fg_bold[white]::1 user::(::2 "
+#~ "build::)$fg_no_bold[white] из $fg_bold[white]::3 tty::$fg_no_bold[white] "
+#~ "на $fg_bold[white]::4 host::$fg_no_bold[white]"
+
+#, fuzzy
+#~ msgid "on date $fg_bold[white]::1 date::$fg_no_bold[white]"
+#~ msgstr "В поисках: $fg_bold[white]::1::$fg_no_bold[white]"
+
+#~ msgid "Searching for: $fg_bold[white]::1::$fg_no_bold[white]"
+#~ msgstr "В поисках: $fg_bold[white]::1::$fg_no_bold[white]"
+
+#~ msgid "WARNING: we cannot ensure we're running in RAM."
+#~ msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно убедиться, что работа ведется в ОЗУ."
+
+#~ msgid "WARNING: no RAM available for me to run safely."
+#~ msgstr "ПРЕДУПРЕЖДЕНИЕ: недостаточно ОЗУ для безопасной работы."
+
+#~ msgid "No access to shared memory on this system, sorry."
+#~ msgstr "Простите, нет доступа к разделяемой памяти на этой системе."
+
+#~ msgid "The key seems invalid, the application/pgp header is missing."
+#~ msgstr "Ключ неверен, отсутствует заголовок application/pgp."
+
+#~ msgid "Removing key temporarily stored from stdin"
+#~ msgstr "Удаляю ключ, временно принятый из stdin"
+
+#~ msgid "Key data found with missing headers, attempting recovery."
+#~ msgstr ""
+#~ "Найдены данные ключа с отсутствующими заголовками, пытаюсь восстановить."
+
+#~ msgid "Invalid key format: ::1 key::"
+#~ msgstr "Неверный формат ключа: ::1 key::"
+
+#~ msgid "::1 key:: succesfully decoded."
+#~ msgstr "::1 key:: успешно расшифрован."
+
+#~ msgid "Error creating temp dir."
+#~ msgstr "Ошибка создания временной папки."
+
+#~ msgid "Cannot mount tmpfs filesystem in volatile memory."
+#~ msgstr "Не могу примонтировать tmpfs в энергонезависимую память."
+
+#~ msgid "Too many tombs open. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Открыто слишком много гробниц. Пожалуйста, закройте какие-нибудь, чтобы "
+#~ "открыть еще одну."
+
+#~ msgid ""
+#~ "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+#~ msgstr ""
+#~ "дата: $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+
+#~ msgid ""
+#~ "Too many tombs opened. Please close any of them to open another tomb."
+#~ msgstr ""
+#~ "Открыто слишком много гробниц. Пожалуйста, закройте какие-нибудь, чтобы "
+#~ "открыть новую."
diff --git a/extras/po/tomb.pot b/extras/po/tomb.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tomb \n"
-"PO-Revision-Date: Mon Jun  9 12:32:43 CEST 2014\n"
+"PO-Revision-Date: Sat Sep 13 17:17:32 CEST 2014\n"
 "Last-Translator: Denis Roio <jaromil@dyne.org>\n"
 "Language: English\n"
 "Language-Team: Tomb developers <crypto@lists.dyne.org>\n"
@@ -14,81 +14,72 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#
-#: commandline help
-#
+#: _verbose
+msgid "Created tempfile: ::1 temp file::"
+msgstr ""
 
-msgid ""
-""
-"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"
-" resize  resize a TOMB to a new size -s (can only grow)"
-""
-" // Operations on keys:"
-" passwd  change the password of a KEY"
-" setkey  change the KEY locking a TOMB (needs old one)"
-" engrave makes a QR code of a KEY to be saved on paper"
-" bury    hide a KEY inside a JPEG image"
-" exhume  extract a KEY from a JPEG image"
-""
-"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)"
-" --kdf  generate passwords armored against dictionary attacks"
-""
-" -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>."
+#: _success
+msgid "All your swaps are belong to crypt.  Good."
 msgstr ""
 
-#
-# tomb internal messages
-#
+#: _failure
+msgid "Operation aborted."
+msgstr ""
+
+#: _verbose
+msgid "exec_as_user '::1 user::': ::2::"
+msgstr ""
+
+#: _verbose
+msgid "Using sudo for root execution of '::1 exec:: ::2 args::'."
+msgstr ""
+
+#: _verbose
+msgid "Escalating privileges using sudo-pwd."
+msgstr ""
+
+#: _verbose
+msgid "is_valid_tomb ::1 tomb file::"
+msgstr ""
 
 #: _warning
-msgid "WARNING: we cannot ensure we're running in RAM."
+msgid "Tomb file is missing from arguments."
 msgstr ""
 
 #: _warning
-msgid "WARNING: no RAM available for me to run safely."
+msgid "Tomb file not found: ::1 tomb file::"
 msgstr ""
 
-#: _failure
-msgid "No access to shared memory on this system, sorry."
+#: _warning
+msgid "Tomb file is not a regular file: ::1 tomb file::"
 msgstr ""
 
-#: _success
-msgid "All your swaps are belong to crypt.  Good."
+#: _warning
+msgid "Tomb file is empty (zero length): ::1 tomb file::"
+msgstr ""
+
+#: _warning
+msgid "Tomb file is not writable: ::1 tomb file::"
+msgstr ""
+
+#: _warning
+msgid "File is not yet a tomb: ::1 tomb file::"
+msgstr ""
+
+#: _warning
+msgid "Tomb is currently in use: ::1 tomb name::"
+msgstr ""
+
+#: _message
+msgid "Valid tomb file found: ::1 tomb file::"
 msgstr ""
 
 #: _failure
-msgid "Operation aborted."
+msgid "Loopback mount called on invalid tomb: ::1 path::"
 msgstr ""
 
 #: _warning
-msgid "Loop mount of volumes is not supported on this machine, this error"
+msgid "Loop mount of volumes is not possible on this machine, this error"
 msgstr ""
 
 #: _warning
@@ -99,72 +90,288 @@ msgstr ""
 msgid "It is impossible to use Tomb on this machine at this conditions."
 msgstr ""
 
+#: _verbose
+msgid "lo_preserve on ::1 path::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_file: ::1 tomb file::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_key: ::1 key:: chars long"
+msgstr ""
+
+#: _verbose
+msgid "tomb_key_file: ::1 key::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_secret: ::1 secret:: chars long"
+msgstr ""
+
+#: _verbose
+msgid "tomb_password: ::1 tomb pass::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_tempfiles: ::1 temp files::"
+msgstr ""
+
+#: _verbose
+msgid "tomb_loopdevs: ::1 loopdevs::"
+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 ""
+
+#: _failure
+msgid "Cannot find ::1::. It's a requirement to use Tomb, please install it."
+msgstr ""
+
+#: _verbose
+msgid "is_valid_key"
+msgstr ""
+
+#: _warning
+msgid "is_valid_key() called without argument."
+msgstr ""
+
 #: _message
-msgid "Valid tomb file found: $1"
+msgid "Key is an image, it might be valid."
 msgstr ""
 
-#: _message -n
-msgid "Waiting for the key to be piped from stdin... "
+#: _message
+msgid "Key is valid."
+msgstr ""
+
+#: _warning
+msgid "Attempting key recovery."
 msgstr ""
 
 #: _failure
 msgid "This operation requires a key file to be specified using the -k option."
 msgstr ""
 
+#: _verbose
+msgid "load_key reading from stdin."
+msgstr ""
+
+#: _message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr ""
+
+#: _verbose
+msgid "load_key argument: ::1 opt::"
+msgstr ""
+
 #: _warning
 msgid "Key not found, specify one using -k."
 msgstr ""
 
+#: _verbose
+msgid "load_key: ::1 key::"
+msgstr ""
+
 #: _warning
-msgid "The key seems invalid, the application/pgp header is missing."
+msgid "The key seems invalid or its format is not known by this version of Tomb."
 msgstr ""
 
-#: _message
-msgid "A password is required to use key ${keyname}"
+#: _verbose
+msgid "GnuPG is version 1.4.11 - adopting status fix."
 msgstr ""
 
-#: _warning
-msgid "User aborted password dialog."
+#: _verbose
+msgid "get_lukskey"
 msgstr ""
 
-#: _message
-msgid "Password OK."
+#: _verbose
+msgid "KDF: ::1 kdf::"
 msgstr ""
 
-#: _message
-msgid "Commanded to change password for tomb key $1"
+#: _failure
+msgid "No suitable program for KDF ::1 program::."
 msgstr ""
 
-#: _success
-msgid "Changing password for $keyfile"
+#: _verbose
+msgid "get_lukskey returns ::1::"
 msgstr ""
 
 #: _failure
-msgid "Error: the newly generated keyfile does not seem valid."
+msgid "Internal error: ask_key_password() called before load_key()."
 msgstr ""
 
-#: _success
-msgid "Your passphrase was successfully updated."
+#: _message
+msgid "A password is required to use key ::1 key::"
+msgstr ""
+
+#: _warning
+msgid "User aborted password dialog."
 msgstr ""
 
 #: _message
-msgid "Removing key temporarily stored from stdin"
+msgid "Password OK."
+msgstr ""
+
+#: _verbose
+msgid "ask_key_password with tombpass: ::1 tomb pass::"
 msgstr ""
 
 #: _message
-msgid "Valid key file found: $1"
+msgid "Commanded to change password for tomb key ::1 key::"
 msgstr ""
 
-#: _warning
-msgid "Key data found with missing headers, attempting recovery."
+#: _success
+msgid "Changing password for ::1 key file::"
 msgstr ""
 
-#: _warning
-msgid "Invalid key format: $1"
+#: _verbose
+msgid "tomb-old-pwd = ::1 old pass::"
 msgstr ""
 
 #: _failure
-msgid "No suitable program for KDF `cut -f 3 <<<$firstline`."
+msgid "No valid password supplied."
+msgstr ""
+
+#: _verbose
+msgid "tomb-pwd = ::1 new pass::"
+msgstr ""
+
+#: _failure
+msgid "Error: the newly generated keyfile does not seem valid."
+msgstr ""
+
+#: _success
+msgid "Your passphrase was successfully updated."
 msgstr ""
 
 #: _failure
@@ -175,30 +382,54 @@ msgstr ""
 msgid "You set empty password, which is not possible."
 msgstr ""
 
+#: _verbose
+msgid "gen_key takes tombpass from CLI argument: ::1 tomb pass::"
+msgstr ""
+
 #: _failure
 msgid "Wrong argument for --kdf: must be an integer number (iteration seconds)."
 msgstr ""
 
 #: _success
-msgid "Using KDF, iterations: $microseconds"
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr ""
+
+#: _message
+msgid "generating salt"
+msgstr ""
+
+#: _message
+msgid "calculating iterations"
+msgstr ""
+
+#: _message
+msgid "encoding the password"
 msgstr ""
 
 #: _failure
 msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
 msgstr ""
 
+#: _failure
+msgid "Bury failed for invalid key: ::1 key::"
+msgstr ""
+
 #: _warning
-msgid "Encode failed: $imagefile is not a jpeg image."
+msgid "Encode failed: ::1 image file:: is not a jpeg image."
 msgstr ""
 
 #: _success
-msgid "Encoding key $tombkey inside image $imagefile"
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
 msgstr ""
 
 #: _message
 msgid "Please confirm the key password for the encoding"
 msgstr ""
 
+#: _verbose
+msgid "tomb-pwd = ::1 tomb pass::"
+msgstr ""
+
 #: _warning
 msgid "Wrong password supplied."
 msgstr ""
@@ -212,47 +443,66 @@ msgid "Encoding error: steghide reports problems."
 msgstr ""
 
 #: _success
-msgid "Tomb key encoded succesfully into image ${imagefile}"
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr ""
+
+#: _message
+msgid "printing exhumed key on stdout"
+msgstr ""
+
+#: _failure
+msgid "Exhume failed, image file not found: ::1 image file::"
+msgstr ""
+
+#: _failure
+msgid "Exhume failed: ::1 image file:: is not a jpeg image."
+msgstr ""
+
+#: _failure
+msgid "Wrong password or no steganographic key found"
 msgstr ""
 
 #: _warning
-msgid "File exists: $tombkey"
+msgid "File exists: ::1 tomb key::"
 msgstr ""
 
 #: _warning
 msgid "Make explicit use of --force to overwrite."
 msgstr ""
 
+#: _failure
+msgid "Refusing to overwrite file. Operation aborted."
+msgstr ""
+
 #: _warning
 msgid "Use of --force selected: overwriting."
 msgstr ""
 
 #: _message
-msgid "Trying to exhume a key out of image $imagefile"
+msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr ""
 
-#: _success
-msgid "${tombkey} succesfully decoded."
+msgid "Key succesfully exhumed to ::1 key::."
 msgstr ""
 
 #: _warning
-msgid "Nothing found in $imagefile"
+msgid "Nothing found in ::1 image file::"
 msgstr ""
 
-#: _success
-msgid "Rendering a printable QRCode for key: $tombkey"
+#: _failure
+msgid "No key specified."
 msgstr ""
 
 #: _success
-msgid "Operation successful:"
+msgid "Rendering a printable QRCode for key: ::1 tomb key::"
 msgstr ""
 
-#: _message
-msgid "`ls -lh $pngname`"
+#: _failure
+msgid "QREncode reported an error."
 msgstr ""
 
-#: _message
-msgid "`file $pngname`"
+#: _success
+msgid "Operation successful:"
 msgstr ""
 
 #: _warning
@@ -260,7 +510,7 @@ msgid "A filename needs to be specified using -k to forge a new key."
 msgstr ""
 
 #: _message
-msgid "Commanded to forge key $destkey"
+msgid "Commanded to forge key ::1 key::"
 msgstr ""
 
 #: _warning
@@ -268,15 +518,11 @@ msgid "Forging this key would overwrite an existing file. Operation aborted."
 msgstr ""
 
 #: _failure
-msgid "Error creating temp dir."
-msgstr ""
-
-#: _warning
-msgid "Cannot mount tmpfs filesystem in volatile memory."
+msgid "`ls -lh $destkey`"
 msgstr ""
 
 #: _message
-msgid "Commanded to forge key $destkey with cipher algorithm $algo"
+msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
 msgstr ""
 
 #: _message
@@ -295,12 +541,16 @@ msgstr ""
 msgid "If you are on a server, you can use an Entropy Generation Daemon."
 msgstr ""
 
+#: _verbose
+msgid "Data dump using ::1:: from ::2 source::"
+msgstr ""
+
 #: _warning
 msgid "Cannot generate encryption key."
 msgstr ""
 
 #: _success
-msgid "Choose the password of your key: ${tombkey}"
+msgid "Choose the  password of your key: ::1 tomb key::"
 msgstr ""
 
 #: _message
@@ -320,7 +570,7 @@ msgid "--"
 msgstr ""
 
 #: _message
-msgid "Done forging $tombkey"
+msgid "Done forging ::1 key::"
 msgstr ""
 
 #: _success
@@ -328,7 +578,7 @@ msgid "Your key is ready:"
 msgstr ""
 
 #: _message
-msgid "Commanded to dig tomb $1"
+msgid "Commanded to dig tomb ::1 tomb name::"
 msgstr ""
 
 #: _warning
@@ -356,19 +606,23 @@ msgid " `ls -lh ${tombdir}/${tombfile}`"
 msgstr ""
 
 #: _success
-msgid "Creating a new tomb in ${tombdir}/${tombfile}"
+msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
 msgstr ""
 
 #: _message
-msgid "Generating ${tombfile} of ${tombsize}MiB"
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr ""
+
+#: _verbose
+msgid "Data dump using ::1:: from /dev/urandom"
 msgstr ""
 
 #: _failure
-msgid "Error creating the tomb ${tombdir}/${tombfile}, operation aborted."
+msgid "Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
 msgstr ""
 
 #: _success
-msgid "Done digging $tombname"
+msgid "Done digging ::1 tomb name::"
 msgstr ""
 
 #: _message
@@ -376,11 +630,11 @@ msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
 msgstr ""
 
 #: _message
-msgid "tomb forge ${tombname}.tomb.key"
+msgid "tomb forge ::1 tomb name::.tomb.key"
 msgstr ""
 
 #: _message
-msgid "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
+msgid "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key"
 msgstr ""
 
 #: _warning
@@ -392,13 +646,21 @@ msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr ""
 
 #: _message
-msgid "Commanded to lock tomb ${tombfile}"
+msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr ""
 
 #: _failure
 msgid "There is no tomb here. You have to it dig first."
 msgstr ""
 
+#: _verbose
+msgid "Tomb found: ::1 tomb dir::/::2 tomb file::"
+msgstr ""
+
+#: _verbose
+msgid "Loop mounted on ::1 mount point::"
+msgstr ""
+
 #: _message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
 msgstr ""
@@ -415,12 +677,16 @@ msgstr ""
 msgid "Fine, this tomb seems empty."
 msgstr ""
 
+#: _failure
+msgid "Aborting operations: error loading key."
+msgstr ""
+
 #: _message
-msgid "Locking using cipher: $cipher"
+msgid "Locking using cipher: ::1 cipher::"
 msgstr ""
 
 #: _success
-msgid "Locking ${tombfile} with ${tombkey}"
+msgid "Locking ::1 tomb file:: with ::2 tomb key::"
 msgstr ""
 
 #: _message
@@ -431,6 +697,10 @@ msgstr ""
 msgid "cryptsetup luksFormat returned an error."
 msgstr ""
 
+#: _warning
+msgid "cryptsetup luksOpen returned an error."
+msgstr ""
+
 #: _message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr ""
@@ -440,59 +710,127 @@ msgid "Tomb format returned an error."
 msgstr ""
 
 #: _warning
-msgid "Your tomb ${tombfile} may be corrupted."
+msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr ""
 
 #: _message
-msgid "Done locking $tombname using Luks dm-crypt ${create_cipher}"
+msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
 msgstr ""
 
 #: _success
-msgid "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombkey}"
+msgid "Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with key ::3 tomb key::"
 msgstr ""
 
 #: _message
-msgid "Commanded to reset key for tomb $2"
+msgid "Commanded to reset key for tomb ::1 tomb name::"
+msgstr ""
+
+#: _warning
+msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
+msgstr ""
+
+#: _warning
+msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
+msgstr ""
+
+#: _failure
+msgid "Execution aborted."
+msgstr ""
+
+#: _failure
+msgid "Not a valid LUKS encrypted volume: ::1 volume::"
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading old key from arguments"
 msgstr ""
 
 #: _success
-msgid "Changing lock on tomb $tombname"
+msgid "Changing lock on tomb ::1 tomb name::"
 msgstr ""
 
 #: _message
-msgid "Old key: $oldkey"
+msgid "Old key: ::1 old key::"
+msgstr ""
+
+#: _failure
+msgid "No valid password supplied for the old key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksOpen."
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading new key from -k"
 msgstr ""
 
 #: _message
-msgid "New key: $newkey"
+msgid "New key: ::1 key::"
+msgstr ""
+
+#: _failure
+msgid "No valid password supplied for the new key."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksChangeKey."
+msgstr ""
+
+#: _failure
+msgid "Unexpected error in luksClose."
 msgstr ""
 
 #: _success
-msgid "Succesfully changed key for tomb: $2"
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
 msgstr ""
 
 #: _message
-msgid "The new key is: $newkey"
+msgid "The new key is: ::1 new key::"
+msgstr ""
+
+#: _verbose
+msgid "create_tomb(): ::1:: ::2::"
 msgstr ""
 
 #: _warning
-msgid "Creating this tomb would overwrite an existing file. Operation aborted."
+msgid "Creating this tomb would overwrite an existing file."
+msgstr ""
+
+#: _failure
+msgid "Failed to forge key, operation aborted."
+msgstr ""
+
+#: _failure
+msgid "Failed to lock tomb with key, operation aborted."
 msgstr ""
 
 #: _success
-msgid "Tomb $tombname succesfully created."
+msgid "Tomb ::1 tomb name:: succesfully created."
 msgstr ""
 
 #: _message
-msgid "Commanded to open tomb $1"
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr ""
+
+#: _warning
+msgid "No tomb name specified for opening."
+msgstr ""
+
+#: _warning
+msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: error loading key ::1 key::"
 msgstr ""
 
 #: _message
-msgid "Mountpoint not specified, using default: $tombmount"
+msgid "Mountpoint not specified, using default: ::1 mount point::"
 msgstr ""
 
 #: _warning
-msgid "$tombname is already open."
+msgid "::1 tomb name:: is already open."
 msgstr ""
 
 #: _message
@@ -500,15 +838,11 @@ msgid "Here below its status is reported:"
 msgstr ""
 
 #: _success
-msgid "Opening $tombfile on $tombmount"
-msgstr ""
-
-#: _failure
-msgid "Too many tombs open. Please close any of them to open another tomb."
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
 msgstr ""
 
 #: _warning
-msgid "$tombfile is not a valid Luks encrypted storage file."
+msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
 msgstr ""
 
 #: _message
@@ -516,7 +850,23 @@ msgid "This tomb is a valid LUKS encrypted device."
 msgstr ""
 
 #: _message
-msgid "Cipher is \"$tombdump[1]\" mode \"$tombdump[2]\" hash \"$tombdump[3]\""
+msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
+msgstr ""
+
+#: _warning
+msgid "Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
+msgstr ""
+
+#: _verbose
+msgid "dev mapper device: ::1 mapper::"
+msgstr ""
+
+#: _verbose
+msgid "Tomb key: ::1 key::"
+msgstr ""
+
+#: _verbose
+msgid "Tomb name: ::1 tomb name:: (to be engraved)"
 msgstr ""
 
 #: _failure
@@ -524,23 +874,31 @@ msgid "Failure mounting the encrypted file."
 msgstr ""
 
 #: _success
-msgid "Success unlocking tomb $tombname"
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr ""
+
+#: _verbose
+msgid "Key size is ::1 size:: for cipher ::2 cipher::"
 msgstr ""
 
 #: _message
-msgid "Checking filesystem via $tombstat[3]"
+msgid "Checking filesystem via ::1::"
+msgstr ""
+
+#: _verbose
+msgid "Tomb engraved as ::1 tomb name::"
 msgstr ""
 
 #: _success
-msgid "Success opening $tombfile on $fg_bold[white]$tombmount$fg_no_bold[white]"
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
 msgstr ""
 
 #: _message
-msgid "Last visit by $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] from $fg_bold[white]$tombtty$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
+msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
 msgstr ""
 
 #: _message
-msgid "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+msgid "on date ::1 date::"
 msgstr ""
 
 #: _warning
@@ -551,28 +909,56 @@ msgstr ""
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr ""
 
+#: _verbose
+msgid "bind-hooks not found in ::1 mount point::"
+msgstr ""
+
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME"
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
 msgstr ""
 
 #: _warning
-msgid "bind-hooks map format: local/to/tomb local/to/HOME.  Rolling back"
+msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
 msgstr ""
 
 #: _warning
-msgid "bind-hook target not existent, skipping $HOME/${maps[$dir]}"
+msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
 msgstr ""
 
 #: _warning
-msgid "bind-hook source not found in tomb, skipping ${MOUNTPOINT}/${dir}"
+msgid "bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
 msgstr ""
 
 #: _success
-msgid "Post hooks found, executing as user $SUDO_USER."
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr ""
+
+#: _failure
+msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
+msgstr ""
+
+#: _failure
+msgid "Internal error: list_tomb_binds called without argument."
+msgstr ""
+
+#: _failure
+msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
+msgstr ""
+
+#: _warning
+msgid "Cannot use GNU findutils for index/search commands."
 msgstr ""
 
 #: _failure
-msgid "There seems to be no open tomb engraved as [$1]"
+msgid "Index command needs 'mlocate' to be installed."
+msgstr ""
+
+#: _verbose
+msgid "$updatedbver"
+msgstr ""
+
+#: _failure
+msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr ""
 
 #: _failure
@@ -583,16 +969,24 @@ msgstr ""
 msgid "Creating and updating search indexes."
 msgstr ""
 
+#: _verbose
+msgid "unoconv listener launched."
+msgstr ""
+
 #: _message
-msgid "Skipping $tombname (.noindex found)."
+msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr ""
 
 #: _message
-msgid "Indexing $tombname filenames..."
+msgid "Indexing ::1 tomb name:: filenames..."
 msgstr ""
 
 #: _message
-msgid "Indexing $tombname contents..."
+msgid "Indexing ::1 tomb name:: contents..."
+msgstr ""
+
+#: _verbose
+msgid "Using swish-e to create index."
 msgstr ""
 
 #: _message
@@ -600,23 +994,27 @@ msgid "Search index updated."
 msgstr ""
 
 #: _success
-msgid "Searching for: $fg_bold[white]${(f)@}$fg_no_bold[white]"
+msgid "Searching for: ::1::"
+msgstr ""
+
+#: _verbose
+msgid "Checking for index: ::1::"
 msgstr ""
 
 #: _message
-msgid "Searching filenames in tomb $tombname"
+msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr ""
 
 #: _message
-msgid "Matches found: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
+msgid "Matches found: ::1 matches::"
 msgstr ""
 
 #: _message
-msgid "Searching contents in tomb $tombname"
+msgid "Searching contents in tomb ::1 tomb name::"
 msgstr ""
 
 #: _warning
-msgid "Skipping tomb $tombname: not indexed."
+msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr ""
 
 #: _warning
@@ -628,7 +1026,7 @@ msgid "Search completed."
 msgstr ""
 
 #: _message
-msgid "Commanded to resize tomb $1 to $opts[-s] megabytes."
+msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
 msgstr ""
 
 #: _failure
@@ -636,15 +1034,19 @@ msgid "No tomb name specified for resizing."
 msgstr ""
 
 #: _failure
-msgid "Cannot find $1"
+msgid "Cannot find ::1::"
+msgstr ""
+
+#: _failure
+msgid "Aborting operations: new size was not specified, use -s"
 msgstr ""
 
 #: _failure
-msgid "The tomb $tombname is open, to resize it it needs to be closed."
+msgid "The tomb ::1 tomb name:: is open, to resize it it needs to be closed."
 msgstr ""
 
 #: _failure
-msgid "You must specify the new size of $tombname"
+msgid "You must specify the new size of ::1 tomb name::"
 msgstr ""
 
 #: _failure
@@ -655,20 +1057,20 @@ msgstr ""
 msgid "The new size must be greater then old tomb size."
 msgstr ""
 
-#: _message -n
-msgid "Generating ${tombfile} of ${newtombsize}MiB"
+#: _failure
+msgid "Error creating the extra resize ::1 size::, operation aborted."
 msgstr ""
 
 #: _failure
-msgid "Too many tombs opened. Please close any of them to open another tomb."
+msgid "cryptsetup failed to resize ::1 mapper::"
 msgstr ""
 
 #: _failure
-msgid "e2fsck failed to check $mapper"
+msgid "e2fsck failed to check ::1 mapper::"
 msgstr ""
 
 #: _failure
-msgid "resize2fs failed to resize $mapper"
+msgid "resize2fs failed to resize ::1 mapper::"
 msgstr ""
 
 #: _warning
@@ -684,11 +1086,23 @@ msgid "or issue the command 'tomb close all' to close them all."
 msgstr ""
 
 #: _message
-msgid "Tomb close $1"
+msgid "Tomb close ::1::"
+msgstr ""
+
+#: _verbose
+msgid "Name: ::1 tomb name::"
+msgstr ""
+
+#: _verbose
+msgid "Mount: ::1 mount point::"
+msgstr ""
+
+#: _verbose
+msgid "Mapper: ::1 mapper::"
 msgstr ""
 
 #: _warning
-msgid "Tomb not found: $1"
+msgid "Tomb not found: ::1 tomb file::"
 msgstr ""
 
 #: _warning
@@ -696,7 +1110,7 @@ msgid "Please specify an existing tomb."
 msgstr ""
 
 #: _success
-msgid "Slamming tomb $tombname mounted on $tombmount"
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
 msgstr ""
 
 #: _message
@@ -704,15 +1118,15 @@ msgid "Kill all processes busy inside the tomb."
 msgstr ""
 
 #: _warning
-msgid "Cannot slam the tomb $tombname"
+msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr ""
 
 #: _message
-msgid "Closing tomb $tombname mounted on $tombmount"
+msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
 msgstr ""
 
 #: _message
-msgid "Closing tomb bind hook: $bind_mount"
+msgid "Closing tomb bind hook: ::1 hook::"
 msgstr ""
 
 #: _success
@@ -720,11 +1134,15 @@ msgid "Slamming tomb: killing all processes using this hook."
 msgstr ""
 
 #: _warning
-msgid "Cannot slam the bind hook $bind_mount"
+msgid "Cannot slam the bind hook ::1 hook::"
 msgstr ""
 
 #: _warning
-msgid "Tomb bind hook $bind_mount is busy, cannot close tomb."
+msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
+msgstr ""
+
+#: _verbose
+msgid "Performing umount of ::1 mount point::"
 msgstr ""
 
 #: _warning
@@ -732,11 +1150,15 @@ msgid "Tomb is busy, cannot umount!"
 msgstr ""
 
 #: _warning
-msgid "Error occurred in cryptsetup luksClose ${mapper}"
+msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
 msgstr ""
 
 #: _success
-msgid "Tomb $tombname closed: your bones will rest in peace."
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr ""
+
+#: _verbose
+msgid "Sending ::1:: to processes inside the tomb:"
 msgstr ""
 
 #: _failure
@@ -744,13 +1166,41 @@ msgid "Error parsing."
 msgstr ""
 
 #: _warning
-msgid "There's no such command \"$subcommand\"."
+msgid "There's no such command \"::1 subcommand::\"."
+msgstr ""
+
+#: _failure
+msgid "Please try -h for help."
 msgstr ""
 
 #: _warning
 msgid "Some error occurred during option processing."
 msgstr ""
 
+#: _failure
+msgid "See \"tomb help\" for more info."
+msgstr ""
+
+#: _failure
+msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
+msgstr ""
+
+#: _failure
+msgid "You specified option ::1 option::, which is DANGEROUS and should only be used for testing\nIf you really want so, add --unsecure-dev-mode"
+msgstr ""
+
+#: _verbose
+msgid "Tomb command: ::1 subcommand:: ::2 param::"
+msgstr ""
+
+#: _verbose
+msgid "Caller: uid[::1 uid::], gid[::2 gid::], tty[::3 tty::]."
+msgstr ""
+
+#: _failure
+msgid "QREncode not installed: cannot engrave keys on paper."
+msgstr ""
+
 #: _warning
 msgid "The create command is deprecated, please use dig, forge and lock instead."
 msgstr ""
@@ -759,8 +1209,56 @@ msgstr ""
 msgid "For more informations see Tomb's manual page (man tomb)."
 msgstr ""
 
+#: _failure
+msgid "Steghide not installed: cannot bury keys into images."
+msgstr ""
+
+#: _failure
+msgid "Steghide not installed: cannot exhume keys from images."
+msgstr ""
+
+#: _failure
+msgid "Resize2fs not installed: cannot resize tombs."
+msgstr ""
+
+#: _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 ""
+
 #: _warning
-msgid "Command \"$subcommand\" not recognized."
+msgid "Command \"::1 subcommand::\" not recognized."
 msgstr ""
 
 #: _message
diff --git a/tomb b/tomb
@@ -154,14 +154,14 @@ tmp_create() {
     local tfile="${TMPPREFIX}${RANDOM}"
     touch "$tfile"
     [[ $? = 0 ]] || {
-        fatal "Fatal error creating a temporary file: $tfile"
+        fatal "Fatal error creating a temporary file: ::1 temp file::" $tfile
         return 1 }
     chown "$_uid":"$_gid" "$tfile"
     chmod 0600 "$tfile"
     [[ $? = 0 ]] || {
-        fatal "Fatal error setting permissions on temporary file: $tfile"
+        fatal "Fatal error setting permissions on temporary file: ::1 temp file::" $tfile
         return 1 }
-    _verbose "created tempfile: $tfile"
+    _verbose "Created tempfile: ::1 temp file::" $tfile
     tomb_tempfiles+=($tfile)
     return 0
 }
@@ -273,7 +273,7 @@ exec_as_user() {
         exec $@[@]
         return $?
     fi
-    _verbose "exec_as_user '$SUDO_USER': ${(f)@}"
+    _verbose "exec_as_user '::1 user::': ::2::" $SUDO_USER ${(f)@}
     sudo -u $SUDO_USER "${@[@]}"
     return $?
 }
@@ -283,7 +283,7 @@ check_priv() {
     # save original user
     username=$USER
     if [ $UID != 0 ]; then
-        _verbose "Using sudo for root execution of '${TOMBEXEC} ${(f)OLDARGS}'."
+        _verbose "Using sudo for root execution of '::1 exec:: ::2 args::'." $TOMBEXEC ${(f)OLDARGS}
         # check if sudo has a timestamp active
         sudok=false
 
@@ -315,31 +315,31 @@ EOF
 
 # check if a filename is a valid tomb
 is_valid_tomb() {
-    _verbose "is_valid_tomb $1"
+    _verbose "is_valid_tomb ::1 tomb file::" $1
     # argument check
     { test "$1" = "" } && {
         _warning "Tomb file is missing from arguments."; return 1 }
     # file checks
     { test -r "$1" } || {
-        _warning "Tomb file not found: $1"; return 1 }
+        _warning "Tomb file not found: ::1 tomb file::" $1; return 1 }
     { test -f "$1" } || {
-        _warning "Tomb file is not a regular file: $1"; return 1 }
+        _warning "Tomb file is not a regular file: ::1 tomb file::" $1; return 1 }
     { test -s "$1" } || {
-        _warning "Tomb file is empty (zero length): $1"; return 1 }
+        _warning "Tomb file is empty (zero length): ::1 tomb file::" $1; return 1 }
     { test -w "$1" } || {
-        _warning "Tomb file is not writable: $1"; return 1 }
+        _warning "Tomb file is not writable: ::1 tomb file::" $1; return 1 }
 
     # check file type (if its a Luks fs)
     file "$1" | grep -i "luks encrypted file" > /dev/null || {
-        _warning "File is not yet a tomb: $1" }
+        _warning "File is not yet a tomb: ::1 tomb file::" $1}
 
     # check if its already open
     tombfile=`basename $1`
     tombname=${tombfile%%\.*}
     mount -l | grep "${tombfile}.*\[$tombname\]$" > /dev/null
     { test $? = 0 } && {
-        _warning "Tomb is currently in use: $tombname"; return 1 }
-    _message "Valid tomb file found: $1"
+        _warning "Tomb is currently in use: ::1 tomb name::" $tombname; return 1 }
+    _message "Valid tomb file found: ::1 tomb file::" $1
     return 0
 }
 
@@ -347,7 +347,7 @@ is_valid_tomb() {
 lo_mount() {
     tpath="$1"
     is_valid_tomb "$tpath" || {
-        _failure "Loopback mount called on invalid tomb: $tpath" }
+        _failure "Loopback mount called on invalid tomb: ::1 path::" $tpath }
 
     # check if we have support for loop mounting
     losetup -f >& -
@@ -372,96 +372,79 @@ lo_new() { print - "${tomb_loopdevs[${#tomb_loopdevs}]}" }
 
 # $1 is the path to the lodev to be preserved after quit
 lo_preserve() {
-    _verbose "lo_preserve on $1"
+    _verbose "lo_preserve on ::1 path::" $1
     # remove the lodev from the tomb_lodevs array
     tomb_loopdevs=("${(@)tomb_loopdevs:#$1}")
 }
 
 # eventually used for debugging
 dump_secrets() {
-    _verbose "tomb_file: $tomb_file"
-    _verbose "tomb_key: ${#tomb_key} chars long"
-    _verbose "tomb_key_file: $tomb_key_file"
-    _verbose "tomb_secret: ${#tomb_secret} chars long"
-    _verbose "tomb_password: $tomb_password"
-
-    _verbose "tomb_tempfiles: ${(@)tomb_tempfiles}"
-    _verbose "tomb_loopdevs: ${(@)tomb_loopdevs}"
+    _verbose "tomb_file: ::1 tomb file::" $tomb_file
+    _verbose "tomb_key: ::1 key:: chars long" ${#tomb_key}
+    _verbose "tomb_key_file: ::1 key::" $tomb_key_file
+    _verbose "tomb_secret: ::1 secret:: chars long" ${#tomb_secret}
+    _verbose "tomb_password: ::1 tomb pass::" $tomb_password
+
+    _verbose "tomb_tempfiles: ::1 temp files::" ${(@)tomb_tempfiles}
+    _verbose "tomb_loopdevs: ::1 loopdevs::" ${(@)tomb_loopdevs}
 }
 # }}}
 
 # {{{ 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
-    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 " bury    hide a KEY inside a JPEG image"
+_print " exhume  extract a KEY from a JPEG image"
+    fi
+_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>."
 }
 
 
@@ -492,6 +475,11 @@ option_value() {
 # Messaging function with pretty coloring
 function _msg() {
     local msg="$(gettext -s "$2")"
+    for i in $(seq 3 ${#});
+    do
+        msg=${(S)msg//::$(($i - 2))*::/$*[$i]}
+    done
+
     local command="print -P"
     local progname="$fg[magenta]${TOMBEXEC##*/}$reset_color"
     local message="$fg_bold[normal]$fg_no_bold[normal]$msg$reset_color"
@@ -517,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\""
@@ -530,32 +521,37 @@ function _msg() {
 function _message say() {
     local notice="message"
     [[ "$1" = "-n" ]] && shift && notice="inline"
-    option_is_set -q || _msg "$notice" "$1"
+    option_is_set -q || _msg "$notice" $@
     return 0
 }
 
 function _verbose xxx() {
-    option_is_set -D && _msg verbose "$1"
+    option_is_set -D && _msg verbose $@
     return 0
 }
 
 function _success yes() {
-    option_is_set -q || _msg success "$1"
+    option_is_set -q || _msg success $@
     return 0
 }
 
 function _warning  no() {
-    option_is_set -q || _msg warning "$1"
+    option_is_set -q || _msg warning $@
     return 1
 }
 
 function _failure die() {
-    typeset -i exitcode=${2:-1}
-    option_is_set -q || _msg failure "$1"
+    typeset -i exitcode=${exitv:-1}
+    option_is_set -q || _msg failure $@
     # be sure we forget the secrets we were told
     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"
@@ -582,7 +578,7 @@ progress() {
 check_bin() {
     # check for required programs
     for req in cryptsetup pinentry sudo gpg; do
-        command -v $req >& - || _failure "Cannot find $req. It's a requirement to use Tomb, please install it." 1
+        command -v $req >& - || exitv=1 _failure "Cannot find ::1::. It's a requirement to use Tomb, please install it." $req
     done
 
     export PATH=/sbin:/usr/sbin:$PATH
@@ -671,7 +667,7 @@ load_key() {
         tomb_key_file=stdin
         tomb_key=`cat`
     else
-        _verbose "load_key argument: $keyopt"
+        _verbose "load_key argument: ::1 opt::" $keyopt
         # take key from a file
         tomb_key_file="$keyopt"
         { test -r "${tomb_key_file}" } || {
@@ -680,7 +676,7 @@ load_key() {
         tomb_key=`cat $tomb_key_file`
     fi
 
-    _verbose "load_key: ${tomb_key_file}"
+    _verbose "load_key: ::1 key::" $tomb_key_file
 
     is_valid_key "${tomb_key}" || {
         _warning "The key seems invalid or its format is not known by this version of Tomb."
@@ -744,14 +740,14 @@ get_lukskey() {
 
     # key is KDF encoded
     if [[ $firstline =~ '^_KDF_' ]]; then
-        _verbose "KDF: `cut -d_ -f 3 <<<$firstline`"
+        _verbose "KDF: ::1 kdf::" $(cut -d_ -f 3 <<<$firstline)
         case `cut -d_ -f 3 <<<$firstline` in
             pbkdf2sha1)
                 pbkdf2_param=`cut -d_ -f 4- <<<$firstline | tr '_' ' '`
                 _password=$(tomb-kdb-pbkdf2 ${=pbkdf2_param} 2>/dev/null <<<$_password)
                 ;;
             *)
-                _failure "No suitable program for KDF `cut -f 3 <<<$firstline`."
+                _failure "No suitable program for KDF ::1 program::." $(cut -f 3 <<<$firstline)
                 unset _password
                 return 1
                 ;;
@@ -769,7 +765,7 @@ get_lukskey() {
 
     ret="$?"
 
-    _verbose "get_lukskey returns $ret"
+    _verbose "get_lukskey returns ::1::" $ret
     return $ret
 }
 
@@ -781,7 +777,7 @@ ask_key_password() {
         _failure "Internal error: ask_key_password() called before load_key()." }
 
     keyname="$tomb_key_file"
-    _message "A password is required to use key ${keyname}"
+    _message "A password is required to use key ::1 key::" $keyname
     passok=0
     tombpass=""
     if [[ "$1" = "" ]]; then
@@ -807,7 +803,7 @@ ask_key_password() {
     else
         # if a second argument is present then the password is already known
         tombpass="$1"
-        _verbose "ask_key_password with tombpass: $tombpass"
+        _verbose "ask_key_password with tombpass: ::1 tomb pass::" $tombpass
 
         get_lukskey "$tombpass"
 
@@ -824,7 +820,7 @@ ask_key_password() {
 
 # change tomb key password
 change_passwd() {
-    _message "Commanded to change password for tomb key $1"
+    _message "Commanded to change password for tomb key ::1 key::" $1
     _check_swap
 
     load_key
@@ -835,12 +831,12 @@ change_passwd() {
     tmp_create
     tmpnewkey=`tmp_new`
 
-    _success "Changing password for $keyfile"
+    _success "Changing password for ::1 key file::" $keyfile
 
 
     if option_is_set --tomb-old-pwd; then
         tomb_old_pwd="`option_value --tomb-old-pwd`"
-        _verbose "tomb-old-pwd = $tomb_old_pwd"
+        _verbose "tomb-old-pwd = ::1 old pass::" $tomb_old_pwd
         ask_key_password "$tomb_old_pwd"
     else
         ask_key_password
@@ -853,7 +849,7 @@ change_passwd() {
 
     if option_is_set --tomb-pwd; then
         tomb_new_pwd="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tomb_new_pwd"
+        _verbose "tomb-pwd = ::1 new pass::" $tomb_new_pwd
         gen_key "$tomb_new_pwd" >> "$tmpnewkey"
     else
         gen_key >> "$tmpnewkey"
@@ -906,7 +902,7 @@ gen_key() {
         done
     else
         tombpass="$1"
-        _verbose "gen_key takes tombpass from CLI argument: $tombpass"
+        _verbose "gen_key takes tombpass from CLI argument: ::1 tomb pass::" $tombpass
     fi
 
     header=""
@@ -924,7 +920,7 @@ gen_key() {
             # --kdf takes one parameter: iter time (on present machine) in seconds
             local -i microseconds
             microseconds=$(( itertime * 10000 ))
-            _success "Using KDF, iterations: $microseconds"
+            _success "Using KDF, iterations: ::1 microseconds::" $microseconds
             _message "generating salt"
             pbkdf2_salt=`tomb-kdb-pbkdf2-gensalt`
             _message "calculating iterations"
@@ -978,17 +974,17 @@ BEGIN { ciphers=0 }
 bury_key() {
     load_key
     [[ $? = 0 ]] || {
-       _failure "Bury failed for invalid key: $tomb_key_file" }
+       _failure "Bury failed for invalid key: ::1 key::" $tomb_key_file }
 
     imagefile=$1
 
     file $imagefile | grep -i JPEG > /dev/null
     if [ $? != 0 ]; then
-       _warning "Encode failed: $imagefile is not a jpeg image."
+       _warning "Encode failed: ::1 image file:: is not a jpeg image." $imagefile
        return 1
     fi
 
-    _success "Encoding key $tombkey inside image $imagefile"
+    _success "Encoding key ::1 tomb key:: inside image ::2 image file::" $tombkey $imagefile
     _message "Please confirm the key password for the encoding"
     # We ask the password and test if it is the same encoding the
     # base key, to insure that the same password is used for the
@@ -999,7 +995,7 @@ bury_key() {
 
     if option_is_set --tomb-pwd; then
         tomb_pwd="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tomb_pwd"
+        _verbose "tomb-pwd = ::1 tomb pass::" $tomb_pwd
         ask_key_password "$tomb_pwd"
     else
         ask_key_password
@@ -1021,7 +1017,7 @@ bury_key() {
        _warning "Encoding error: steghide reports problems."
        res=1
     else
-       _success "Tomb key encoded succesfully into image ${imagefile}"
+       _success "Tomb key encoded succesfully into image ::1 image file::" $imagefile
        res=0
     fi
 
@@ -1048,10 +1044,10 @@ exhume_key() {
     }
 
     { test -r "$imagefile" } || {
-        _failure "Exhume failed, image file not found: $imagefile" }
+        _failure "Exhume failed, image file not found: ::1 image file::" $imagefile }
 
     [[ `file "$imagefile"` =~ "JP.G" ]] || {
-        _failure "Exhume failed: $imagefile is not a jpeg image." }
+        _failure "Exhume failed: ::1 image file:: is not a jpeg image." $imagefile }
 
     # when a password is passed as argument then always print out
     # the exhumed key on stdout without further checks (internal use)
@@ -1066,7 +1062,7 @@ exhume_key() {
 
     { test "$destkey" = "-" } || {
         if [[ -s "$destkey" ]]; then
-            _warning "File exists: $destkey"
+            _warning "File exists: ::1 tomb key::" $tombkey
             { option_is_set -f } || {
                 _warning "Make explicit use of --force to overwrite."
                 _failure "Refusing to overwrite file. Operation aborted." }
@@ -1075,10 +1071,10 @@ exhume_key() {
         fi
     }
 
-    _message "Trying to exhume a key out of image $imagefile"
+    _message "Trying to exhume a key out of image ::1 image file::" $imagefile
     if option_is_set --tomb-pwd; then
         tombpass="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tombpass"
+        _verbose "tomb-pwd = ::1 tomb pass::" $tombpass
     elif [[ "$tomb_password" != "" ]]; then
         # password is known already
         tombpass="$tomb_password"
@@ -1098,9 +1094,9 @@ exhume_key() {
 
     [[ "$destkey" = "-" ]] && { destkey="stdout" }
     if [ $res = 0 ]; then
-        _success "Key succesfully exhumed to ${destkey}."
+        _success "Key succesfully exhumed to ::1 key::." $destkey
     else
-        _warning "Nothing found in ${imagefile}."
+        _warning "Nothing found in ::1 image file::" $imagefile
     fi
 
     return $res
@@ -1116,7 +1112,7 @@ engrave_key() {
     keyname=`basename $tombkey`
     pngname="$keyname.qr.png"
 
-    _success "Rendering a printable QRCode for key: $tombkey"
+    _success "Rendering a printable QRCode for key: ::1 tomb key::" $tombkey
     # we omit armor strings to save space
     awk '
 /^-----/ {next}
@@ -1151,7 +1147,7 @@ forge_key() {
         _warning "A filename needs to be specified using -k to forge a new key."
         return 1 }
 
-    _message "Commanded to forge key $destkey"
+    _message "Commanded to forge key ::1 key::" $destkey
     _check_swap
 
 
@@ -1167,7 +1163,7 @@ forge_key() {
     { option_is_set -o } && { algopt="`option_value -o`" }
     algo=${algopt:-AES256}
 
-    _message "Commanded to forge key $destkey with cipher algorithm $algo"
+    _message "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::" $destkey $algo
 
     tomb_key_file="$destkey"
 
@@ -1181,7 +1177,7 @@ forge_key() {
         random_source=/dev/urandom
     fi
 
-    _verbose "Data dump using ${DD[1]} from $random_source"
+    _verbose "Data dump using ::1:: from ::2 source::" ${DD[1]} $random_source
     tomb_secret=`${=DD} bs=1 count=256 if=$random_source`
     { test $? = 0 } || {
         _warning "Cannot generate encryption key."
@@ -1189,7 +1185,7 @@ forge_key() {
 
     # here the global var tomb_secret contains the nude secret
 
-    _success "Choose the  password of your key: ${tomb_key_file}"
+    _success "Choose the  password of your key: ::1 tomb key::" $tomb_key_file
     _message "(You can also change it later using 'tomb passwd'.)"
     touch ${tomb_key_file}
     chown ${_uid}:${_gid} ${tomb_key_file}
@@ -1199,7 +1195,7 @@ forge_key() {
     # the gen_key() function takes care of the new key's encryption
     if option_is_set --tomb-pwd; then
         tomb_new_pwd="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tomb_new_pwd"
+        _verbose "tomb-pwd = ::1 new pass::" $tomb_new_pwd
         gen_key "$tomb_new_pwd" >> "$tomb_key_file"
     else
         gen_key >> "$tomb_key_file"
@@ -1219,7 +1215,7 @@ forge_key() {
         _failure "Operation aborted."
     }
 
-    _message "Done forging $tomb_key_file"
+    _message "Done forging ::1 key::" $tomb_key_file
     _success "Your key is ready:"
     ls -lh ${tomb_key_file}
 }
@@ -1228,7 +1224,7 @@ forge_key() {
 # as a loopback filesystem. Initially the file is filled with random data
 # taken from /dev/urandom which improves the tomb's overall security
 dig_tomb() {
-    _message "Commanded to dig tomb $1"
+    _message "Commanded to dig tomb ::1 tomb name::" $1
     if [ "$1" = "" ]; then
         _warning "No tomb name specified for creation."
         return 1
@@ -1257,28 +1253,28 @@ dig_tomb() {
         return 1
     fi
 
-    _success "Creating a new tomb in ${tombdir}/${tombfile}"
+    _success "Creating a new tomb in ::1 tomb dir::/::2 tomb file::" $tombdir $tombfile
 
-    _message "Generating ${tombfile} of ${tombsize}MiB"
+    _message "Generating ::1 tomb file:: of ::2 size::MiB" $tombfile $tombsize
     # we will first touch the file and set permissions: this way, even if interrupted, permissions are right
     touch ${tombdir}/${tombfile}
     chmod 0600 "${tombdir}/${tombfile}"
     chown $_uid:$_gid "${tombdir}/${tombfile}"
 
-    _verbose "Data dump using ${DD[1]} from /dev/urandom"
+    _verbose "Data dump using ::1:: from /dev/urandom" ${DD[1]}
 
     ${=DD} if=/dev/urandom bs=1048576 count=${tombsize} of=${tombdir}/${tombfile}
 
     if [ $? = 0 -a -e ${tombdir}/${tombfile} ]; then
         _message " `ls -lh ${tombdir}/${tombfile}`"
     else
-        _failure "Error creating the tomb ${tombdir}/${tombfile}, operation aborted."
+        _failure "Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted." $tombdir $tombfile
     fi
 
-    _success "Done digging $tombname"
+    _success "Done digging ::1 tomb name::" $tombname
     _message "Your tomb is not yet ready, you need to forge a key and lock it:"
-    _message "tomb forge ${tombname}.tomb.key"
-    _message "tomb lock ${tombname}.tomb -k ${tombname}.tomb.key"
+    _message "tomb forge ::1 tomb name::.tomb.key" $tombname
+    _message "tomb lock ::1 tomb name::.tomb -k ::1 tomb name::.tomb.key" $tombname
 }
 
 
@@ -1293,7 +1289,7 @@ lock_tomb_with_key() {
     fi
 
     tombpath="$1"
-    _message "Commanded to lock tomb ${tombfile}"
+    _message "Commanded to lock tomb ::1 tomb file::" $tombfile
 
     tombdir=`dirname "$tombpath"`
     tombfile=`basename "$tombpath"`
@@ -1303,12 +1299,12 @@ lock_tomb_with_key() {
         _failure "There is no tomb here. You have to it dig first."
         return 1 }
 
-    _verbose "Tomb found: ${tombdir}/${tombfile}"
+    _verbose "Tomb found: ::1 tomb dir::/::2 tomb file::" $tombdir $tombfile
 
     lo_mount "${tombdir}/${tombfile}"
     nstloop=`lo_new`
 
-    _verbose "Loop mounted on ${nstloop}"
+    _verbose "Loop mounted on ::1 mount point::" $nstloop
 
     _message "Checking if the tomb is empty (we never step on somebody else's bones)."
     cryptsetup isLuks ${nstloop}
@@ -1335,12 +1331,12 @@ lock_tomb_with_key() {
         # old default was aes-cbc-essiv:sha256
         # for more alternatives refer to cryptsetup(8)
     fi
-    _message "Locking using cipher: $cipher"
+    _message "Locking using cipher: ::1 cipher::" $cipher
 
     # get the pass from the user and check it
     if option_is_set --tomb-pwd; then
         tomb_pwd="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tomb_pwd"
+        _verbose "tomb-pwd = ::1 tomb pass::" $tomb_pwd
         ask_key_password "$tomb_pwd"
     else
         ask_key_password
@@ -1348,7 +1344,7 @@ lock_tomb_with_key() {
     { test $? = 0 } || {
         _failure "No valid password supplied." }
 
-    _success "Locking ${tombfile} with ${tombkey}"
+    _success "Locking ::1 tomb file:: with ::2 tomb key::" $tombfile $tombkey
 
     _message "Formatting Luks mapped device."
     print -n - "$tomb_secret" | \
@@ -1373,21 +1369,21 @@ lock_tomb_with_key() {
 
     if [ $? != 0 ]; then
         _warning "Tomb format returned an error."
-        _warning "Your tomb ${tombfile} may be corrupted."
+        _warning "Your tomb ::1 tomb file:: may be corrupted." $tombfile
     fi
 
     # sync
 
     cryptsetup luksClose tomb.tmp
 
-    _message "Done locking $tombname using Luks dm-crypt ${create_cipher}"
-    _success "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombkey}"
+    _message "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::" $tombname $create_cipher
+    _success "Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with key ::3 tomb key::" $tombdir $tombfile $tombkey
 
 }
 
 # This function changes the key that locks a tomb
 change_tomb_key() {
-    _message "Commanded to reset key for tomb $2"
+    _message "Commanded to reset key for tomb ::1 tomb name::" $2
 
     _check_swap
 
@@ -1402,7 +1398,7 @@ change_tomb_key() {
     cryptsetup isLuks ${nstloop}
     # is it a LUKS encrypted nest? we check one more time
     { test $? = 0 } || {
-        _failure "Not a valid LUKS encrypted volume: $2" }
+        _failure "Not a valid LUKS encrypted volume: ::1 volume::" $2 }
 
 
     load_key "$1"
@@ -1412,19 +1408,18 @@ change_tomb_key() {
     old_key_file="$tomb_key_file"
 
     # we have everything, prepare to mount
-    _success "Changing lock on tomb $tombname"
-    _message "Old key: $old_key_file"
+    _success "Changing lock on tomb ::1 tomb name::" $tombname
+    _message "Old key: ::1 old key::" $oldkey
 
     # render the mapper
     mapdate=`date +%s`
     # save date of mount in minutes since 1970
     mapper="tomb.${tombname}.${mapdate}.`basename $nstloop`"
 
-
     # load the old key
     if option_is_set --tomb-old-pwd; then
         tomb_old_pwd="`option_value --tomb-old-pwd`"
-        _verbose "tomb-old-pwd = $tomb_old_pwd"
+        _verbose "tomb-old-pwd = ::1 old pass::" $tomb_old_pwd
         ask_key_password "$tomb_old_pwd"
     else
         ask_key_password
@@ -1444,11 +1439,11 @@ change_tomb_key() {
         _failure "Aborting operations: error loading new key from -k" }
     new_key="$tomb_key"
     new_key_file="$tomb_key_file"
-    _message "New key: $new_key_file"
+    _message "New key: ::1 key::" $new_key_file
 
     if option_is_set --tomb-pwd; then
         tomb_new_pwd="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tomb_new_pwd"
+        _verbose "tomb-pwd = ::1 tomb pass::" $tomb_new_pwd
         ask_key_password "$tomb_new_pwd"
     else
         ask_key_password
@@ -1474,15 +1469,15 @@ change_tomb_key() {
     { test $? = 0 } || {
         _failure "Unexpected error in luksClose." }
 
-    _success "Succesfully changed key for tomb: $2"
-    _message "The new key is: $new_key_file"
+    _success "Succesfully changed key for tomb: ::1 tomb file::" $2
+    _message "The new key is: ::1 new key::" $newkey
 
     return 0
 }
 
 # backward compatibility
 create_tomb() {
-    _verbose "create_tomb(): ${=@} ${=OLDARGS}"
+    _verbose "create_tomb(): ::1:: ::2::" ${=@} ${=OLDARGS}
     [[ "$1" = "" ]] && {
         _warning "No tomb name specified for creation."
         return 1 }
@@ -1505,7 +1500,7 @@ create_tomb() {
     ${TOMBEXEC} lock ${tombdir}/${tombfile} -k ${tombdir}/${tombfile}.key
     { test $? = 0 } || { _failure "Failed to lock tomb with key, operation aborted." }
 
-    _success "Tomb $tombname succesfully created."
+    _success "Tomb ::1 tomb name:: succesfully created." $tombname
     ls -l ${tombfile}*
 }
 
@@ -1515,7 +1510,7 @@ create_tomb() {
 
 # $1 = tombfile $2(optional) = mountpoint
 mount_tomb() {
-    _message "Commanded to open tomb $1"
+    _message "Commanded to open tomb ::1 tomb name::" $1
     if [ "$1" = "" ]; then
         _warning "No tomb name specified for opening."
         return 1
@@ -1532,22 +1527,22 @@ mount_tomb() {
     file ${tombdir}/${tombfile} | \
         grep -i 'luks encrypted file' 2>&1 > /dev/null
     if [ $? != 0 ]; then
-        _warning "$1 is not a valid tomb file, operation aborted."
+        _warning "::1 tomb file:: is not a valid tomb file, operation aborted." $1
         return 1
     fi
     tombname=${tombfile%%\.*}
-    _verbose "Tomb found: ${tombdir}/${tombfile}"
+    _verbose "Tomb found: ::1 tomb dir::/::2 tomb file::" $tombdir $tombfile
 
     # load_key called here
     load_key
     ########
 
     { test $? = 0 } || {
-        _failure "Aborting operations: error loading key $tomb_key_file"    }
+        _failure "Aborting operations: error loading key ::1 key::" $tombkey }
 
     if [ "$2" = "" ]; then
         tombmount=/media/${tombfile}
-        _message "Mountpoint not specified, using default: $tombmount"
+        _message "Mountpoint not specified, using default: ::1 mount point::" $tombmount
     else
         tombmount=$2
     fi
@@ -1555,13 +1550,13 @@ mount_tomb() {
     # check if its already open
     mount -l | grep "${tombfile}.*\[$tombname\]$" 2>&1 > /dev/null
     if [ $? = 0 ]; then
-        _warning "$tombname is already open."
+        _warning "::1 tomb name:: is already open." $tombname
         _message "Here below its status is reported:"
         list_tombs ${tombname}
         return 0
     fi
 
-    _success "Opening $tombfile on $tombmount"
+    _success "Opening ::1 tomb file:: on ::2 mount point::" $tombfile $tombmount
 
     lo_mount "${tombdir}/${tombfile}"
     nstloop=`lo_new`
@@ -1569,7 +1564,7 @@ mount_tomb() {
     cryptsetup isLuks ${nstloop}
     if [ $? != 0 ]; then
         # is it a LUKS encrypted nest? see cryptsetup(1)
-        _warning "$tombfile is not a valid Luks encrypted storage file."
+        _warning "::1 tomb file:: is not a valid Luks encrypted storage file." $tombfile
         return 1
     fi
     _message "This tomb is a valid LUKS encrypted device."
@@ -1579,7 +1574,7 @@ mount_tomb() {
         /^Cipher name/ {print $3}
         /^Cipher mode/ {print $3}
         /^Hash spec/   {print $3}'`)
-    _message "Cipher is \"$tombdump[1]\" mode \"$tombdump[2]\" hash \"$tombdump[3]\""
+    _message "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\"" $tombdump[1] $tombdump[2] $tombdump[3]
 
     slotwarn=`print $luksdump | awk '
         BEGIN { zero=0 }
@@ -1592,15 +1587,15 @@ mount_tomb() {
     mapdate=`date +%s`
 
     mapper="tomb.${tombname}.${mapdate}.`basename $nstloop`"
-    _verbose "dev mapper device: $mapper"
-    _verbose "Tomb key: $tomb_key_file"
+    _verbose "dev mapper device: ::1 mapper::" $mapper
+    _verbose "Tomb key: ::1 key::" $tombkey
 
     # take the name only, strip extensions
-    _verbose "Tomb name: $tombname (to be engraved)"
+    _verbose "Tomb name: ::1 tomb name:: (to be engraved)" $tombname
 
     if option_is_set --tomb-pwd; then
         tomb_pwd="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tomb_pwd"
+        _verbose "tomb-pwd = ::1 tomb pass::" $tomb_pwd
         ask_key_password "$tomb_pwd"
     else
         ask_key_password
@@ -1623,12 +1618,12 @@ mount_tomb() {
     /cipher:/  {print $2}
     /keysize:/ {print $2}
     /device:/  {print $2}'`)
-    _success "Success unlocking tomb $tombname"
-    _verbose "Key size is $tombstat[2] for cipher $tombstat[1]"
+    _success "Success unlocking tomb ::1 tomb name::" $tombname
+    _verbose "Key size is ::1 size:: for cipher ::2 cipher::" $tombstat[2] $tombstat[1]
 
-    _message "Checking filesystem via $tombstat[3]"
+    _message "Checking filesystem via ::1::" $tombstat[3]
     fsck -p -C0 /dev/mapper/${mapper}
-    _verbose "Tomb engraved as $tombname"
+    _verbose "Tomb engraved as ::1 tomb name::" $tombname
     tune2fs -L ${tombname} /dev/mapper/${mapper} > /dev/null
 
     # we need root from here on
@@ -1639,7 +1634,7 @@ mount_tomb() {
     chown ${_uid}:${_gid} ${tombmount}
     chmod 0711 ${tombmount}
 
-    _success "Success opening $tombfile on $fg_bold[white]$tombmount$fg_no_bold[white]"
+    _success "Success opening ::1 tomb file:: on ::2 mount point::" $tombfile $tombmount
 
     # print out when was opened the last time, by whom and where
     { test -r ${tombmount}/.last } && {
@@ -1648,8 +1643,8 @@ mount_tomb() {
         tombuid="`cat ${tombmount}/.uid`"
         tomblast="`cat ${tombmount}/.last`"
         tombuser=`awk -F: '/:'"$tombuid"':/ {print $1}' /etc/passwd`
-        _message "Last visit by $fg_bold[white]$tombuser($tombuid)$fg_no_bold[white] from $fg_bold[white]$tombtty$fg_no_bold[white] on $fg_bold[white]$tombhost$fg_no_bold[white]"
-        _message "on date $fg_bold[white]`date --date @${tomblast} +%c`$fg_no_bold[white]"
+        _message "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::" $tombuser $tombuid $tombtty $tombhost
+        _message "on date ::1 date::" $(date --date @$tomblast +%c)
     }
     # write down the UID and TTY that opened the tomb
     rm -f ${tombmount}/.uid
@@ -1692,7 +1687,7 @@ exec_safe_bind_hooks() {
         return 1
     fi
     if ! [ -r "$MOUNTPOINT/bind-hooks" ]; then
-        _verbose "bind-hooks not found in $MOUNTPOINT"
+        _verbose "bind-hooks not found in ::1 mount point::" $MOUNTPOINT
         return 1
     fi
     typeset -al mounted
@@ -1709,9 +1704,9 @@ exec_safe_bind_hooks() {
             return 1
         fi
         if [ ! -r "$HOME/${maps[$dir]}" ]; then
-            _warning "bind-hook target not existent, skipping $HOME/${maps[$dir]}"
+            _warning "bind-hook target not existent, skipping ::1 home::/::2 subdir::" $HOME ${maps[$dir]}
         elif [ ! -r "$MOUNTPOINT/$dir" ]; then
-            _warning "bind-hook source not found in tomb, skipping ${MOUNTPOINT}/${dir}"
+            _warning "bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::" $MOUNTPOINT $dir
         else
             mount -o bind,$MOUNTOPTS $MOUNTPOINT/$dir $HOME/${maps[$dir]}
             mounted+=("$HOME/${maps[$dir]}")
@@ -1731,7 +1726,7 @@ exec_safe_post_hooks() {
     # make encrypted executables.
     cat ${mnt}/post-hooks | head -n1 | grep '^#!/'
     if [ $? = 0 ]; then
-        _success "Post hooks found, executing as user $SUDO_USER."
+        _success "Post hooks found, executing as user ::1 user name::." $SUDO_USER
         exec_as_user ${mnt}/post-hooks "$2" "$1"
     fi
 }
@@ -1747,7 +1742,7 @@ list_tombs() {
     # list all open tombs
     mounted_tombs=(`list_tomb_mounts $1`)
     { test ${#mounted_tombs} = 0 } && {
-        _failure "I can't see any ${1:-open} tomb, may they all rest in peace." }
+        _failure "I can't see any ::1 status:: tomb, may they all rest in peace." ${1:-open} }
 
     for t in ${mounted_tombs}; do
         mapper=`basename ${t[(ws:;:)1]}`
@@ -1921,7 +1916,7 @@ index_tombs() {
 
     mounted_tombs=(`list_tomb_mounts $1`)
     { test ${#mounted_tombs} = 0 } && {
-        if [ $1 ]; then _failure "There seems to be no open tomb engraved as [$1]"
+        if [ $1 ]; then _failure "There seems to be no open tomb engraved as [::1::]" $1
         else _failure "I can't see any open tomb, may they all rest in peace."
         fi
     }
@@ -1940,14 +1935,14 @@ index_tombs() {
         tombname=${t[(ws:;:)5]}
         tombmount=${t[(ws:;:)2]}
         { test -r ${tombmount}/.noindex } && {
-            _message "Skipping $tombname (.noindex found)."
+            _message "Skipping ::1 tomb name:: (.noindex found)." $tombname
             continue }
-        _message "Indexing $tombname filenames..."
+        _message "Indexing ::1 tomb name:: filenames..." $tombname
         updatedb -l 0 -o ${tombmount}/.updatedb -U ${tombmount}
 
         # here we use swish to index file contents
         { test $SWISH = 1 } && {
-            _message "Indexing $tombname contents..."
+            _message "Indexing ::1 tomb name:: contents..." $tombname
             tmp_create
             swishrc=`tmp_new`
 
@@ -2042,26 +2037,26 @@ search_tombs() {
     if [ ${#mounted_tombs} = 0 ]; then
         _failure "I can't see any open tomb, may they all rest in peace."; fi
 
-    _success "Searching for: $fg_bold[white]${(f)@}$fg_no_bold[white]"
+    _success "Searching for: ::1::" ${(f)@}
     for t in ${mounted_tombs}; do
-        _verbose "Checking for index: ${t}"
+        _verbose "Checking for index: ::1::" ${t}
         mapper=`basename ${t[(ws:;:)1]}`
         tombname=${t[(ws:;:)5]}
         tombmount=${t[(ws:;:)2]}
         if [ -r ${tombmount}/.updatedb ]; then
 
         # use mlocate to search hits on filenames
-        _message "Searching filenames in tomb $tombname"
+        _message "Searching filenames in tomb ::1 tomb name::" $tombname
         locate -d ${tombmount}/.updatedb -e -i "${(f)@}"
-        _message "Matches found: `locate -d ${tombmount}/.updatedb -e -i -c ${(f)@}`"
+        _message "Matches found: ::1 matches::" $(locate -d ${tombmount}/.updatedb -e -i -c ${(f)@})
 
         # use swish-e to search over contents
         { test $SWISH = 1 } && { test -r $tombmount/.swish } && {
-            _message "Searching contents in tomb $tombname"
+            _message "Searching contents in tomb ::1 tomb name::" $tombname
             swish-search -w ${=@} -f $tombmount/.swish -H0 }
 
         else
-            _warning "Skipping tomb $tombname: not indexed."
+            _warning "Skipping tomb ::1 tomb name::: not indexed." $tombname
             _warning "Run 'tomb index' to create indexes."
         fi
     done
@@ -2074,11 +2069,11 @@ search_tombs() {
 
 # resize tomb file size
 resize_tomb() {
-    _message "Commanded to resize tomb $1 to $opts[-s] megabytes."
+    _message "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes." $1 $opts[-s]
     if ! [ $1 ]; then
         _failure "No tomb name specified for resizing."
     elif ! [ -r "$1" ]; then
-        _failure "Cannot find $1"
+        _failure "Cannot find ::1::" $1
     fi
     # $1 is the tomb file path
 
@@ -2100,11 +2095,11 @@ resize_tomb() {
         awk -vtomb="[$tombname]" '/^\/dev\/mapper\/tomb/ { if($7==tomb) print $1 }'`
 
     if [ "$mounted_tomb" ]; then
-        _failure "The tomb $tombname is open, to resize it it needs to be closed."
+        _failure "The tomb ::1 tomb name:: is open, to resize it it needs to be closed." $tombname
     fi
 
     if ! [ "$newtombsize" ] ; then
-        _failure "You must specify the new size of $tombname"
+        _failure "You must specify the new size of ::1 tomb name::" $tombname
     elif [[ $newtombsize != <-> ]]; then
         _failure "Size is not an integer."
     elif [ "$newtombsize" -le "$oldtombsize" ]; then
@@ -2113,17 +2108,17 @@ resize_tomb() {
 
     delta="$(( $newtombsize - $oldtombsize ))"
 
-    _message "Generating ${tombfile} of ${newtombsize}MiB"
+    _message "Generating ::1 tomb file:: of ::2 size::MiB" $tombfile $newtombsize
 
-    _verbose "Data dump using ${DD[1]} from /dev/urandom"
+    _verbose "Data dump using ::1:: from /dev/urandom" ${DD[1]}
     ${=DD} if=/dev/urandom bs=1048576 count=${delta} >> ${tombdir}/${tombfile}
 
     { test $? = 0 } || {
-        _failure "Error creating the extra resize $tmp_resize, operation aborted." }
+        _failure "Error creating the extra resize ::1 size::, operation aborted." $tmp_resize }
 
     if option_is_set --tomb-pwd; then
         tomb_pwd="`option_value --tomb-pwd`"
-        _verbose "tomb-pwd = $tomb_pwd"
+        _verbose "tomb-pwd = ::1 tomb pass::" $tomb_pwd
         ask_key_password "$tomb_pwd"
     else
         ask_key_password
@@ -2146,17 +2141,17 @@ resize_tomb() {
 
     cryptsetup resize "${mapper}"
     if [ $? != 0 ]; then
-        _failure "cryptsetup failed to resize $mapper"
+        _failure "cryptsetup failed to resize ::1 mapper::" $mapper
     fi
 
     e2fsck -p -f /dev/mapper/${mapper}
     if [ $? != 0 ]; then
-        _failure "e2fsck failed to check $mapper"
+        _failure "e2fsck failed to check ::1 mapper::" $mapper
     fi
 
     resize2fs /dev/mapper/${mapper}
     if [ $? != 0 ]; then
-        _failure "resize2fs failed to resize $mapper"
+        _failure "resize2fs failed to resize ::1 mapper::" $mapper
     fi
 
     sleep 1 # needs to settle a bit
@@ -2191,7 +2186,7 @@ umount_tomb() {
             _warning "or issue the command 'tomb close all' to close them all."
             return 1 }
 
-    _message "Tomb close $1"
+    _message "Tomb close ::1::" $1
 
     for t in ${mounted_tombs}; do
         mapper=`basename ${t[(ws:;:)1]}`
@@ -2201,24 +2196,24 @@ umount_tomb() {
         tombfsopts=${t[(ws:;:)4]}
         tombloop=${mapper[(ws:.:)4]}
 
-        _verbose "Name: $tombname"
-        _verbose "Mount: $tombmount"
-        _verbose "Mapper: $mapper"
+        _verbose "Name: ::1 tomb name::" $tombname
+        _verbose "Mount: ::1 mount point::" $tombmount
+        _verbose "Mapper: ::1 mapper::" $mapper
 
         { test -e "$mapper" } && {
-            _warning "Tomb not found: $1"
+            _warning "Tomb not found: ::1 tomb file::" $1
             _warning "Please specify an existing tomb."
             return 0 }
 
         if [ $SLAM ]; then
-            _success "Slamming tomb $tombname mounted on $tombmount"
+            _success "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::" $tombname $tombmount
             _message "Kill all processes busy inside the tomb."
             if ! slam_tomb "$tombmount"; then
-                _warning "Cannot slam the tomb $tombname"
+                _warning "Cannot slam the tomb ::1 tomb name::" $tombname
                 return 1
             fi
         else
-            _message "Closing tomb $tombname mounted on $tombmount"
+            _message "Closing tomb ::1 tomb name:: mounted on ::2 mount point::" $tombname $tombmount
         fi
 
     # check if there are binded dirs and close them
@@ -2226,19 +2221,19 @@ umount_tomb() {
         for b in ${bind_tombs}; do
             bind_mapper="${b[(ws:;:)1]}"
             bind_mount="${b[(ws:;:)2]}"
-            _message "Closing tomb bind hook: $bind_mount"
+            _message "Closing tomb bind hook: ::1 hook::" $bind_mount
             umount $bind_mount
             if [[ $? != 0 ]]; then
                 if [ $SLAM ]; then
                     _success "Slamming tomb: killing all processes using this hook."
                     slam_tomb "$bind_mount"
                     if [[ $? == 1 ]]; then
-                        _warning "Cannot slam the bind hook $bind_mount"
+                        _warning "Cannot slam the bind hook ::1 hook::" $bind_mount
                         return 1
                     fi
                     umount $bind_mount
                 else
-                    _warning "Tomb bind hook $bind_mount is busy, cannot close tomb."
+                    _warning "Tomb bind hook ::1 hook:: is busy, cannot close tomb." $bind_mount
                 fi
             fi
         done
@@ -2248,7 +2243,7 @@ umount_tomb() {
             exec_safe_post_hooks ${tombmount%%/} close
         fi
 
-        _verbose "Performing umount of $tombmount"
+        _verbose "Performing umount of ::1 mount point::" $tombmount
         umount ${tombmount}
         if ! [ $? = 0 ]; then _warning "Tomb is busy, cannot umount!"
         else
@@ -2259,12 +2254,12 @@ umount_tomb() {
 
         cryptsetup luksClose $mapper
         { test $? = 0 } || {
-            _warning "Error occurred in cryptsetup luksClose ${mapper}"
+            _warning "Error occurred in cryptsetup luksClose ::1 mapper::" $mapper
             return 1 }
 
         losetup -d "/dev/$tombloop"
 
-        _success "Tomb $tombname closed: your bones will rest in peace."
+        _success "Tomb ::1 tomb name:: closed: your bones will rest in peace." $tombname
 
     done # loop across mounted tombs
 
@@ -2279,7 +2274,7 @@ slam_tomb() {
     fi
     #Note: shells are NOT killed by INT or TERM, but they are killed by HUP
     for s in TERM HUP KILL; do
-        _verbose "Sending $s to processes inside the tomb:"
+        _verbose "Sending ::1:: to processes inside the tomb:" $s
         if option_is_set -D; then
             ps -fp `fuser -m /media/a.tomb 2>/dev/null`|
             while read line; do
@@ -2385,9 +2380,8 @@ main() {
     fi
 
     if [[ -z ${(k)subcommands_opts[$subcommand]} ]]; then
-        _warning "There's no such command \"$subcommand\"."
-        _failure "Please try -h for help." 127
-#        _failure "Subcommand '$subcommand' doesn't exist" 127
+        _warning "There's no such command \"::1 subcommand::\"." $subcommand
+        exitv=127 _failure "Please try -h for help."
     fi
     argv=(${oldstar})
     unset oldstar
@@ -2400,7 +2394,7 @@ main() {
         zparseopts -M -E -D -Aopts ${cmd_opts}
         if [[ $? != 0 ]]; then
             _warning "Some error occurred during option processing."
-            _failure "See \"tomb help\" for more info." 127
+            exitv=127 _failure "See \"tomb help\" for more info."
         fi
     fi
     #build PARAM (array of arguments) and check if there are unrecognized options
@@ -2412,7 +2406,7 @@ main() {
             continue #it shouldnt be appended to PARAM
         elif [[ $arg[1] == '-'  ]]; then
             if [[ $ok == 0 ]]; then
-                _failure "Unrecognized option $arg for subcommand $subcommand" 127
+                exitv=127 _failure "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::" $arg $subcommand
             fi
         fi
         PARAM+=$arg
@@ -2429,7 +2423,7 @@ main() {
     if ! option_is_set --unsecure-dev-mode; then
         for opt in --sudo-pwd --tomb-pwd --use-urandom --tomb-old-pwd; do
             if option_is_set $opt; then
-                _failure "You specified option $opt, which is DANGEROUS and should only be used for testing\nIf you really want so, add --unsecure-dev-mode" 127
+                exitv=127 _failure "You specified option ::1 option::, which is DANGEROUS and should only be used for testing\nIf you really want so, add --unsecure-dev-mode" $opt
             fi
         done
     fi
@@ -2440,8 +2434,8 @@ main() {
     if option_is_set -G; then _gid="`option_value -G`"; fi
     if option_is_set -T; then _tty="`option_value -T`"; fi
 
-    _verbose "Tomb command: $subcommand ${PARAM}"
-    _verbose "Caller: uid[$_uid], gid[$_gid], tty[$_tty]."
+    _verbose "Tomb command: ::1 subcommand:: ::2 param::" $subcommand $PARAM
+    _verbose "Caller: uid[::1 uid::], gid[::2 gid::], tty[::3 tty::]." $_uid $_gid $_tty
 
     case "$subcommand" in
 
@@ -2523,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`
@@ -2550,7 +2543,7 @@ EOF
             usage
             ;;
         *)
-            _warning "Command \"$subcommand\" not recognized."
+            _warning "Command \"::1 subcommand::\" not recognized." $subcommand
             _message "Try -h for help."
             return 1
             ;;