tomb

the crypto undertaker
git clone git://parazyd.org/tomb.git
Log | Files | Refs | README | LICENSE
commit 219962e6512a56bfef90aad7cc2ed8ee909d61b8
parent f4f4837ff4ac40559698fe0502ff7499f22bda79
Author: Dani <gdrooid@openmailbox.org>
Date:   Fri, 14 Nov 2014 21:53:57 +0100

Merge pull request #160 from gdrooid/master

[i18n] Updated pot and po files.
Diffstat:

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


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


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


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


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


5 files changed, 2374 insertions(+), 2162 deletions(-)

diff --git a/extras/po/de.po b/extras/po/de.po
@@ -7,1050 +7,961 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
 
-#: _success
-msgid "All your swaps are belong to crypt.  Good."
-msgstr "Alle geteilten Speicher gehören crypt.  Gut."
+#: failure
+msgid "Fatal error creating a directory for temporary files"
+msgstr ""
+
+#: failure
+msgid "Cannot mount tmpfs in ::1 shm path::"
+msgstr ""
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr ""
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr ""
+
+#: failure
+msgid "Fatal error setting permissions on temporary file: ::1 temp file::"
+msgstr ""
+
+#: warning
+msgid "You can deactivate all swap partitions using the command:"
+msgstr ""
+
+#: warning
+msgid " swapoff -a"
+msgstr ""
 
-#: _failure
+#: warning
+msgid "But if you want to proceed like this, use the -f (force) flag."
+msgstr ""
+
+#: failure
 msgid "Operation aborted."
 msgstr "Vorgang abgebrochen."
 
-#: _warning
+#: failure
 msgid "Tomb file is missing from arguments."
 msgstr "Grab Datei fehlen Argumente."
 
-#: _warning
+#: failure
 msgid "Tomb file not found: ::1 tomb file::"
 msgstr "Grab Datei nicht gefunden: ::1 tomb file::"
 
-#: _warning
+#: failure
 msgid "Tomb file is not a regular file: ::1 tomb file::"
 msgstr "Tomb File ist keine reguläre Datei: ::1 tomb file::"
 
-#: _warning
+#: failure
 msgid "Tomb file is empty (zero length): ::1 tomb file::"
 msgstr "Grab Datei ist leer (Länge: 0): ::1 tomb file::"
 
-#: _warning
+#: failure
 msgid "Tomb file is not writable: ::1 tomb file::"
 msgstr "Gültige Grab-Datei gefunden: ::1 tomb file::"
 
-#: _warning
+#: warning
 msgid "File is not yet a tomb: ::1 tomb file::"
 msgstr "Datei ist noch kein Grab: ::1 tomb file::"
 
-#: _warning
+#: failure
 msgid "Tomb is currently in use: ::1 tomb name::"
 msgstr "Grab wird schon benutzt ::1 tomb name::"
 
-#: _message
-msgid "Valid tomb file found: ::1 tomb file::"
-msgstr "Gültige Grab-Datei gefunden: ::1 tomb file::"
+#: message
+msgid "Valid tomb file found: ::1 tomb path::"
+msgstr ""
 
-#: _failure
+#: failure
 msgid "Loopback mount called on invalid tomb: ::1 path::"
 msgstr "Loopback Einhängen mit ungültiger Datei versucht: ::1 path::"
 
-#: _warning
+#: warning
 msgid "Loop mount of volumes is not possible on this machine, this error"
 msgstr "Loop-Mount der Laufwerke nicht unterstützt, dieser Fehler"
 
-#: _warning
+#: 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."
 
-#: _warning
+#: 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."
 
-#: _print
+#: print
 msgid "Syntax: tomb [options] command [arguments]"
 msgstr "Syntax: tomb [Optionen] Befehl [Argumente]"
 
-#: _print
+#: print
 msgid "Commands:"
 msgstr "Befehle:"
 
-#: _print
+#: print
 msgid " // Creation:"
 msgstr " // Erstellen:"
 
-#: _print
+#: 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
+#: print
 msgid " forge   create a new KEY file and set its password"
 msgstr " forge   Neuen SCHLÜSSEL erstellen und Passwort zuweisen"
 
-#: _print
+#: print
 msgid " lock    installs a lock on a TOMB to use it with KEY"
 msgstr " lock    GRAB mit einem SCHLÜSSEL zusperren"
 
-#: _print
+#: print
 msgid " // Operations on tombs:"
 msgstr " // Gräber bearbeiten:"
 
-#: _print
+#: print
 msgid " open    open an existing TOMB"
 msgstr " open    Vorhandenens GRAB öffnen"
 
-#: _print
+#: print
 msgid " index   update the search indexes of tombs"
 msgstr " index   Den Suchindex der Gräber aktualisieren"
 
-#: _print
+#: print
 msgid " search  looks for filenames matching text patterns"
 msgstr " search  Sucht nach Dateinamen welche Textmustern entsprechen"
 
-#: _print
+#: print
 msgid " list    list of open TOMBs and information on them"
 msgstr " list    Liste geöffneter GRÄBER mit Infos"
 
-#: _print
+#: print
 msgid " close   close a specific TOMB (or 'all')"
 msgstr " close   Schliesst das angegebene GRAB (oder \"all\")"
 
-#: _print
+#: 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
+#: 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
+#: print
 msgid " // Operations on keys:"
 msgstr " // Schlüssel bearbeiten:"
 
-#: _print
+#: print
 msgid " passwd  change the password of a KEY"
 msgstr " passwd  Passwort eines SCHLÜSSELS ändern"
 
-#: _print
+#: print
 msgid " setkey  change the KEY locking a TOMB (needs old one)"
 msgstr " setkey  SCHLÜSSEL eines GRABES ändern"
 
-#: _print
+#: 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
+#: print
 msgid " bury    hide a KEY inside a JPEG image"
 msgstr " bury    versteckt einen SCHLÜSSEL in einer JPEG Datei"
 
-#: _print
+#: print
 msgid " exhume  extract a KEY from a JPEG image"
 msgstr " exhume  extrahiert den SCHLÜSSEL aus einer JPEG-Datei"
 
-#: _print
+#: print
 msgid "Options:"
 msgstr "Optionen:"
 
-#: _print
+#: 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
+#: 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
+#: print
 msgid " -n     don't process the hooks found in tomb"
 msgstr " -n        'Hooks' im Grab nicht benutzen"
 
-#: _print
+#: print
 msgid " -o     mount options used to open (default: rw,noatime,nodev)"
 msgstr " -o        Mount Optionen beim Öffnen (Standart: rw,noatime,nodev)"
 
-#: _print
+#: print
 msgid " -f     force operation (i.e. even if swap is active)"
 msgstr " -f        Vorgang erzwingen (z.B. falls Swap-Datei aktiv)"
 
-#: _print
+#: print
 msgid " --kdf  generate passwords armored against dictionary attacks"
 msgstr " --kdf     Gegen Wörterbuchattacken gefeite Passwörter erstellen"
 
-#: _print
+#: print
 msgid " -h     print this help"
 msgstr " -h        Anzeigen dieses Hilfetextes"
 
-#: _print
+#: print
 msgid " -v     print version, license and list of available ciphers"
 msgstr ""
 " -v        Anzeigen der Version, Lizenzen und vorhandeners "
 "Verschlüsslungsmethoden"
 
-#: _print
+#: print
 msgid " -q     run quietly without printing informations"
 msgstr " -q        Still ablaufen lassen ohne Infos anzuzeigen"
 
-#: _print
+#: print
 msgid " -D     print debugging information at runtime"
 msgstr " -D        Debug-Infos beim Ablauf anzeigen"
 
-#: _print
+#: print
 msgid "For more informations on Tomb read the manual: man tomb"
 msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."
 
-#: _print
+#: 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."
+#: failure
+msgid "Missing required dependency ::1 command::.  Please install it."
 msgstr ""
-"Kann ::1:: nicht finden. Bitte installieren, da es zum Funktionement von "
-"Tomb benötigt wird."
 
-#: _warning
-msgid "is_valid_key() called without argument."
-msgstr "is_valid_key() ohne Argumente aufgerufen."
+#: warning
+msgid "is_valid_key() called without an argument."
+msgstr ""
 
-#: _message
+#: message
 msgid "Key is an image, it might be valid."
 msgstr "Schlüssel ist ein Bild, es könnte gültig sein"
 
-#: _message
+#: message
 msgid "Key is valid."
 msgstr "Schlüssel ist gültig"
 
-#: _warning
+#: warning
 msgid "Attempting key recovery."
 msgstr "Versuche Schlüssel wieder herzustellen"
 
-#: _failure
+#: 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."
 
-#: _message
+#: message
 msgid "Waiting for the key to be piped from stdin... "
 msgstr "Warten auf den Schlüssel auf der Standarteingabe... "
 
-#: _warning
+#: failure
 msgid "Key not found, specify one using -k."
 msgstr "Schlüssel nicht gefunden, bitte mit -k einen Schlüssel angeben."
 
-#: _warning
+#: warning
 msgid ""
 "The key seems invalid or its format is not known by this version of Tomb."
 msgstr ""
 "Der Schlüssel scheint ungültig zu sein, oder sein Format ist dieser Tomb "
 "Version unbekannt."
 
-#: _failure
+#: failure
 msgid "No suitable program for KDF ::1 program::."
 msgstr "Kein gültiges Programm zur Schlüsselableitung ::1 program::."
 
-#: _failure
-msgid "Internal error: ask_key_password() called before load_key()."
-msgstr "Interner Fehler: ask_key_password() vor load_key gestartet"
+#: failure
+msgid "Internal error: ask_key_password() called before _load_key()."
+msgstr ""
 
-#: _message
+#: message
 msgid "A password is required to use key ::1 key::"
 msgstr "Ein Passwort ist zur Benutzung des Schlüssels ::1 key:: erforderlich"
 
-#: _warning
+#: warning
 msgid "User aborted password dialog."
 msgstr "Benutzer hat den Passwortdialog abgebrochen."
 
-#: _message
+#: message
 msgid "Password OK."
 msgstr "Passwort OK."
 
-#: _message
+#: message
 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 ::1 key file::"
-msgstr "Passwort gewechselt für ::1 key file::."
-
-#: _failure
+#: failure
 msgid "No valid password supplied."
 msgstr "Kein gültiges Passwort angegeben"
 
-#: _failure
+#: failure
 msgid "Error: the newly generated keyfile does not seem valid."
 msgstr "Fehler: Der neu erstellte Schlüssel scheint nicht gültig zu sein."
 
-#: _success
-msgid "Your passphrase was successfully updated."
-msgstr "Ihr Passwort wurde erfolgreich geändert."
-
-#: _failure
+#: failure
 msgid "User aborted."
 msgstr "Vom Benutzer abgebrochen."
 
-#: _warning
+#: warning
 msgid "You set empty password, which is not possible."
 msgstr "Fehler: Passwort nicht gesetzt."
 
-#: _failure
+#: failure
 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: ::1 microseconds::"
-msgstr "::1 microseconds:: Iterationen zur Schlüsselableitung."
-
-#: _message
+#: message
 msgid "generating salt"
 msgstr "generiere Salt"
 
-#: _message
+#: message
 msgid "calculating iterations"
 msgstr "berechne Iterationen"
 
-#: _message
+#: message
 msgid "encoding the password"
 msgstr "Passwort verschlüsseln"
 
-#: _failure
+#: failure
 msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
 msgstr ""
 "gpg (GnuPG) welches zur Funktion von Tomb notwendig ist, nicht gefunden."
 
-#: _failure
-msgid "Bury failed for invalid key: ::1 key::"
-msgstr "Vergraben für ungültiges Passwort fehlgeschlagen: ::1 key::"
-
-#: _warning
+#: warning
 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 ::1 tomb key:: inside image ::2 image file::"
-msgstr "Verschlüssleung des Schlüssels ::1 tomb key:: im Bild ::2 image file::"
-
-#: _message
+#: message
 msgid "Please confirm the key password for the encoding"
 msgstr "Bitte bestätigen Sie das Passwort zur Verschlüsselung"
 
-#: _warning
+#: warning
 msgid "Wrong password supplied."
 msgstr "Das eingegebene Passwort ist falsch."
 
-#: _failure
+#: 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."
 
-#: _warning
+#: warning
 msgid "Encoding error: steghide reports problems."
 msgstr "Fehler beim Verschlüsseln: steghide meldet Fehler."
 
-#: _success
-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 "Gebe exhumierten Schlüssel auf stdout aus"
-
-#: _failure
+#: failure
 msgid "Exhume failed, image file not found: ::1 image file::"
 msgstr "Exhumieren fehlgeschlagen, Bilddatei nicht gefunden: ::1 image file::"
 
-#: _failure
+#: failure
 msgid "Exhume failed: ::1 image file:: is not a jpeg image."
 msgstr "Verschlüsselung fehlgeschlagen: ::1 image file:: ist keine JPEG-Datei."
 
-#: _failure
+#: failure
 msgid "Wrong password or no steganographic key found"
 msgstr "Falsches Passwort, oder kein steganographischer Schlüssel gefunden"
 
-#: _warning
+#: message
+msgid "printing exhumed key on stdout"
+msgstr "Gebe exhumierten Schlüssel auf stdout aus"
+
+#: warning
 msgid "File exists: ::1 tomb key::"
 msgstr "Datei existiert: ::1 tomb key::"
 
-#: _warning
+#: warning
+msgid "Use of --force selected: overwriting."
+msgstr "--force wurde benutzt, wird überschrieben."
+
+#: warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Benutzen Sie --force um ein Überschreiben zu erzwingen."
 
-#: _failure
+#: failure
 msgid "Refusing to overwrite file. Operation aborted."
 msgstr "Überschreiben verweigert. Operation abgebrochen."
 
-#: _warning
-msgid "Use of --force selected: overwriting."
-msgstr "--force wurde benutzt, wird überschrieben."
-
-#: _message
+#: message
 msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Versuche Schlüssel aus ::1 image file:: zu exhumieren"
 
-msgid "Key succesfully exhumed to ::1 key::."
-msgstr "Schlüssel erfolgreich nach ::1 key:: exhumiert."
-
-#: _warning
+#: warning
 msgid "Nothing found in ::1 image file::"
 msgstr "Nichts gefunden in ::1 image file::"
 
-#: _failure
-msgid "No key specified."
-msgstr "Kein Schlüssel angegeben"
-
-#: _success
-msgid "Rendering a printable QRCode for key: ::1 tomb key::"
-msgstr "::1 tomb key:: wird in QR-Code umgewandelt"
-
-#: _failure
+#: failure
 msgid "QREncode reported an error."
 msgstr "QREncode meldet einen Fehler"
 
-#: _success
-msgid "Operation successful:"
-msgstr "Vorgang erfolgreich:"
+#: message
+msgid "Commanded to dig tomb ::1 tomb path::"
+msgstr ""
+
+#: failure
+msgid "Missing path to tomb"
+msgstr ""
+
+#: failure
+msgid "Size argument missing, use -s"
+msgstr "Größenangabe fehlt, benutzen Sie -s."
+
+#: failure
+msgid "Size must be an integer (megabytes)"
+msgstr ""
+
+#: failure
+msgid "Tombs can't be smaller than 10 megabytes"
+msgstr ""
+
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
+msgstr "Es existiert bereits ein Grab. Hier grabe ich nicht:"
+
+#: message
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Grab ::1 tomb file:: wird erstellt, mit der Größe ::2 size::Mb"
+
+#: warning
+msgid "Error creating the tomb ::1 tomb path::"
+msgstr ""
+
+#: 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:"
+
+#: message
+msgid "tomb forge ::1 tomb path::.key"
+msgstr ""
+
+#: message
+msgid "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
+msgstr ""
 
-#: _warning
+#: failure
 msgid "A filename needs to be specified using -k to forge a new key."
 msgstr ""
 "Mit -k muss ein Dateiname angegeben werden, um einen neuen Schlüssel zu "
 "schmieden."
 
-#: _message
+#: message
 msgid "Commanded to forge key ::1 key::"
 msgstr "::1 key:: wird geschmiedet"
 
-#: _warning
+#: 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."
 
-#: _message
+#: message
 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
+#: 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,"
 
-#: _message
+#: 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."
 
-#: _message
+#: 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."
 
-#: _message
+#: 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."
 
-#: _warning
+#: warning
 msgid "Cannot generate encryption key."
 msgstr "Verschlüsselungsschlüssel konnte nicht erstellt werden."
 
-#: _success
-msgid "Choose the  password of your key: ::1 tomb key::"
-msgstr "Wählen Sie ein Passwort für ihren Schlüssel: ::1 tomb key::"
-
-#: _message
+#: message
 msgid "(You can also change it later using 'tomb passwd'.)"
 msgstr "(Sie können ihn auch später mit 'tomb passwd' wechseln.)"
 
-#: _warning
+#: warning
 msgid "The key does not seem to be valid."
 msgstr "Der Schlüssel scheint ungültig zu sein."
 
-#: _warning
+#: warning
 msgid "Dumping contents to screen:"
 msgstr "Inhalte werden am Bildschirm angezeigt :"
 
-#: _message
-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 tomb name::"
-msgstr "Das Grab ::1 tomb name:: wird ausgehoben"
-
-#: _warning
-msgid "No tomb name specified for creation."
-msgstr "Dem Grab wurde bei seiner Erstellung kein Name zugeteilt."
-
-#: _failure
-msgid "Size argument missing, use -s"
-msgstr "Größenangabe fehlt, benutzen Sie -s."
-
-#: _failure
-msgid "Size argument is not an integer."
-msgstr "Die Größe muss eine Ganzzahl sein."
-
-#: _failure
-msgid "Tombs can't be smaller than 10 megabytes."
-msgstr "Die minimale Größe ist 10 Mb."
-
-#: _warning
-msgid "A tomb exists already. I'm not digging here:"
-msgstr "Es existiert bereits ein Grab. Hier grabe ich nicht:"
-
-#: _success
-msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
-msgstr "Neues Grab in ::1 tomb dir::/::2 tomb file::"
-
-#: _message
-msgid "Generating ::1 tomb file:: of ::2 size::MiB"
-msgstr "Grab ::1 tomb file:: wird erstellt, mit der Größe ::2 size::Mb"
-
-#: _failure
-msgid ""
-"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+#: warning
+msgid "--"
 msgstr ""
-"Fehler beim Erstellen des Grabes ::1 tomb dir::/::2 tomb file::. Vorgang "
-"abgebrochen."
 
-#: _success
-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:"
+#: message
+msgid "Done forging ::1 key file::"
 msgstr ""
-"Ihr Grab ist noch nicht bereit, erst müssen Sie einen Schlüssel schmieden "
-"und es abschließen:"
 
-#: _warning
+#: warning
 msgid "No tomb specified for locking."
 msgstr "Kein Grab zum verschließen angegeben"
 
-#: _warning
+#: warning
 msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Gebrauch: tomb lock file.tomb file.tomb.key"
 
-#: _message
+#: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr "Grab ::1 tomb file:: wird verschlossen"
 
-#: _failure
+#: 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."
 
-#: _message
+#: 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)."
 
-#: _warning
+#: warning
 msgid "The tomb was already locked with another key."
 msgstr "Grab ist schon mit anderem Schlüssel verschlossen."
 
-#: _failure
+#: 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."
 
-#: _message
+#: message
 msgid "Fine, this tomb seems empty."
 msgstr "Gut, dieses Grab scheint leer."
 
-#: _failure
-msgid "Aborting operations: error loading key."
-msgstr "Operationen werden abgebrochen: Fehler beim laden des Schlüssels."
-
-#: _message
+#: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr "Abschließen mit Chiffre: ::1 cipher::"
 
-#: _success
-msgid "Locking ::1 tomb file:: with ::2 tomb key::"
-msgstr "Abschließen von ::1 tomb file:: mit ::2 tomb key::"
-
-#: _message
+#: message
 msgid "Formatting Luks mapped device."
 msgstr "Formatieren des Luks Gerätes."
 
-#: _warning
+#: warning
 msgid "cryptsetup luksFormat returned an error."
 msgstr "'cryptsetup luksFormat' hat einen Fehler ausgegeben"
 
-#: _warning
+#: warning
 msgid "cryptsetup luksOpen returned an error."
 msgstr "'cryptsetup luksOpen' hat einen Fehler ausgegeben"
 
-#: _message
+#: message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Ihr Grab wird mit Ext3/Ext4 formatiert."
 
-#: _warning
+#: warning
 msgid "Tomb format returned an error."
 msgstr "Beim Formatieren ist ein Fehler aufgetreten."
 
-#: _warning
+#: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr "Ihr Grab ::1 tomb file:: könnte korrumpiert sein."
 
-#: _message
+#: message
 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 ::2 "
 "cipher::"
 
-#: _success
-msgid ""
-"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
-"key ::3 tomb key::"
+#: message
+msgid "Commanded to reset key for tomb ::1 tomb path::"
 msgstr ""
-"Ihr Grab ist unter ::1 tomb dir::/::2 tomb file:: bereit und mit "
-"Schlüssel ::3 tomb key:: geschützt"
-
-#: _message
-msgid "Commanded to reset key for tomb ::1 tomb name::"
-msgstr "Schlüssel wird zurückgesetzt für Grab ::1 tomb name::"
 
-#: _warning
+#: warning
 msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
 msgstr ""
 "Der Befehl 'setkey' benötigt zwei Argumente: Die alte Schlüsseldatei und das "
 "Grab."
 
-#: _warning
+#: warning
 msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
 msgstr "z.B.: tomb -k new.tomb.key old.tomb.key secret.tomb"
 
-#: _failure
+#: failure
 msgid "Execution aborted."
 msgstr "Vorgang abgebrochen."
 
-#: _failure
+#: failure
 msgid "Not a valid LUKS encrypted volume: ::1 volume::"
 msgstr "Dieses Grab ist ein gültiges LUKS verschlüsseltes Gerät: ::1 volume::"
 
-#: _failure
-msgid "Aborting operations: error loading old key from arguments"
-msgstr ""
-"Operationen abgebrochen: Fehler beim Laden des alten Schlüssels aus den "
-"Argumenten"
-
-#: _success
-msgid "Changing lock on tomb ::1 tomb name::"
-msgstr "Ändern des Schlosses für das Grab ::1 tomb name::"
-
-#: _message
+#: message
 msgid "Old key: ::1 old key::"
 msgstr "Alter Schlüssel: ::1 old key::"
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the old key."
 msgstr "Kein gültiges Passwort für den alten Schlüssel angegeben."
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksOpen."
 msgstr "Unerwarteter Fehler in luksOpen"
 
-#: _failure
-msgid "Aborting operations: error loading new key from -k"
-msgstr "Operationen abgebrochen: Fehler beim Laden des neuen Schlüssels von -k"
-
-#: _message
-msgid "New key: ::1 key::"
-msgstr "Neuer Schlüssel: ::1 key::"
+#: message
+msgid "New key: ::1 key file::"
+msgstr ""
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the new key."
 msgstr "Kein gültiges Passwort für den neuen Schlüssel angegeben."
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksChangeKey."
 msgstr "Unerwarteter Fehler in luksChangeKey"
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksClose."
 msgstr "Unerwarteter Fehler in luksClose "
 
-#: _success
-msgid "Succesfully changed key for tomb: ::1 tomb file::"
-msgstr "Der Schlüssel wurde erfolgreich gewechselt am Grab ::1 tomb file::"
-
-#: _message
+#: message
 msgid "The new key is: ::1 new key::"
 msgstr "Der neue Schlüssel ist: ::1 new key::"
 
-#: _warning
-msgid "Creating this tomb would overwrite an existing file."
-msgstr ""
-"Das ausheben dieses Grabes würde eine existierende Datei überschreiben."
-
-#: _failure
-msgid "Failed to forge key, operation aborted."
-msgstr "Schlüssel schmieden fehlgeschlagen, Operation abgebrochen."
-
-#: _failure
-msgid "Failed to lock tomb with key, operation aborted."
-msgstr ""
-"Abschliessen des Grabes mit dem Schlüssel fehlgeschlagen, Operation "
-"abgebrochen."
-
-#: _success
-msgid "Tomb ::1 tomb name:: succesfully created."
-msgstr "Das Grab ::1 tomb name:: wurde erfolgreich erstellt."
-
-#: _message
-msgid "Commanded to open tomb ::1 tomb name::"
-msgstr "Grab ::1 tomb name:: wird geöffnet"
-
-#: _warning
+#: failure
 msgid "No tomb name specified for opening."
 msgstr "Bitte geben Sie den Namen des zu vöffnenden Grabes an."
 
-#: _warning
-msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
-msgstr "::1 tomb file:: ist keine gültige Grab Datei, Operation abgebrochen."
+#: message
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Grab ::1 tomb name:: wird geöffnet"
 
-#: _failure
-msgid "Aborting operations: error loading key ::1 key::"
+#: warning
+msgid "::1 tomb file:: is not a valid tomb file"
 msgstr ""
-"Operationen werden abgebrochen: Fehler beim Laden des Schlüssels ::1 key::"
 
-#: _message
+#: message
 msgid "Mountpoint not specified, using default: ::1 mount point::"
 msgstr "Mountpoint nicht angegeben, ::1 mount point:: wird benutzt"
 
-#: _warning
+#: warning
 msgid "::1 tomb name:: is already open."
 msgstr "::1 tomb name:: ist bereits geöffnet."
 
-#: _message
+#: message
 msgid "Here below its status is reported:"
 msgstr "Zustand des Grabes wie folgt :"
 
-#: _success
-msgid "Opening ::1 tomb file:: on ::2 mount point::"
-msgstr "::1 tomb file:: geöffnet in ::2 mount point::"
-
-#: _warning
+#: failure
 msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
 msgstr "::1 tomb file:: ist keine gültige Luks verschlüsselte Datei."
 
-#: _message
+#: message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Dieses Grab ist ein gültiges LUKS verschlüsseltes Gerät."
 
-#: _message
+#: message
 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
+#: warning
 msgid ""
 "Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
 msgstr ""
 "Mehrere Schlüssellöcher sind an diesem Grab angebracht. Achtung, es könnte "
 "eine Hintertür geben."
 
-#: _failure
+#: failure
 msgid "Failure mounting the encrypted file."
 msgstr "Fehler beim Einhängen der verschlüsselten Datei."
 
-#: _success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr "::1 tomb name:: wurde erfolgreich aufgeschlossen."
-
-#: _message
+#: message
 msgid "Checking filesystem via ::1::"
 msgstr "Dateisystem kontrollieren mit ::1::"
 
-#: _success
-msgid "Success opening ::1 tomb file:: on ::2 mount point::"
-msgstr "::1 tomb file:: erfolgreich geöffnet in ::2 mount point::"
-
-#: _message
+#: message
 msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
 msgstr ""
 "Letzer Besuch von ::1 user::(::2 tomb build::) von ::3 tty:: auf ::4 host::"
 
-#: _message
+#: message
 msgid "on date ::1 date::"
 msgstr "am ::1 date::"
 
-#: _warning
+#: warning
 msgid "How pitiful!  A tomb, and no HOME."
 msgstr "Wie bedaurndswert ! Ein Grab aber kein Zuhause."
 
-#: _warning
+#: warning
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr "'Bind hooks' kann nicht benutzt werden ohne eingehängtes Grab."
 
-#: _warning
+#: warning
+msgid "bind-hooks file is broken"
+msgstr ""
+
+#: warning
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
 msgstr "'bind hooks' map format: local/to/tomb local/to/$HOME"
 
-#: _warning
+#: warning
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
 msgstr ""
 "'bind-hooks' map format: local/to/tomb local/to/$HOME.  Wird rückgängig "
 "gemacht"
 
-#: _warning
+#: warning
 msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
 msgstr "'bind-hooks' Ziel ungültig,  ::1 home::/::2 subdir:: wird ignoriert."
 
-#: _warning
+#: warning
 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 subdir:: "
 "wird ignoriert"
 
-#: _success
-msgid "Post hooks found, executing as user ::1 user name::."
-msgstr "'Post hooks' gefunden, werden als ::1 user name:: ausgeführt."
-
-#: _failure
+#: failure
 msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
 msgstr "Ich sehe keine ::1 status::. Mögen sie alle in Frieden ruhen."
 
-#: _failure
+#: message
+msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: open since ::2 tombsince::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::"
+"%) is used: ::4 tombavail:: free "
+msgstr ""
+
+#: warning
+msgid "::1 tombname:: warning: your tomb is almost full!"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: hooks ::2 hookname:: on ::3 hookdest::"
+msgstr ""
+
+#: failure
 msgid "Internal error: list_tomb_binds called without argument."
 msgstr "Interner fehler: list_tomb_binds ohne rgumente aufgerufen."
 
-#: _failure
+#: failure
 msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
 msgstr ""
 "Kann Gräber auf diesem System nicht indexieren: updatedb (mlocate) nicht "
 "installiert."
 
-#: _warning
+#: warning
 msgid "Cannot use GNU findutils for index/search commands."
 msgstr "Kann GNU findutils nicht für Indexierung/Suchbefehle benutzen."
 
-#: _failure
+#: failure
 msgid "Index command needs 'mlocate' to be installed."
 msgstr "Index Befehl benötigt installiertes 'mlocate'"
 
-#: _failure
+#: failure
 msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr "Es scheint kein als [::1::] graviertes Grab offen zu sein"
 
-#: _failure
+#: failure
 msgid "I can't see any open tomb, may they all rest in peace."
 msgstr "Ich sehe kein geöffnetes Grab. Mögen sie alle in Frieden ruhen."
 
-#: _success
-msgid "Creating and updating search indexes."
-msgstr "Erstellen und aktualisieren des Such-Indexes."
-
-#: _message
+#: message
 msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr "Überspringen von ::1 tomb name:: (.noindex gefunden)."
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: filenames..."
 msgstr "Indexieren der Dateinamen von ::1 tomb name:: im Gange..."
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: contents..."
 msgstr "Indexieren der Inhalte von ::1 tomb name:: im Gange..."
 
-#: _message
+#: message
 msgid "Search index updated."
 msgstr "Such-Index aktualisiert."
 
-#: _success
-msgid "Searching for: ::1::"
-msgstr "Suchen nach  ::1::"
-
-#: _message
+#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr "Suche Dateinamen in::1 tomb name::"
 
-#: _message
+#: message
 msgid "Matches found: ::1 matches::"
 msgstr "Ergebnisse: ::1 matches::"
 
-#: _message
+#: message
 msgid "Searching contents in tomb ::1 tomb name::"
 msgstr "Suche in den Inhalten von ::1 tomb name::"
 
-#: _warning
+#: warning
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr "Das Grab ::1 tomb name:: ist nicht indexiert und wird ignoriert."
 
-#: _warning
+#: warning
 msgid "Run 'tomb index' to create indexes."
 msgstr "Führen Sie 'tomb index' aus um Suchindexe zu erstellen."
 
-#: _message
+#: message
 msgid "Search completed."
 msgstr "Suche abgeschlossen."
 
-#: _message
+#: message
 msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
 msgstr "Grab ::1 tomb name:: wird auf ::2 size:: Mb vergrössert."
 
-#: _failure
+#: failure
 msgid "No tomb name specified for resizing."
 msgstr "Kein Name für das zu vergrössernde Grab angegeben."
 
-#: _failure
+#: failure
 msgid "Cannot find ::1::"
 msgstr "::1:: nicht gefunden."
 
-#: _failure
+#: failure
 msgid "Aborting operations: new size was not specified, use -s"
 msgstr "Operationen werden abgebrochen: Neue Größe nicht mit -s angegeben"
 
-#: _failure
-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 "Please close the tomb ::1 tomb name:: before trying to resize it."
+msgstr ""
 
-#: _failure
+#: failure
 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
+#: failure
 msgid "Size is not an integer."
 msgstr "Die Grösse muss eine Ganzzahl sein."
 
-#: _failure
+#: failure
 msgid "The new size must be greater then old tomb size."
 msgstr "Die neue Grösse muss grösser sein als die alte."
 
-#: _failure
+#: failure
 msgid "Error creating the extra resize ::1 size::, operation aborted."
 msgstr ""
 "Fehler beim erstellen der extra Vergrösserung ::1 size::, Operation "
 "abgebrochen."
 
-#: _failure
+#: failure
 msgid "cryptsetup failed to resize ::1 mapper::"
 msgstr "cryptsetup konnte ::1 mapper:: nicht vergrössern"
 
-#: _failure
+#: failure
 msgid "e2fsck failed to check ::1 mapper::"
 msgstr "e2fsck konnte ::1 mapper:: nicht verifizieren"
 
-#: _failure
+#: failure
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr "resize2fs konnte ::1 mapper:: nicht vergrössern"
 
-#: _warning
+#: failure
 msgid "There is no open tomb to be closed."
 msgstr "Es gibt kein zu schließendes Grab."
 
-#: _warning
+#: 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')"
 
-#: _warning
+#: 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
+#: message
 msgid "Tomb close ::1::"
 msgstr "Tomb close ::1::"
 
-#: _warning
+#: warning
 msgid "Tomb not found: ::1 tomb file::"
 msgstr "Grab unauffindbar: ::1 tomb file::"
 
-#: _warning
+#: warning
 msgid "Please specify an existing tomb."
 msgstr "Bitte geben Sie ein existierendes Grab an."
 
-#: _success
-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
+#: message
 msgid "Kill all processes busy inside the tomb."
 msgstr "Abbrechen aller laufenden Prozesse im Grab."
 
-#: _warning
+#: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr "::1 tomb name:: kann nicht abrupt geschlossen werden !"
 
-#: _message
+#: message
 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
+#: message
 msgid "Closing tomb bind hook: ::1 hook::"
 msgstr "Schliessen des 'bind hooks': ::1 hook::"
 
-#: _success
-msgid "Slamming tomb: killing all processes using this hook."
-msgstr "Abruptes Schließen, abbrechen aller Prozesse die diesen Hook benutzen."
-
-#: _warning
+#: failure
 msgid "Cannot slam the bind hook ::1 hook::"
 msgstr "Abruptes schliessen des 'bind hooks' ::1 hook:: nicht möglich"
 
-#: _warning
+#: warning
 msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
 msgstr ""
 "Der 'bind hook' ::1 hook:: ist beschäftigt und kann nicht geschlossen werden."
 
-#: _warning
+#: warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "Grab ist beschäftigt und kann nicht ausgehänkt werden !"
 
-#: _warning
+#: failure
 msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
 msgstr ""
 "Ein Fehler ist beim Ausführen von 'cryptsetup luksClose ::1 mapper::' "
 "aufgetreten."
 
-#: _success
-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."
-
-#: _failure
+#: failure
 msgid "Error parsing."
 msgstr "Syntax Fehler."
 
-#: _warning
+#: warning
 msgid "There's no such command \"::1 subcommand::\"."
 msgstr "Der Befehl \"::1 subcommand::\" existiert nicht."
 
-#: _failure
+#: failure
 msgid "Please try -h for help."
 msgstr "Versuchen Sie -h um Hilfe zu erhalten."
 
-#: _warning
+#: warning
 msgid "Some error occurred during option processing."
 msgstr "Fehler beim interpretieren der Optionen"
 
-#: _failure
+#: failure
 msgid "See \"tomb help\" for more info."
 msgstr "Sie \"tomb help\" für mehr Infos."
 
-#: _failure
+#: failure
 msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
 msgstr "Unbekannte Option ::1 arg:: für Unterbefehl ::2 subcommand::"
 
-#: _failure
+#: failure
 msgid ""
 "You specified option ::1 option::, which is DANGEROUS and should only be "
 "used for testing\n"
@@ -1060,81 +971,258 @@ msgstr ""
 "Tests verwendet werden soll\n"
 "Wenn Sie sie wirklich benutzen wollen, fügen Sie --unsecure-dev-mode hinzu"
 
-#: _failure
-msgid "QREncode not installed: cannot engrave keys on paper."
-msgstr "QREncode nicht installiert: Kann Grabgravur nicht auf Papier ausgeben."
-
-#: _warning
+#: warning
 msgid ""
 "The create command is deprecated, please use dig, forge and lock instead."
 msgstr ""
 "Der Befehl create ist veraltet, benutzen Sie stattdesseb dig, forge, und "
 "lock."
 
-#: _warning
+#: warning
 msgid "For more informations see Tomb's manual page (man tomb)."
 msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."
 
-#: _failure
+#: failure
+msgid "Resize2fs not installed: cannot resize tombs."
+msgstr "Resize2fs nicht installiert: Gräber können nicht vergrössert werden."
+
+#: failure
+msgid "QREncode not installed: cannot engrave keys on paper."
+msgstr "QREncode nicht installiert: Kann Grabgravur nicht auf Papier ausgeben."
+
+#: failure
 msgid "Steghide not installed: cannot bury keys into images."
 msgstr ""
 "Steghide ist nicht installiert: Schlüssel können nicht in Bilder vergraben "
 "werden."
 
-#: _failure
+#: failure
 msgid "Steghide not installed: cannot exhume keys from images."
 msgstr ""
 "Steghide ist nicht installiert: Schlüssel können nicht aus Bilder "
 "ausgegraben werden."
 
-#: _failure
-msgid "Resize2fs not installed: cannot resize tombs."
-msgstr "Resize2fs nicht installiert: Gräber können nicht vergrössert werden."
-
-#: _print
+#: print
 msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
 msgstr ""
 "Tomb ::1 version:: - ein starker und sanfter Totengräber für ihre Geheimnisse"
 
-#: _print
+#: print
 msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
 msgstr " Urheberrecht (C) 2007-2014 Dyne.org Foundation, Lizens GNU GPL v3+"
 
-#: _print
+#: print
 msgid " This is free software: you are free to change and redistribute it"
 msgstr ""
 " This ist freie Software, Sie sind frei sie zu verändern und weiterzugeben"
 
-#: _print
+#: print
 msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
 msgstr "Der neueste Quellcode ist auf <http://tomb.dyne.org> erhältlich"
 
-#: _print
+#: print
 msgid " This source code is distributed in the hope that it will be useful,"
 msgstr ""
 " Dieser Quellcode wird veröffentlicht in der Hoffnung dass er nützlich ist,"
 
-#: _print
+#: print
 msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
 msgstr " aber OHNE JEDWEGE GARANTIE; inbegriffen die Garantie der"
 
-#: _print
+#: print
 msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr " MARKTGÄNGIGKEIT oder der EIGNUNG ZU EINEM BESTIMMTEN ZWECK."
 
-#: _print
+#: print
 msgid " Please refer to the GNU Public License for more details."
 msgstr ""
 " Bitte beziehen Sie sich auf die \"GNU Public License\" für mehr Details."
 
-#: _print
+#: print
 msgid "System utils:"
 msgstr "Systemwerkzeuge:"
 
-#: _warning
+#: warning
 msgid "Command \"::1 subcommand::\" not recognized."
 msgstr "Der Befehl \"::1 subcommand::\" wurde nicht erkannt."
 
-#: _message
+#: message
 msgid "Try -h for help."
 msgstr "Versuchen Sie -h um Hilfe zu erhalten."
+
+#~ msgid "All your swaps are belong to crypt.  Good."
+#~ msgstr "Alle geteilten Speicher gehören crypt.  Gut."
+
+#~ msgid "Valid tomb file found: ::1 tomb file::"
+#~ msgstr "Gültige Grab-Datei gefunden: ::1 tomb file::"
+
+#~ msgid ""
+#~ "Cannot find ::1::. It's a requirement to use Tomb, please install it."
+#~ msgstr ""
+#~ "Kann ::1:: nicht finden. Bitte installieren, da es zum Funktionement von "
+#~ "Tomb benötigt wird."
+
+#~ msgid "is_valid_key() called without argument."
+#~ msgstr "is_valid_key() ohne Argumente aufgerufen."
+
+#~ msgid "Internal error: ask_key_password() called before load_key()."
+#~ msgstr "Interner Fehler: ask_key_password() vor load_key gestartet"
+
+#~ msgid "Changing password for ::1 key file::"
+#~ msgstr "Passwort gewechselt für ::1 key file::."
+
+#~ msgid "Your passphrase was successfully updated."
+#~ msgstr "Ihr Passwort wurde erfolgreich geändert."
+
+#~ msgid "Using KDF, iterations: ::1 microseconds::"
+#~ msgstr "::1 microseconds:: Iterationen zur Schlüsselableitung."
+
+#~ msgid "Bury failed for invalid key: ::1 key::"
+#~ msgstr "Vergraben für ungültiges Passwort fehlgeschlagen: ::1 key::"
+
+#~ msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+#~ msgstr ""
+#~ "Verschlüssleung des Schlüssels ::1 tomb key:: im Bild ::2 image file::"
+
+#~ 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."
+
+#~ msgid "Key succesfully exhumed to ::1 key::."
+#~ msgstr "Schlüssel erfolgreich nach ::1 key:: exhumiert."
+
+#~ msgid "No key specified."
+#~ msgstr "Kein Schlüssel angegeben"
+
+#~ msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+#~ msgstr "::1 tomb key:: wird in QR-Code umgewandelt"
+
+#~ msgid "Operation successful:"
+#~ msgstr "Vorgang erfolgreich:"
+
+#~ msgid "Choose the  password of your key: ::1 tomb key::"
+#~ msgstr "Wählen Sie ein Passwort für ihren Schlüssel: ::1 tomb key::"
+
+#~ msgid "Done forging ::1 key::"
+#~ msgstr "Der Schlüssel ::1 key:: wurde geschmiedet"
+
+#~ msgid "Your key is ready:"
+#~ msgstr "Ihr Schlüssel ist bereit :"
+
+#~ msgid "Commanded to dig tomb ::1 tomb name::"
+#~ msgstr "Das Grab ::1 tomb name:: wird ausgehoben"
+
+#~ msgid "No tomb name specified for creation."
+#~ msgstr "Dem Grab wurde bei seiner Erstellung kein Name zugeteilt."
+
+#~ msgid "Size argument is not an integer."
+#~ msgstr "Die Größe muss eine Ganzzahl sein."
+
+#~ msgid "Tombs can't be smaller than 10 megabytes."
+#~ msgstr "Die minimale Größe ist 10 Mb."
+
+#~ msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+#~ msgstr "Neues Grab in ::1 tomb dir::/::2 tomb file::"
+
+#~ msgid ""
+#~ "Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+#~ msgstr ""
+#~ "Fehler beim Erstellen des Grabes ::1 tomb dir::/::2 tomb file::. Vorgang "
+#~ "abgebrochen."
+
+#~ msgid "Done digging ::1 tomb name::"
+#~ msgstr "Das Grab ::1 tomb name:: wurde ausgehoben."
+
+#~ msgid "Aborting operations: error loading key."
+#~ msgstr "Operationen werden abgebrochen: Fehler beim laden des Schlüssels."
+
+#~ msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+#~ msgstr "Abschließen von ::1 tomb file:: mit ::2 tomb key::"
+
+#~ 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 tomb dir::/::2 tomb file:: bereit und mit "
+#~ "Schlüssel ::3 tomb key:: geschützt"
+
+#~ msgid "Commanded to reset key for tomb ::1 tomb name::"
+#~ msgstr "Schlüssel wird zurückgesetzt für Grab ::1 tomb name::"
+
+#~ msgid "Aborting operations: error loading old key from arguments"
+#~ msgstr ""
+#~ "Operationen abgebrochen: Fehler beim Laden des alten Schlüssels aus den "
+#~ "Argumenten"
+
+#~ msgid "Changing lock on tomb ::1 tomb name::"
+#~ msgstr "Ändern des Schlosses für das Grab ::1 tomb name::"
+
+#~ msgid "Aborting operations: error loading new key from -k"
+#~ msgstr ""
+#~ "Operationen abgebrochen: Fehler beim Laden des neuen Schlüssels von -k"
+
+#~ msgid "New key: ::1 key::"
+#~ msgstr "Neuer Schlüssel: ::1 key::"
+
+#~ msgid "Succesfully changed key for tomb: ::1 tomb file::"
+#~ msgstr "Der Schlüssel wurde erfolgreich gewechselt am Grab ::1 tomb file::"
+
+#~ msgid "Creating this tomb would overwrite an existing file."
+#~ msgstr ""
+#~ "Das ausheben dieses Grabes würde eine existierende Datei überschreiben."
+
+#~ msgid "Failed to forge key, operation aborted."
+#~ msgstr "Schlüssel schmieden fehlgeschlagen, Operation abgebrochen."
+
+#~ msgid "Failed to lock tomb with key, operation aborted."
+#~ msgstr ""
+#~ "Abschliessen des Grabes mit dem Schlüssel fehlgeschlagen, Operation "
+#~ "abgebrochen."
+
+#~ msgid "Tomb ::1 tomb name:: succesfully created."
+#~ msgstr "Das Grab ::1 tomb name:: wurde erfolgreich erstellt."
+
+#~ msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+#~ msgstr ""
+#~ "::1 tomb file:: ist keine gültige Grab Datei, Operation abgebrochen."
+
+#~ msgid "Aborting operations: error loading key ::1 key::"
+#~ msgstr ""
+#~ "Operationen werden abgebrochen: Fehler beim Laden des Schlüssels ::1 key::"
+
+#~ msgid "Opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "::1 tomb file:: geöffnet in ::2 mount point::"
+
+#~ msgid "Success unlocking tomb ::1 tomb name::"
+#~ msgstr "::1 tomb name:: wurde erfolgreich aufgeschlossen."
+
+#~ msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "::1 tomb file:: erfolgreich geöffnet in ::2 mount point::"
+
+#~ msgid "Post hooks found, executing as user ::1 user name::."
+#~ msgstr "'Post hooks' gefunden, werden als ::1 user name:: ausgeführt."
+
+#~ msgid "Creating and updating search indexes."
+#~ msgstr "Erstellen und aktualisieren des Such-Indexes."
+
+#~ msgid "Searching for: ::1::"
+#~ msgstr "Suchen nach  ::1::"
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Slamming tomb: killing all processes using this hook."
+#~ msgstr ""
+#~ "Abruptes Schließen, abbrechen aller Prozesse die diesen Hook benutzen."
+
+#~ 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."
diff --git a/extras/po/es.po b/extras/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tomb \n"
-"PO-Revision-Date: sáb ago 30 20:56:52 CEST 2014\n"
+"PO-Revision-Date: Fri Nov 14 21:49:32 CET 2014\n"
 "Last-Translator: Dani \"GDrooid\" <gdrooid@openmailbox.org>\n"
 "Language-Team: Tomb developers <crypto@lists.dyne.org>\n"
 "Language: Spanish\n"
@@ -14,1035 +14,953 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _success
-msgid "All your swaps are belong to crypt.  Good."
-msgstr "Toda tu memoria de intercambio pertenece a la cripta. Bien."
+#: failure
+msgid "Fatal error creating a directory for temporary files"
+msgstr ""
+
+#: failure
+msgid "Cannot mount tmpfs in ::1 shm path::"
+msgstr ""
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr ""
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr ""
+
+#: failure
+msgid "Fatal error setting permissions on temporary file: ::1 temp file::"
+msgstr ""
+
+#: warning
+msgid "You can deactivate all swap partitions using the command:"
+msgstr ""
+
+#: warning
+msgid " swapoff -a"
+msgstr ""
 
-#: _failure
+#: warning
+msgid "But if you want to proceed like this, use the -f (force) flag."
+msgstr ""
+
+#: failure
 msgid "Operation aborted."
 msgstr "Operación abortada."
 
-#: _warning
+#: failure
 msgid "Tomb file is missing from arguments."
 msgstr "La tumba falta en los argumentos."
 
-#: _warning
+#: failure
 msgid "Tomb file not found: ::1 tomb file::"
 msgstr "No se ha encontrado la tumba: ::1 tumba::"
 
-#: _warning
+#: failure
 msgid "Tomb file is not a regular file: ::1 tomb file::"
 msgstr "La tumba no es un fichero regular: ::1 tumba::"
 
-#: _warning
+#: failure
 msgid "Tomb file is empty (zero length): ::1 tomb file::"
 msgstr "La tumba está vacía (longitud cero): ::1 tumba::"
 
-#: _warning
+#: failure
 msgid "Tomb file is not writable: ::1 tomb file::"
 msgstr "No se puede escribir en la tumba: ::1 tumba::"
 
-#: _warning
+#: warning
 msgid "File is not yet a tomb: ::1 tomb file::"
 msgstr "El fichero no es una tumba todavía: ::1 tumba::"
 
-#: _warning
+#: failure
 msgid "Tomb is currently in use: ::1 tomb name::"
 msgstr "La tumba ya está en uso: ::1 tumba::"
 
-#: _message
-msgid "Valid tomb file found: ::1 tomb file::"
-msgstr "Tumba válida encontrada: ::1 tumba::"
+#: message
+msgid "Valid tomb file found: ::1 tomb path::"
+msgstr ""
 
-#: _failure
+#: failure
 msgid "Loopback mount called on invalid tomb: ::1 path::"
 msgstr "Se ha intentado montar en loopback una tumba inválida: ::1 ruta::"
 
-#: _warning
+#: 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
+#: 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'."
 
-#: _warning
+#: 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."
 
-#: _print
+#: print
 msgid "Syntax: tomb [options] command [arguments]"
 msgstr "Sintaxis: tomb [opciones] comando [argumentos]"
 
-#: _print
+#: print
 msgid "Commands:"
 msgstr "Comandos:"
 
-#: _print
+#: print
 msgid " // Creation:"
 msgstr "// Creación:"
 
-#: _print
+#: 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
+#: print
 msgid " forge   create a new KEY file and set its password"
 msgstr " forge   crear una nueva LLAVE y especificar su contraseña"
 
-#: _print
+#: 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 LLAVE"
 
-#: _print
+#: print
 msgid " // Operations on tombs:"
 msgstr "// Operaciones en tumbas:"
 
-#: _print
+#: print
 msgid " open    open an existing TOMB"
 msgstr " open   abrir una TUMBA existente"
 
-#: _print
+#: print
 msgid " index   update the search indexes of tombs"
 msgstr " index   actualiza los índices de búsqueda de las tumbas"
 
-#: _print
+#: print
 msgid " search  looks for filenames matching text patterns"
 msgstr " search   busca nombres de fichero que coincidan con patrones de texto"
 
-#: _print
+#: print
 msgid " list    list of open TOMBs and information on them"
 msgstr " list   lista de TUMBAs abiertas e información acerca de ellas"
 
-#: _print
+#: print
 msgid " close   close a specific TOMB (or 'all')"
 msgstr " close   cerrar una TUMBA específica o todas ('all')"
 
-#: _print
+#: 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
+#: 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
+#: print
 msgid " // Operations on keys:"
 msgstr "// Operaciones en llaves:"
 
-#: _print
+#: print
 msgid " passwd  change the password of a KEY"
 msgstr " passwd   cambia la contraseña de una LLAVE"
 
-#: _print
+#: print
 msgid " setkey  change the KEY locking a TOMB (needs old one)"
 msgstr " setkey   cambia la LLAVE que asegura una TUMBA (necesita la anterior)"
 
-#: _print
+#: print
 msgid " engrave makes a QR code of a KEY to be saved on paper"
 msgstr " engrave   crea un código QR de una LLAVE para guardarla en papel"
 
-#: _print
+#: print
 msgid " bury    hide a KEY inside a JPEG image"
 msgstr " bury   esconde una LLAVE dentro de una imagen JPEG"
 
-#: _print
+#: print
 msgid " exhume  extract a KEY from a JPEG image"
 msgstr " exhume   extrae una LLAVE de una imagen JPEG"
 
-#: _print
+#: print
 msgid "Options:"
 msgstr "Opciones:"
 
-#: _print
+#: print
 msgid " -s     size of the tomb file when creating/resizing one (in MB)"
 msgstr " -s     tamaño de la tumba al crearla o cambiar su tamaño (en MB)"
 
-#: _print
+#: print
 msgid " -k     path to the key to be used ('-k -' to read from stdin)"
 msgstr " -k     ruta a la llave a utilizar ('-k -' para leerla de stdin)"
 
-#: _print
+#: print
 msgid " -n     don't process the hooks found in tomb"
 msgstr " -n     no procesar los hooks encontrados en la tumba"
 
-#: _print
+#: 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
+#: 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
+#: print
 msgid " --kdf  generate passwords armored against dictionary attacks"
 msgstr " --kdf  generar contraseñas blindadas contra ataques de diccionario"
 
-#: _print
+#: print
 msgid " -h     print this help"
 msgstr " -h     imprimir este mensaje de ayuda"
 
-#: _print
+#: print
 msgid " -v     print version, license and list of available ciphers"
 msgstr " -v     imprimir versión, licencia y lista de cifrados disponibles"
 
-#: _print
+#: print
 msgid " -q     run quietly without printing informations"
 msgstr " -q     correr silenciosamente sin imprimir información"
 
-#: _print
+#: print
 msgid " -D     print debugging information at runtime"
 msgstr " -D     imprimir información de debugging al correr"
 
-#: _print
+#: 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
+#: 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."
+#: failure
+msgid "Missing required dependency ::1 command::.  Please install it."
 msgstr ""
-"No se pudo encontrar ::1::. Es necesario para usar Tomb, por favor, "
-"instálalo."
 
-#: _warning
-msgid "is_valid_key() called without argument."
-msgstr "Se ha llamado a is_valid_key() sin argumento."
+#: warning
+msgid "is_valid_key() called without an argument."
+msgstr ""
 
-#: _message
+#: message
 msgid "Key is an image, it might be valid."
 msgstr "La llave es una imagen, puede que sea válida."
 
-#: _message
+#: message
 msgid "Key is valid."
 msgstr "La llave es válida."
 
-#: _warning
+#: warning
 msgid "Attempting key recovery."
 msgstr "Intentando recuperar la llave."
 
-#: _failure
+#: failure
 msgid "This operation requires a key file to be specified using the -k option."
 msgstr "Esta operación requiere que se especifique una llave con la opción -k."
 
-#: _message
+#: message
 msgid "Waiting for the key to be piped from stdin... "
 msgstr "Esperando a recibir la llave a través de stdin... "
 
-#: _warning
+#: failure
 msgid "Key not found, specify one using -k."
 msgstr "Llave no encontrada, especifica una usando -k."
 
-#: _warning
+#: warning
 msgid ""
 "The key seems invalid or its format is not known by this version of Tomb."
 msgstr ""
 "La llave parece inválida, o este formato no es reconocido por esta versión "
 "de Tomb."
 
-#: _failure
+#: failure
 msgid "No suitable program for KDF ::1 program::."
 msgstr "No hay un programa apropiado para usar KDF: ::1 programa::"
 
-#: _failure
-msgid "Internal error: ask_key_password() called before load_key()."
-msgstr "Error interno: se ha llamado a ask_key_password() antes de load_key()."
+#: failure
+msgid "Internal error: ask_key_password() called before _load_key()."
+msgstr ""
 
-#: _message
+#: message
 msgid "A password is required to use key ::1 key::"
 msgstr "Es necesaria una contraseña para usar la llave ::1 llave::"
 
-#: _warning
+#: warning
 msgid "User aborted password dialog."
 msgstr "El usuario ha abortado el diálogo de contraseña."
 
-#: _message
+#: message
 msgid "Password OK."
 msgstr "Contraseña OK."
 
-#: _message
+#: message
 msgid "Commanded to change password for tomb key ::1 key::"
 msgstr "Se ha ordenado cambiar la contraseña de la llave ::1 llave::"
 
-#: _success
-msgid "Changing password for ::1 key file::"
-msgstr "Cambiando contraseña para ::1 llave::"
-
-#: _failure
+#: failure
 msgid "No valid password supplied."
 msgstr "Contraseña incorrecta."
 
-#: _failure
+#: failure
 msgid "Error: the newly generated keyfile does not seem valid."
 msgstr "Error: la llave recién generada no parece válida."
 
-#: _success
-msgid "Your passphrase was successfully updated."
-msgstr "Tu contraseña ha sido actualizada con éxito."
-
-#: _failure
+#: failure
 msgid "User aborted."
 msgstr "El usuario ha abortado."
 
-#: _warning
+#: warning
 msgid "You set empty password, which is not possible."
 msgstr "Has elegido una contraseña vacía, lo que no es posible."
 
-#: _failure
+#: 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)."
 
-#: _success
-msgid "Using KDF, iterations: ::1 microseconds::"
-msgstr "Usando KDF, iteraciones: ::1 microsegundos::"
-
-#: _message
+#: message
 msgid "generating salt"
 msgstr "generando salt"
 
-#: _message
+#: message
 msgid "calculating iterations"
 msgstr "calculando iteraciones"
 
-#: _message
+#: message
 msgid "encoding the password"
 msgstr "codificando la contraseña"
 
-#: _failure
+#: 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 "bury a fallado para una llave inválida: ::1 llave::"
-
-#: _warning
+#: warning
 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 ::1 tomb key:: inside image ::2 image file::"
-msgstr "Codificando clave ::1 clave:: en la imagen ::2 fichero::"
-
-#: _message
+#: message
 msgid "Please confirm the key password for the encoding"
 msgstr "Por favor, confirma la contraseña de la clave para la codificación"
 
-#: _warning
+#: warning
 msgid "Wrong password supplied."
 msgstr "Contraseña incorrecta."
 
-#: _failure
+#: failure
 msgid "You shall not bury a key whose password is unknown to you."
 msgstr "No deberías enterrar una clave cuya contraseña desconoces."
 
-#: _warning
+#: warning
 msgid "Encoding error: steghide reports problems."
 msgstr "Error en la codficación: steghide reporta problemas."
 
-#: _success
-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 "mostrando llave exhumada en stdout"
-
-#: _failure
+#: failure
 msgid "Exhume failed, image file not found: ::1 image file::"
 msgstr "La exhumación ha fallado, no se ha encontrado la imagen: ::1 imagen::"
 
-#: _failure
+#: failure
 msgid "Exhume failed: ::1 image file:: is not a jpeg image."
 msgstr "La exhumación falló: ::1 imagen:: no es una imagen jpeg."
 
-#: _failure
+#: failure
 msgid "Wrong password or no steganographic key found"
 msgstr "Contraseña incorrecta o no se ha econtrando una clave esteganográfica"
 
-#: _warning
+#: message
+msgid "printing exhumed key on stdout"
+msgstr "mostrando llave exhumada en stdout"
+
+#: warning
 msgid "File exists: ::1 tomb key::"
 msgstr "El fichero existe: ::1 clave::"
 
-#: _warning
+#: warning
+msgid "Use of --force selected: overwriting."
+msgstr "Usando --force: sobreescribiendo."
+
+#: warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Usa --force para sobreescribir."
 
-#: _failure
+#: 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
+#: message
 msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Intentando exhumar una llave de la imagen ::1 fichero::"
 
-msgid "Key succesfully exhumed to ::1 key::."
-msgstr "Llave exhumada con éxito en ::1 llave::."
-
-#: _warning
+#: warning
 msgid "Nothing found in ::1 image file::"
 msgstr "No se ha encontrado nada en ::1 fichero::"
 
-#: _failure
-msgid "No key specified."
-msgstr "No se ha especificado una llave."
-
-#: _success
-msgid "Rendering a printable QRCode for key: ::1 tomb key::"
-msgstr "Creando un código QR imprimible para la llave: ::1 llave::"
-
-#: _failure
+#: failure
 msgid "QREncode reported an error."
 msgstr "QREncode ha reportado un error."
 
-#: _success
-msgid "Operation successful:"
-msgstr "Operación con éxito:"
+#: message
+msgid "Commanded to dig tomb ::1 tomb path::"
+msgstr ""
+
+#: failure
+msgid "Missing path to tomb"
+msgstr ""
+
+#: failure
+msgid "Size argument missing, use -s"
+msgstr "Falta el argumento de tamaño, usa -s"
+
+#: failure
+msgid "Size must be an integer (megabytes)"
+msgstr ""
+
+#: failure
+msgid "Tombs can't be smaller than 10 megabytes"
+msgstr ""
+
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
+msgstr "Ya existe una tumba. No voy a cavar aquí:"
+
+#: message
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Generando ::1 tumba:: de ::2 size::MiB"
+
+#: warning
+msgid "Error creating the tomb ::1 tomb path::"
+msgstr ""
+
+#: message
+msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
+msgstr ""
+"Tu tumba no está lista todavía, tienes que forjar una llave y asegurarla:"
+
+#: message
+msgid "tomb forge ::1 tomb path::.key"
+msgstr ""
 
-#: _warning
+#: message
+msgid "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
+msgstr ""
+
+#: failure
 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 "
 "llave nueva."
 
-#: _message
+#: message
 msgid "Commanded to forge key ::1 key::"
 msgstr "Se ha ordenado forjar la llave ::1 llave::"
 
-#: _warning
+#: warning
 msgid "Forging this key would overwrite an existing file. Operation aborted."
 msgstr ""
 "Forjar esta llave sobreescribiría un fichero existente. Operación abortada."
 
-#: _message
+#: message
 msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
 msgstr ""
 "Se ha ordenado forjar la llave ::1 llave:: con el algoritmo de cifrado ::2 "
 "algoritmo::"
 
-#: _message
+#: 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,"
 
-#: _message
+#: message
 msgid "once done you will be asked to choose a password for your tomb."
 msgstr "cuando termine se te pedirá que elijas una contraseña para tu tumba."
 
-#: _message
+#: message
 msgid "To make it faster you can move the mouse around."
 msgstr "Para acelerarlo puedes mover el ratón por la pantalla."
 
-#: _message
+#: message
 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."
 
-#: _warning
+#: warning
 msgid "Cannot generate encryption key."
 msgstr "No se puede generar la llave de encriptación."
 
-#: _success
-msgid "Choose the  password of your key: ::1 tomb key::"
-msgstr "Elige la contraseña para tu llave: ::1 llave::"
-
-#: _message
+#: message
 msgid "(You can also change it later using 'tomb passwd'.)"
 msgstr "(También puedes cambiarla más tarde usando 'tomb passwd'.)"
 
-#: _warning
+#: warning
 msgid "The key does not seem to be valid."
 msgstr "Parece que la llave no es válida."
 
-#: _warning
+#: warning
 msgid "Dumping contents to screen:"
 msgstr "Volcando contenido en la pantalla:"
 
-#: _message
-msgid "Done forging ::1 key::"
-msgstr "Se ha terminado de forjar ::1 llave::"
-
-#: _success
-msgid "Your key is ready:"
-msgstr "Tu llave está lista:"
-
-#: _message
-msgid "Commanded to dig tomb ::1 tomb name::"
-msgstr "Se ha ordenado cavar la tumba ::1 tumba::"
-
-#: _warning
-msgid "No tomb name specified for creation."
-msgstr "No se ha especificado un nombre para la creación de la tumba."
-
-#: _failure
-msgid "Size argument missing, use -s"
-msgstr "Falta el argumento de tamaño, usa -s"
-
-#: _failure
-msgid "Size argument is not an integer."
-msgstr "El argumento de tamaño no es un número entero."
-
-#: _failure
-msgid "Tombs can't be smaller than 10 megabytes."
-msgstr "Las tumbas no pueden ser menores de 10 megabytes."
-
-#: _warning
-msgid "A tomb exists already. I'm not digging here:"
-msgstr "Ya existe una tumba. No voy a cavar aquí:"
-
-#: _success
-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 ::1 tomb file:: of ::2 size::MiB"
-msgstr "Generando ::1 tumba:: de ::2 size::MiB"
-
-#: _failure
-msgid ""
-"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+#: warning
+msgid "--"
 msgstr ""
-"Error al crear la tumba ::1 directorio::/::2 fichero::, operación abortada."
-
-#: _success
-msgid "Done digging ::1 tomb name::"
-msgstr "He terminado de cavar ::1 tumba::"
 
-#: _message
-msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
+#: message
+msgid "Done forging ::1 key file::"
 msgstr ""
-"Tu tumba no está lista todavía, tienes que forjar una llave y asegurarla:"
 
-#: _warning
+#: warning
 msgid "No tomb specified for locking."
 msgstr "No se ha especificado una tumba que asegurar."
 
-#: _warning
+#: warning
 msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Uso: tomb lock file.tomb file.tomb.key"
 
-#: _message
+#: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr "Se ha ordenado asegurar la tumba ::1 tumba::"
 
-#: _failure
+#: failure
 msgid "There is no tomb here. You have to it dig first."
 msgstr "No hay una tumba aquí. Tienes que cavarla primero."
 
-#: _message
+#: 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)."
 
-#: _warning
+#: warning
 msgid "The tomb was already locked with another key."
 msgstr "La tumba ya estaba asegurada con otra llave."
 
-#: _failure
+#: 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."
 
-#: _message
+#: message
 msgid "Fine, this tomb seems empty."
 msgstr "Bien, esta tumba parece vacía."
 
-#: _failure
-msgid "Aborting operations: error loading key."
-msgstr "Abortando operaciones: error al cargar la llave."
-
-#: _message
+#: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr "Asegurando usando el cifrado: ::1::"
 
-#: _success
-msgid "Locking ::1 tomb file:: with ::2 tomb key::"
-msgstr "Asegurando ::1 tumba:: con ::1 llave::"
-
-#: _message
+#: message
 msgid "Formatting Luks mapped device."
 msgstr "Formateando dispositivo mapeado con Luks."
 
-#: _warning
+#: warning
 msgid "cryptsetup luksFormat returned an error."
 msgstr "cryptsetup luksFormat ha devuelto un error."
 
-#: _warning
+#: warning
 msgid "cryptsetup luksOpen returned an error."
 msgstr "cryptsetup luksOpen ha devuelto un error."
 
-#: _message
+#: message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Formateando tu tumba con el sistema de ficheros Ext3/Ext4."
 
-#: _warning
+#: warning
 msgid "Tomb format returned an error."
 msgstr "El formateo de la tumba ha devuelto un error."
 
-#: _warning
+#: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr "Puede que tu tumba ::1 tumba:: esté corrupta."
 
-#: _message
+#: message
 msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
 msgstr "He terminado de asegurar ::1 tumba:: usando Luks dm-crypt ::2::"
 
-#: _success
-msgid ""
-"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
-"key ::3 tomb key::"
+#: message
+msgid "Commanded to reset key for tomb ::1 tomb path::"
 msgstr ""
-"Tu tumba está preparada en ::1 directorio::/::2 tumba:: y asegurada con la "
-"llave ::3 clave::"
-
-#: _message
-msgid "Commanded to reset key for tomb ::1 tomb name::"
-msgstr "Se ha ordenado resetear la llave para la tumba ::1 tumba::"
 
-#: _warning
+#: warning
 msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
 msgstr ""
 "El comando 'setkey' necesita dos argumentos: la vieja llave y la tumba."
 
-#: _warning
+#: warning
 msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
 msgstr "Por ejemplo: tomb -k new.tomb.key old.tomb.key secret.tomb"
 
-#: _failure
+#: failure
 msgid "Execution aborted."
 msgstr "Ejecución abortada."
 
-#: _failure
+#: failure
 msgid "Not a valid LUKS encrypted volume: ::1 volume::"
 msgstr "No es un volumen LUKS encriptado válido: ::1 volumen::"
 
-#: _failure
-msgid "Aborting operations: error loading old key from arguments"
-msgstr ""
-"Abortando operaciones: error al cargar la vieja llave de los argumentos"
-
-#: _success
-msgid "Changing lock on tomb ::1 tomb name::"
-msgstr "Cambiando el candado de la tumba ::1 tumba::"
-
-#: _message
+#: message
 msgid "Old key: ::1 old key::"
 msgstr "Llave vieja: ::1 Llave::"
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the old key."
 msgstr "No se ha proporcionado una contraseña válida para la vieja llave."
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksOpen."
 msgstr "Error inesperado en luksOpen."
 
-#: _failure
-msgid "Aborting operations: error loading new key from -k"
-msgstr "Abortando operaciones: error al cargar la nueva llave de -k"
-
-#: _message
-msgid "New key: ::1 key::"
-msgstr "Llave nueva: ::1 llave::"
+#: message
+msgid "New key: ::1 key file::"
+msgstr ""
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the new key."
 msgstr "No se ha proporcionado una contraseña válida para la nueva llave."
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksChangeKey."
 msgstr "Error inesperado en luksChangeKey."
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksClose."
 msgstr "Error inesperado en luksClose."
 
-#: _success
-msgid "Succesfully changed key for tomb: ::1 tomb file::"
-msgstr "Se ha cambiado con éxito la llave para la tumba: ::1 tumba::"
-
-#: _message
+#: message
 msgid "The new key is: ::1 new key::"
 msgstr "La nueva llave es: ::1 llave::"
 
-#: _warning
-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 "Fallo al forjar la llave, operación abortada."
-
-#: _failure
-msgid "Failed to lock tomb with key, operation aborted."
-msgstr "Fallo al asegurar la tumba con la llave, operación abortada."
-
-#: _success
-msgid "Tomb ::1 tomb name:: succesfully created."
-msgstr "Tumba ::1 tumba:: creada con éxito."
-
-#: _message
-msgid "Commanded to open tomb ::1 tomb name::"
-msgstr "Se ha ordenado abrir la tumba ::1 tumba::"
-
-#: _warning
+#: failure
 msgid "No tomb name specified for opening."
 msgstr "No se ha especificado el nombre de la tumba a abrir."
 
-#: _warning
-msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
-msgstr "::1 tumba:: no es una tumba válida, operación abortada."
+#: message
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Se ha ordenado abrir la tumba ::1 tumba::"
 
-#: _failure
-msgid "Aborting operations: error loading key ::1 key::"
-msgstr "Abortando operaciones: error al cargar la llave ::1 llave::"
+#: warning
+msgid "::1 tomb file:: is not a valid tomb file"
+msgstr ""
 
-#: _message
+#: message
 msgid "Mountpoint not specified, using default: ::1 mount point::"
 msgstr ""
 "Punto de montaje no especificado, utilizando estándar: ::1 punto de montaje::"
 
-#: _warning
+#: warning
 msgid "::1 tomb name:: is already open."
 msgstr "::1 tumba:: ya está abierta."
 
-#: _message
+#: message
 msgid "Here below its status is reported:"
 msgstr "Su estado se muestra a continuación:"
 
-#: _success
-msgid "Opening ::1 tomb file:: on ::2 mount point::"
-msgstr "Abriendo ::1 tumba:: en ::2 punto de montaje::"
-
-#: _warning
+#: failure
 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
+#: message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Esta tumba es un dispositivo encriptado con LUKS válido."
 
-#: _message
+#: message
 msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
 msgstr ""
 "El cifrado es \"::1 cifrado::\" en modo \"::2 modo::\" y hash \"::3 hash::\""
 
-#: _warning
+#: warning
 msgid ""
 "Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
 msgstr ""
 "Hay múltiples rarunas para la llave en esta tumba. Cuidado: puede haber una "
 "puerta trasera."
 
-#: _failure
+#: failure
 msgid "Failure mounting the encrypted file."
 msgstr "Fallo al montar el fichero encriptado."
 
-#: _success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr "La tumba ::1 tumba:: ha sido abierta con éxito."
-
-#: _message
+#: message
 msgid "Checking filesystem via ::1::"
 msgstr "Comprobando el sistema de ficheros a través de ::1::"
 
-#: _success
-msgid "Success opening ::1 tomb file:: on ::2 mount point::"
-msgstr "::1 tumba:: ha sido abierta en ::2 punto de montaje::"
-
-#: _message
+#: message
 msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
 msgstr ""
 "Última visita de ::1 usuario::(::2 versión de tomb::) desde ::3 tty:: en ::4 "
 "host::"
 
-#: _message
+#: message
 msgid "on date ::1 date::"
 msgstr "el ::1 fecha::"
 
-#: _warning
+#: warning
 msgid "How pitiful!  A tomb, and no HOME."
 msgstr "¡Que lamentable! Una tumba, y ningún HOGAR."
 
-#: _warning
+#: warning
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr "No se pueden ejecutar los bind-hooks sin una tumba montada."
 
-#: _warning
+#: warning
+msgid "bind-hooks file is broken"
+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"
 
-#: _warning
+#: 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"
 
-#: _warning
+#: warning
 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
+#: warning
 msgid ""
 "bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
 msgstr ""
 "No se ha encontrado la fuente para el bind-hook en la tumba, omitiendo ::1 "
 "punto de montaje::/::2 directorio::"
 
-#: _success
-msgid "Post hooks found, executing as user ::1 user name::."
-msgstr "Se han encontrado post-hooks, ejecutando como usuario ::1 usuario::."
-
-#: _failure
+#: failure
 msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
 msgstr "No puedo ver ninguna tumba ::1 estado::. Que todos descansen en paz."
 
-#: _failure
+#: message
+msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: open since ::2 tombsince::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::"
+"%) is used: ::4 tombavail:: free "
+msgstr ""
+
+#: warning
+msgid "::1 tombname:: warning: your tomb is almost full!"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: hooks ::2 hookname:: on ::3 hookdest::"
+msgstr ""
+
+#: failure
 msgid "Internal error: list_tomb_binds called without argument."
 msgstr "Error interno: se ha llamado a list_tomb_binds sin argumento."
 
-#: _failure
+#: failure
 msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
 msgstr ""
 "No se pueden indexar la tumbas en este sistema: updatedb (mlocate) no está "
 "instalado."
 
-#: _warning
+#: warning
 msgid "Cannot use GNU findutils for index/search commands."
 msgstr "No se puede usar GNU findutils para los comandos index/search."
 
-#: _failure
+#: failure
 msgid "Index command needs 'mlocate' to be installed."
 msgstr "El comando index necesita que 'mlocate' esté instalado."
 
-#: _failure
+#: failure
 msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr "Parece que existe una tumba con el grabado [::1::]"
 
-#: _failure
+#: failure
 msgid "I can't see any open tomb, may they all rest in peace."
 msgstr "No puedo ver ninguna tumba abierta. Que todos descansen en paz."
 
-#: _success
-msgid "Creating and updating search indexes."
-msgstr "Creando y actualizando índices de búsqueda."
-
-#: _message
+#: message
 msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr "Omitiendo ::1 tumba:: (se ha econtrado .noindex)."
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: filenames..."
 msgstr "Indexando los nombre de fichero de ::1 tumba::..."
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: contents..."
 msgstr "Indexando el contenido de ::1 tumba::..."
 
-#: _message
+#: message
 msgid "Search index updated."
 msgstr "Índice de búsqueda actualizado."
 
-#: _success
-msgid "Searching for: ::1::"
-msgstr "Buscando ::1::"
-
-#: _message
+#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr "Buscando nombres de fichero en la tumba ::1 tumba::"
 
-#: _message
+#: message
 msgid "Matches found: ::1 matches::"
 msgstr "Se han encontrado coindicencias: ::1::"
 
-#: _message
+#: message
 msgid "Searching contents in tomb ::1 tomb name::"
 msgstr "Buscando contenido en la tumba ::1 tumba::"
 
-#: _warning
+#: warning
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr "Omitiendo tumba ::1 tomb name::: no se ha indexado."
 
-#: _warning
+#: warning
 msgid "Run 'tomb index' to create indexes."
 msgstr "Corre 'tomb index' para crear los índices."
 
-#: _message
+#: message
 msgid "Search completed."
 msgstr "Búsqueda completada."
 
-#: _message
+#: message
 msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
 msgstr ""
 "Se ha ordenado cambiar el tamaño de la tumba ::1 tumba:: a ::2 tamaño:: "
 "megabytes."
 
-#: _failure
+#: failure
 msgid "No tomb name specified for resizing."
 msgstr ""
 "No se ha especificado el nombre de la tumba a la que cambiar el tamaño."
 
-#: _failure
+#: failure
 msgid "Cannot find ::1::"
 msgstr "No se puede encontrar ::1::"
 
-#: _failure
+#: failure
 msgid "Aborting operations: new size was not specified, use -s"
 msgstr "Abortando operaciones: no se ha especificado un nuevo tamaño, usa -s"
 
-#: _failure
-msgid "The tomb ::1 tomb name:: is open, to resize it it needs to be closed."
+#: failure
+msgid "Please close the tomb ::1 tomb name:: before trying to resize it."
 msgstr ""
-"La tumba ::1 tumba:: está abierta, necesita estar cerrada para el cambio de "
-"tamaño."
 
-#: _failure
+#: failure
 msgid "You must specify the new size of ::1 tomb name::"
 msgstr "Debes especificar el nuevo tamaño de ::1 tumba::"
 
-#: _failure
+#: failure
 msgid "Size is not an integer."
 msgstr "El tamaño no es un número entero."
 
-#: _failure
+#: failure
 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."
 
-#: _failure
+#: failure
 msgid "Error creating the extra resize ::1 size::, operation aborted."
 msgstr "Error al crear el espacio extra ::1 tamaño::, operación abortada."
 
-#: _failure
+#: failure
 msgid "cryptsetup failed to resize ::1 mapper::"
 msgstr "cryptsetup ha fallado al cambiar el tamaño de ::1 mapper::"
 
-#: _failure
+#: failure
 msgid "e2fsck failed to check ::1 mapper::"
 msgstr "e2fsck ha fallado al comprobar ::1::"
 
-#: _failure
+#: failure
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr "resize2fs ha fallado al cambiar el tamaño de ::1::"
 
-#: _warning
+#: failure
 msgid "There is no open tomb to be closed."
 msgstr "No hay ninguna tumba abierta que cerrar."
 
-#: _warning
+#: warning
 msgid "Too many tombs mounted, please specify one (see tomb list)"
 msgstr "Demasiadas tumbas abietas, por favor, especifica una (véase tomb list)"
 
-#: _warning
+#: warning
 msgid "or issue the command 'tomb close all' to close them all."
 msgstr "o utiliza el comando 'tomb close all' para cerrarlas todas."
 
-#: _message
+#: message
 msgid "Tomb close ::1::"
 msgstr "Se ha cerrado la tumba ::1 tumba::"
 
-#: _warning
+#: warning
 msgid "Tomb not found: ::1 tomb file::"
 msgstr "No se ha encontrado la tumba: ::1 tumba::"
 
-#: _warning
+#: warning
 msgid "Please specify an existing tomb."
 msgstr "Por favor, especifica una tumba existente."
 
-#: _success
-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
+#: message
 msgid "Kill all processes busy inside the tomb."
 msgstr "Mata todos los procesos ocupados dentro de la tumba."
 
-#: _warning
+#: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr "No se puede cerrar de un portazo la tumba ::1 tumba::"
 
-#: _message
+#: message
 msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
 msgstr "Cerrando la tumba ::1 tumba:: montada en ::2 punto de montaje::"
 
-#: _message
+#: message
 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."
-
-#: _warning
+#: failure
 msgid "Cannot slam the bind hook ::1 hook::"
 msgstr "No se puede cerrar de un portazo el bind-hook ::1::"
 
-#: _warning
+#: warning
 msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
 msgstr "El bind-hook ::1:: está ocupado, no se puede cerrar la tumba."
 
-#: _warning
+#: warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "La tumba está ocupada, ¡no se puede desmontar!"
 
-#: _warning
+#: failure
 msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
 msgstr "Ha ocurrido un error en cryptsetup luksClose ::1::"
 
-#: _success
-msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
-msgstr "Tumba ::1 tumba:: cerrada: tus huesos descansarán en paz."
-
-#: _failure
+#: failure
 msgid "Error parsing."
 msgstr "Error al parsear."
 
-#: _warning
+#: warning
 msgid "There's no such command \"::1 subcommand::\"."
 msgstr "No existe el comando \"::1 comando::\"."
 
-#: _failure
+#: failure
 msgid "Please try -h for help."
 msgstr "Prueba -h para obtener ayuda."
 
-#: _warning
+#: warning
 msgid "Some error occurred during option processing."
 msgstr "Ha ocurrido algún error al procesar las opciones."
 
-#: _failure
+#: failure
 msgid "See \"tomb help\" for more info."
 msgstr "Véase \"tomb help\" par más información."
 
-#: _failure
+#: failure
 msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
 msgstr ""
 "No se reconoce la opción ::1 argumento:: para el subcomando ::2 subcomando::"
 
-#: _failure
+#: failure
 msgid ""
 "You specified option ::1 option::, which is DANGEROUS and should only be "
 "used for testing\n"
@@ -1052,76 +970,247 @@ msgstr ""
 "usar para el testeo\n"
 "Si realmente quieres usarla, añade --unsecure-dev-mode"
 
-#: _failure
-msgid "QREncode not installed: cannot engrave keys on paper."
-msgstr "QREncode no está instalado: no se pueden grabar las llave en papel."
-
-#: _warning
+#: 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."
 
-#: _warning
+#: 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
+#: failure
+msgid "Resize2fs not installed: cannot resize tombs."
+msgstr ""
+"Resize2fs no está instalado: no se puede cambiar el tamaño de las tumbas."
+
+#: failure
+msgid "QREncode not installed: cannot engrave keys on paper."
+msgstr "QREncode no está instalado: no se pueden grabar las llave en papel."
+
+#: failure
 msgid "Steghide not installed: cannot bury keys into images."
 msgstr ""
 "Steghide no está instalado: no se pueden enterrar llaves en las imágenes."
 
-#: _failure
+#: failure
 msgid "Steghide not installed: cannot exhume keys from images."
 msgstr ""
 "Setghide no está instalado: no se pueden exhumar llaves de las imágenes."
 
-#: _failure
-msgid "Resize2fs not installed: cannot resize tombs."
-msgstr ""
-"Resize2fs no está instalado: no se puede cambiar el tamaño de las tumbas."
-
-#: _print
+#: print
 msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
 msgstr "Tomb ::1 versión:: - un enterrador fuerte y amable para tus secretos"
 
-#: _print
+#: print
 msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
 msgstr " Copyright (C) 2007-2014 Fundación Dyne.org, Licencia GNU GPL v3+"
 
-#: _print
+#: print
 msgid " This is free software: you are free to change and redistribute it"
 msgstr " Esto es software libre: eres libre de modificarlo y redistribuirlo"
 
-#: _print
+#: print
 msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
 msgstr " El código más reciente de Tomb se publica en <http://tomb.dyne.org>"
 
-#: _print
+#: print
 msgid " This source code is distributed in the hope that it will be useful,"
 msgstr " Este código fuente se distribuye con la esperanza de que sea util,"
 
-#: _print
+#: print
 msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
 msgstr " pero SIN NINGUNA GARANTÍA; ni siquiera la garantía tácita de"
 
-#: _print
+#: print
 msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr " MERCANTIBILIDAD or APTITUD PARA UN PROPÓSITO PARTICULAR."
 
-#: _print
+#: print
 msgid " Please refer to the GNU Public License for more details."
 msgstr " Por favor, refiérase a la Licencia Pública GNU para más detalles."
 
-#: _print
+#: print
 msgid "System utils:"
 msgstr "Utilidades del sistema:"
 
-#: _warning
+#: warning
 msgid "Command \"::1 subcommand::\" not recognized."
 msgstr "No se ha reconocido el commando \"::1 comando::\"."
 
-#: _message
+#: message
 msgid "Try -h for help."
 msgstr "Prueba -h para obtener ayuda."
+
+#~ msgid "All your swaps are belong to crypt.  Good."
+#~ msgstr "Toda tu memoria de intercambio pertenece a la cripta. Bien."
+
+#~ msgid "Valid tomb file found: ::1 tomb file::"
+#~ msgstr "Tumba válida encontrada: ::1 tumba::"
+
+#~ msgid ""
+#~ "Cannot find ::1::. It's a requirement to use Tomb, please install it."
+#~ msgstr ""
+#~ "No se pudo encontrar ::1::. Es necesario para usar Tomb, por favor, "
+#~ "instálalo."
+
+#~ msgid "is_valid_key() called without argument."
+#~ msgstr "Se ha llamado a is_valid_key() sin argumento."
+
+#~ msgid "Internal error: ask_key_password() called before load_key()."
+#~ msgstr ""
+#~ "Error interno: se ha llamado a ask_key_password() antes de load_key()."
+
+#~ msgid "Changing password for ::1 key file::"
+#~ msgstr "Cambiando contraseña para ::1 llave::"
+
+#~ msgid "Your passphrase was successfully updated."
+#~ msgstr "Tu contraseña ha sido actualizada con éxito."
+
+#~ msgid "Using KDF, iterations: ::1 microseconds::"
+#~ msgstr "Usando KDF, iteraciones: ::1 microsegundos::"
+
+#~ msgid "Bury failed for invalid key: ::1 key::"
+#~ msgstr "bury a fallado para una llave inválida: ::1 llave::"
+
+#~ msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+#~ msgstr "Codificando clave ::1 clave:: en la imagen ::2 fichero::"
+
+#~ msgid "Tomb key encoded succesfully into image ::1 image file::"
+#~ msgstr "Clave tomb codificada con éxito en la imagen ::1 fichero::"
+
+#~ msgid "Key succesfully exhumed to ::1 key::."
+#~ msgstr "Llave exhumada con éxito en ::1 llave::."
+
+#~ msgid "No key specified."
+#~ msgstr "No se ha especificado una llave."
+
+#~ msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+#~ msgstr "Creando un código QR imprimible para la llave: ::1 llave::"
+
+#~ msgid "Operation successful:"
+#~ msgstr "Operación con éxito:"
+
+#~ msgid "Choose the  password of your key: ::1 tomb key::"
+#~ msgstr "Elige la contraseña para tu llave: ::1 llave::"
+
+#~ msgid "Done forging ::1 key::"
+#~ msgstr "Se ha terminado de forjar ::1 llave::"
+
+#~ msgid "Your key is ready:"
+#~ msgstr "Tu llave está lista:"
+
+#~ msgid "Commanded to dig tomb ::1 tomb name::"
+#~ msgstr "Se ha ordenado cavar la tumba ::1 tumba::"
+
+#~ msgid "No tomb name specified for creation."
+#~ msgstr "No se ha especificado un nombre para la creación de la tumba."
+
+#~ msgid "Size argument is not an integer."
+#~ msgstr "El argumento de tamaño no es un número entero."
+
+#~ msgid "Tombs can't be smaller than 10 megabytes."
+#~ msgstr "Las tumbas no pueden ser menores de 10 megabytes."
+
+#~ msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+#~ msgstr "Creando una nueva tumba en ::1 directorio::/::2 fichero::"
+
+#~ 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."
+
+#~ msgid "Done digging ::1 tomb name::"
+#~ msgstr "He terminado de cavar ::1 tumba::"
+
+#~ msgid "Aborting operations: error loading key."
+#~ msgstr "Abortando operaciones: error al cargar la llave."
+
+#~ msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+#~ msgstr "Asegurando ::1 tumba:: con ::1 llave::"
+
+#~ 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 llave ::3 clave::"
+
+#~ msgid "Commanded to reset key for tomb ::1 tomb name::"
+#~ msgstr "Se ha ordenado resetear la llave para la tumba ::1 tumba::"
+
+#~ msgid "Aborting operations: error loading old key from arguments"
+#~ msgstr ""
+#~ "Abortando operaciones: error al cargar la vieja llave de los argumentos"
+
+#~ msgid "Changing lock on tomb ::1 tomb name::"
+#~ msgstr "Cambiando el candado de la tumba ::1 tumba::"
+
+#~ msgid "Aborting operations: error loading new key from -k"
+#~ msgstr "Abortando operaciones: error al cargar la nueva llave de -k"
+
+#~ msgid "New key: ::1 key::"
+#~ msgstr "Llave nueva: ::1 llave::"
+
+#~ msgid "Succesfully changed key for tomb: ::1 tomb file::"
+#~ msgstr "Se ha cambiado con éxito la llave para la tumba: ::1 tumba::"
+
+#~ msgid "Creating this tomb would overwrite an existing file."
+#~ msgstr ""
+#~ "Crear esta tumba sobreescribiría un fichero existente. Operación abortada."
+
+#~ msgid "Failed to forge key, operation aborted."
+#~ msgstr "Fallo al forjar la llave, operación abortada."
+
+#~ msgid "Failed to lock tomb with key, operation aborted."
+#~ msgstr "Fallo al asegurar la tumba con la llave, operación abortada."
+
+#~ msgid "Tomb ::1 tomb name:: succesfully created."
+#~ msgstr "Tumba ::1 tumba:: creada con éxito."
+
+#~ msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+#~ msgstr "::1 tumba:: no es una tumba válida, operación abortada."
+
+#~ msgid "Aborting operations: error loading key ::1 key::"
+#~ msgstr "Abortando operaciones: error al cargar la llave ::1 llave::"
+
+#~ msgid "Opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "Abriendo ::1 tumba:: en ::2 punto de montaje::"
+
+#~ msgid "Success unlocking tomb ::1 tomb name::"
+#~ msgstr "La tumba ::1 tumba:: ha sido abierta con éxito."
+
+#~ msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "::1 tumba:: ha sido abierta en ::2 punto de montaje::"
+
+#~ msgid "Post hooks found, executing as user ::1 user name::."
+#~ msgstr ""
+#~ "Se han encontrado post-hooks, ejecutando como usuario ::1 usuario::."
+
+#~ msgid "Creating and updating search indexes."
+#~ msgstr "Creando y actualizando índices de búsqueda."
+
+#~ msgid "Searching for: ::1::"
+#~ msgstr "Buscando ::1::"
+
+#~ 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."
+
+#~ 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::"
+
+#~ msgid "Slamming tomb: killing all processes using this hook."
+#~ msgstr ""
+#~ "Cerrando tumba de un portazo: matando todos los procesos que usan este "
+#~ "hook."
+
+#~ msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+#~ msgstr "Tumba ::1 tumba:: cerrada: tus huesos descansarán en paz."
diff --git a/extras/po/fr.po b/extras/po/fr.po
@@ -7,867 +7,774 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
 
-#: _success
-msgid "All your swaps are belong to crypt.  Good."
-msgstr "Toutes les partitions d'échange sont chiffrées.  C'est bien."
+#: failure
+msgid "Fatal error creating a directory for temporary files"
+msgstr ""
+
+#: failure
+msgid "Cannot mount tmpfs in ::1 shm path::"
+msgstr ""
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr ""
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr ""
+
+#: failure
+msgid "Fatal error setting permissions on temporary file: ::1 temp file::"
+msgstr ""
+
+#: warning
+msgid "You can deactivate all swap partitions using the command:"
+msgstr ""
+
+#: warning
+msgid " swapoff -a"
+msgstr ""
+
+#: warning
+msgid "But if you want to proceed like this, use the -f (force) flag."
+msgstr ""
 
-#: _failure
+#: failure
 msgid "Operation aborted."
 msgstr "L'opération est interrompue."
 
-#: _warning
+#: failure
 msgid "Tomb file is missing from arguments."
 msgstr ""
 
-#: _warning
+#: failure
 #, fuzzy
 msgid "Tomb file not found: ::1 tomb file::"
 msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
 
-#: _warning
+#: failure
 #, 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
+#: failure
 #, 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
+#: failure
 #, fuzzy
 msgid "Tomb file is not writable: ::1 tomb file::"
 msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "File is not yet a tomb: ::1 tomb file::"
 msgstr "Ouverture de la tombe ::1 tomb file::"
 
-#: _warning
+#: failure
 #, 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::"
+#: message
+msgid "Valid tomb file found: ::1 tomb path::"
+msgstr ""
 
-#: _failure
+#: failure
 msgid "Loopback mount called on invalid tomb: ::1 path::"
 msgstr ""
 
-#: _warning
+#: 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
+#: 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."
 
-#: _warning
+#: 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."
 
-#: _print
+#: print
 msgid "Syntax: tomb [options] command [arguments]"
 msgstr "Syntaxe : tomb [options] commande [arguments]"
 
-#: _print
+#: print
 msgid "Commands:"
 msgstr "Commandes :"
 
-#: _print
+#: print
 msgid " // Creation:"
 msgstr " // Création :"
 
-#: _print
+#: 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
+#: 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
+#: 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
+#: print
 msgid " // Operations on tombs:"
 msgstr " // Opérations sur les tombes :"
 
-#: _print
+#: print
 msgid " open    open an existing TOMB"
 msgstr " open    (ouvrir)         Ouvrir une TOMBE existante"
 
-#: _print
+#: print
 msgid " index   update the search indexes of tombs"
 msgstr ""
 " index   (indéxer)       Mettre à jour les indices de recherche des tombes"
 
-#: _print
+#: print
 msgid " search  looks for filenames matching text patterns"
 msgstr ""
 " search (rechercher) Rechercher des noms de fichiers selon des motifs "
 "textuels"
 
-#: _print
+#: print
 msgid " list    list of open TOMBs and information on them"
 msgstr ""
 " list       (énumérer)   Établir une liste informative des TOMBES ouvertes"
 
-#: _print
+#: print
 msgid " close   close a specific TOMB (or 'all')"
 msgstr ""
 " close   (fermer)        Sceller une TOMBE en fermant tous les programmes "
 "associés"
 
-#: _print
+#: print
 msgid " slam    slam a TOMB killing all programs using it"
 msgstr ""
 
-#: _print
+#: 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
+#: print
 msgid " // Operations on keys:"
 msgstr " // Opération sur les clés :"
 
-#: _print
+#: print
 msgid " passwd  change the password of a KEY"
 msgstr " passwd                    Modifier le mot de passe d'une CLÉ"
 
-#: _print
+#: 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
+#: 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
+#: print
 msgid " bury    hide a KEY inside a JPEG image"
 msgstr ""
 " bury       (enterrer)   Cacher la CLÉ dans une image JPEG (stéganographie)"
 
-#: _print
+#: 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
+#: print
 msgid "Options:"
 msgstr "Options :"
 
-#: _print
+#: 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
+#: 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
+#: print
 msgid " -n     don't process the hooks found in tomb"
 msgstr " -n        ne pas utiliser les 'crochets' trouvés dans la tombe"
 
-#: _print
+#: 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
+#: 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
+#: 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
+#: print
 msgid " -h     print this help"
 msgstr " -h        imprimer cette aide"
 
-#: _print
+#: 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
+#: print
 msgid " -q     run quietly without printing informations"
 msgstr " -q       exécuter silencieusement sans imprimer les informations"
 
-#: _print
+#: print
 msgid " -D     print debugging information at runtime"
 msgstr " -D       imprimer les information de débogage durant l'exécution"
 
-#: _print
+#: 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
+#: 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."
+#: failure
+msgid "Missing required dependency ::1 command::.  Please install it."
 msgstr ""
 
-#: _warning
-msgid "is_valid_key() called without argument."
+#: warning
+msgid "is_valid_key() called without an argument."
 msgstr ""
 
-#: _message
+#: message
 msgid "Key is an image, it might be valid."
 msgstr ""
 
-#: _message
+#: message
 msgid "Key is valid."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Attempting key recovery."
 msgstr ""
 
-#: _failure
+#: 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."
 
-#: _message
+#: message
 msgid "Waiting for the key to be piped from stdin... "
 msgstr "En attente d'une clé à lire sur l'entrée standard... "
 
-#: _warning
+#: failure
 msgid "Key not found, specify one using -k."
 msgstr "Aucune clé n'a été trouvée, merci d'en spécifier une avec -k."
 
-#: _warning
+#: warning
 msgid ""
 "The key seems invalid or its format is not known by this version of Tomb."
 msgstr ""
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "No suitable program for KDF ::1 program::."
 msgstr "Pas de programme approprié pour la dérivation de clé ::1 kdf::."
 
-#: _failure
-msgid "Internal error: ask_key_password() called before load_key()."
+#: failure
+msgid "Internal error: ask_key_password() called before _load_key()."
 msgstr ""
 
-#: _message
+#: message
 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
+#: warning
 msgid "User aborted password dialog."
 msgstr "L'utilisateur a interrompu le dialogue du mot de passe."
 
-#: _message
+#: message
 msgid "Password OK."
 msgstr "Le mot de passe est valide."
 
-#: _message
+#: message
 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
-#, fuzzy
-msgid "Changing password for ::1 key file::"
-msgstr "Mise à jour du mot de passe de ::1 key::."
-
-#: _failure
+#: failure
 #, fuzzy
 msgid "No valid password supplied."
 msgstr "Le mot de passe fourni est invalide."
 
-#: _failure
+#: failure
 msgid "Error: the newly generated keyfile does not seem valid."
 msgstr "Erreur : le fichier de clé nouvellement créé semble invalide."
 
-#: _success
-msgid "Your passphrase was successfully updated."
-msgstr "Votre mot de passe a été mis à jour correctement."
-
-#: _failure
+#: failure
 msgid "User aborted."
 msgstr "L'utilisateur a interrompu l'opération."
 
-#: _warning
+#: warning
 msgid "You set empty password, which is not possible."
 msgstr "Vous ne pouvez pas saisir un mot de passe vide."
 
-#: _failure
+#: 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)."
 
-#: _success
-msgid "Using KDF, iterations: ::1 microseconds::"
-msgstr "::1 microsecondes:: itérations pour la dérivation de clé."
-
-#: _message
+#: message
 msgid "generating salt"
 msgstr ""
 
-#: _message
+#: message
 msgid "calculating iterations"
 msgstr ""
 
-#: _message
+#: message
 msgid "encoding the password"
 msgstr ""
 
-#: _failure
+#: 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."
 
-#: _failure
-#, fuzzy
-msgid "Bury failed for invalid key: ::1 key::"
-msgstr "Une clé valide a été trouvée : ::1 key::"
-
-#: _warning
+#: warning
 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
-#, 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
+#: 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"
 
-#: _warning
+#: warning
 msgid "Wrong password supplied."
 msgstr "Le mot de passe fourni est invalide."
 
-#: _failure
+#: failure
 msgid "You shall not bury a key whose password is unknown to you."
 msgstr "Vous ne pouvez pas enterrer une clé dont vous ignorez le mot de passe."
 
-#: _warning
+#: warning
 msgid "Encoding error: steghide reports problems."
 msgstr "Erreur à l'encodage : steghide rapporte des problèmes."
 
-#: _success
-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
+#: 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
+#: 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
+#: failure
 msgid "Wrong password or no steganographic key found"
 msgstr ""
 
-#: _warning
+#: message
+msgid "printing exhumed key on stdout"
+msgstr ""
+
+#: warning
 #, fuzzy
 msgid "File exists: ::1 tomb key::"
 msgstr "Le fichier existe : ::1 key::"
 
-#: _warning
+#: warning
+msgid "Use of --force selected: overwriting."
+msgstr "L'option --force est sélectionnée : ré-écriture en cours."
+
+#: warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Pour l'ignorer et l'écrire de nouveau, utiliser --force."
 
-#: _failure
+#: 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
+#: message
 msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Tentative d'exhumer une clé de l'image ::1 image file::"
 
-msgid "Key succesfully exhumed to ::1 key::."
-msgstr ""
-
-#: _warning
+#: warning
 msgid "Nothing found in ::1 image file::"
 msgstr "Aucune clé n'a été trouvée dans ::1 image file::"
 
-#: _failure
-msgid "No key specified."
+#: failure
+msgid "QREncode reported an error."
 msgstr ""
 
-#: _success
-#, fuzzy
-msgid "Rendering a printable QRCode for key: ::1 tomb key::"
-msgstr "Conversion en QR code imprimable de la clé : ::1 key::"
+#: message
+msgid "Commanded to dig tomb ::1 tomb path::"
+msgstr ""
 
-#: _failure
-msgid "QREncode reported an error."
+#: failure
+msgid "Missing path to tomb"
+msgstr ""
+
+#: failure
+msgid "Size argument missing, use -s"
+msgstr "Utiliser -s pour préciser la taille de la tombe en Mo."
+
+#: failure
+msgid "Size must be an integer (megabytes)"
+msgstr ""
+
+#: failure
+msgid "Tombs can't be smaller than 10 megabytes"
+msgstr ""
+
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
+msgstr "Une tombe existe déjà à cet endroit. Je n'y creuse pas !"
+
+#: message
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Tombe en cours de création ::1 tomb file::, de taille ::2 size::Mo"
+
+#: warning
+msgid "Error creating the tomb ::1 tomb path::"
+msgstr ""
+
+#: 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 :"
 
-#: _success
-msgid "Operation successful:"
-msgstr "Succès : "
+#: message
+msgid "tomb forge ::1 tomb path::.key"
+msgstr ""
 
-#: _warning
+#: message
+msgid "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
+msgstr ""
+
+#: failure
 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."
 
-#: _message
+#: message
 msgid "Commanded to forge key ::1 key::"
 msgstr "Forge de la clé ::1 key::"
 
-#: _warning
+#: 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."
 
-#: _message
+#: message
 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
+#: 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,"
 
-#: _message
+#: 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."
 
-#: _message
+#: message
 msgid "To make it faster you can move the mouse around."
 msgstr "Vous pouvez accélérer l'opération en bougeant la souris."
 
-#: _message
+#: 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."
 
-#: _warning
+#: warning
 msgid "Cannot generate encryption key."
 msgstr "La clé de chiffrement ne peut être générée."
 
-#: _success
-#, fuzzy
-msgid "Choose the  password of your key: ::1 tomb key::"
-msgstr "Saisir un mot de passe pour votre clé : ::1 key::"
-
-#: _message
+#: message
 msgid "(You can also change it later using 'tomb passwd'.)"
 msgstr ""
 "(Vous pouvez le modifier ultérieurement avec la commande 'tomb passwd'.)"
 
-#: _warning
+#: warning
 msgid "The key does not seem to be valid."
 msgstr "La clé semble être invalide."
 
-#: _warning
+#: warning
 msgid "Dumping contents to screen:"
 msgstr "Capture des contenus à l'écran :"
 
-#: _message
-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
-#, 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."
-msgstr "La tombe n'a pas été nommée lors de sa création."
-
-#: _failure
-msgid "Size argument missing, use -s"
-msgstr "Utiliser -s pour préciser la taille de la tombe en Mo."
-
-#: _failure
-msgid "Size argument is not an integer."
-msgstr "L'argument de la taille doit être un nombre entier."
-
-#: _failure
-msgid "Tombs can't be smaller than 10 megabytes."
-msgstr "La taille minimale d'une tombe est de 10 megaoctets."
-
-#: _warning
-msgid "A tomb exists already. I'm not digging here:"
-msgstr "Une tombe existe déjà à cet endroit. Je n'y creuse pas !"
-
-#: _success
-#, fuzzy
-msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
-msgstr "Nouvelle tombe à ::1 dir::/::2 tomb file::"
-
-#: _message
-msgid "Generating ::1 tomb file:: of ::2 size::MiB"
-msgstr "Tombe en cours de création ::1 tomb file::, de taille ::2 size::Mo"
-
-#: _failure
-#, fuzzy
-msgid ""
-"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+#: warning
+msgid "--"
 msgstr ""
-"Erreur lors de la création de la tombe ::1 dir::/::2 tomb file::. Opération "
-"annulée."
-
-#: _success
-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:"
+#: message
+msgid "Done forging ::1 key file::"
 msgstr ""
-"Votre tombe n'est pas encore prête, vous devez en forger la clé et la "
-"vérouiller :"
 
-#: _warning
+#: warning
 msgid "No tomb specified for locking."
 msgstr "Quelle tombe dois-je vérouiller ?"
 
-#: _warning
+#: warning
 msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Usage : tomb lock file.tomb file.tomb.key"
 
-#: _message
+#: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr "Vérouillage de la tombe ::1 tomb file:: en cours"
 
-#: _failure
+#: 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')."
 
-#: _message
+#: message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
 msgstr "Sondage de la tombe (nous ne piétinons jamais les os d'autrui)."
 
-#: _warning
+#: warning
 msgid "The tomb was already locked with another key."
 msgstr "La tombe est déjà vérouillée avec une autre clé."
 
-#: _failure
+#: 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')."
 
-#: _message
+#: message
 msgid "Fine, this tomb seems empty."
 msgstr "Bien, la tombe semble être vide."
 
-#: _failure
-msgid "Aborting operations: error loading key."
-msgstr ""
-
-#: _message
+#: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr "Vérouillage avec l'algorithme de chiffrement : ::1 cipher::"
 
-#: _success
-#, fuzzy
-msgid "Locking ::1 tomb file:: with ::2 tomb key::"
-msgstr "Vérouillage de ::1 tomb file:: avec ::1 key::"
-
-#: _message
+#: message
 msgid "Formatting Luks mapped device."
 msgstr "Formatage du dispositif LUKS désigné."
 
-#: _warning
+#: warning
 msgid "cryptsetup luksFormat returned an error."
 msgstr "Une erreur s'est produite à l'exécution de cryptsetup luksFormat"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "cryptsetup luksOpen returned an error."
 msgstr "Une erreur s'est produite à l'exécution de cryptsetup luksFormat"
 
-#: _message
+#: message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Formatage de votre tombe avec un système de fichier Ext3/Ext4."
 
-#: _warning
+#: warning
 msgid "Tomb format returned an error."
 msgstr "Une erreur s'est produite à l'exécution du formatage."
 
-#: _warning
+#: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr "Votre tombe ::1 tomb file:: pourrait être corrompu."
 
-#: _message
+#: message
 #, 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
-#, fuzzy
-msgid ""
-"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
-"key ::3 tomb key::"
+#: message
+msgid "Commanded to reset key for tomb ::1 tomb path::"
 msgstr ""
-"Votre tombe est disponible à ::1 dir::/::2 tomb file:: et protégée par la "
-"clé ::1 key::"
 
-#: _message
-#, fuzzy
-msgid "Commanded to reset key for tomb ::1 tomb name::"
-msgstr "Changement du verrou sur la tombe ::1 tomb file::"
-
-#: _warning
+#: warning
 msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
 msgstr ""
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "Execution aborted."
 msgstr "L'opération est interrompue."
 
-#: _failure
+#: 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 ::1 tomb name::"
-msgstr "Changement du verrou en cours sur ::1 tomb name::"
-
-#: _message
+#: message
 #, fuzzy
 msgid "Old key: ::1 old key::"
 msgstr "Clé précédente : ::1 key::"
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the old key."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksOpen."
 msgstr ""
 
-#: _failure
-msgid "Aborting operations: error loading new key from -k"
+#: message
+msgid "New key: ::1 key file::"
 msgstr ""
 
-#: _message
-msgid "New key: ::1 key::"
-msgstr "Nouvelle clé : ::1 key::"
-
-#: _failure
+#: failure
 msgid "No valid password supplied for the new key."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksChangeKey."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksClose."
 msgstr ""
 
-#: _success
-msgid "Succesfully changed key for tomb: ::1 tomb file::"
-msgstr "Le verrou est changé sur la tombe ::1 tomb file::"
-
-#: _message
+#: message
 #, fuzzy
 msgid "The new key is: ::1 new key::"
 msgstr "La nouvelle clé est : ::1 key::"
 
-#: _warning
-#, 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 ::1 tomb name:: succesfully created."
-msgstr "La tombe ::1 tomb name:: a été créée avec succès."
-
-#: _message
-#, fuzzy
-msgid "Commanded to open tomb ::1 tomb name::"
-msgstr "Ouverture de la tombe ::1 tomb file::"
-
-#: _warning
+#: failure
 #, fuzzy
 msgid "No tomb name specified for opening."
 msgstr "Merci de spécifier le nom de la tombe à agrandir."
 
-#: _warning
+#: message
 #, 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."
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Ouverture de la tombe ::1 tomb file::"
 
-#: _failure
-msgid "Aborting operations: error loading key ::1 key::"
+#: warning
+msgid "::1 tomb file:: is not a valid tomb file"
 msgstr ""
 
-#: _message
+#: message
 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
+#: warning
 msgid "::1 tomb name:: is already open."
 msgstr "::1 tomb name:: est déjà ouverte."
 
-#: _message
+#: message
 msgid "Here below its status is reported:"
 msgstr "L'état de la tombe suit :"
 
-#: _success
-msgid "Opening ::1 tomb file:: on ::2 mount point::"
-msgstr "Ouverture de ::1 tomb file:: sur ::2 mount point::"
-
-#: _warning
+#: failure
 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
+#: message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Cette tombe est un dispositif chiffré LUKS valide."
 
-#: _message
+#: message
 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
+#: warning
 msgid ""
 "Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Failure mounting the encrypted file."
 msgstr "Le montage du fichier chiffré a échoué."
 
-#: _success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr "La tombe ::1 tomb name:: est à présent dévérouillée."
-
-#: _message
+#: message
 msgid "Checking filesystem via ::1::"
 msgstr "Vérification du système de fichiers avec ::1::"
 
-#: _success
-#, fuzzy
-msgid "Success opening ::1 tomb file:: on ::2 mount point::"
-msgstr "Ouverture de ::1 tomb file:: sur ::2 mount point::"
-
-#: _message
+#: message
 msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
 msgstr ""
 
-#: _message
+#: message
 msgid "on date ::1 date::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "How pitiful!  A tomb, and no HOME."
 msgstr "C'est pitoyable ! Une tombe, mais sans abri (HOME n'est pas défini)."
 
-#: _warning
+#: 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."
 
-#: _warning
+#: warning
+msgid "bind-hooks file is broken"
+msgstr ""
+
+#: warning
 #, 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
+#: warning
 #, 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
+#: warning
 #, 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
+#: warning
 #, fuzzy
 msgid ""
 "bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
@@ -875,325 +782,472 @@ msgstr ""
 "L'origine du point de montage n'est pas relatif à la tombe : le chemin ::1 "
 "mount point::/::2 dir:: est ignoré."
 
-#: _success
-#, 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
+#: 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
+#: message
+msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: open since ::2 tombsince::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::"
+"%) is used: ::4 tombavail:: free "
+msgstr ""
+
+#: warning
+msgid "::1 tombname:: warning: your tomb is almost full!"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: hooks ::2 hookname:: on ::3 hookdest::"
+msgstr ""
+
+#: failure
 msgid "Internal error: list_tomb_binds called without argument."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Cannot use GNU findutils for index/search commands."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Index command needs 'mlocate' to be installed."
 msgstr ""
 
-#: _failure
+#: 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
+#: failure
 msgid "I can't see any open tomb, may they all rest in peace."
 msgstr "Je ne vois aucune tombe ouverte, qu'ils reposent tous en paix."
 
-#: _success
-msgid "Creating and updating search indexes."
-msgstr "Création et mise à jour des index de recherche."
-
-#: _message
+#: message
 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
+#: message
 msgid "Indexing ::1 tomb name:: filenames..."
 msgstr "Index des fichiers dans ::1 tomb name:: en cours..."
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: contents..."
 msgstr "Index des contenus de ::1 tomb name:: en cours..."
 
-#: _message
+#: message
 msgid "Search index updated."
 msgstr "L'index de recherche a été mis à jour."
 
-#: _success
-#, fuzzy
-msgid "Searching for: ::1::"
-msgstr "Vérification du système de fichiers avec ::1::"
-
-#: _message
+#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr "Recherche parmi les fichiers dans la tombe ::1 tomb name::"
 
-#: _message
+#: message
 msgid "Matches found: ::1 matches::"
 msgstr "Résultats trouvés : ::1 matches::"
 
-#: _message
+#: message
 msgid "Searching contents in tomb ::1 tomb name::"
 msgstr "Recherche parmi les contenus de la tombe ::1 tomb name::"
 
-#: _warning
+#: warning
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr "La tombe ::1 tomb name:: n'est pas indexée, et donc ignorée."
 
-#: _warning
+#: warning
 msgid "Run 'tomb index' to create indexes."
 msgstr "Exécuter 'tomb index' pour générer les index."
 
-#: _message
+#: message
 msgid "Search completed."
 msgstr "La recherche est terminée."
 
-#: _message
+#: message
 #, 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
+#: failure
 msgid "No tomb name specified for resizing."
 msgstr "Merci de spécifier le nom de la tombe à agrandir."
 
-#: _failure
+#: failure
 msgid "Cannot find ::1::"
 msgstr "::1:: reste introuvable."
 
-#: _failure
+#: failure
 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."
+#: failure
+msgid "Please close the tomb ::1 tomb name:: before trying to resize it."
 msgstr ""
-"La tombe ::1 tomb name:: est ouverte, mais elle doit être fermée pour être "
-"agrandie."
 
-#: _failure
+#: failure
 msgid "You must specify the new size of ::1 tomb name::"
 msgstr "Vous devez spécifier la nouvelle taille de ::1 tomb name::"
 
-#: _failure
+#: failure
 msgid "Size is not an integer."
 msgstr "La taille doit être un nombre entier."
 
-#: _failure
+#: failure
 msgid "The new size must be greater then old tomb size."
 msgstr "La nouvelle taille doit être supérieure à l'ancienne."
 
-#: _failure
+#: 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
+#: failure
 #, fuzzy
 msgid "cryptsetup failed to resize ::1 mapper::"
 msgstr "resize2fs n'a pas pu redimensionner ::1 mapper::"
 
-#: _failure
+#: failure
 msgid "e2fsck failed to check ::1 mapper::"
 msgstr "e2fsck n'a pas pu vérifier ::1 mapper::"
 
-#: _failure
+#: failure
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr "resize2fs n'a pas pu redimensionner ::1 mapper::"
 
-#: _warning
+#: failure
 msgid "There is no open tomb to be closed."
 msgstr "Il n'y a pas de tombe à fermer."
 
-#: _warning
+#: warning
 msgid "Too many tombs mounted, please specify one (see tomb list)"
 msgstr "Trop de tombes sont montées, merci d'en choisir une (voir 'tomb list')"
 
-#: _warning
+#: warning
 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
+#: message
 #, fuzzy
 msgid "Tomb close ::1::"
 msgstr "Fermons la tombe ::1 tomb name::"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "Tomb not found: ::1 tomb file::"
 msgstr "Tombe introuvable : ::1 tomb name::"
 
-#: _warning
+#: warning
 msgid "Please specify an existing tomb."
 msgstr "Merci d'indiquer une tombe existante."
 
-#: _success
-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
+#: message
 msgid "Kill all processes busy inside the tomb."
 msgstr "Exécution (sommaire) de tous les processus en cours dans la tombe."
 
-#: _warning
+#: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr "La tombe ::1 tomb name:: ne peut pas être fermée !"
 
-#: _message
+#: message
 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
+#: message
 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
+#: failure
 #, fuzzy
 msgid "Cannot slam the bind hook ::1 hook::"
 msgstr "Quelque chose coince à ::1 mount point::."
 
-#: _warning
+#: warning
 #, 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é."
 
-#: _warning
+#: warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "La tombe est occupée et ne peut pas être démontée !"
 
-#: _warning
+#: failure
 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 ::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."
-
-#: _failure
+#: failure
 msgid "Error parsing."
 msgstr "Erreur de syntaxe."
 
-#: _warning
+#: warning
 msgid "There's no such command \"::1 subcommand::\"."
 msgstr "La commande \"::1 subcommand::\" n'est pas implémentée."
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "Please try -h for help."
 msgstr "Essayer -h pour obtenir l'aide."
 
-#: _warning
+#: warning
 msgid "Some error occurred during option processing."
 msgstr "L'interprétation des options a échoué."
 
-#: _failure
+#: failure
 msgid "See \"tomb help\" for more info."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
 msgstr ""
 
-#: _failure
+#: 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 ""
 
-#: _failure
-msgid "QREncode not installed: cannot engrave keys on paper."
-msgstr ""
-
-#: _warning
+#: 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\"."
 
-#: _warning
+#: 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)."
 
-#: _failure
-msgid "Steghide not installed: cannot bury keys into images."
+#: failure
+msgid "Resize2fs not installed: cannot resize tombs."
 msgstr ""
 
-#: _failure
-msgid "Steghide not installed: cannot exhume keys from images."
+#: failure
+msgid "QREncode not installed: cannot engrave keys on paper."
 msgstr ""
 
-#: _failure
-msgid "Resize2fs not installed: cannot resize tombs."
+#: failure
+msgid "Steghide not installed: cannot bury keys into images."
 msgstr ""
 
-#: _print
+#: failure
+msgid "Steghide not installed: cannot exhume keys from images."
+msgstr ""
+
+#: print
 msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
 msgstr ""
 
-#: _print
+#: print
 msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
 msgstr ""
 
-#: _print
+#: print
 msgid " This is free software: you are free to change and redistribute it"
 msgstr ""
 
-#: _print
+#: print
 msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
 msgstr ""
 
-#: _print
+#: print
 msgid " This source code is distributed in the hope that it will be useful,"
 msgstr ""
 
-#: _print
+#: print
 msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
 msgstr ""
 
-#: _print
+#: print
 msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: _print
+#: print
 msgid " Please refer to the GNU Public License for more details."
 msgstr ""
 
-#: _print
+#: print
 msgid "System utils:"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Command \"::1 subcommand::\" not recognized."
 msgstr "La command \"::1 subcommand::\" n'est pas reconnue."
 
-#: _message
+#: message
 msgid "Try -h for help."
 msgstr "Essayer -h pour obtenir l'aide."
+
+#~ msgid "All your swaps are belong to crypt.  Good."
+#~ msgstr "Toutes les partitions d'échange sont chiffrées.  C'est bien."
+
+#~ msgid "Valid tomb file found: ::1 tomb file::"
+#~ msgstr "Le fichier valide d'une tombe a été trouvé : ::1 tomb file::"
+
+#, fuzzy
+#~ msgid "Changing password for ::1 key file::"
+#~ msgstr "Mise à jour du mot de passe de ::1 key::."
+
+#~ msgid "Your passphrase was successfully updated."
+#~ msgstr "Votre mot de passe a été mis à jour correctement."
+
+#~ msgid "Using KDF, iterations: ::1 microseconds::"
+#~ msgstr "::1 microsecondes:: itérations pour la dérivation de clé."
+
+#, fuzzy
+#~ msgid "Bury failed for invalid key: ::1 key::"
+#~ msgstr "Une clé valide a été trouvée : ::1 key::"
+
+#, 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::"
+
+#~ msgid "Tomb key encoded succesfully into image ::1 image file::"
+#~ msgstr "La clé a été correctement inscrite dans l'image ::1 image file::"
+
+#, fuzzy
+#~ msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+#~ msgstr "Conversion en QR code imprimable de la clé : ::1 key::"
+
+#~ msgid "Operation successful:"
+#~ msgstr "Succès : "
+
+#, fuzzy
+#~ msgid "Choose the  password of your key: ::1 tomb key::"
+#~ msgstr "Saisir un mot de passe pour votre clé : ::1 key::"
+
+#~ msgid "Done forging ::1 key::"
+#~ msgstr "La clé ::1 key:: a été forgée"
+
+#~ msgid "Your key is ready:"
+#~ msgstr "Votre clé est prête :"
+
+#, fuzzy
+#~ msgid "Commanded to dig tomb ::1 tomb name::"
+#~ msgstr "Creusement de la tombe ::1 tomb file::"
+
+#~ msgid "No tomb name specified for creation."
+#~ msgstr "La tombe n'a pas été nommée lors de sa création."
+
+#~ msgid "Size argument is not an integer."
+#~ msgstr "L'argument de la taille doit être un nombre entier."
+
+#~ msgid "Tombs can't be smaller than 10 megabytes."
+#~ msgstr "La taille minimale d'une tombe est de 10 megaoctets."
+
+#, fuzzy
+#~ msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+#~ msgstr "Nouvelle tombe à ::1 dir::/::2 tomb file::"
+
+#, 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."
+
+#~ msgid "Done digging ::1 tomb name::"
+#~ msgstr "La tombe ::1 tomb name:: est creusée."
+
+#, fuzzy
+#~ msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+#~ msgstr "Vérouillage de ::1 tomb file:: avec ::1 key::"
+
+#, 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::"
+
+#, fuzzy
+#~ msgid "Commanded to reset key for tomb ::1 tomb name::"
+#~ msgstr "Changement du verrou sur la tombe ::1 tomb file::"
+
+#~ msgid "Changing lock on tomb ::1 tomb name::"
+#~ msgstr "Changement du verrou en cours sur ::1 tomb name::"
+
+#~ msgid "New key: ::1 key::"
+#~ msgstr "Nouvelle clé : ::1 key::"
+
+#~ msgid "Succesfully changed key for tomb: ::1 tomb file::"
+#~ msgstr "Le verrou est changé sur la tombe ::1 tomb file::"
+
+#, 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."
+
+#~ msgid "Tomb ::1 tomb name:: succesfully created."
+#~ msgstr "La tombe ::1 tomb name:: a été créée avec succès."
+
+#, 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."
+
+#~ msgid "Opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "Ouverture de ::1 tomb file:: sur ::2 mount point::"
+
+#~ msgid "Success unlocking tomb ::1 tomb name::"
+#~ msgstr "La tombe ::1 tomb name:: est à présent dévérouillée."
+
+#, fuzzy
+#~ msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "Ouverture de ::1 tomb file:: sur ::2 mount point::"
+
+#, 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::."
+
+#~ msgid "Creating and updating search indexes."
+#~ msgstr "Création et mise à jour des index de recherche."
+
+#, fuzzy
+#~ msgid "Searching for: ::1::"
+#~ msgstr "Vérification du système de fichiers avec ::1::"
+
+#~ 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."
+
+#~ 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::."
+
+#~ msgid "Slamming tomb: killing all processes using this hook."
+#~ msgstr "Fermeture soudaine : interruption des processus utilisant ce hook."
+
+#~ 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."
diff --git a/extras/po/ru.po b/extras/po/ru.po
@@ -7,1133 +7,1185 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
 
-#: _success
-msgid "All your swaps are belong to crypt.  Good."
-msgstr "Весь swap принадлежит криптографии. Хорошо."
+#: failure
+msgid "Fatal error creating a directory for temporary files"
+msgstr ""
+
+#: failure
+msgid "Cannot mount tmpfs in ::1 shm path::"
+msgstr ""
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr ""
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr ""
+
+#: failure
+msgid "Fatal error setting permissions on temporary file: ::1 temp file::"
+msgstr ""
+
+#: warning
+msgid "You can deactivate all swap partitions using the command:"
+msgstr ""
+
+#: warning
+msgid " swapoff -a"
+msgstr ""
+
+#: warning
+msgid "But if you want to proceed like this, use the -f (force) flag."
+msgstr ""
 
-#: _failure
+#: failure
 msgid "Operation aborted."
 msgstr "Операция отменена."
 
-#: _warning
+#: failure
 msgid "Tomb file is missing from arguments."
 msgstr ""
 
-#: _warning
+#: failure
 #, fuzzy
 msgid "Tomb file not found: ::1 tomb file::"
 msgstr "Найден верный файл гробницы: ::1 tomb file::"
 
-#: _warning
+#: failure
 #, fuzzy
 msgid "Tomb file is not a regular file: ::1 tomb file::"
 msgstr "Найден верный файл гробницы: ::1 tomb file::"
 
-#: _warning
+#: failure
 #, fuzzy
 msgid "Tomb file is empty (zero length): ::1 tomb file::"
 msgstr "Найден верный файл гробницы: ::1 tomb file::"
 
-#: _warning
+#: failure
 #, fuzzy
 msgid "Tomb file is not writable: ::1 tomb file::"
 msgstr "Найден верный файл гробницы: ::1 tomb file::"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "File is not yet a tomb: ::1 tomb file::"
 msgstr "Приказано открыть гробницу ::1 tomb file::"
 
-#: _warning
+#: failure
 #, 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::"
+#: message
+msgid "Valid tomb file found: ::1 tomb path::"
+msgstr ""
 
-#: _failure
+#: failure
 msgid "Loopback mount called on invalid tomb: ::1 path::"
 msgstr ""
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "Loop mount of volumes is not possible on this machine, this error"
 msgstr "Loop-монтирование томов не поддерживается на этой машине, эта ошибка"
 
-#: _warning
+#: warning
 msgid "often occurs on VPS and kernels that don't provide the loop module."
 msgstr "часто возникает на VPS и ядрах, которые не имеют модуля loop."
 
-#: _warning
+#: warning
 msgid "It is impossible to use Tomb on this machine at this conditions."
 msgstr "Невозможно использовать Tomb на этой машине при таких условиях."
 
-#: _print
+#: print
 msgid "Syntax: tomb [options] command [arguments]"
 msgstr "Синтаксис: tomb [опции] команда [аргументы]"
 
-#: _print
+#: print
 msgid "Commands:"
 msgstr "Команды:"
 
-#: _print
+#: print
 msgid " // Creation:"
 msgstr " // Создание: "
 
-#: _print
+#: print
 msgid " dig     create a new empty TOMB file of size -s in MB"
 msgstr " dig     создать новый пустой файл ГРОБНИЦЫ размером -s Мб "
 
-#: _print
+#: print
 msgid " forge   create a new KEY file and set its password"
 msgstr " forge   создать новый файл КЛЮЧА и задать его пароль "
 
-#: _print
+#: print
 msgid " lock    installs a lock on a TOMB to use it with KEY"
 msgstr " lock    установить замок на ГРОБНИЦУ, используя КЛЮЧ "
 
-#: _print
+#: print
 msgid " // Operations on tombs:"
 msgstr " // Операции над гробницами: "
 
-#: _print
+#: print
 msgid " open    open an existing TOMB"
 msgstr " open    открыть существующую ГРОБНИЦУ "
 
-#: _print
+#: print
 msgid " index   update the search indexes of tombs"
 msgstr " index   обновить поисковый индекс гробниц "
 
-#: _print
+#: print
 msgid " search  looks for filenames matching text patterns"
 msgstr " search  ищет имена файлов, соответствующие шаблону "
 
-#: _print
+#: print
 msgid " list    list of open TOMBs and information on them"
 msgstr " list    список открытых ГРОБНИЦ и информация о них "
 
-#: _print
+#: print
 msgid " close   close a specific TOMB (or 'all')"
 msgstr " close   закрыть определенную ГРОБНИЦУ (или 'all' для всех) "
 
-#: _print
+#: print
 msgid " slam    slam a TOMB killing all programs using it"
 msgstr " slam    захлопнуть ГРОБНИЦУ, убив все программы, использующие ее "
 
-#: _print
+#: print
 msgid " resize  resize a TOMB to a new size -s (can only grow)"
 msgstr " resize  привести размер гробницы к -s Мб (можно только увеличить) "
 
-#: _print
+#: print
 msgid " // Operations on keys:"
 msgstr " // Операции с ключами: "
 
-#: _print
+#: print
 msgid " passwd  change the password of a KEY"
 msgstr " passwd  изменить пароль КЛЮЧА "
 
-#: _print
+#: print
 msgid " setkey  change the KEY locking a TOMB (needs old one)"
 msgstr " setkey  изменить КЛЮЧ для закрытия ГРОБНИЦЫ (нужен старый ключ) "
 
-#: _print
+#: print
 msgid " engrave makes a QR code of a KEY to be saved on paper"
 msgstr " engrave создает штрих-код для хранения КЛЮЧА на бумаге "
 
-#: _print
+#: print
 msgid " bury    hide a KEY inside a JPEG image"
 msgstr ""
 " bury    спрятать КЛЮЧ в JPEG изображении exhume  извлечь КЛЮЧ из JPEG "
 "изображения "
 
-#: _print
+#: print
 msgid " exhume  extract a KEY from a JPEG image"
 msgstr ""
 
-#: _print
+#: print
 msgid "Options:"
 msgstr "Опции: "
 
-#: _print
+#: print
 msgid " -s     size of the tomb file when creating/resizing one (in MB)"
 msgstr " -s     размер файла гробницы при создании/изменении размера (в Мб) "
 
-#: _print
+#: print
 msgid " -k     path to the key to be used ('-k -' to read from stdin)"
 msgstr " -k     путь к ключу ('-k -' для чтения из stdin) "
 
-#: _print
+#: print
 msgid " -n     don't process the hooks found in tomb"
 msgstr " -n     не обрабатывать события, найденные в гробнице "
 
-#: _print
+#: print
 msgid " -o     mount options used to open (default: rw,noatime,nodev)"
 msgstr ""
 " -o     параметры монтирования при открытии (по умолчанию rw,noatime,nodev) "
 
-#: _print
+#: print
 msgid " -f     force operation (i.e. even if swap is active)"
 msgstr " -f     форсировать операцию (например, даже при активном swap) "
 
-#: _print
+#: print
 msgid " --kdf  generate passwords armored against dictionary attacks"
 msgstr " --kdf  сгенерировать пароли, устойчивые к атакам по словарю "
 
-#: _print
+#: print
 msgid " -h     print this help"
 msgstr " -h     показать эту справку "
 
-#: _print
+#: print
 msgid " -v     print version, license and list of available ciphers"
 msgstr " -v     показать версию, лицензию и доступные шифры "
 
-#: _print
+#: print
 msgid " -q     run quietly without printing informations"
 msgstr " -q     выполнение без вывода информации на экран "
 
-#: _print
+#: print
 msgid " -D     print debugging information at runtime"
 msgstr " -D     вывести отладочную информацию при запуске"
 
-#: _print
+#: print
 msgid "For more informations on Tomb read the manual: man tomb"
 msgstr "Больше информации по Tomb вы можете найти в руководстве: man tomb"
 
-#: _print
+#: 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."
+#: failure
+msgid "Missing required dependency ::1 command::.  Please install it."
 msgstr ""
 
-#: _warning
-msgid "is_valid_key() called without argument."
+#: warning
+msgid "is_valid_key() called without an argument."
 msgstr ""
 
-#: _message
+#: message
 msgid "Key is an image, it might be valid."
 msgstr ""
 
-#: _message
+#: message
 msgid "Key is valid."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Attempting key recovery."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "This operation requires a key file to be specified using the -k option."
 msgstr "Эта операция требует указания файла ключа с помощью опции -k."
 
-#: _message
+#: message
 msgid "Waiting for the key to be piped from stdin... "
 msgstr "Ожидание передачи ключа через stdin..."
 
-#: _warning
+#: failure
 msgid "Key not found, specify one using -k."
 msgstr "Ключ не найден, укажите его с помощью опции -k."
 
-#: _warning
+#: warning
 msgid ""
 "The key seems invalid or its format is not known by this version of Tomb."
 msgstr ""
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "No suitable program for KDF ::1 program::."
 msgstr "Нет подходящей программы для KDF ::1 kdf::."
 
-#: _failure
-msgid "Internal error: ask_key_password() called before load_key()."
+#: failure
+msgid "Internal error: ask_key_password() called before _load_key()."
 msgstr ""
 
-#: _message
+#: message
 msgid "A password is required to use key ::1 key::"
 msgstr "Для использования ключа ::1 key:: требуется пароль"
 
-#: _warning
+#: warning
 msgid "User aborted password dialog."
 msgstr "Пользователь отменил диалог пароля."
 
-#: _message
+#: message
 msgid "Password OK."
 msgstr "Верный пароль."
 
-#: _message
+#: message
 msgid "Commanded to change password for tomb key ::1 key::"
 msgstr "Приказано изменить пароль для ключа ::1 key::"
 
-#: _success
-#, fuzzy
-msgid "Changing password for ::1 key file::"
-msgstr "Меняю пароль для ::1 key::"
-
-#: _failure
+#: failure
 #, fuzzy
 msgid "No valid password supplied."
 msgstr "Указан неверный пароль."
 
-#: _failure
+#: failure
 msgid "Error: the newly generated keyfile does not seem valid."
 msgstr "Ошибка: сгенерированный файл ключа неверен."
 
-#: _success
-msgid "Your passphrase was successfully updated."
-msgstr "Ваш пароль успешно обновлен."
-
-#: _failure
+#: failure
 msgid "User aborted."
 msgstr "Отменено пользователем."
 
-#: _warning
+#: warning
 msgid "You set empty password, which is not possible."
 msgstr "Вы указали пустой пароль, так нельзя."
 
-#: _failure
+#: failure
 msgid ""
 "Wrong argument for --kdf: must be an integer number (iteration seconds)."
 msgstr ""
 "Неверный аргумент для --kdf: должно быть указано целое число (секунд "
 "итерации)."
 
-#: _success
-msgid "Using KDF, iterations: ::1 microseconds::"
-msgstr "Использую KDF, итераций: ::1 microseconds::"
-
-#: _message
+#: message
 msgid "generating salt"
 msgstr ""
 
-#: _message
+#: message
 msgid "calculating iterations"
 msgstr ""
 
-#: _message
+#: message
 msgid "encoding the password"
 msgstr ""
 
-#: _failure
+#: 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
+#: warning
 msgid "Encode failed: ::1 image file:: is not a jpeg image."
 msgstr "Шифрование не удалось: ::1 image file:: не jpeg-изображение."
 
-#: _success
-#, fuzzy
-msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
-msgstr "Шифрую ключ ::1 key:: в изображение ::2 image file::"
-
-#: _message
+#: message
 msgid "Please confirm the key password for the encoding"
 msgstr "Пожалуйста, подтвердите пароль ключа для шифрования"
 
-#: _warning
+#: warning
 msgid "Wrong password supplied."
 msgstr "Указан неверный пароль."
 
-#: _failure
+#: failure
 msgid "You shall not bury a key whose password is unknown to you."
 msgstr "Вам не захоронить ключ, чей пароль не известен Вам."
 
-#: _warning
+#: warning
 msgid "Encoding error: steghide reports problems."
 msgstr "Ошибка шифрования: steghide сообщает о проблемах."
 
-#: _success
-msgid "Tomb key encoded succesfully into image ::1 image file::"
-msgstr "Ключ от гробницы успешно зашифрован в изображении ::1 image file::"
-
-#: _message
-msgid "printing exhumed key on stdout"
-msgstr ""
-
-#: _failure
+#: failure
 #, fuzzy
 msgid "Exhume failed, image file not found: ::1 image file::"
 msgstr "Найден верный файл гробницы: ::1 tomb file::"
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "Exhume failed: ::1 image file:: is not a jpeg image."
 msgstr "Шифрование не удалось: ::1 image file:: не jpeg-изображение."
 
-#: _failure
+#: failure
 msgid "Wrong password or no steganographic key found"
 msgstr ""
 
-#: _warning
+#: message
+msgid "printing exhumed key on stdout"
+msgstr ""
+
+#: warning
 #, fuzzy
 msgid "File exists: ::1 tomb key::"
 msgstr "Файл существует: ::1 key::"
 
-#: _warning
+#: warning
+msgid "Use of --force selected: overwriting."
+msgstr "Указана опция --force: перезаписываю."
+
+#: warning
 msgid "Make explicit use of --force to overwrite."
 msgstr "Явно укажите опцию --force для перезаписи."
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "Refusing to overwrite file. Operation aborted."
 msgstr "Создание этой гробницы перепишет существующий файл. Операция отменена."
 
-#: _warning
-msgid "Use of --force selected: overwriting."
-msgstr "Указана опция --force: перезаписываю."
-
-#: _message
+#: message
 msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Пытаюсь эксгумировать ключ из изображения ::1 image file::"
 
-msgid "Key succesfully exhumed to ::1 key::."
-msgstr ""
-
-#: _warning
+#: warning
 msgid "Nothing found in ::1 image file::"
 msgstr "В ::1 image file:: ничего не найдено"
 
-#: _failure
-msgid "No key specified."
+#: failure
+msgid "QREncode reported an error."
 msgstr ""
 
-#: _success
-#, fuzzy
-msgid "Rendering a printable QRCode for key: ::1 tomb key::"
-msgstr "Рендерю штрих-код для печати ключа: ::1 key::"
+#: message
+msgid "Commanded to dig tomb ::1 tomb path::"
+msgstr ""
 
-#: _failure
-msgid "QREncode reported an error."
+#: failure
+msgid "Missing path to tomb"
+msgstr ""
+
+#: failure
+msgid "Size argument missing, use -s"
+msgstr "Отсутствует размер, укажите его с помощью -s"
+
+#: failure
+msgid "Size must be an integer (megabytes)"
+msgstr ""
+
+#: failure
+msgid "Tombs can't be smaller than 10 megabytes"
+msgstr ""
+
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
+msgstr "Гробница существует. Я не буду копать здесь:"
+
+#: message
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+msgstr "Генерирую ::1 tomb file:: размером ::2 size::Мб"
+
+#: warning
+msgid "Error creating the tomb ::1 tomb path::"
+msgstr ""
+
+#: message
+msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
+msgstr "Ваша гробница пока не готова, необходимо выковать ключ и запереть ее:"
+
+#: message
+msgid "tomb forge ::1 tomb path::.key"
 msgstr ""
 
-#: _success
-msgid "Operation successful:"
-msgstr "Операция успешна:"
+#: message
+msgid "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
+msgstr ""
 
-#: _warning
+#: failure
 msgid "A filename needs to be specified using -k to forge a new key."
 msgstr ""
 "Необходимо указать имя файла через опцию -k, чтобы выковать новый ключ."
 
-#: _message
+#: message
 msgid "Commanded to forge key ::1 key::"
 msgstr "Приказано выковать ключ ::1 key::"
 
-#: _warning
+#: warning
 msgid "Forging this key would overwrite an existing file. Operation aborted."
 msgstr "Выковка этого ключа перезапишет существующий файл. Операция отменена."
 
-#: _message
+#: message
 msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
 msgstr ""
 "Приказано выковать ключ ::1 key:: с алгоритмом шифрования ::2 algorithm::"
 
-#: _message
+#: message
 msgid "This operation takes time, keep using this computer on other tasks,"
 msgstr "Эта операция займет некоторое время, выполняйте пока другие задачи,"
 
-#: _message
+#: message
 msgid "once done you will be asked to choose a password for your tomb."
 msgstr "по завершении Вас вопросят ввести пароль для гробницы."
 
-#: _message
+#: message
 msgid "To make it faster you can move the mouse around."
 msgstr "Чтобы ускорить операцию, подвигайте мышку."
 
-#: _message
+#: message
 msgid "If you are on a server, you can use an Entropy Generation Daemon."
 msgstr "Если Вы на сервере, можно использовать демон генерации энтропии.."
 
-#: _warning
+#: warning
 msgid "Cannot generate encryption key."
 msgstr "Не могу сгенерировать ключ шифрования."
 
-#: _success
-#, fuzzy
-msgid "Choose the  password of your key: ::1 tomb key::"
-msgstr "Выберите пароль для ключа: ::1 key::"
-
-#: _message
+#: message
 msgid "(You can also change it later using 'tomb passwd'.)"
 msgstr "(Его можно потом изменить с помощью 'tomb passwd'.)"
 
-#: _warning
+#: warning
 msgid "The key does not seem to be valid."
 msgstr "Ключ неверен."
 
-#: _warning
+#: warning
 msgid "Dumping contents to screen:"
 msgstr "Выгрузка содержимого на экран:"
 
-#: _message
-msgid "Done forging ::1 key::"
-msgstr "Ключ выкован: ::1 key::"
-
-#: _success
-msgid "Your key is ready:"
-msgstr "Ваш ключ готов:"
-
-#: _message
-#, fuzzy
-msgid "Commanded to dig tomb ::1 tomb name::"
-msgstr "Приказано выкопать гробницу ::1 tomb file::"
-
-#: _warning
-msgid "No tomb name specified for creation."
-msgstr "Не указано имя гробницы для ее создания."
-
-#: _failure
-msgid "Size argument missing, use -s"
-msgstr "Отсутствует размер, укажите его с помощью -s"
-
-#: _failure
-msgid "Size argument is not an integer."
-msgstr "Указанный размер не целое число."
-
-#: _failure
-msgid "Tombs can't be smaller than 10 megabytes."
-msgstr "Гробницы не могут быть меньше 10 Мб."
-
-#: _warning
-msgid "A tomb exists already. I'm not digging here:"
-msgstr "Гробница существует. Я не буду копать здесь:"
-
-#: _success
-#, fuzzy
-msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
-msgstr "Создаю новую гробницу в ::1 dir::/::2 tomb file::"
-
-#: _message
-msgid "Generating ::1 tomb file:: of ::2 size::MiB"
-msgstr "Генерирую ::1 tomb file:: размером ::2 size::Мб"
-
-#: _failure
-#, fuzzy
-msgid ""
-"Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
-msgstr "Ошибка создания гробницы ::1 dir::/::2 tomb file::, операция отменена."
-
-#: _success
-msgid "Done digging ::1 tomb name::"
-msgstr "Выкопана гробница ::1 tomb name::"
+#: warning
+msgid "--"
+msgstr ""
 
-#: _message
-msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
-msgstr "Ваша гробница пока не готова, необходимо выковать ключ и запереть ее:"
+#: message
+msgid "Done forging ::1 key file::"
+msgstr ""
 
-#: _warning
+#: warning
 msgid "No tomb specified for locking."
 msgstr "Не указана гробница для запирания."
 
-#: _warning
+#: warning
 msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr "Использование: tomb lock file.tomb file.tomb.key"
 
-#: _message
+#: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr "Приказано запереть гробницу ::1 tomb file::"
 
-#: _failure
+#: failure
 msgid "There is no tomb here. You have to it dig first."
 msgstr "Здесь нет гробницы. Сначала выкопайте ее."
 
-#: _message
+#: message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
 msgstr "Проверяю, пуста ли гробница (мы никогда не ходим по чужим костям)."
 
-#: _warning
+#: warning
 msgid "The tomb was already locked with another key."
 msgstr "Гробница уже заперта другим ключом."
 
-#: _failure
+#: failure
 msgid ""
 "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
 msgstr ""
 "Операция отменена. Я не могу запереть уже запертую гробницу. Выкопайте новую."
 
-#: _message
+#: message
 msgid "Fine, this tomb seems empty."
 msgstr "Так, эта гробница, вроде как, пуста."
 
-#: _failure
-msgid "Aborting operations: error loading key."
-msgstr ""
-
-#: _message
+#: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr "Запираю, используя шифр ::1 cipher::"
 
-#: _success
-#, fuzzy
-msgid "Locking ::1 tomb file:: with ::2 tomb key::"
-msgstr "Запираю ::1 tomb file:: ключом ::1 key::"
-
-#: _message
+#: message
 msgid "Formatting Luks mapped device."
 msgstr "Форматирую устройство LUKS."
 
-#: _warning
+#: warning
 msgid "cryptsetup luksFormat returned an error."
 msgstr "cryptsetup luksFormat вернул ошибку."
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "cryptsetup luksOpen returned an error."
 msgstr "cryptsetup luksFormat вернул ошибку."
 
-#: _message
+#: message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr "Форматирую Вашу гробницу в файловую систему Ext3/Ext4."
 
-#: _warning
+#: warning
 msgid "Tomb format returned an error."
 msgstr "Tomb format вернул ошибку."
 
-#: _warning
+#: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr "Ваша гробница ::1 tomb file:: может быть повреждена."
 
-#: _message
+#: message
 #, fuzzy
 msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
 msgstr "Запер ::1 tomb name:: с помощью LUKS dm-cryps ::1 cipher::"
 
-#: _success
-#, fuzzy
-msgid ""
-"Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with "
-"key ::3 tomb key::"
+#: message
+msgid "Commanded to reset key for tomb ::1 tomb path::"
 msgstr ""
-"Ваша гробница подготовлена в ::1 dir::/::2 tomb file:: и охраняется "
-"ключом ::1 key::"
-
-#: _message
-#, fuzzy
-msgid "Commanded to reset key for tomb ::1 tomb name::"
-msgstr "Приказано сбросить ключ для гробницы ::1 tomb file::"
 
-#: _warning
+#: warning
 msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
 msgstr ""
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "Execution aborted."
 msgstr "Операция отменена."
 
-#: _failure
+#: 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 ::1 tomb name::"
-msgstr "Меняю замок на гробнице ::1 tomb name::"
-
-#: _message
+#: message
 #, fuzzy
 msgid "Old key: ::1 old key::"
 msgstr "Старый ключ: ::1 key::"
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the old key."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksOpen."
 msgstr ""
 
-#: _failure
-msgid "Aborting operations: error loading new key from -k"
+#: message
+msgid "New key: ::1 key file::"
 msgstr ""
 
-#: _message
-msgid "New key: ::1 key::"
-msgstr "Новый ключ: ::1 key::"
-
-#: _failure
+#: failure
 msgid "No valid password supplied for the new key."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksChangeKey."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksClose."
 msgstr ""
 
-#: _success
-msgid "Succesfully changed key for tomb: ::1 tomb file::"
-msgstr "Смена ключа успешна для гробницы: ::1 tomb file::"
-
-#: _message
+#: message
 #, fuzzy
 msgid "The new key is: ::1 new key::"
 msgstr "Новый ключ: ::1 key::"
 
-#: _warning
-#, 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 ::1 tomb name:: succesfully created."
-msgstr "Гробница ::1 tomb name:: успешно создана."
-
-#: _message
-#, fuzzy
-msgid "Commanded to open tomb ::1 tomb name::"
-msgstr "Приказано открыть гробницу ::1 tomb file::"
-
-#: _warning
+#: failure
 #, fuzzy
 msgid "No tomb name specified for opening."
 msgstr "Не указано имя гробницы для изменения размера."
 
-#: _warning
+#: message
 #, fuzzy
-msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
-msgstr "::1 tomb file:: - неверное зашифрованное устройство LUSK."
+msgid "Commanded to open tomb ::1 tomb name::"
+msgstr "Приказано открыть гробницу ::1 tomb file::"
 
-#: _failure
-msgid "Aborting operations: error loading key ::1 key::"
+#: warning
+msgid "::1 tomb file:: is not a valid tomb file"
 msgstr ""
 
-#: _message
+#: message
 msgid "Mountpoint not specified, using default: ::1 mount point::"
 msgstr ""
 "Не указана точка монтирования, использую точку по умолчанию: ::1 mount "
 "point::"
 
-#: _warning
+#: warning
 msgid "::1 tomb name:: is already open."
 msgstr "::1 tomb name:: уже открыт."
 
-#: _message
+#: message
 msgid "Here below its status is reported:"
 msgstr "Ниже назодится отчет о его статусе:"
 
-#: _success
-msgid "Opening ::1 tomb file:: on ::2 mount point::"
-msgstr "Открываю ::1 tomb file:: в ::2 mount point::"
-
-#: _warning
+#: failure
 msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
 msgstr "::1 tomb file:: - неверное зашифрованное устройство LUSK."
 
-#: _message
+#: message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr "Эта гробница - верное зашифрованное устройство LUKS."
 
-#: _message
+#: message
 #, fuzzy
 msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
 msgstr "Шифр \"::1 cipher::\", режим \"::2 mode::\", хеш \"::3 hash::\""
 
-#: _warning
+#: warning
 msgid ""
 "Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Failure mounting the encrypted file."
 msgstr "Не удалось примонтировать зашифрованный файл."
 
-#: _success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr "Успешно открыта гробница ::1 tomb name::"
-
-#: _message
+#: message
 msgid "Checking filesystem via ::1::"
 msgstr "Проверк файловой системы через ::1::"
 
-#: _success
-#, fuzzy
-msgid "Success opening ::1 tomb file:: on ::2 mount point::"
-msgstr "Открываю ::1 tomb file:: в ::2 mount point::"
-
-#: _message
+#: message
 msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
 msgstr ""
 
-#: _message
+#: message
 msgid "on date ::1 date::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "How pitiful!  A tomb, and no HOME."
 msgstr "Как жаль! Гробница есть, но нет HOME."
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr "Невозможно выполнить обработчик события без примонтированной гробницы."
 
-#: _warning
+#: warning
+msgid "bind-hooks file is broken"
+msgstr ""
+
+#: warning
 #, fuzzy
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
 msgstr "Формат bind-hooks: local/to/tomb local/to/HOME"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
 msgstr "Формат bind-hooks: local/to/tomb local/to/HOME.  Откат"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
 msgstr "Цель bind-hook не существует, пропускаю ::1 home::/::2 dir::"
 
-#: _warning
+#: warning
 #, fuzzy
 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 ::1 user name::."
-msgstr "Найден пост-обработчик, выполняю от имени пользователя ::1 user::."
-
-#: _failure
+#: failure
 #, fuzzy
 msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
 msgstr "Я не вижу открытых гробниц, да упокоятся они все с миром."
 
-#: _failure
+#: message
+msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: open since ::2 tombsince::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgstr ""
+
+#: message
+msgid ""
+"::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::"
+"%) is used: ::4 tombavail:: free "
+msgstr ""
+
+#: warning
+msgid "::1 tombname:: warning: your tomb is almost full!"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: hooks ::2 hookname:: on ::3 hookdest::"
+msgstr ""
+
+#: failure
 msgid "Internal error: list_tomb_binds called without argument."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Cannot use GNU findutils for index/search commands."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Index command needs 'mlocate' to be installed."
 msgstr ""
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr "Не похоже, что открыта гробница, гравированная как [::1 tomb name::]"
 
-#: _failure
+#: failure
 msgid "I can't see any open tomb, may they all rest in peace."
 msgstr "Я не вижу открытых гробниц, да упокоятся они все с миром."
 
-#: _success
-msgid "Creating and updating search indexes."
-msgstr "Создаю и обновляю поисковые индексы."
-
-#: _message
+#: message
 msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr "Пропускаю ::1 tomb name:: (найден файл .noindex)."
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: filenames..."
 msgstr "Индексирую имена в ::1 tomb name::..."
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: contents..."
 msgstr "Индексирую содержимое ::1 tomb name::..."
 
-#: _message
+#: message
 msgid "Search index updated."
 msgstr "Поисковый индекс обновлен."
 
-#: _success
-#, fuzzy
-msgid "Searching for: ::1::"
-msgstr "Проверк файловой системы через ::1::"
-
-#: _message
+#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr "Ищу в именах файлов гробницы ::1 tomb name::"
 
-#: _message
+#: message
 msgid "Matches found: ::1 matches::"
 msgstr "Найдены совпадения: ::1 matches::"
 
-#: _message
+#: message
 msgid "Searching contents in tomb ::1 tomb name::"
 msgstr "Ищу в содержимом гробницы ::1 tomb name::"
 
-#: _warning
+#: warning
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr "Пропускаю гробницу ::1 tomb name::: она не индексирована."
 
-#: _warning
+#: warning
 msgid "Run 'tomb index' to create indexes."
 msgstr "Запустите 'tomb index' для создания индексов."
 
-#: _message
+#: message
 msgid "Search completed."
 msgstr "Поиск завершен."
 
-#: _message
+#: message
 #, fuzzy
 msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
 msgstr ""
 "Приказано изменить размер гробницы ::1 tomb file::. Новый размер: ::2 size:: "
 "Мб."
 
-#: _failure
+#: failure
 msgid "No tomb name specified for resizing."
 msgstr "Не указано имя гробницы для изменения размера."
 
-#: _failure
+#: failure
 msgid "Cannot find ::1::"
 msgstr "Не могу найти ::1::"
 
-#: _failure
+#: failure
 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."
+#: failure
+msgid "Please close the tomb ::1 tomb name:: before trying to resize it."
 msgstr ""
-"Гробница ::1 tomb name:: открыта, для изменения ее размера ее необходимо "
-"закрыть."
 
-#: _failure
+#: failure
 msgid "You must specify the new size of ::1 tomb name::"
 msgstr "Вы должны указать новый размер для ::1 tomb name::"
 
-#: _failure
+#: failure
 msgid "Size is not an integer."
 msgstr "Размер не целое число."
 
-#: _failure
+#: failure
 msgid "The new size must be greater then old tomb size."
 msgstr "Новый размер гробницы должен быть больше старого."
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "Error creating the extra resize ::1 size::, operation aborted."
 msgstr "Ошибка создания гробницы ::1 dir::/::2 tomb file::, операция отменена."
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "cryptsetup failed to resize ::1 mapper::"
 msgstr "resize2fs не смог изменить размер ::1 mapper::"
 
-#: _failure
+#: failure
 msgid "e2fsck failed to check ::1 mapper::"
 msgstr "e2fsck не смог проверить ::1 mapper::"
 
-#: _failure
+#: failure
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr "resize2fs не смог изменить размер ::1 mapper::"
 
-#: _warning
+#: failure
 msgid "There is no open tomb to be closed."
 msgstr "Нет открытой гробницы для закрытия."
 
-#: _warning
+#: warning
 msgid "Too many tombs mounted, please specify one (see tomb list)"
 msgstr ""
 "Примонтировано слишком много гробниц, пожалуйста, укажите точнее (см. tomb "
 "list)"
 
-#: _warning
+#: warning
 msgid "or issue the command 'tomb close all' to close them all."
 msgstr "или выполните команду 'tomb close all', чтобы закрыть их все."
 
-#: _message
+#: message
 #, fuzzy
 msgid "Tomb close ::1::"
 msgstr "Закрываю гробницу ::1 tomb name::"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "Tomb not found: ::1 tomb file::"
 msgstr "Гробница не найдена: ::1 tomb name::"
 
-#: _warning
+#: warning
 msgid "Please specify an existing tomb."
 msgstr "Пожалуйста, укажите существующую гробницу."
 
-#: _success
-msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
-msgstr ""
-"Захлопываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
-
-#: _message
+#: message
 msgid "Kill all processes busy inside the tomb."
 msgstr "Убиваю все процессы, занятые в гробнице"
 
-#: _warning
+#: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr "Не могу захлопнуть гробницу ::1 tomb name::"
 
-#: _message
+#: message
 msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
 msgstr ""
 "Закрываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
 
-#: _message
+#: message
 #, fuzzy
 msgid "Closing tomb bind hook: ::1 hook::"
 msgstr "Закрываю обработчик событий гробницы: ::1 hook::"
 
-#: _success
-#, fuzzy
-msgid "Slamming tomb: killing all processes using this hook."
-msgstr ""
-"Захлопываю гробницу: убиваю все процессы, использующие этот обработчик."
-
-#: _warning
+#: failure
 #, fuzzy
 msgid "Cannot slam the bind hook ::1 hook::"
 msgstr "Не могу захлопнуть обработчик ::1 mount point::"
 
-#: _warning
+#: warning
 #, fuzzy
 msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
 msgstr "Обработчик гробницы ::1 mount point:: занят, не могу закрыть гробницу."
 
-#: _warning
+#: warning
 msgid "Tomb is busy, cannot umount!"
 msgstr "Гробница занята, не могу отмонтировать!"
 
-#: _warning
+#: failure
 msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
 msgstr "Произошла ошибка cryptsetup luksClose ::1 mapper::"
 
-#: _success
-msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
-msgstr ""
-"Гробница ::1 tomb name:: закрыта: пусть земля Вашим костям будет пухом."
-
-#: _failure
+#: failure
 msgid "Error parsing."
 msgstr "Ошибка парсинга."
 
-#: _warning
+#: warning
 msgid "There's no such command \"::1 subcommand::\"."
 msgstr "Нет такой команды \"::1 subcommand::\"."
 
-#: _failure
+#: failure
 #, fuzzy
 msgid "Please try -h for help."
 msgstr "Используйте -h для вызова справки."
 
-#: _warning
+#: warning
 msgid "Some error occurred during option processing."
 msgstr "Произошла какая-то ошибка при обработке опций."
 
-#: _failure
+#: failure
 msgid "See \"tomb help\" for more info."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
 msgstr ""
 
-#: _failure
+#: 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 ""
 
-#: _failure
-msgid "QREncode not installed: cannot engrave keys on paper."
-msgstr ""
-
-#: _warning
+#: warning
 msgid ""
 "The create command is deprecated, please use dig, forge and lock instead."
 msgstr "Команда create устарела, пожалуйста, используйте dig, forge и lock."
 
-#: _warning
+#: 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."
+#: failure
+msgid "Resize2fs not installed: cannot resize tombs."
 msgstr ""
 
-#: _failure
-msgid "Steghide not installed: cannot exhume keys from images."
+#: failure
+msgid "QREncode not installed: cannot engrave keys on paper."
 msgstr ""
 
-#: _failure
-msgid "Resize2fs not installed: cannot resize tombs."
+#: failure
+msgid "Steghide not installed: cannot bury keys into images."
 msgstr ""
 
-#: _print
+#: failure
+msgid "Steghide not installed: cannot exhume keys from images."
+msgstr ""
+
+#: print
 msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
 msgstr ""
 
-#: _print
+#: print
 msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
 msgstr ""
 
-#: _print
+#: print
 msgid " This is free software: you are free to change and redistribute it"
 msgstr ""
 
-#: _print
+#: print
 msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
 msgstr ""
 
-#: _print
+#: print
 msgid " This source code is distributed in the hope that it will be useful,"
 msgstr ""
 
-#: _print
+#: print
 msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
 msgstr ""
 
-#: _print
+#: print
 msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: _print
+#: print
 msgid " Please refer to the GNU Public License for more details."
 msgstr ""
 
-#: _print
+#: print
 msgid "System utils:"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Command \"::1 subcommand::\" not recognized."
 msgstr "Команда \"::1 subcommand::\" не распознана."
 
-#: _message
+#: message
 msgid "Try -h for help."
 msgstr "Используйте -h для вызова справки."
+
+#~ msgid "All your swaps are belong to crypt.  Good."
+#~ msgstr "Весь swap принадлежит криптографии. Хорошо."
+
+#~ msgid "Valid tomb file found: ::1 tomb file::"
+#~ msgstr "Найден верный файл гробницы: ::1 tomb file::"
+
+#, fuzzy
+#~ msgid "Changing password for ::1 key file::"
+#~ msgstr "Меняю пароль для ::1 key::"
+
+#~ msgid "Your passphrase was successfully updated."
+#~ msgstr "Ваш пароль успешно обновлен."
+
+#~ msgid "Using KDF, iterations: ::1 microseconds::"
+#~ msgstr "Использую KDF, итераций: ::1 microseconds::"
+
+#, fuzzy
+#~ msgid "Bury failed for invalid key: ::1 key::"
+#~ msgstr "Найден верный файл ключа: ::1 key::"
+
+#, fuzzy
+#~ msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+#~ msgstr "Шифрую ключ ::1 key:: в изображение ::2 image file::"
+
+#~ msgid "Tomb key encoded succesfully into image ::1 image file::"
+#~ msgstr "Ключ от гробницы успешно зашифрован в изображении ::1 image file::"
+
+#, fuzzy
+#~ msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+#~ msgstr "Рендерю штрих-код для печати ключа: ::1 key::"
+
+#~ msgid "Operation successful:"
+#~ msgstr "Операция успешна:"
+
+#, fuzzy
+#~ msgid "Choose the  password of your key: ::1 tomb key::"
+#~ msgstr "Выберите пароль для ключа: ::1 key::"
+
+#~ msgid "Done forging ::1 key::"
+#~ msgstr "Ключ выкован: ::1 key::"
+
+#~ msgid "Your key is ready:"
+#~ msgstr "Ваш ключ готов:"
+
+#, fuzzy
+#~ msgid "Commanded to dig tomb ::1 tomb name::"
+#~ msgstr "Приказано выкопать гробницу ::1 tomb file::"
+
+#~ msgid "No tomb name specified for creation."
+#~ msgstr "Не указано имя гробницы для ее создания."
+
+#~ msgid "Size argument is not an integer."
+#~ msgstr "Указанный размер не целое число."
+
+#~ msgid "Tombs can't be smaller than 10 megabytes."
+#~ msgstr "Гробницы не могут быть меньше 10 Мб."
+
+#, fuzzy
+#~ msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+#~ msgstr "Создаю новую гробницу в ::1 dir::/::2 tomb file::"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+#~ msgstr ""
+#~ "Ошибка создания гробницы ::1 dir::/::2 tomb file::, операция отменена."
+
+#~ msgid "Done digging ::1 tomb name::"
+#~ msgstr "Выкопана гробница ::1 tomb name::"
+
+#, fuzzy
+#~ msgid "Locking ::1 tomb file:: with ::2 tomb key::"
+#~ msgstr "Запираю ::1 tomb file:: ключом ::1 key::"
+
+#, 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::"
+
+#, fuzzy
+#~ msgid "Commanded to reset key for tomb ::1 tomb name::"
+#~ msgstr "Приказано сбросить ключ для гробницы ::1 tomb file::"
+
+#~ msgid "Changing lock on tomb ::1 tomb name::"
+#~ msgstr "Меняю замок на гробнице ::1 tomb name::"
+
+#~ msgid "New key: ::1 key::"
+#~ msgstr "Новый ключ: ::1 key::"
+
+#~ msgid "Succesfully changed key for tomb: ::1 tomb file::"
+#~ msgstr "Смена ключа успешна для гробницы: ::1 tomb file::"
+
+#, fuzzy
+#~ msgid "Creating this tomb would overwrite an existing file."
+#~ msgstr ""
+#~ "Создание этой гробницы перепишет существующий файл. Операция отменена."
+
+#~ msgid "Tomb ::1 tomb name:: succesfully created."
+#~ msgstr "Гробница ::1 tomb name:: успешно создана."
+
+#, fuzzy
+#~ msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+#~ msgstr "::1 tomb file:: - неверное зашифрованное устройство LUSK."
+
+#~ msgid "Opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "Открываю ::1 tomb file:: в ::2 mount point::"
+
+#~ msgid "Success unlocking tomb ::1 tomb name::"
+#~ msgstr "Успешно открыта гробница ::1 tomb name::"
+
+#, fuzzy
+#~ msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+#~ msgstr "Открываю ::1 tomb file:: в ::2 mount point::"
+
+#, fuzzy
+#~ msgid "Post hooks found, executing as user ::1 user name::."
+#~ msgstr "Найден пост-обработчик, выполняю от имени пользователя ::1 user::."
+
+#~ msgid "Creating and updating search indexes."
+#~ msgstr "Создаю и обновляю поисковые индексы."
+
+#, fuzzy
+#~ msgid "Searching for: ::1::"
+#~ msgstr "Проверк файловой системы через ::1::"
+
+#~ msgid ""
+#~ "The tomb ::1 tomb name:: is open, to resize it it needs to be closed."
+#~ msgstr ""
+#~ "Гробница ::1 tomb name:: открыта, для изменения ее размера ее необходимо "
+#~ "закрыть."
+
+#~ msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+#~ msgstr ""
+#~ "Захлопываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
+
+#, fuzzy
+#~ msgid "Slamming tomb: killing all processes using this hook."
+#~ msgstr ""
+#~ "Захлопываю гробницу: убиваю все процессы, использующие этот обработчик."
+
+#~ msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+#~ msgstr ""
+#~ "Гробница ::1 tomb name:: закрыта: пусть земля Вашим костям будет пухом."
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: Sat Sep 13 17:17:32 CEST 2014\n"
+"PO-Revision-Date: Fri Nov 14 20:58:30 CET 2014\n"
 "Last-Translator: Denis Roio <jaromil@dyne.org>\n"
 "Language: English\n"
 "Language-Team: Tomb developers <crypto@lists.dyne.org>\n"
@@ -14,1042 +14,971 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _success
-msgid "All your swaps are belong to crypt.  Good."
+#: failure
+msgid "Fatal error creating a directory for temporary files"
 msgstr ""
 
-#: _failure
+#: failure
+msgid "Cannot mount tmpfs in ::1 shm path::"
+msgstr ""
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr ""
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr ""
+
+#: failure
+msgid "Fatal error setting permissions on temporary file: ::1 temp file::"
+msgstr ""
+
+#: warning
+msgid "You can deactivate all swap partitions using the command:"
+msgstr ""
+
+#: warning
+msgid " swapoff -a"
+msgstr ""
+
+#: warning
+msgid "But if you want to proceed like this, use the -f (force) flag."
+msgstr ""
+
+#: failure
 msgid "Operation aborted."
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Tomb file is missing from arguments."
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Tomb file not found: ::1 tomb file::"
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Tomb file is not a regular file: ::1 tomb file::"
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Tomb file is empty (zero length): ::1 tomb file::"
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Tomb file is not writable: ::1 tomb file::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "File is not yet a tomb: ::1 tomb file::"
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Tomb is currently in use: ::1 tomb name::"
 msgstr ""
 
-#: _message
-msgid "Valid tomb file found: ::1 tomb file::"
+#: message
+msgid "Valid tomb file found: ::1 tomb path::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Loopback mount called on invalid tomb: ::1 path::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Loop mount of volumes is not possible on this machine, this error"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "often occurs on VPS and kernels that don't provide the loop module."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "It is impossible to use Tomb on this machine at this conditions."
 msgstr ""
 
-#: _print
+#: print
 msgid "Syntax: tomb [options] command [arguments]"
 msgstr ""
 
-#: _print
+#: print
 msgid "Commands:"
 msgstr ""
 
-#: _print
+#: print
 msgid " // Creation:"
 msgstr ""
 
-#: _print
+#: print
 msgid " dig     create a new empty TOMB file of size -s in MB"
 msgstr ""
 
-#: _print
+#: print
 msgid " forge   create a new KEY file and set its password"
 msgstr ""
 
-#: _print
+#: print
 msgid " lock    installs a lock on a TOMB to use it with KEY"
 msgstr ""
 
-#: _print
+#: print
 msgid " // Operations on tombs:"
 msgstr ""
 
-#: _print
+#: print
 msgid " open    open an existing TOMB"
 msgstr ""
 
-#: _print
+#: print
 msgid " index   update the search indexes of tombs"
 msgstr ""
 
-#: _print
+#: print
 msgid " search  looks for filenames matching text patterns"
 msgstr ""
 
-#: _print
+#: print
 msgid " list    list of open TOMBs and information on them"
 msgstr ""
 
-#: _print
+#: print
 msgid " close   close a specific TOMB (or 'all')"
 msgstr ""
 
-#: _print
+#: print
 msgid " slam    slam a TOMB killing all programs using it"
 msgstr ""
 
-#: _print
+#: print
 msgid " resize  resize a TOMB to a new size -s (can only grow)"
 msgstr ""
 
-#: _print
+#: print
 msgid " // Operations on keys:"
 msgstr ""
 
-#: _print
+#: print
 msgid " passwd  change the password of a KEY"
 msgstr ""
 
-#: _print
+#: print
 msgid " setkey  change the KEY locking a TOMB (needs old one)"
 msgstr ""
 
-#: _print
+#: print
 msgid " engrave makes a QR code of a KEY to be saved on paper"
 msgstr ""
 
-#: _print
+#: print
 msgid " bury    hide a KEY inside a JPEG image"
 msgstr ""
 
-#: _print
+#: print
 msgid " exhume  extract a KEY from a JPEG image"
 msgstr ""
 
-#: _print
+#: print
 msgid "Options:"
 msgstr ""
 
-#: _print
+#: print
 msgid " -s     size of the tomb file when creating/resizing one (in MB)"
 msgstr ""
 
-#: _print
+#: print
 msgid " -k     path to the key to be used ('-k -' to read from stdin)"
 msgstr ""
 
-#: _print
+#: print
 msgid " -n     don't process the hooks found in tomb"
 msgstr ""
 
-#: _print
+#: print
 msgid " -o     mount options used to open (default: rw,noatime,nodev)"
 msgstr ""
 
-#: _print
+#: print
 msgid " -f     force operation (i.e. even if swap is active)"
 msgstr ""
 
-#: _print
+#: print
 msgid " --kdf  generate passwords armored against dictionary attacks"
 msgstr ""
 
-#: _print
+#: print
 msgid " -h     print this help"
 msgstr ""
 
-#: _print
+#: print
 msgid " -v     print version, license and list of available ciphers"
 msgstr ""
 
-#: _print
+#: print
 msgid " -q     run quietly without printing informations"
 msgstr ""
 
-#: _print
+#: print
 msgid " -D     print debugging information at runtime"
 msgstr ""
 
-#: _print
+#: print
 msgid "For more informations on Tomb read the manual: man tomb"
 msgstr ""
 
-#: _print
+#: 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."
+#: failure
+msgid "Missing required dependency ::1 command::.  Please install it."
 msgstr ""
 
-#: _warning
-msgid "is_valid_key() called without argument."
+#: warning
+msgid "is_valid_key() called without an argument."
 msgstr ""
 
-#: _message
+#: message
 msgid "Key is an image, it might be valid."
 msgstr ""
 
-#: _message
+#: message
 msgid "Key is valid."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Attempting key recovery."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "This operation requires a key file to be specified using the -k option."
 msgstr ""
 
-#: _message
+#: message
 msgid "Waiting for the key to be piped from stdin... "
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Key not found, specify one using -k."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "The key seems invalid or its format is not known by this version of Tomb."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "No suitable program for KDF ::1 program::."
 msgstr ""
 
-#: _failure
-msgid "Internal error: ask_key_password() called before load_key()."
+#: failure
+msgid "Internal error: ask_key_password() called before _load_key()."
 msgstr ""
 
-#: _message
+#: message
 msgid "A password is required to use key ::1 key::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "User aborted password dialog."
 msgstr ""
 
-#: _message
+#: message
 msgid "Password OK."
 msgstr ""
 
-#: _message
+#: message
 msgid "Commanded to change password for tomb key ::1 key::"
 msgstr ""
 
-#: _success
-msgid "Changing password for ::1 key file::"
-msgstr ""
-
-#: _failure
+#: failure
 msgid "No valid password supplied."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Error: the newly generated keyfile does not seem valid."
 msgstr ""
 
-#: _success
-msgid "Your passphrase was successfully updated."
-msgstr ""
-
-#: _failure
+#: failure
 msgid "User aborted."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "You set empty password, which is not possible."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Wrong argument for --kdf: must be an integer number (iteration seconds)."
 msgstr ""
 
-#: _success
-msgid "Using KDF, iterations: ::1 microseconds::"
-msgstr ""
-
-#: _message
+#: message
 msgid "generating salt"
 msgstr ""
 
-#: _message
+#: message
 msgid "calculating iterations"
 msgstr ""
 
-#: _message
+#: message
 msgid "encoding the password"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
 msgstr ""
 
-#: _failure
-msgid "Bury failed for invalid key: ::1 key::"
-msgstr ""
-
-#: _warning
+#: warning
 msgid "Encode failed: ::1 image file:: is not a jpeg image."
 msgstr ""
 
-#: _success
-msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
-msgstr ""
-
-#: _message
+#: message
 msgid "Please confirm the key password for the encoding"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Wrong password supplied."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "You shall not bury a key whose password is unknown to you."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Encoding error: steghide reports problems."
 msgstr ""
 
-#: _success
-msgid "Tomb key encoded succesfully into image ::1 image file::"
-msgstr ""
-
-#: _message
-msgid "printing exhumed key on stdout"
-msgstr ""
-
-#: _failure
+#: failure
 msgid "Exhume failed, image file not found: ::1 image file::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Exhume failed: ::1 image file:: is not a jpeg image."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Wrong password or no steganographic key found"
 msgstr ""
 
-#: _warning
-msgid "File exists: ::1 tomb key::"
-msgstr ""
-
-#: _warning
-msgid "Make explicit use of --force to overwrite."
+#: message
+msgid "printing exhumed key on stdout"
 msgstr ""
 
-#: _failure
-msgid "Refusing to overwrite file. Operation aborted."
+#: warning
+msgid "File exists: ::1 tomb key::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Use of --force selected: overwriting."
 msgstr ""
 
-#: _message
-msgid "Trying to exhume a key out of image ::1 image file::"
-msgstr ""
-
-msgid "Key succesfully exhumed to ::1 key::."
+#: warning
+msgid "Make explicit use of --force to overwrite."
 msgstr ""
 
-#: _warning
-msgid "Nothing found in ::1 image file::"
+#: failure
+msgid "Refusing to overwrite file. Operation aborted."
 msgstr ""
 
-#: _failure
-msgid "No key specified."
+#: message
+msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr ""
 
-#: _success
-msgid "Rendering a printable QRCode for key: ::1 tomb key::"
+#: warning
+msgid "Nothing found in ::1 image file::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "QREncode reported an error."
 msgstr ""
 
-#: _success
-msgid "Operation successful:"
+#: message
+msgid "Commanded to dig tomb ::1 tomb path::"
 msgstr ""
 
-#: _warning
-msgid "A filename needs to be specified using -k to forge a new key."
+#: failure
+msgid "Missing path to tomb"
 msgstr ""
 
-#: _message
-msgid "Commanded to forge key ::1 key::"
-msgstr ""
-
-#: _warning
-msgid "Forging this key would overwrite an existing file. Operation aborted."
-msgstr ""
-
-#: _message
-msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
+#: failure
+msgid "Size argument missing, use -s"
 msgstr ""
 
-#: _message
-msgid "This operation takes time, keep using this computer on other tasks,"
+#: failure
+msgid "Size must be an integer (megabytes)"
 msgstr ""
 
-#: _message
-msgid "once done you will be asked to choose a password for your tomb."
+#: failure
+msgid "Tombs can't be smaller than 10 megabytes"
 msgstr ""
 
-#: _message
-msgid "To make it faster you can move the mouse around."
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
 msgstr ""
 
-#: _message
-msgid "If you are on a server, you can use an Entropy Generation Daemon."
+#: message
+msgid "Generating ::1 tomb file:: of ::2 size::MiB"
 msgstr ""
 
-#: _warning
-msgid "Cannot generate encryption key."
+#: warning
+msgid "Error creating the tomb ::1 tomb path::"
 msgstr ""
 
-#: _success
-msgid "Choose the  password of your key: ::1 tomb key::"
+#: message
+msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
 msgstr ""
 
-#: _message
-msgid "(You can also change it later using 'tomb passwd'.)"
+#: message
+msgid "tomb forge ::1 tomb path::.key"
 msgstr ""
 
-#: _warning
-msgid "The key does not seem to be valid."
+#: message
+msgid "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
 msgstr ""
 
-#: _warning
-msgid "Dumping contents to screen:"
+#: failure
+msgid "A filename needs to be specified using -k to forge a new key."
 msgstr ""
 
-#: _message
-msgid "Done forging ::1 key::"
+#: message
+msgid "Commanded to forge key ::1 key::"
 msgstr ""
 
-#: _success
-msgid "Your key is ready:"
+#: warning
+msgid "Forging this key would overwrite an existing file. Operation aborted."
 msgstr ""
 
-#: _message
-msgid "Commanded to dig tomb ::1 tomb name::"
+#: message
+msgid "Commanded to forge key ::1 key:: with cipher algorithm ::2 algorithm::"
 msgstr ""
 
-#: _warning
-msgid "No tomb name specified for creation."
+#: message
+msgid "This operation takes time, keep using this computer on other tasks,"
 msgstr ""
 
-#: _failure
-msgid "Size argument missing, use -s"
+#: message
+msgid "once done you will be asked to choose a password for your tomb."
 msgstr ""
 
-#: _failure
-msgid "Size argument is not an integer."
+#: message
+msgid "To make it faster you can move the mouse around."
 msgstr ""
 
-#: _failure
-msgid "Tombs can't be smaller than 10 megabytes."
+#: message
+msgid "If you are on a server, you can use an Entropy Generation Daemon."
 msgstr ""
 
-#: _warning
-msgid "A tomb exists already. I'm not digging here:"
+#: warning
+msgid "Cannot generate encryption key."
 msgstr ""
 
-#: _success
-msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
+#: message
+msgid "(You can also change it later using 'tomb passwd'.)"
 msgstr ""
 
-#: _message
-msgid "Generating ::1 tomb file:: of ::2 size::MiB"
+#: warning
+msgid "The key does not seem to be valid."
 msgstr ""
 
-#: _failure
-msgid "Error creating the tomb ::1 tomb dir::/::2 tomb file::, operation aborted."
+#: warning
+msgid "Dumping contents to screen:"
 msgstr ""
 
-#: _success
-msgid "Done digging ::1 tomb name::"
+#: warning
+msgid "--"
 msgstr ""
 
-#: _message
-msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
+#: message
+msgid "Done forging ::1 key file::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "No tomb specified for locking."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Usage: tomb lock file.tomb file.tomb.key"
 msgstr ""
 
-#: _message
+#: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "There is no tomb here. You have to it dig first."
 msgstr ""
 
-#: _message
+#: message
 msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "The tomb was already locked with another key."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
 msgstr ""
 
-#: _message
+#: message
 msgid "Fine, this tomb seems empty."
 msgstr ""
 
-#: _failure
-msgid "Aborting operations: error loading key."
-msgstr ""
-
-#: _message
+#: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr ""
 
-#: _success
-msgid "Locking ::1 tomb file:: with ::2 tomb key::"
-msgstr ""
-
-#: _message
+#: message
 msgid "Formatting Luks mapped device."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "cryptsetup luksFormat returned an error."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "cryptsetup luksOpen returned an error."
 msgstr ""
 
-#: _message
+#: message
 msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Tomb format returned an error."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr ""
 
-#: _message
+#: message
 msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
 msgstr ""
 
-#: _success
-msgid "Your tomb is ready in ::1 tomb dir::/::2 tomb file:: and secured with key ::3 tomb key::"
+#: message
+msgid "Commanded to reset key for tomb ::1 tomb path::"
 msgstr ""
 
-#: _message
-msgid "Commanded to reset key for tomb ::1 tomb name::"
-msgstr ""
-
-#: _warning
+#: warning
 msgid "Command 'setkey' needs two arguments: the old key file and the tomb."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Execution aborted."
 msgstr ""
 
-#: _failure
+#: 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 ::1 tomb name::"
-msgstr ""
-
-#: _message
+#: message
 msgid "Old key: ::1 old key::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the old key."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksOpen."
 msgstr ""
 
-#: _failure
-msgid "Aborting operations: error loading new key from -k"
-msgstr ""
-
-#: _message
-msgid "New key: ::1 key::"
+#: message
+msgid "New key: ::1 key file::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "No valid password supplied for the new key."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksChangeKey."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unexpected error in luksClose."
 msgstr ""
 
-#: _success
-msgid "Succesfully changed key for tomb: ::1 tomb file::"
-msgstr ""
-
-#: _message
+#: message
 msgid "The new key is: ::1 new key::"
 msgstr ""
 
-#: _warning
-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 ::1 tomb name:: succesfully created."
-msgstr ""
-
-#: _message
-msgid "Commanded to open tomb ::1 tomb name::"
-msgstr ""
-
-#: _warning
+#: failure
 msgid "No tomb name specified for opening."
 msgstr ""
 
-#: _warning
-msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
+#: message
+msgid "Commanded to open tomb ::1 tomb name::"
 msgstr ""
 
-#: _failure
-msgid "Aborting operations: error loading key ::1 key::"
+#: warning
+msgid "::1 tomb file:: is not a valid tomb file"
 msgstr ""
 
-#: _message
+#: message
 msgid "Mountpoint not specified, using default: ::1 mount point::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "::1 tomb name:: is already open."
 msgstr ""
 
-#: _message
+#: message
 msgid "Here below its status is reported:"
 msgstr ""
 
-#: _success
-msgid "Opening ::1 tomb file:: on ::2 mount point::"
-msgstr ""
-
-#: _warning
+#: failure
 msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
 msgstr ""
 
-#: _message
+#: message
 msgid "This tomb is a valid LUKS encrypted device."
 msgstr ""
 
-#: _message
+#: message
 msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Failure mounting the encrypted file."
 msgstr ""
 
-#: _success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr ""
-
-#: _message
+#: message
 msgid "Checking filesystem via ::1::"
 msgstr ""
 
-#: _success
-msgid "Success opening ::1 tomb file:: on ::2 mount point::"
-msgstr ""
-
-#: _message
+#: message
 msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
 msgstr ""
 
-#: _message
+#: message
 msgid "on date ::1 date::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "How pitiful!  A tomb, and no HOME."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Cannot exec bind hooks without a mounted tomb."
 msgstr ""
 
-#: _warning
+#: warning
+msgid "bind-hooks file is broken"
+msgstr ""
+
+#: warning
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "bind-hook target not existent, skipping ::1 home::/::2 subdir::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
 msgstr ""
 
-#: _success
-msgid "Post hooks found, executing as user ::1 user name::."
+#: failure
+msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
 msgstr ""
 
-#: _failure
-msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
+#: message
+msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
 msgstr ""
 
-#: _failure
+#: message
+msgid "::1 tombname:: open since ::2 tombsince::"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::%) is used: ::4 tombavail:: free "
+msgstr ""
+
+#: warning
+msgid "::1 tombname:: warning: your tomb is almost full!"
+msgstr ""
+
+#: message
+msgid "::1 tombname:: hooks ::2 hookname:: on ::3 hookdest::"
+msgstr ""
+
+#: failure
 msgid "Internal error: list_tomb_binds called without argument."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Cannot use GNU findutils for index/search commands."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Index command needs 'mlocate' to be installed."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "I can't see any open tomb, may they all rest in peace."
 msgstr ""
 
-#: _success
-msgid "Creating and updating search indexes."
-msgstr ""
-
-#: _message
+#: message
 msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr ""
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: filenames..."
 msgstr ""
 
-#: _message
+#: message
 msgid "Indexing ::1 tomb name:: contents..."
 msgstr ""
 
-#: _message
+#: message
 msgid "Search index updated."
 msgstr ""
 
-#: _success
-msgid "Searching for: ::1::"
-msgstr ""
-
-#: _message
+#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr ""
 
-#: _message
+#: message
 msgid "Matches found: ::1 matches::"
 msgstr ""
 
-#: _message
+#: message
 msgid "Searching contents in tomb ::1 tomb name::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Run 'tomb index' to create indexes."
 msgstr ""
 
-#: _message
+#: message
 msgid "Search completed."
 msgstr ""
 
-#: _message
+#: message
 msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "No tomb name specified for resizing."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Cannot find ::1::"
 msgstr ""
 
-#: _failure
+#: failure
 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."
+#: failure
+msgid "Please close the tomb ::1 tomb name:: before trying to resize it."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "You must specify the new size of ::1 tomb name::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Size is not an integer."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "The new size must be greater then old tomb size."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Error creating the extra resize ::1 size::, operation aborted."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "cryptsetup failed to resize ::1 mapper::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "e2fsck failed to check ::1 mapper::"
 msgstr ""
 
-#: _failure
+#: failure
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr ""
 
-#: _warning
+#: failure
 msgid "There is no open tomb to be closed."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Too many tombs mounted, please specify one (see tomb list)"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "or issue the command 'tomb close all' to close them all."
 msgstr ""
 
-#: _message
+#: message
 msgid "Tomb close ::1::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Tomb not found: ::1 tomb file::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Please specify an existing tomb."
 msgstr ""
 
-#: _success
-msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
-msgstr ""
-
-#: _message
+#: message
 msgid "Kill all processes busy inside the tomb."
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr ""
 
-#: _message
+#: message
 msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
 msgstr ""
 
-#: _message
+#: message
 msgid "Closing tomb bind hook: ::1 hook::"
 msgstr ""
 
-#: _success
-msgid "Slamming tomb: killing all processes using this hook."
-msgstr ""
-
-#: _warning
+#: failure
 msgid "Cannot slam the bind hook ::1 hook::"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Tomb is busy, cannot umount!"
 msgstr ""
 
-#: _warning
+#: failure
 msgid "Error occurred in cryptsetup luksClose ::1 mapper::"
 msgstr ""
 
-#: _success
-msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
-msgstr ""
-
-#: _failure
+#: failure
 msgid "Error parsing."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "There's no such command \"::1 subcommand::\"."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Please try -h for help."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Some error occurred during option processing."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "See \"tomb help\" for more info."
 msgstr ""
 
-#: _failure
+#: failure
 msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
 msgstr ""
 
-#: _failure
+#: 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 ""
 
-#: _failure
-msgid "QREncode not installed: cannot engrave keys on paper."
-msgstr ""
-
-#: _warning
+#: warning
 msgid "The create command is deprecated, please use dig, forge and lock instead."
 msgstr ""
 
-#: _warning
+#: warning
 msgid "For more informations see Tomb's manual page (man tomb)."
 msgstr ""
 
-#: _failure
-msgid "Steghide not installed: cannot bury keys into images."
+#: failure
+msgid "Resize2fs not installed: cannot resize tombs."
 msgstr ""
 
-#: _failure
-msgid "Steghide not installed: cannot exhume keys from images."
+#: failure
+msgid "QREncode not installed: cannot engrave keys on paper."
 msgstr ""
 
-#: _failure
-msgid "Resize2fs not installed: cannot resize tombs."
+#: failure
+msgid "Steghide not installed: cannot bury keys into images."
+msgstr ""
+
+#: failure
+msgid "Steghide not installed: cannot exhume keys from images."
 msgstr ""
 
-#: _print
+#: print
 msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
 msgstr ""
 
-#: _print
+#: print
 msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
 msgstr ""
 
-#: _print
+#: print
 msgid " This is free software: you are free to change and redistribute it"
 msgstr ""
 
-#: _print
+#: print
 msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
 msgstr ""
 
-#: _print
+#: print
 msgid " This source code is distributed in the hope that it will be useful,"
 msgstr ""
 
-#: _print
+#: print
 msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
 msgstr ""
 
-#: _print
+#: print
 msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: _print
+#: print
 msgid " Please refer to the GNU Public License for more details."
 msgstr ""
 
-#: _print
+#: print
 msgid "System utils:"
 msgstr ""
 
-#: _warning
+#: warning
 msgid "Command \"::1 subcommand::\" not recognized."
 msgstr ""
 
-#: _message
+#: message
 msgid "Try -h for help."
 msgstr ""