tomb

the crypto undertaker
git clone git://parazyd.org/tomb.git
Log | Files | Refs | README | LICENSE
commit 1ef2576b16e025c9795a287880f6c2c33ebea70c
parent 7a8a8666bab53270fda2c666136810b718e415e5
Author: gdrooid <gdrooid@openmailbox.org>
Date:   Wed, 26 Nov 2014 17:42:08 +0100

[l10n] Updated German, Russian and Spanish translations.

Diffstat:

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


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


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


3 files changed, 1418 insertions(+), 1832 deletions(-)

diff --git a/extras/po/de.po b/extras/po/de.po
@@ -1,59 +1,295 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Tomb the Crypto Undertaker\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
+"Project-Id-Version: Tomb the Crypto Undertaker\n"
+"Language: de\n"
 
 #: failure
-msgid "Failing to identify the user who is calling us"
-msgstr ""
+msgid "Operation aborted."
+msgstr "Vorgang abgebrochen."
+
+#: 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
+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."
+
+#: message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr "Warten auf den Schlüssel auf der Standarteingabe... "
 
 #: failure
-msgid "Tomb won't work without a TOMBNAME."
-msgstr ""
+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."
 
 #: failure
-msgid "Fatal error creating the temporary directory: ::1 temp dir::"
-msgstr ""
+msgid "Key not found, specify one using -k."
+msgstr "Schlüssel nicht gefunden, bitte mit -k einen Schlüssel angeben."
+
+#: warning
+msgid "User aborted password dialog."
+msgstr "Benutzer hat den Passwortdialog abgebrochen."
+
+#: message
+msgid "Password OK."
+msgstr "Passwort OK."
 
 #: failure
-msgid "Fatal error setting the permission umask for temporary files"
-msgstr ""
+msgid "Error: the newly generated keyfile does not seem valid."
+msgstr "Fehler: Der neu erstellte Schlüssel scheint nicht gültig zu sein."
 
 #: failure
-msgid "Someone is messing up with us trying to hijack temporary files."
-msgstr ""
+msgid "User aborted."
+msgstr "Vom Benutzer abgebrochen."
 
 #: failure
-msgid "Fatal error creating a temporary file: ::1 temp file::"
-msgstr ""
+msgid "You set empty password, which is not possible."
+msgstr "Fehler: Passwort nicht gesetzt."
 
 #: failure
-msgid "Fatal error setting ownership on temporary file: ::1 temp file::"
-msgstr ""
+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 "All your swaps are belong to crypt.  Good."
-msgstr "Alle geteilten Speicher gehören crypt.  Gut."
+#: failure
+msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
+msgstr "gpg (GnuPG) welches zur Funktion von Tomb notwendig ist, nicht gefunden."
+
+#: message
+msgid "Please confirm the key password for the encoding"
+msgstr "Bitte bestätigen Sie das Passwort zur Verschlüsselung"
+
+#: warning
+msgid "Wrong password supplied."
+msgstr "Das eingegebene Passwort ist falsch."
+
+#: failure
+msgid "You shall not bury a key whose password is unknown to you."
+msgstr "Sie dürfen keinen Schlüssel vergraben, von dem Sie das Passwort nicht kennen."
+
+#: warning
+msgid "Encoding error: steghide reports problems."
+msgstr "Fehler beim Verschlüsseln: steghide meldet Fehler."
+
+#: warning
+msgid "Make explicit use of --force to overwrite."
+msgstr "Benutzen Sie --force um ein Überschreiben zu erzwingen."
+
+#: warning
+msgid "Use of --force selected: overwriting."
+msgstr "--force wurde benutzt, wird überschrieben."
+
+#: 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."
+
+#: failure
+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
+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
+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
+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
+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
+msgid "Cannot generate encryption key."
+msgstr "Verschlüsselungsschlüssel konnte nicht erstellt werden."
+
+#: message
+msgid "(You can also change it later using 'tomb passwd'.)"
+msgstr "(Sie können ihn auch später mit 'tomb passwd' wechseln.)"
+
+#: warning
+msgid "The key does not seem to be valid."
+msgstr "Der Schlüssel scheint ungültig zu sein."
+
+#: warning
+msgid "Dumping contents to screen:"
+msgstr "Inhalte werden am Bildschirm angezeigt :"
+
+#: failure
+msgid "Size argument missing, use -s"
+msgstr "Größenangabe fehlt, benutzen Sie -s."
+
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
+msgstr "Es existiert bereits ein Grab. Hier grabe ich nicht:"
+
+#: 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:"
+
+#: warning
+msgid "No tomb specified for locking."
+msgstr "Kein Grab zum verschließen angegeben"
+
+#: warning
+msgid "Usage: tomb lock file.tomb file.tomb.key"
+msgstr "Gebrauch: tomb lock file.tomb file.tomb.key"
+
+#: 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
+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
+msgid "The tomb was already locked with another key."
+msgstr "Grab ist schon mit anderem Schlüssel verschlossen."
+
+#: failure
+msgid "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
+msgstr "Vorgang abgebrochen. Ich kann kein bereits abgeschlossenes Grab nochmal abschließen. Graben Sie ein neues."
+
+#: message
+msgid "Fine, this tomb seems empty."
+msgstr "Gut, dieses Grab scheint leer."
+
+#: message
+msgid "Formatting Luks mapped device."
+msgstr "Formatieren des Luks Gerätes."
+
+#: warning
+msgid "cryptsetup luksFormat returned an error."
+msgstr "'cryptsetup luksFormat' hat einen Fehler ausgegeben"
+
+#: message
+msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
+msgstr "Ihr Grab wird mit Ext3/Ext4 formatiert."
+
+#: warning
+msgid "Tomb format returned an error."
+msgstr "Beim Formatieren ist ein Fehler aufgetreten."
+
+#: message
+msgid "Here below its status is reported:"
+msgstr "Zustand des Grabes wie folgt :"
+
+#: message
+msgid "This tomb is a valid LUKS encrypted device."
+msgstr "Dieses Grab ist ein gültiges LUKS verschlüsseltes Gerät."
+
+#: failure
+msgid "Failure mounting the encrypted file."
+msgstr "Fehler beim Einhängen der verschlüsselten Datei."
+
+#: warning
+msgid "How pitiful!  A tomb, and no HOME."
+msgstr "Wie bedaurndswert ! Ein Grab aber kein Zuhause."
+
+#: warning
+msgid "Cannot exec bind hooks without a mounted tomb."
+msgstr "'Bind hooks' kann nicht benutzt werden ohne eingehängtes Grab."
+
+#: 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."
+
+#: message
+msgid "Search index updated."
+msgstr "Such-Index aktualisiert."
+
+#: warning
+msgid "Run 'tomb index' to create indexes."
+msgstr "Führen Sie 'tomb index' aus um Suchindexe zu erstellen."
+
+#: message
+msgid "Search completed."
+msgstr "Suche abgeschlossen."
+
+#: failure
+msgid "No tomb name specified for resizing."
+msgstr "Kein Name für das zu vergrössernde Grab angegeben."
+
+#: failure
+msgid "Size is not an integer."
+msgstr "Die Grösse muss eine Ganzzahl sein."
+
+#: 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
+msgid "There is no open tomb to be closed."
+msgstr "Es gibt kein zu schließendes Grab."
+
+#: warning
+msgid "Too many tombs mounted, please specify one (see tomb list)"
+msgstr "Zu viele Gräber geöffnet, bitte geben sie ein Grab an (siehe 'tomb list')"
+
+#: 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."
+
+#: warning
+msgid "Please specify an existing tomb."
+msgstr "Bitte geben Sie ein existierendes Grab an."
+
+#: message
+msgid "Kill all processes busy inside the tomb."
+msgstr "Abbrechen aller laufenden Prozesse im Grab."
+
+#: warning
+msgid "Tomb is busy, cannot umount!"
+msgstr "Grab ist beschäftigt und kann nicht ausgehänkt werden!"
+
+#: failure
+msgid "Error parsing."
+msgstr "Syntax Fehler."
+
+#: warning
+msgid "Some error occurred during option processing."
+msgstr "Fehler beim interpretieren der Optionen"
+
+#: 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
+msgid "For more informations see Tomb's manual page (man tomb)."
+msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."
+
+#: message
+msgid "Try -h for help."
+msgstr "Versuchen Sie -h um Hilfe zu erhalten."
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr "Ohne GRABNAME kann Tomb nicht funktionieren"
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr "Fataler Fehler beim erzeugen der temporären Datei: ::1 temp file::"
 
 #: warning
 msgid "You can deactivate all swap partitions using the command:"
-msgstr ""
+msgstr "Sie können alle Swap-Partitionen deaktivieren mit dem Befehl:"
 
 #: warning
 msgid " swapoff -a"
-msgstr ""
+msgstr " swapoff -a"
 
 #: warning
 msgid "But if you want to proceed like this, use the -f (force) flag."
-msgstr ""
-
-#: failure
-msgid "Operation aborted."
-msgstr "Vorgang abgebrochen."
+msgstr "Falls sie ohne dies zu tun fortfahren wollen, benutzen sie die -f (forcieren) Option."
 
 #: failure
 msgid "Tomb file is missing from arguments."
@@ -85,22 +321,12 @@ msgstr "Grab wird schon benutzt ::1 tomb name::"
 
 #: message
 msgid "Valid tomb file found: ::1 tomb path::"
-msgstr ""
+msgstr "Gültige tomb Datei gefunden: ::1 tomb path::"
 
 #: 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
-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
-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
 msgid "Syntax: tomb [options] command [arguments]"
 msgstr "Syntax: tomb [Optionen] Befehl [Argumente]"
@@ -162,47 +388,20 @@ msgid " // Operations on keys:"
 msgstr " // Schlüssel bearbeiten:"
 
 #: print
-msgid " passwd  change the password of a KEY (needs old pass)"
-msgstr ""
-
-#: print
-msgid " setkey  change the KEY locking a TOMB (needs old key and pass)"
-msgstr ""
-
-#: print
-msgid " // Backup on paper:"
-msgstr ""
-
-#: print
 msgid " engrave makes a QR code of a KEY to be saved on paper"
 msgstr " engrave Erstellt einen QR-Code eines SCHLÜSSELS zum ausdrucken"
 
 #: print
-msgid " // Steganography:"
-msgstr ""
-
-#: print
-msgid " bury    hide a KEY inside a JPEG image (for use with -k)"
-msgstr ""
-
-#: print
-msgid " exhume  extract a KEY from a JPEG image (prints to stdout)"
-msgstr ""
-
-#: print
 msgid "Options:"
 msgstr "Optionen:"
 
 #: print
 msgid " -s     size of the tomb file when creating/resizing one (in MB)"
-msgstr ""
-" -s        Größe eines Grabes (beim Erstellen/neue Größe zuweisen) (in Mb)"
+msgstr " -s        Größe eines Grabes (beim Erstellen/neue Größe zuweisen) (in Mb)"
 
 #: print
 msgid " -k     path to the key to be used ('-k -' to read from stdin)"
-msgstr ""
-" -k        Dateipfad zum Schlüssel ('-k -' um ihn aus der Standarteingabe "
-"einzulesen)"
+msgstr " -k        Dateipfad zum Schlüssel ('-k -' um ihn aus der Standarteingabe einzulesen)"
 
 #: print
 msgid " -n     don't process the hooks found in tomb"
@@ -226,9 +425,7 @@ msgstr " -h        Anzeigen dieses Hilfetextes"
 
 #: print
 msgid " -v     print version, license and list of available ciphers"
-msgstr ""
-" -v        Anzeigen der Version, Lizenzen und vorhandeners "
-"Verschlüsslungsmethoden"
+msgstr " -v        Anzeigen der Version, Lizenzen und vorhandeners Verschlüsslungsmethoden"
 
 #: print
 msgid " -q     run quietly without printing informations"
@@ -248,55 +445,27 @@ msgstr "Bug-Reports bitte an <https://github.com/dyne/tomb/issues>.."
 
 #: failure
 msgid "Missing required dependency ::1 command::.  Please install it."
-msgstr ""
-
-#: warning
-msgid "cleartext key from stdin selected: this is unsafe."
-msgstr ""
-
-#: failure
-msgid "please use --unsafe if you really want to do this."
-msgstr ""
-
-#: warning
-msgid "received key in cleartext from stdin (unsafe mode)"
-msgstr ""
+msgstr "Fehlende Abhängigkeit ::1 tomb path:: wird benötigt. Bitte installieren Sie sie."
 
 #: warning
 msgid "is_valid_key() called without an argument."
-msgstr ""
+msgstr "is_valid_key() ausgeführt ohne gültiges Argument."
 
 #: message
 msgid "Key is an image, it might be valid."
-msgstr "Schlüssel ist ein Bild, es könnte gültig sein"
-
-#: message
-msgid "Key is valid."
-msgstr "Schlüssel ist gültig"
-
-#: warning
-msgid "Attempting key recovery."
-msgstr "Versuche Schlüssel wieder herzustellen"
-
-#: failure
-msgid "This operation requires a key file to be specified using the -k option."
-msgstr ""
-"Diese Operation benötigt das angeben eines Schlüssels durch die -k Option."
+msgstr "Schlüssel ist ein Bild, es könnte gültig sein"
 
 #: message
-msgid "Waiting for the key to be piped from stdin... "
-msgstr "Warten auf den Schlüssel auf der Standarteingabe... "
+msgid "Key is valid."
+msgstr "Schlüssel ist gültig"
 
-#: failure
-msgid "Key not found, specify one using -k."
-msgstr "Schlüssel nicht gefunden, bitte mit -k einen Schlüssel angeben."
+#: warning
+msgid "Attempting key recovery."
+msgstr "Versuche Schlüssel wieder herzustellen"
 
 #: 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."
+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
 msgid "No suitable program for KDF ::1 program::."
@@ -304,20 +473,12 @@ msgstr "Kein gültiges Programm zur Schlüsselableitung ::1 program::."
 
 #: failure
 msgid "Internal error: ask_key_password() called before _load_key()."
-msgstr ""
+msgstr "Interner Fehler: ask_key_password() vor _load_key() ausgeführt."
 
 #: message
 msgid "A password is required to use key ::1 key::"
 msgstr "Ein Passwort ist zur Benutzung des Schlüssels ::1 key:: erforderlich"
 
-#: warning
-msgid "User aborted password dialog."
-msgstr "Benutzer hat den Passwortdialog abgebrochen."
-
-#: message
-msgid "Password OK."
-msgstr "Passwort OK."
-
 #: message
 msgid "Commanded to change password for tomb key ::1 key::"
 msgstr "Benutzer hat Passwort für Schlüssel ::1 key:: gewechselt."
@@ -326,35 +487,6 @@ msgstr "Benutzer hat Passwort für Schlüssel ::1 key:: gewechselt."
 msgid "No valid password supplied."
 msgstr "Kein gültiges Passwort angegeben"
 
-#: success
-msgid "Changing password for ::1 key file::"
-msgstr "Passwort gewechselt für ::1 key file::."
-
-#: 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
-msgid "User aborted."
-msgstr "Vom Benutzer abgebrochen."
-
-#: failure
-msgid "You set empty password, which is not possible."
-msgstr "Fehler: Passwort nicht gesetzt."
-
-#: 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
 msgid "generating salt"
 msgstr "generiere Salt"
@@ -367,46 +499,10 @@ msgstr "berechne Iterationen"
 msgid "encoding the password"
 msgstr "Passwort verschlüsseln"
 
-#: failure
-msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
-msgstr ""
-"gpg (GnuPG) welches zur Funktion von Tomb notwendig ist, nicht gefunden."
-
 #: 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
-msgid "Please confirm the key password for the encoding"
-msgstr "Bitte bestätigen Sie das Passwort zur Verschlüsselung"
-
-#: warning
-msgid "Wrong password supplied."
-msgstr "Das eingegebene Passwort ist falsch."
-
-#: failure
-msgid "You shall not bury a key whose password is unknown to you."
-msgstr ""
-"Sie dürfen keinen Schlüssel vergraben, von dem Sie das Passwort nicht kennen."
-
-#: 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."
-
-#: failure
-msgid "Exhume failed, no image specified"
-msgstr ""
-
 #: failure
 msgid "Exhume failed, image file not found: ::1 image file::"
 msgstr "Exhumieren fehlgeschlagen, Bilddatei nicht gefunden: ::1 image file::"
@@ -427,14 +523,6 @@ msgstr "Gebe exhumierten Schlüssel auf stdout aus"
 msgid "File exists: ::1 tomb key::"
 msgstr "Datei existiert: ::1 tomb key::"
 
-#: 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
 msgid "Refusing to overwrite file. Operation aborted."
 msgstr "Überschreiben verweigert. Operation abgebrochen."
@@ -443,53 +531,29 @@ msgstr "Überschreiben verweigert. Operation abgebrochen."
 msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Versuche Schlüssel aus ::1 image file:: zu exhumieren"
 
-#: success
-msgid "Key succesfully exhumed to ::1 key::."
-msgstr "Schlüssel erfolgreich nach ::1 key:: exhumiert."
-
 #: warning
 msgid "Nothing found in ::1 image file::"
 msgstr "Nichts gefunden in ::1 image file::"
 
-#: success
-msgid "Rendering a printable QRCode for key: ::1 tomb key file::"
-msgstr ""
-
 #: 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 ""
+msgstr "Befehl erhalten zum ausgraben des Grabes: ::1 tomb path::"
 
 #: failure
 msgid "Missing path to tomb"
-msgstr ""
-
-#: failure
-msgid "Size argument missing, use -s"
-msgstr "Größenangabe fehlt, benutzen Sie -s."
+msgstr "Dateipfad zum Grab fehlt"
 
 #: failure
 msgid "Size must be an integer (megabytes)"
-msgstr ""
+msgstr "Größe muss eine Ganzzahl sein (Megabytes)"
 
 #: 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:"
-
-#: success
-msgid "Creating a new tomb in ::1 tomb path::"
-msgstr ""
+msgstr "Gräber können nicht kleiner als 10 Megabyte sein"
 
 #: message
 msgid "Generating ::1 tomb file:: of ::2 size::MiB"
@@ -497,186 +561,55 @@ msgstr "Grab ::1 tomb file:: wird erstellt, mit der Größe ::2 size::Mb"
 
 #: warning
 msgid "Error creating the tomb ::1 tomb path::"
-msgstr ""
-
-#: 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:"
-msgstr ""
-"Ihr Grab ist noch nicht bereit, erst müssen Sie einen Schlüssel schmieden "
-"und es abschließen:"
+msgstr "Fehler beim Erzeugen des Grabes  ::1 tomb path::"
 
 #: message
 msgid "tomb forge ::1 tomb path::.key"
-msgstr ""
+msgstr "tomb forge ::1 tomb path::.key "
 
 #: 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 ""
-"Mit -k muss ein Dateiname angegeben werden, um einen neuen Schlüssel zu "
-"schmieden."
+msgstr "tomb lock ::1 tomb path:: -k ::1 tomb path::.key "
 
 #: message
 msgid "Commanded to forge key ::1 key::"
 msgstr "::1 key:: wird geschmiedet"
 
-#: warning
-msgid "Forging this key would overwrite an existing file. Operation aborted."
-msgstr ""
-"Diesen Schlüssel zu schmieden würde eine existierende Datei überschreiben. "
-"Aktion abgebrochen."
-
 #: 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
-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
-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
-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
-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
-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
-msgid "(You can also change it later using 'tomb passwd'.)"
-msgstr "(Sie können ihn auch später mit 'tomb passwd' wechseln.)"
-
-#: warning
-msgid "The key does not seem to be valid."
-msgstr "Der Schlüssel scheint ungültig zu sein."
-
-#: warning
-msgid "Dumping contents to screen:"
-msgstr "Inhalte werden am Bildschirm angezeigt :"
+msgstr "Der Schlüssel ::1 key:: wird mit dem Verschlüsselungsalgorithmus ::2 algorithm:: geschmiedet."
 
 #: message
 msgid "Done forging ::1 key file::"
-msgstr ""
-
-#: success
-msgid "Your key is ready:"
-msgstr "Ihr Schlüssel ist bereit :"
-
-#: warning
-msgid "No tomb specified for locking."
-msgstr "Kein Grab zum verschließen angegeben"
-
-#: warning
-msgid "Usage: tomb lock file.tomb file.tomb.key"
-msgstr "Gebrauch: tomb lock file.tomb file.tomb.key"
+msgstr "::1 key file:: fertig geschmiedet"
 
 #: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr "Grab ::1 tomb file:: wird verschlossen"
 
-#: failure
-msgid "There is no tomb here. You have to it dig first."
-msgstr "Es ist kein Grab an diesem Ort. Sie müssen erst eins graben."
-
-#: 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
-msgid "The tomb was already locked with another key."
-msgstr "Grab ist schon mit anderem Schlüssel verschlossen."
-
-#: failure
-msgid ""
-"Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
-msgstr ""
-"Vorgang abgebrochen. Ich kann kein bereits abgeschlossenes Grab nochmal "
-"abschließen. Graben Sie ein neues."
-
-#: message
-msgid "Fine, this tomb seems empty."
-msgstr "Gut, dieses Grab scheint leer."
-
 #: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr "Abschließen mit Chiffre: ::1 cipher::"
 
-#: success
-msgid "Locking ::1 tomb file:: with ::2 tomb key file::"
-msgstr ""
-
-#: message
-msgid "Formatting Luks mapped device."
-msgstr "Formatieren des Luks Gerätes."
-
-#: warning
-msgid "cryptsetup luksFormat returned an error."
-msgstr "'cryptsetup luksFormat' hat einen Fehler ausgegeben"
-
 #: warning
 msgid "cryptsetup luksOpen returned an error."
 msgstr "'cryptsetup luksOpen' hat einen Fehler ausgegeben"
 
-#: message
-msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
-msgstr "Ihr Grab wird mit Ext3/Ext4 formatiert."
-
-#: warning
-msgid "Tomb format returned an error."
-msgstr "Beim Formatieren ist ein Fehler aufgetreten."
-
 #: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr "Ihr Grab ::1 tomb file:: könnte korrumpiert sein."
 
 #: 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 path:: and secured with key ::2 tomb key::"
-msgstr ""
+msgstr "Grab ::1 tomb name:: wurde erfolgreich verschlüsselt mit LUKS dm-crypt ::2 cipher::"
 
 #: message
 msgid "Commanded to reset key for tomb ::1 tomb path::"
-msgstr ""
+msgstr "Befehl erhalten zum zurücksetzen des Schlüssels fur das Grab ::1 tomb path::"
 
 #: 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."
+msgstr "Der Befehl 'setkey' benötigt zwei Argumente: Die alte Schlüsseldatei und das Grab."
 
 #: warning
 msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
@@ -690,10 +623,6 @@ msgstr "Vorgang abgebrochen."
 msgid "Not a valid LUKS encrypted volume: ::1 volume::"
 msgstr "Dieses Grab ist ein gültiges LUKS verschlüsseltes Gerät: ::1 volume::"
 
-#: success
-msgid "Changing lock on tomb ::1 tomb name::"
-msgstr "Ändern des Schlosses für das Grab ::1 tomb name::"
-
 #: message
 msgid "Old key: ::1 old key::"
 msgstr "Alter Schlüssel: ::1 old key::"
@@ -708,7 +637,7 @@ msgstr "Unerwarteter Fehler in luksOpen"
 
 #: message
 msgid "New key: ::1 key file::"
-msgstr ""
+msgstr "Neuer Schlüssel: ::1 key file::"
 
 #: failure
 msgid "No valid password supplied for the new key."
@@ -722,10 +651,6 @@ msgstr "Unerwarteter Fehler in luksChangeKey"
 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
 msgid "The new key is: ::1 new key::"
 msgstr "Der neue Schlüssel ist: ::1 new key::"
@@ -740,7 +665,7 @@ msgstr "Grab ::1 tomb name:: wird geöffnet"
 
 #: warning
 msgid "::1 tomb file:: is not a valid tomb file"
-msgstr ""
+msgstr "::1 tomb file:: iste keine gültige Grabdatei"
 
 #: message
 msgid "Mountpoint not specified, using default: ::1 mount point::"
@@ -750,71 +675,33 @@ msgstr "Mountpoint nicht angegeben, ::1 mount point:: wird benutzt"
 msgid "::1 tomb name:: is already open."
 msgstr "::1 tomb name:: ist bereits geöffnet."
 
-#: message
-msgid "Here below its status is reported:"
-msgstr "Zustand des Grabes wie folgt :"
-
-#: success
-msgid "Opening ::1 tomb file:: on ::2 mount point::"
-msgstr "::1 tomb file:: geöffnet in ::2 mount point::"
-
 #: 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
-msgid "This tomb is a valid LUKS encrypted device."
-msgstr "Dieses Grab ist ein gültiges LUKS verschlüsseltes Gerät."
-
-#: message
-msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
-msgstr ""
-"Verschlüsselung \"::1 cipher::\" im Modus \"::2 mode::\" und der "
-"Hashfunktion \"::3 hash::\"."
-
-#: warning
-msgid ""
-"Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
-msgstr ""
-"Mehrere Schlüssellöcher sind an diesem Grab angebracht. Achtung, es könnte "
-"eine Hintertür geben."
-
-#: failure
-msgid "Failure mounting the encrypted file."
-msgstr "Fehler beim Einhängen der verschlüsselten Datei."
+msgstr "::1 tomb file:: ist keine gültige Luks verschlüsselte Datei."
 
-#: success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr "::1 tomb name:: wurde erfolgreich aufgeschlossen."
+#: 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
+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."
 
 #: 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
 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::"
+msgstr "Letzer Besuch von ::1 user::(::2 tomb build::) von ::3 tty:: auf ::4 host::"
 
 #: message
 msgid "on date ::1 date::"
 msgstr "am ::1 date::"
 
 #: warning
-msgid "How pitiful!  A tomb, and no HOME."
-msgstr "Wie bedaurndswert ! Ein Grab aber kein Zuhause."
-
-#: warning
-msgid "Cannot exec bind hooks without a mounted tomb."
-msgstr "'Bind hooks' kann nicht benutzt werden ohne eingehängtes Grab."
-
-#: warning
 msgid "bind-hooks file is broken"
-msgstr ""
+msgstr "Datei mit den Bind-Hooks ist korrumpiert"
 
 #: warning
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME"
@@ -822,24 +709,15 @@ msgstr "'bind hooks' map format: local/to/tomb local/to/$HOME"
 
 #: 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"
+msgstr "'bind-hooks' map format: local/to/tomb local/to/$HOME.  Wird rückgängig gemacht"
 
 #: 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
-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."
+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"
 
 #: failure
 msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
@@ -847,30 +725,27 @@ msgstr "Ich sehe keine ::1 status::. Mögen sie alle in Frieden ruhen."
 
 #: message
 msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
-msgstr ""
+msgstr "::1 tombname:: geöffnet in ::2 tombmount:: mit ::3 tombfsopts::"
 
 #: message
 msgid "::1 tombname:: open since ::2 tombsince::"
-msgstr ""
+msgstr "::1 tombname:: geöffnet seit ::2 tombsince::"
 
 #: message
-msgid ""
-"::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
-msgstr ""
+msgid "::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgstr "::1 tombname:: geöffnet von ::2 tombuser:: von ::3 tombtty:: auf ::4 tombhost::"
 
 #: message
-msgid ""
-"::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::"
-"%) is used: ::4 tombavail:: free "
-msgstr ""
+msgid "::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::%) is used: ::4 tombavail:: free "
+msgstr "::1 tombname:: Grösse ::2 tombtot:: davon ::3 tombused:: (::5 tombpercent::%) is benutzt: ::4 tombavail:: frei␣ "
 
 #: warning
 msgid "::1 tombname:: warning: your tomb is almost full!"
-msgstr ""
+msgstr "::1 tombname:: Warnung: Ihr Grab ist fast voll!"
 
 #: message
 msgid "::1 tombname:: hooks ::2 hookname:: on ::3 hookdest::"
-msgstr ""
+msgstr "::1 tombname:: bindet ::2 hookname:: ein auf ::3 hookdest::"
 
 #: failure
 msgid "Internal error: list_tomb_binds called without argument."
@@ -878,9 +753,7 @@ msgstr "Interner fehler: list_tomb_binds ohne rgumente aufgerufen."
 
 #: 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."
+msgstr "Kann Gräber auf diesem System nicht indexieren: updatedb (mlocate) nicht installiert."
 
 #: warning
 msgid "Cannot use GNU findutils for index/search commands."
@@ -894,14 +767,6 @@ msgstr "Index Befehl benötigt installiertes 'mlocate'"
 msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr "Es scheint kein als [::1::] graviertes Grab offen zu sein"
 
-#: 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
 msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr "Überspringen von ::1 tomb name:: (.noindex gefunden)."
@@ -915,18 +780,6 @@ msgid "Indexing ::1 tomb name:: contents..."
 msgstr "Indexieren der Inhalte von ::1 tomb name:: im Gange..."
 
 #: message
-msgid "Generating a new swish-e configuration file: ::1 swish conf::"
-msgstr ""
-
-#: message
-msgid "Search index updated."
-msgstr "Such-Index aktualisiert."
-
-#: success
-msgid "Searching for: ::1::"
-msgstr "Suchen nach  ::1::"
-
-#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr "Suche Dateinamen in::1 tomb name::"
 
@@ -942,23 +795,11 @@ msgstr "Suche in den Inhalten von ::1 tomb name::"
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr "Das Grab ::1 tomb name:: ist nicht indexiert und wird ignoriert."
 
-#: warning
-msgid "Run 'tomb index' to create indexes."
-msgstr "Führen Sie 'tomb index' aus um Suchindexe zu erstellen."
-
-#: message
-msgid "Search completed."
-msgstr "Suche abgeschlossen."
-
 #: 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
-msgid "No tomb name specified for resizing."
-msgstr "Kein Name für das zu vergrössernde Grab angegeben."
-
-#: failure
 msgid "Cannot find ::1::"
 msgstr "::1:: nicht gefunden."
 
@@ -968,25 +809,15 @@ msgstr "Operationen werden abgebrochen: Neue Größe nicht mit -s angegeben"
 
 #: failure
 msgid "Please close the tomb ::1 tomb name:: before trying to resize it."
-msgstr ""
+msgstr "Bitte schließen Sie das Grab ::1 tomb name:: bevor Sie versuchen die Größe zu ändern."
 
 #: 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
-msgid "Size is not an integer."
-msgstr "Die Grösse muss eine Ganzzahl sein."
-
-#: 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
 msgid "Error creating the extra resize ::1 size::, operation aborted."
-msgstr ""
-"Fehler beim erstellen der extra Vergrösserung ::1 size::, Operation "
-"abgebrochen."
+msgstr "Fehler beim erstellen der extra Vergrösserung ::1 size::, Operation abgebrochen."
 
 #: failure
 msgid "cryptsetup failed to resize ::1 mapper::"
@@ -1000,37 +831,10 @@ msgstr "e2fsck konnte ::1 mapper:: nicht verifizieren"
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr "resize2fs konnte ::1 mapper:: nicht vergrössern"
 
-#: failure
-msgid "There is no open tomb to be closed."
-msgstr "Es gibt kein zu schließendes Grab."
-
-#: warning
-msgid "Too many tombs mounted, please specify one (see tomb list)"
-msgstr ""
-"Zu viele Gräber geöffnet, bitte geben sie ein Grab an (siehe 'tomb list')"
-
-#: 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."
-
 #: warning
 msgid "Tomb not found: ::1 tomb file::"
 msgstr "Grab unauffindbar: ::1 tomb file::"
 
-#: 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
-msgid "Kill all processes busy inside the tomb."
-msgstr "Abbrechen aller laufenden Prozesse im Grab."
-
 #: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr "::1 tomb name:: kann nicht abrupt geschlossen werden !"
@@ -1043,38 +847,17 @@ msgstr "Grab ::1 tomb name:: eingehängt in ::2 mount point:: wird geschlossen."
 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."
-
 #: failure
 msgid "Cannot slam the bind hook ::1 hook::"
-msgstr "Abruptes schliessen des 'bind hooks' ::1 hook:: nicht möglich"
+msgstr "Abruptes Schliessen des 'bind hooks' ::1 hook:: nicht möglich"
 
 #: 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
-msgid "Tomb is busy, cannot umount!"
-msgstr "Grab ist beschäftigt und kann nicht ausgehänkt werden !"
+msgstr "Der 'bind hook' ::1 hook:: ist beschäftigt und kann nicht geschlossen werden."
 
 #: 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
-msgid "Error parsing."
-msgstr "Syntax Fehler."
+msgstr "Ein Fehler ist beim Ausführen von 'cryptsetup luksClose ::1 mapper::' aufgetreten."
 
 #: warning
 msgid "There's no such command \"::1 subcommand::\"."
@@ -1084,10 +867,6 @@ msgstr "Der Befehl \"::1 subcommand::\" existiert nicht."
 msgid "Please try -h for help."
 msgstr "Versuchen Sie -h um Hilfe zu erhalten."
 
-#: warning
-msgid "Some error occurred during option processing."
-msgstr "Fehler beim interpretieren der Optionen"
-
 #: failure
 msgid "See \"tomb help\" for more info."
 msgstr "Sie \"tomb help\" für mehr Infos."
@@ -1097,24 +876,6 @@ msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
 msgstr "Unbekannte Option ::1 arg:: für Unterbefehl ::2 subcommand::"
 
 #: failure
-msgid ""
-"You specified option ::1 option::, which is DANGEROUS and should only be "
-"used for testing\n"
-"If you really want so, add --unsafe"
-msgstr ""
-
-#: 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
-msgid "For more informations see Tomb's manual page (man tomb)."
-msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."
-
-#: failure
 msgid "Resize2fs not installed: cannot resize tombs."
 msgstr "Resize2fs nicht installiert: Gräber können nicht vergrössert werden."
 
@@ -1124,20 +885,15 @@ 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."
+msgstr "Steghide ist nicht installiert: Schlüssel können nicht in Bilder vergraben werden."
 
 #: failure
 msgid "Steghide not installed: cannot exhume keys from images."
-msgstr ""
-"Steghide ist nicht installiert: Schlüssel können nicht aus Bilder "
-"ausgegraben werden."
+msgstr "Steghide ist nicht installiert: Schlüssel können nicht aus Bilder ausgegraben werden."
 
 #: 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"
+msgstr "Tomb ::1 version:: - ein starker und sanfter Totengräber für ihre Geheimnisse"
 
 #: print
 msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
@@ -1145,17 +901,11 @@ msgstr " Urheberrecht (C) 2007-2014 Dyne.org Foundation, Lizens GNU GPL v3+"
 
 #: 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
-msgid " For the latest sourcecode go to <http://dyne.org/software/tomb>"
-msgstr ""
+msgstr " This ist freie Software, Sie sind frei sie zu verändern und weiterzugeben"
 
 #: 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,"
+msgstr " Dieser Quellcode wird veröffentlicht in der Hoffnung dass er nützlich ist,"
 
 #: print
 msgid " but WITHOUT ANY WARRANTY; without even the implied warranty of"
@@ -1166,158 +916,204 @@ msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr " MARKTGÄNGIGKEIT oder der EIGNUNG ZU EINEM BESTIMMTEN ZWECK."
 
 #: print
-msgid " When in need please refer to <http://dyne.org/support>."
-msgstr ""
-
-#: print
 msgid "System utils:"
 msgstr "Systemwerkzeuge:"
 
-#: print
-msgid "Optional utils:"
-msgstr ""
-
 #: warning
 msgid "Command \"::1 subcommand::\" not recognized."
 msgstr "Der Befehl \"::1 subcommand::\" wurde nicht erkannt."
 
-#: message
-msgid "Try -h for help."
-msgstr "Versuchen Sie -h um Hilfe zu erhalten."
+#: print
+msgid " passwd  change the password of a KEY (needs old pass)"
+msgstr " passwd ändern des Passworts für einen SCHLÜSSEL (benötigt altes Passwort)"
+
+#: print
+msgid " setkey  change the KEY locking a TOMB (needs old key and pass)"
+msgstr " setkey ändern des SCHLÜSSELS von einem GRAB (benötigt alten Schlüssel und Passwort)"
+
+#: print
+msgid " // Backup on paper:"
+msgstr " //Backup auf Papier:"
 
-#~ 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 ""
-#~ "Sie haben die Option ::1 option:: gewählt welche GEFÄHRLICH ist, und nur "
-#~ "für Tests verwendet werden soll\n"
-#~ "Wenn Sie sie wirklich benutzen wollen, fügen Sie --unsecure-dev-mode hinzu"
+#: print
+msgid " // Steganography:"
+msgstr " // Steganographie:"
+
+#: print
+msgid " bury    hide a KEY inside a JPEG image (for use with -k)"
+msgstr " bury versteckt einen SCHLÜSSEL in einem JPEG Bild (zur Nutzung mit -k)"
+
+#: print
+msgid " exhume  extract a KEY from a JPEG image (prints to stdout)"
+msgstr " exhume extrahiert einen SCHLÜSSEL aus einer JPEG Datei (gibt an dei Standardausgabe aus)"
+
+#: failure
+msgid "Exhume failed, no image specified"
+msgstr "Extrahieren fehlgeschlagen, keine Bilddatei angegeben"
+
+#: print
+msgid " For the latest sourcecode go to <http://dyne.org/software/tomb>"
+msgstr " Für den aktuellsten Quellcode besuchen sie <http://dyne.org/software/tomb>"
+
+#: print
+msgid " When in need please refer to <http://dyne.org/support>."
+msgstr " Für Hilfe bitte wenden Sie sich an <http://dyne.org/support>."
+
+#: print
+msgid "Optional utils:"
+msgstr "Optionelle Hilfsmittel:"
+
+#: failure
+msgid "Fatal error setting the permission umask for temporary files"
+msgstr "Fataler Fehler beim Setzen der Berechtigungsmaske für die temporären Dateien"
+
+#: failure
+msgid "Fatal error setting ownership on temporary file: ::1 temp file::"
+msgstr "Fataler Fehler beim Setzen des Besitzers für die temporäre Datei: ::1 temp file::"
+
+#: warning
+msgid "cleartext key from stdin selected: this is unsafe."
+msgstr "Klartext Schlüssel von der Standarteingabe ausgewählt: Dies ist nicht sicher."
 
-#~ msgid "Loopback mount called on invalid tomb: ::1 path::"
-#~ msgstr "Loopback Einhängen mit ungültiger Datei versucht: ::1 path::"
+#: failure
+msgid "please use --unsafe if you really want to do this."
+msgstr "Bitte benutzen Sie --unsafe wenn Sie dies wirklich tun wollen."
 
-#~ msgid " passwd  change the password of a KEY"
-#~ msgstr " passwd  Passwort eines SCHLÜSSELS ändern"
+#: warning
+msgid "received key in cleartext from stdin (unsafe mode)"
+msgstr "Empfangen des Schlüssels in Klartext von der Standarteingabe (Nicht sicherer Modus)"
 
-#~ msgid " setkey  change the KEY locking a TOMB (needs old one)"
-#~ msgstr " setkey  SCHLÜSSEL eines GRABES ändern"
+#: failure
+msgid "You specified option ::1 option::, which is DANGEROUS and should only be used for testing\n"
+"If you really want so, add --unsafe"
+msgstr "Sie haben die Option ::1 option:: gewählt, welche GEFÄHRLICH ist und nur zum Testen benutzt werden sollte.\n"
+"Wenn sie dies wollen, benutzen sie --unsafe"
 
-#~ msgid " bury    hide a KEY inside a JPEG image"
-#~ msgstr " bury    versteckt einen SCHLÜSSEL in einer JPEG Datei"
+#: failure
+msgid "Failing to identify the user who is calling us"
+msgstr "Fehler beim Identifizieren des uns rufenden Benutzers"
 
-#~ msgid " exhume  extract a KEY from a JPEG image"
-#~ msgstr " exhume  extrahiert den SCHLÜSSEL aus einer JPEG-Datei"
+#: failure
+msgid "Fatal error creating the temporary directory: ::1 temp dir::"
+msgstr "Fataler Fehler beim kreieren der temporären Datei: ::1 temp dir::"
 
-#~ msgid "Tomb close ::1::"
-#~ msgstr "Tomb close ::1::"
+#: failure
+msgid "Someone is messing up with us trying to hijack temporary files."
+msgstr "Jemand versucht uns durcheinander zu bringen und unsere temporären Dateien zu kapern."
 
-#~ msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
-#~ msgstr "Der neueste Quellcode ist auf <http://tomb.dyne.org> erhältlich"
+#: success
+msgid "All your swaps are belong to crypt.  Good."
+msgstr "All ihre Auslagerungsdateien gehören Crypt. Gut."
 
-#~ 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."
+#: success
+msgid "Changing password for ::1 key file::"
+msgstr "Wechsle Passwort für ::1 key file::"
 
-#~ msgid "Valid tomb file found: ::1 tomb file::"
-#~ msgstr "Gültige Grab-Datei gefunden: ::1 tomb file::"
+#: success
+msgid "Your passphrase was successfully updated."
+msgstr "Ihr Passphrase wurde erfolgreich auf den neuesten Stand gebracht."
 
-#~ 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."
+#: success
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr "Benutze Schlüsselableitungsverfahren, Durchläufe: ::1 microseconds::"
 
-#~ msgid "is_valid_key() called without argument."
-#~ msgstr "is_valid_key() ohne Argumente aufgerufen."
+#: success
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+msgstr "Enkodiere Schlüssel ::1 tomb key:: im Bild ::2 image file::"
 
-#~ msgid "Internal error: ask_key_password() called before load_key()."
-#~ msgstr "Interner Fehler: ask_key_password() vor load_key gestartet"
+#: success
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr "Grabschlüssel erfolgreich im Bild ::1 image file:: enkodiert"
 
-#~ msgid "Bury failed for invalid key: ::1 key::"
-#~ msgstr "Vergraben für ungültiges Passwort fehlgeschlagen: ::1 key::"
+#: success
+msgid "Key succesfully exhumed to ::1 key::."
+msgstr "Schlüssel erfolgreich exhumiert in ::1 key::"
 
-#~ msgid "No key specified."
-#~ msgstr "Kein Schlüssel angegeben"
+#: success
+msgid "Rendering a printable QRCode for key: ::1 tomb key file::"
+msgstr "Rendern eines ausdruckbaren QRCodes für Schlüssel: ::1 tomb key file::"
 
-#~ msgid "Rendering a printable QRCode for key: ::1 tomb key::"
-#~ msgstr "::1 tomb key:: wird in QR-Code umgewandelt"
+#: success
+msgid "Operation successful:"
+msgstr "Operation erfolgreich:"
 
-#~ msgid "Done forging ::1 key::"
-#~ msgstr "Der Schlüssel ::1 key:: wurde geschmiedet"
+#: success
+msgid "Creating a new tomb in ::1 tomb path::"
+msgstr "Erstelle ein neues Grab in ::1 tomb path::"
 
-#~ msgid "Commanded to dig tomb ::1 tomb name::"
-#~ msgstr "Das Grab ::1 tomb name:: wird ausgehoben"
+#: success
+msgid "Done digging ::1 tomb name::"
+msgstr "Fertig mit ausgraben ::1 tomb name::"
 
-#~ msgid "No tomb name specified for creation."
-#~ msgstr "Dem Grab wurde bei seiner Erstellung kein Name zugeteilt."
+#: success
+msgid "Choose the  password of your key: ::1 tomb key::"
+msgstr "Wählen Sie das Passwort von ihrem Schlüssel: ::1 tomb key::"
 
-#~ msgid "Size argument is not an integer."
-#~ msgstr "Die Größe muss eine Ganzzahl sein."
+#: success
+msgid "Your key is ready:"
+msgstr "Ihr Schlüssel ist bereit:"
 
-#~ msgid "Tombs can't be smaller than 10 megabytes."
-#~ msgstr "Die minimale Größe ist 10 Mb."
+#: success
+msgid "Locking ::1 tomb file:: with ::2 tomb key file::"
+msgstr "Schliesse ::1 tomb file:: ab mit ::2 tomb key file::"
 
-#~ msgid "Creating a new tomb in ::1 tomb dir::/::2 tomb file::"
-#~ msgstr "Neues Grab in ::1 tomb dir::/::2 tomb file::"
+#: success
+msgid "Your tomb is ready in ::1 tomb path:: and secured with key ::2 tomb key::"
+msgstr "Ihr Grab ist bereit in ::1 tomb path::und gesichert mit dem Schlüssel ::2 tomb key::"
 
-#~ 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."
+#: success
+msgid "Changing lock on tomb ::1 tomb name::"
+msgstr "Wechsle Schloss am Grab ::1 tomb name::"
 
-#~ msgid "Aborting operations: error loading key."
-#~ msgstr "Operationen werden abgebrochen: Fehler beim laden des Schlüssels."
+#: success
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
+msgstr "Schlüssel Erfolgreich gewechselt für das Grab: : ::1 tomb file::"
 
-#~ msgid "Locking ::1 tomb file:: with ::2 tomb key::"
-#~ msgstr "Abschließen von ::1 tomb file:: mit ::2 tomb key::"
+#: success
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Öffne ::1 tomb file:: auf ::2 mount point::"
 
-#~ 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"
+#: success
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr "Entsperren erfolgreich von ::1 tomb name::"
 
-#~ msgid "Commanded to reset key for tomb ::1 tomb name::"
-#~ msgstr "Schlüssel wird zurückgesetzt für Grab ::1 tomb name::"
+#: success
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Erfolgreiches Öffnen von ::1 tomb file:: auf ::2 mount point::"
 
-#~ msgid "Aborting operations: error loading old key from arguments"
-#~ msgstr ""
-#~ "Operationen abgebrochen: Fehler beim Laden des alten Schlüssels aus den "
-#~ "Argumenten"
+#: success
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr "Post Hooks gefunden, ausführen als Benutzer ::1 user name::."
 
-#~ msgid "Aborting operations: error loading new key from -k"
-#~ msgstr ""
-#~ "Operationen abgebrochen: Fehler beim Laden des neuen Schlüssels von -k"
+#: success
+msgid "Creating and updating search indexes."
+msgstr "Kreieren und aktualisieren von Suchindexen"
 
-#~ msgid "New key: ::1 key::"
-#~ msgstr "Neuer Schlüssel: ::1 key::"
+#: message
+msgid "Generating a new swish-e configuration file: ::1 swish conf::"
+msgstr "Kreieren einer neuen swish-e Konfigurationsdatei: ::1 swish conf::"
 
-#~ msgid "Creating this tomb would overwrite an existing file."
-#~ msgstr ""
-#~ "Das ausheben dieses Grabes würde eine existierende Datei überschreiben."
+#: success
+msgid "Searching for: ::1::"
+msgstr "Suchen nach: ::1::"
 
-#~ msgid "Failed to forge key, operation aborted."
-#~ msgstr "Schlüssel schmieden fehlgeschlagen, Operation abgebrochen."
+#: success
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr "Abruptes Schließen von ::1 tomb name:: eingehangen in ::2 mount point:: "
 
-#~ msgid "Failed to lock tomb with key, operation aborted."
-#~ msgstr ""
-#~ "Abschliessen des Grabes mit dem Schlüssel fehlgeschlagen, Operation "
-#~ "abgebrochen."
+#: success
+msgid "Slamming tomb: killing all processes using this hook."
+msgstr "Abruptes Schließen des Grabes: Beenden aller Prozesse die diesen Hook benutzen."
 
-#~ msgid "Tomb ::1 tomb name:: succesfully created."
-#~ msgstr "Das Grab ::1 tomb name:: wurde erfolgreich erstellt."
+#: success
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr "Grab ::1 tomb name:: geschlossen: Ihre Knochen werden in Frieden ruhen."
 
-#~ msgid "::1 tomb file:: is not a valid tomb file, operation aborted."
-#~ msgstr ""
-#~ "::1 tomb file:: ist keine gültige Grab Datei, Operation abgebrochen."
+#: warning
+msgid "Pinentry error: ::1 error::"
+msgstr "Pinentry Fehler: ::1 error::"
 
-#~ msgid "Aborting operations: error loading key ::1 key::"
-#~ msgstr ""
-#~ "Operationen werden abgebrochen: Fehler beim Laden des Schlüssels ::1 key::"
+#: warning
+msgid "Empty password"
+msgstr "Leeres Passwort"
 
-#~ 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."
diff --git a/extras/po/es.po b/extras/po/es.po
@@ -1,50 +1,287 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Tomb the Crypto Undertaker\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
+"Project-Id-Version: Tomb the Crypto Undertaker\n"
+"Language: es\n"
 
 #: failure
-msgid "Failing to identify the user who is calling us"
-msgstr ""
+msgid "Operation aborted."
+msgstr "Operación abortada."
+
+#: 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
+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."
+
+#: message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr "Esperando a recibir la llave a través de stdin... "
 
 #: failure
-msgid "Tomb won't work without a TOMBNAME."
-msgstr "Tomb no funcionará sin un TOMBNAME (nombre de la tumba)."
+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."
 
 #: failure
-msgid "Fatal error creating the temporary directory: ::1 temp dir::"
-msgstr ""
+msgid "Key not found, specify one using -k."
+msgstr "Llave no encontrada, especifica una usando -k."
+
+#: warning
+msgid "User aborted password dialog."
+msgstr "El usuario ha abortado el diálogo de contraseña."
+
+#: message
+msgid "Password OK."
+msgstr "Contraseña OK."
 
 #: failure
-msgid "Fatal error setting the permission umask for temporary files"
-msgstr ""
-"Error fatal al establecer el permiso umask para los ficheros temporales"
+msgid "Error: the newly generated keyfile does not seem valid."
+msgstr "Error: la llave recién generada no parece válida."
 
 #: failure
-msgid "Someone is messing up with us trying to hijack temporary files."
-msgstr ""
+msgid "User aborted."
+msgstr "El usuario ha abortado."
 
 #: failure
-msgid "Fatal error creating a temporary file: ::1 temp file::"
-msgstr "Error fatal al crear el fichero temporal ::1 fichero::"
+msgid "You set empty password, which is not possible."
+msgstr "Has elegido una contraseña vacía, lo que no es posible."
 
 #: failure
-msgid "Fatal error setting ownership on temporary file: ::1 temp file::"
-msgstr ""
-"Error fatal al establecer la posesión del fichero temporal ::1 fichero::"
+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 "All your swaps are belong to crypt.  Good."
-msgstr ""
+#: failure
+msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
+msgstr "No se encuentra gpg (GnuPG), Tomb no puede funcionar sin ello."
+
+#: 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
+msgid "Wrong password supplied."
+msgstr "Contraseña incorrecta."
+
+#: 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
+msgid "Encoding error: steghide reports problems."
+msgstr "Error en la codficación: steghide reporta problemas."
+
+#: warning
+msgid "Make explicit use of --force to overwrite."
+msgstr "Usa --force para sobreescribir."
+
+#: warning
+msgid "Use of --force selected: overwriting."
+msgstr "Usando --force: sobreescribiendo."
+
+#: 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."
+
+#: failure
+msgid "Forging this key would overwrite an existing file. Operation aborted."
+msgstr "Forjar esta llave sobreescribiría un fichero existente. Operación abortada."
+
+#: 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
+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
+msgid "To make it faster you can move the mouse around."
+msgstr "Para acelerarlo puedes mover el ratón por la pantalla."
+
+#: 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
+msgid "Cannot generate encryption key."
+msgstr "No se puede generar la llave de encriptación."
+
+#: message
+msgid "(You can also change it later using 'tomb passwd'.)"
+msgstr "(También puedes cambiarla más tarde usando 'tomb passwd'.)"
+
+#: warning
+msgid "The key does not seem to be valid."
+msgstr "Parece que la llave no es válida."
+
+#: warning
+msgid "Dumping contents to screen:"
+msgstr "Volcando contenido en la pantalla:"
+
+#: failure
+msgid "Size argument missing, use -s"
+msgstr "Falta el argumento de tamaño, usa -s"
+
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
+msgstr "Ya existe una tumba. No voy a cavar aquí:"
+
+#: 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:"
+
+#: warning
+msgid "No tomb specified for locking."
+msgstr "No se ha especificado una tumba que asegurar."
+
+#: warning
+msgid "Usage: tomb lock file.tomb file.tomb.key"
+msgstr "Uso: tomb lock file.tomb file.tomb.key"
+
+#: failure
+msgid "There is no tomb here. You have to it dig first."
+msgstr "No hay una tumba aquí. Tienes que cavarla primero."
+
+#: 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
+msgid "The tomb was already locked with another key."
+msgstr "La tumba ya estaba asegurada con otra llave."
+
+#: 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
+msgid "Fine, this tomb seems empty."
+msgstr "Bien, esta tumba parece vacía."
+
+#: message
+msgid "Formatting Luks mapped device."
+msgstr "Formateando dispositivo mapeado con Luks."
+
+#: warning
+msgid "cryptsetup luksFormat returned an error."
+msgstr "cryptsetup luksFormat ha devuelto un error."
+
+#: message
+msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
+msgstr "Formateando tu tumba con el sistema de ficheros Ext3/Ext4."
+
+#: warning
+msgid "Tomb format returned an error."
+msgstr "El formateo de la tumba ha devuelto un error."
+
+#: message
+msgid "Here below its status is reported:"
+msgstr "Su estado se muestra a continuación:"
+
+#: message
+msgid "This tomb is a valid LUKS encrypted device."
+msgstr "Esta tumba es un dispositivo encriptado con LUKS válido."
+
+#: failure
+msgid "Failure mounting the encrypted file."
+msgstr "Fallo al montar el fichero encriptado."
+
+#: warning
+msgid "How pitiful!  A tomb, and no HOME."
+msgstr "¡Que lamentable! Una tumba, y ningún HOGAR."
+
+#: warning
+msgid "Cannot exec bind hooks without a mounted tomb."
+msgstr "No se pueden ejecutar los bind-hooks sin una tumba montada."
+
+#: 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."
+
+#: message
+msgid "Search index updated."
+msgstr "Índice de búsqueda actualizado."
+
+#: warning
+msgid "Run 'tomb index' to create indexes."
+msgstr "Corre 'tomb index' para crear los índices."
+
+#: message
+msgid "Search completed."
+msgstr "Búsqueda completada."
+
+#: 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
+msgid "Size is not an integer."
+msgstr "El tamaño no es un número entero."
+
+#: 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
+msgid "There is no open tomb to be closed."
+msgstr "No hay ninguna tumba abierta que cerrar."
+
+#: 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
+msgid "or issue the command 'tomb close all' to close them all."
+msgstr "o utiliza el comando 'tomb close all' para cerrarlas todas."
+
+#: warning
+msgid "Please specify an existing tomb."
+msgstr "Por favor, especifica una tumba existente."
+
+#: message
+msgid "Kill all processes busy inside the tomb."
+msgstr "Mata todos los procesos ocupados dentro de la tumba."
+
+#: warning
+msgid "Tomb is busy, cannot umount!"
+msgstr "La tumba está ocupada, ¡no se puede desmontar!"
+
+#: failure
+msgid "Error parsing."
+msgstr "Error al parsear."
+
+#: warning
+msgid "Some error occurred during option processing."
+msgstr "Ha ocurrido algún error al procesar las opciones."
+
+#: 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
+msgid "For more informations see Tomb's manual page (man tomb)."
+msgstr "Para más información mira el manual de Tomb (man tomb)."
+
+#: message
+msgid "Try -h for help."
+msgstr "Prueba -h para obtener ayuda."
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr "Tomb no funcionará sin un TOMBNAME (nombre de la tumba)."
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr "Error fatal al crear el fichero temporal ::1 fichero::"
 
 #: warning
 msgid "You can deactivate all swap partitions using the command:"
-msgstr ""
-"Puedes desactivar todas las particiones swap usando el siguiente comando:"
+msgstr "Puedes desactivar todas las particiones swap usando el siguiente comando:"
 
 #: warning
 msgid " swapoff -a"
@@ -55,10 +292,6 @@ msgid "But if you want to proceed like this, use the -f (force) flag."
 msgstr "Pero si deseas continuar tal cual, usa el flag -f (force)."
 
 #: failure
-msgid "Operation aborted."
-msgstr "Operación abortada."
-
-#: failure
 msgid "Tomb file is missing from arguments."
 msgstr "La tumba falta en los argumentos."
 
@@ -92,18 +325,7 @@ msgstr "Se ha encontrado una tumba válida en ::1 ruta::"
 
 #: warning
 msgid "Loop mount of volumes is not possible on this machine, this error"
-msgstr ""
-"No hay soporte para el montaje en loop de volúmenes en esta máquina, este "
-"error"
-
-#: warning
-msgid "often occurs on VPS and kernels that don't provide the loop module."
-msgstr ""
-"ocurre frecuentemente en VPS y kernels que no proveen el módulo 'loop'."
-
-#: 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."
+msgstr "No hay soporte para el montaje en loop de volúmenes en esta máquina, este error"
 
 #: print
 msgid "Syntax: tomb [options] command [arguments]"
@@ -155,52 +377,21 @@ msgstr " close   cerrar una TUMBA específica o todas ('all')"
 
 #: print
 msgid " slam    slam a TOMB killing all programs using it"
-msgstr ""
-" slam    cerrar una TUMBA de un portazo, matando todos los programas que la "
-"usan"
+msgstr " slam    cerrar una TUMBA de un portazo, matando todos los programas que la usan"
 
 #: print
 msgid " resize  resize a TOMB to a new size -s (can only grow)"
-msgstr ""
-" resize  cambia el tamaño de una TUMBA al tamaño -s (sólo puede aumentar)"
+msgstr " resize  cambia el tamaño de una TUMBA al tamaño -s (sólo puede aumentar)"
 
 #: print
 msgid " // Operations on keys:"
 msgstr "// Operaciones en llaves:"
 
 #: print
-msgid " passwd  change the password of a KEY (needs old pass)"
-msgstr ""
-" passwd  cambia la contraseña de la LLAVE (necesita la contraseña vieja)"
-
-#: print
-msgid " setkey  change the KEY locking a TOMB (needs old key and pass)"
-msgstr ""
-" setkey  cambia la LLAVE que cierra la TUMBA (necesita la contraseña y llave "
-"viejas)"
-
-#: print
-msgid " // Backup on paper:"
-msgstr " // Copia de seguridad en papel:"
-
-#: 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
-msgid " // Steganography:"
-msgstr " // Esteganografía:"
-
-#: print
-msgid " bury    hide a KEY inside a JPEG image (for use with -k)"
-msgstr ""
-" bury   esconde la LLAVE dentro de una imagen JPEG (para usarla con -k)"
-
-#: print
-msgid " exhume  extract a KEY from a JPEG image (prints to stdout)"
-msgstr " exhume extraer una LLAVE de una imagen JPEG (escribe en stdout)"
-
-#: print
 msgid "Options:"
 msgstr "Opciones:"
 
@@ -218,13 +409,11 @@ msgstr " -n     no procesar los hooks encontrados en la tumba"
 
 #: print
 msgid " -o     mount options used to open (default: rw,noatime,nodev)"
-msgstr ""
-" -o     opciones de montaje usadas al abrir (por defecto: rw,noatime,nodev)"
+msgstr " -o     opciones de montaje usadas al abrir (por defecto: rw,noatime,nodev)"
 
 #: print
 msgid " -f     force operation (i.e. even if swap is active)"
-msgstr ""
-" -f     forzar operación (incluso si la memoria de intercambio está activa)"
+msgstr " -f     forzar operación (incluso si la memoria de intercambio está activa)"
 
 #: print
 msgid " --kdf  generate passwords armored against dictionary attacks"
@@ -259,22 +448,6 @@ msgid "Missing required dependency ::1 command::.  Please install it."
 msgstr "Falta la dependencia ::1 comando::. Por favor, instálala."
 
 #: warning
-msgid "cleartext key from stdin selected: this is unsafe."
-msgstr ""
-"se ha seleccionado una clave en texto plano por la entrada estándar: esto es "
-"inseguro."
-
-#: failure
-msgid "please use --unsafe if you really want to do this."
-msgstr "por favor, usa --unsafe si estás seguro."
-
-#: warning
-msgid "received key in cleartext from stdin (unsafe mode)"
-msgstr ""
-"se ha recibido una clave en texto plano por la entrada estándar (modo "
-"inseguro)"
-
-#: warning
 msgid "is_valid_key() called without an argument."
 msgstr "Se ha llamado a is_valid_key() sin argumento."
 
@@ -290,24 +463,9 @@ msgstr "La llave es válida."
 msgid "Attempting key recovery."
 msgstr "Intentando recuperar la llave."
 
-#: 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
-msgid "Waiting for the key to be piped from stdin... "
-msgstr "Esperando a recibir la llave a través de stdin... "
-
-#: failure
-msgid "Key not found, specify one using -k."
-msgstr "Llave no encontrada, especifica una usando -k."
-
 #: 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."
+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
 msgid "No suitable program for KDF ::1 program::."
@@ -315,20 +473,11 @@ 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()."
+msgstr "Error interno: se ha llamado a ask_key_password() antes de _load_key()."
 
 #: message
-msgid "A password is required to use key ::1 key::"
-msgstr "Es necesaria una contraseña para usar la llave ::1 llave::"
-
-#: warning
-msgid "User aborted password dialog."
-msgstr "El usuario ha abortado el diálogo de contraseña."
-
-#: message
-msgid "Password OK."
-msgstr "Contraseña OK."
+msgid "A password is required to use key ::1 key::"
+msgstr "Es necesaria una contraseña para usar la llave ::1 llave::"
 
 #: message
 msgid "Commanded to change password for tomb key ::1 key::"
@@ -338,37 +487,6 @@ msgstr "Se ha ordenado cambiar la contraseña de la llave ::1 llave::"
 msgid "No valid password supplied."
 msgstr "Contraseña incorrecta."
 
-#: success
-msgid "Changing password for ::1 key file::"
-msgstr ""
-
-#: 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 ""
-
-#: failure
-msgid "User aborted."
-msgstr "El usuario ha abortado."
-
-#: failure
-msgid "You set empty password, which is not possible."
-msgstr "Has elegido una contraseña vacía, lo que no es posible."
-
-#: 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 ""
-
 #: message
 msgid "generating salt"
 msgstr "generando salt"
@@ -381,42 +499,10 @@ msgstr "calculando iteraciones"
 msgid "encoding the password"
 msgstr "codificando la contraseña"
 
-#: failure
-msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
-msgstr "No se encuentra gpg (GnuPG), Tomb no puede funcionar sin ello."
-
 #: 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 ""
-
-#: 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
-msgid "Wrong password supplied."
-msgstr "Contraseña incorrecta."
-
-#: 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
-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 ""
-
-#: failure
-msgid "Exhume failed, no image specified"
-msgstr "La exhumación ha fallado, no se ha especificado una imagen"
-
 #: 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::"
@@ -437,43 +523,22 @@ msgstr "mostrando llave exhumada en stdout"
 msgid "File exists: ::1 tomb key::"
 msgstr "El fichero existe: ::1 clave::"
 
-#: 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
 msgid "Refusing to overwrite file. Operation aborted."
-msgstr ""
-"Crear esta tumba sobreescribiría un fichero existente. Operación abortada."
+msgstr "Crear esta tumba sobreescribiría un fichero existente. Operación abortada."
 
 #: message
 msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Intentando exhumar una llave de la imagen ::1 fichero::"
 
-#: success
-msgid "Key succesfully exhumed to ::1 key::."
-msgstr ""
-
 #: warning
 msgid "Nothing found in ::1 image file::"
 msgstr "No se ha encontrado nada en ::1 fichero::"
 
-#: success
-msgid "Rendering a printable QRCode for key: ::1 tomb key file::"
-msgstr ""
-
 #: failure
 msgid "QREncode reported an error."
 msgstr "QREncode ha reportado un error."
 
-#: success
-msgid "Operation successful:"
-msgstr ""
-
 #: message
 msgid "Commanded to dig tomb ::1 tomb path::"
 msgstr "Se ha ordenado cavar la tubma ::1 ruta::"
@@ -483,10 +548,6 @@ msgid "Missing path to tomb"
 msgstr "Falta la ruta de la tumba"
 
 #: 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 "El tamaño debe ser un número entero (megabytes)"
 
@@ -494,14 +555,6 @@ msgstr "El tamaño debe ser un número entero (megabytes)"
 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 path::"
-msgstr ""
-
 #: message
 msgid "Generating ::1 tomb file:: of ::2 size::MiB"
 msgstr "Generando ::1 tumba:: de ::2 size::MiB"
@@ -510,15 +563,6 @@ msgstr "Generando ::1 tumba:: de ::2 size::MiB"
 msgid "Error creating the tomb ::1 tomb path::"
 msgstr "Error al crear la tumba ::1 ruta de la tumba::"
 
-#: success
-msgid "Done digging ::1 tomb name::"
-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 "tomb forge ::1 ruta::.key"
@@ -527,137 +571,30 @@ msgstr "tomb forge ::1 ruta::.key"
 msgid "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
 msgstr "tomb lock ::1 ruta:: -k ::1 ruta::.key"
 
-#: 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
 msgid "Commanded to forge key ::1 key::"
 msgstr "Se ha ordenado forjar la llave ::1 llave::"
 
-#: 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
 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
-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
-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
-msgid "To make it faster you can move the mouse around."
-msgstr "Para acelerarlo puedes mover el ratón por la pantalla."
-
-#: 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
-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 ""
-
-#: message
-msgid "(You can also change it later using 'tomb passwd'.)"
-msgstr "(También puedes cambiarla más tarde usando 'tomb passwd'.)"
-
-#: warning
-msgid "The key does not seem to be valid."
-msgstr "Parece que la llave no es válida."
-
-#: warning
-msgid "Dumping contents to screen:"
-msgstr "Volcando contenido en la pantalla:"
+msgstr "Se ha ordenado forjar la llave ::1 llave:: con el algoritmo de cifrado ::2 algoritmo::"
 
 #: message
 msgid "Done forging ::1 key file::"
 msgstr "Se ha terminado de forjar ::1 llave::"
 
-#: success
-msgid "Your key is ready:"
-msgstr ""
-
-#: warning
-msgid "No tomb specified for locking."
-msgstr "No se ha especificado una tumba que asegurar."
-
-#: warning
-msgid "Usage: tomb lock file.tomb file.tomb.key"
-msgstr "Uso: tomb lock file.tomb file.tomb.key"
-
 #: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr "Se ha ordenado asegurar la tumba ::1 tumba::"
 
-#: failure
-msgid "There is no tomb here. You have to it dig first."
-msgstr "No hay una tumba aquí. Tienes que cavarla primero."
-
-#: 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
-msgid "The tomb was already locked with another key."
-msgstr "La tumba ya estaba asegurada con otra llave."
-
-#: 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
-msgid "Fine, this tomb seems empty."
-msgstr "Bien, esta tumba parece vacía."
-
 #: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr "Asegurando usando el cifrado: ::1::"
 
-#: success
-msgid "Locking ::1 tomb file:: with ::2 tomb key file::"
-msgstr ""
-
-#: message
-msgid "Formatting Luks mapped device."
-msgstr "Formateando dispositivo mapeado con Luks."
-
-#: warning
-msgid "cryptsetup luksFormat returned an error."
-msgstr "cryptsetup luksFormat ha devuelto un error."
-
 #: warning
 msgid "cryptsetup luksOpen returned an error."
 msgstr "cryptsetup luksOpen ha devuelto un error."
 
-#: message
-msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
-msgstr "Formateando tu tumba con el sistema de ficheros Ext3/Ext4."
-
-#: warning
-msgid "Tomb format returned an error."
-msgstr "El formateo de la tumba ha devuelto un error."
-
 #: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr "Puede que tu tumba ::1 tumba:: esté corrupta."
@@ -666,19 +603,13 @@ msgstr "Puede que tu tumba ::1 tumba:: esté corrupta."
 msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
 msgstr "Se ha terminado de asegurar ::1 tumba:: usando Luks dm-crypt ::2::"
 
-#: success
-msgid ""
-"Your tomb is ready in ::1 tomb path:: and secured with key ::2 tomb key::"
-msgstr ""
-
 #: message
 msgid "Commanded to reset key for tomb ::1 tomb path::"
 msgstr "Se ha ordenado resetear la llave para la tumba ::1 ruta::"
 
 #: 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."
+msgstr "El comando 'setkey' necesita dos argumentos: la vieja llave y la tumba."
 
 #: warning
 msgid "I.e:  tomb -k new.tomb.key old.tomb.key secret.tomb"
@@ -692,10 +623,6 @@ msgstr "Ejecución abortada."
 msgid "Not a valid LUKS encrypted volume: ::1 volume::"
 msgstr "No es un volumen LUKS encriptado válido: ::1 volumen::"
 
-#: success
-msgid "Changing lock on tomb ::1 tomb name::"
-msgstr ""
-
 #: message
 msgid "Old key: ::1 old key::"
 msgstr "Llave vieja: ::1 Llave::"
@@ -724,10 +651,6 @@ msgstr "Error inesperado en luksChangeKey."
 msgid "Unexpected error in luksClose."
 msgstr "Error inesperado en luksClose."
 
-#: success
-msgid "Succesfully changed key for tomb: ::1 tomb file::"
-msgstr ""
-
 #: message
 msgid "The new key is: ::1 new key::"
 msgstr "La nueva llave es: ::1 llave::"
@@ -746,76 +669,37 @@ msgstr "::1 fichero:: no es un fichero de tumba válido"
 
 #: message
 msgid "Mountpoint not specified, using default: ::1 mount point::"
-msgstr ""
-"Punto de montaje no especificado, utilizando estándar: ::1 punto de montaje::"
+msgstr "Punto de montaje no especificado, utilizando estándar: ::1 punto de montaje::"
 
 #: warning
 msgid "::1 tomb name:: is already open."
 msgstr "::1 tumba:: ya está abierta."
 
-#: 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 ""
-
 #: 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
-msgid "This tomb is a valid LUKS encrypted device."
-msgstr "Esta tumba es un dispositivo encriptado con LUKS válido."
-
-#: 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::\""
+msgstr "El cifrado es \"::1 cifrado::\" en modo \"::2 modo::\" y hash \"::3 hash::\""
 
 #: 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
-msgid "Failure mounting the encrypted file."
-msgstr "Fallo al montar el fichero encriptado."
-
-#: success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr ""
+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."
 
 #: 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 ""
-
 #: 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::"
+msgstr "Última visita de ::1 usuario::(::2 versión de tomb::) desde ::3 tty:: en ::4 host::"
 
 #: message
 msgid "on date ::1 date::"
 msgstr "el ::1 fecha::"
 
 #: warning
-msgid "How pitiful!  A tomb, and no HOME."
-msgstr "¡Que lamentable! Una tumba, y ningún HOGAR."
-
-#: warning
-msgid "Cannot exec bind hooks without a mounted tomb."
-msgstr "No se pueden ejecutar los bind-hooks sin una tumba montada."
-
-#: warning
 msgid "bind-hooks file is broken"
 msgstr "El fichero de bind-hooks está roto."
 
@@ -825,25 +709,15 @@ msgstr "Formato de mapeo de los bind-hooks: local/to/tomb local/to/$HOME"
 
 #: warning
 msgid "bind-hooks map format: local/to/tomb local/to/$HOME.  Rolling back"
-msgstr ""
-"Formato de mapeo de los bind-hooks: local/to/tomb local/to/HOME. Restaurando"
+msgstr "Formato de mapeo de los bind-hooks: local/to/tomb local/to/HOME. Restaurando"
 
 #: 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
-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::"
+msgstr "No existe un objetivo para el bind-hook, omitiendo ::1 hogar::/::2 directorio::"
 
-#: success
-msgid "Post hooks found, executing as user ::1 user name::."
-msgstr ""
+#: 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::"
 
 #: failure
 msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
@@ -851,25 +725,19 @@ msgstr "No puedo ver ninguna tumba ::1 estado::. Que todos descansen en paz."
 
 #: message
 msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
-msgstr ""
-"Se ha abierto ::1 nombre:: en ::2 punto de montaje:: usando ::3 opciones::"
+msgstr "Se ha abierto ::1 nombre:: en ::2 punto de montaje:: usando ::3 opciones::"
 
 #: message
 msgid "::1 tombname:: open since ::2 tombsince::"
 msgstr "::1 nombre:: abierto desde ::2 cuando::"
 
 #: message
-msgid ""
-"::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgid "::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
 msgstr "::1 nombre:: abierto por ::2 usuario:: desde ::3 tty:: en ::4 host::"
 
 #: message
-msgid ""
-"::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::"
-"%) is used: ::4 tombavail:: free "
-msgstr ""
-"::1 nombre:: de tamaño ::2 total:: del que ::3 usado:: (::5 porcentaje::%) "
-"se usa y ::4 disponible:: está libre "
+msgid "::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::%) is used: ::4 tombavail:: free "
+msgstr "::1 nombre:: de tamaño ::2 total:: del que ::3 usado:: (::5 porcentaje::%) se usa y ::4 disponible:: está libre "
 
 #: warning
 msgid "::1 tombname:: warning: your tomb is almost full!"
@@ -885,9 +753,7 @@ msgstr "Error interno: se ha llamado a list_tomb_binds sin argumento."
 
 #: 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."
+msgstr "No se pueden indexar la tumbas en este sistema: updatedb (mlocate) no está instalado."
 
 #: warning
 msgid "Cannot use GNU findutils for index/search commands."
@@ -901,14 +767,6 @@ msgstr "El comando index necesita que 'mlocate' esté instalado."
 msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr "Parece que existe una tumba con el grabado [::1::]"
 
-#: failure
-msgid "I can't see any open tomb, may they all rest in peace."
-msgstr "No puedo ver ninguna tumba abierta. Que todos descansen en paz."
-
-#: success
-msgid "Creating and updating search indexes."
-msgstr ""
-
 #: message
 msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr "Omitiendo ::1 tumba:: (se ha econtrado .noindex)."
@@ -922,18 +780,6 @@ msgid "Indexing ::1 tomb name:: contents..."
 msgstr "Indexando el contenido de ::1 tumba::..."
 
 #: message
-msgid "Generating a new swish-e configuration file: ::1 swish conf::"
-msgstr ""
-
-#: message
-msgid "Search index updated."
-msgstr "Índice de búsqueda actualizado."
-
-#: success
-msgid "Searching for: ::1::"
-msgstr ""
-
-#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr "Buscando nombres de fichero en la tumba ::1 tumba::"
 
@@ -949,24 +795,9 @@ msgstr "Buscando contenido en la tumba ::1 tumba::"
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr "Omitiendo tumba ::1 tomb name::: no se ha indexado."
 
-#: warning
-msgid "Run 'tomb index' to create indexes."
-msgstr "Corre 'tomb index' para crear los índices."
-
-#: message
-msgid "Search completed."
-msgstr "Búsqueda completada."
-
 #: 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
-msgid "No tomb name specified for resizing."
-msgstr ""
-"No se ha especificado el nombre de la tumba a la que cambiar el tamaño."
+msgstr "Se ha ordenado cambiar el tamaño de la tumba ::1 tumba:: a ::2 tamaño:: megabytes."
 
 #: failure
 msgid "Cannot find ::1::"
@@ -985,14 +816,6 @@ msgid "You must specify the new size of ::1 tomb name::"
 msgstr "Debes especificar el nuevo tamaño de ::1 tumba::"
 
 #: failure
-msgid "Size is not an integer."
-msgstr "El tamaño no es un número entero."
-
-#: 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
 msgid "Error creating the extra resize ::1 size::, operation aborted."
 msgstr "Error al crear el espacio extra ::1 tamaño::, operación abortada."
 
@@ -1008,34 +831,10 @@ msgstr "e2fsck ha fallado al comprobar ::1::"
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr "resize2fs ha fallado al cambiar el tamaño de ::1::"
 
-#: failure
-msgid "There is no open tomb to be closed."
-msgstr "No hay ninguna tumba abierta que cerrar."
-
-#: 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
-msgid "or issue the command 'tomb close all' to close them all."
-msgstr "o utiliza el comando 'tomb close all' para cerrarlas todas."
-
 #: warning
 msgid "Tomb not found: ::1 tomb file::"
 msgstr "No se ha encontrado la tumba: ::1 tumba::"
 
-#: 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 ""
-
-#: message
-msgid "Kill all processes busy inside the tomb."
-msgstr "Mata todos los procesos ocupados dentro de la tumba."
-
 #: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr "No se puede cerrar de un portazo la tumba ::1 tumba::"
@@ -1048,10 +847,6 @@ msgstr "Cerrando la tumba ::1 tumba:: montada en ::2 punto de montaje::"
 msgid "Closing tomb bind hook: ::1 hook::"
 msgstr "Cerrando el bind-hook: ::1::"
 
-#: success
-msgid "Slamming tomb: killing all processes using this hook."
-msgstr ""
-
 #: failure
 msgid "Cannot slam the bind hook ::1 hook::"
 msgstr "No se puede cerrar de un portazo el bind-hook ::1::"
@@ -1060,22 +855,10 @@ msgstr "No se puede cerrar de un portazo el bind-hook ::1::"
 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
-msgid "Tomb is busy, cannot umount!"
-msgstr "La tumba está ocupada, ¡no se puede desmontar!"
-
 #: 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 ""
-
-#: failure
-msgid "Error parsing."
-msgstr "Error al parsear."
-
 #: warning
 msgid "There's no such command \"::1 subcommand::\"."
 msgstr "No existe el comando \"::1 comando::\"."
@@ -1084,44 +867,17 @@ msgstr "No existe el comando \"::1 comando::\"."
 msgid "Please try -h for help."
 msgstr "Prueba -h para obtener ayuda."
 
-#: warning
-msgid "Some error occurred during option processing."
-msgstr "Ha ocurrido algún error al procesar las opciones."
-
 #: failure
 msgid "See \"tomb help\" for more info."
 msgstr "Véase \"tomb help\" par más información."
 
 #: 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
-msgid ""
-"You specified option ::1 option::, which is DANGEROUS and should only be "
-"used for testing\n"
-"If you really want so, add --unsafe"
-msgstr ""
-"Has especificado la opción ::1 opción::, que es PELIGROSA y debería usarse "
-"sólo en testeo\n"
-"Si estás seguro, añade --unsafe"
-
-#: 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
-msgid "For more informations see Tomb's manual page (man tomb)."
-msgstr "Para más información mira el manual de Tomb (man tomb)."
+msgstr "No se reconoce la opción ::1 argumento:: para el subcomando ::2 subcomando::"
 
 #: failure
 msgid "Resize2fs not installed: cannot resize tombs."
-msgstr ""
-"Resize2fs no está instalado: no se puede cambiar el tamaño de las tumbas."
+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."
@@ -1129,13 +885,11 @@ 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."
+msgstr "Steghide no está instalado: no se pueden enterrar llaves en las imágenes."
 
 #: failure
 msgid "Steghide not installed: cannot exhume keys from images."
-msgstr ""
-"Setghide no está instalado: no se pueden exhumar llaves de las imágenes."
+msgstr "Setghide no está instalado: no se pueden exhumar llaves de las imágenes."
 
 #: print
 msgid "Tomb ::1 version:: - a strong and gentle undertaker for your secrets"
@@ -1150,12 +904,6 @@ 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
-msgid " For the latest sourcecode go to <http://dyne.org/software/tomb>"
-msgstr ""
-" Para encontrar el código fuente más reciente visita <http://dyne.org/"
-"software/tomb>"
-
-#: 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,"
 
@@ -1168,72 +916,203 @@ msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr " MERCANTIBILIDAD or APTITUD PARA UN PROPÓSITO PARTICULAR."
 
 #: print
-msgid " When in need please refer to <http://dyne.org/support>."
-msgstr " Cuando sea necesario por favor dirígete a <http://dyne.org/support>."
-
-#: print
 msgid "System utils:"
 msgstr "Utilidades del sistema:"
 
+#: warning
+msgid "Command \"::1 subcommand::\" not recognized."
+msgstr "No se ha reconocido el commando \"::1 comando::\"."
+
+#: print
+msgid " passwd  change the password of a KEY (needs old pass)"
+msgstr " passwd  cambia la contraseña de la LLAVE (necesita la contraseña vieja)"
+
+#: print
+msgid " setkey  change the KEY locking a TOMB (needs old key and pass)"
+msgstr " setkey  cambia la LLAVE que cierra la TUMBA (necesita la contraseña y llave viejas)"
+
+#: print
+msgid " // Backup on paper:"
+msgstr " // Copia de seguridad en papel:"
+
+#: print
+msgid " // Steganography:"
+msgstr " // Esteganografía:"
+
+#: print
+msgid " bury    hide a KEY inside a JPEG image (for use with -k)"
+msgstr " bury   esconde la LLAVE dentro de una imagen JPEG (para usarla con -k)"
+
+#: print
+msgid " exhume  extract a KEY from a JPEG image (prints to stdout)"
+msgstr " exhume extraer una LLAVE de una imagen JPEG (escribe en stdout)"
+
+#: failure
+msgid "Exhume failed, no image specified"
+msgstr "La exhumación ha fallado, no se ha especificado una imagen"
+
+#: print
+msgid " For the latest sourcecode go to <http://dyne.org/software/tomb>"
+msgstr " Para encontrar el código fuente más reciente visita <http://dyne.org/software/tomb>"
+
+#: print
+msgid " When in need please refer to <http://dyne.org/support>."
+msgstr " Cuando sea necesario por favor dirígete a <http://dyne.org/support>."
+
 #: print
 msgid "Optional utils:"
 msgstr "Utilidades opcionales:"
 
+#: failure
+msgid "Fatal error setting the permission umask for temporary files"
+msgstr "Error fatal al establecer el permiso umask para los ficheros temporales"
+
+#: failure
+msgid "Fatal error setting ownership on temporary file: ::1 temp file::"
+msgstr "Error fatal al establecer la posesión del fichero temporal ::1 fichero::"
+
 #: warning
-msgid "Command \"::1 subcommand::\" not recognized."
-msgstr "No se ha reconocido el commando \"::1 comando::\"."
+msgid "cleartext key from stdin selected: this is unsafe."
+msgstr "se ha seleccionado una clave en texto plano por la entrada estándar: esto es inseguro."
 
-#: message
-msgid "Try -h for help."
-msgstr "Prueba -h para obtener ayuda."
+#: failure
+msgid "please use --unsafe if you really want to do this."
+msgstr "por favor, usa --unsafe si estás seguro."
+
+#: warning
+msgid "received key in cleartext from stdin (unsafe mode)"
+msgstr "se ha recibido una clave en texto plano por la entrada estándar (modo inseguro)"
+
+#: failure
+msgid "You specified option ::1 option::, which is DANGEROUS and should only be used for testing\n"
+"If you really want so, add --unsafe"
+msgstr "Has especificado la opción ::1 opción::, que es PELIGROSA y debería usarse sólo en testeo\nSi estás seguro, añade --unsafe"
+
+#: failure
+msgid "Failing to identify the user who is calling us"
+msgstr "Falló la identificación del usuario que nos llama."
+
+#: failure
+msgid "Fatal error creating the temporary directory: ::1 temp dir::"
+msgstr "Error fatal al crear el directorio temporal ::1 directorio::"
+
+#: failure
+msgid "Someone is messing up with us trying to hijack temporary files."
+msgstr "Alguien está intentando secuestrar nuestros ficheros temporales."
+
+#: success
+msgid "All your swaps are belong to crypt.  Good."
+msgstr "Todas tus particiones de intercambio pertenecen a crypt. Bien."
+
+#: success
+msgid "Changing password for ::1 key file::"
+msgstr "Cambiando la contraseña para ::1 fichero::"
+
+#: success
+msgid "Your passphrase was successfully updated."
+msgstr "Tu contraseña ha sido actualizada con éxito."
+
+#: success
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr "Usando KDF: ::1 microsegundos:: iteraciones"
+
+#: success
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+msgstr "Codificando la llave ::1 llave:: en la imagen ::2 imagen::."
+
+#: success
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr "Llave codificada con éxito en la imagen ::1 fichero::."
+
+#: success
+msgid "Key succesfully exhumed to ::1 key::."
+msgstr "Llave exhumada con éxito en ::1 llave::."
+
+#: success
+msgid "Rendering a printable QRCode for key: ::1 tomb key file::"
+msgstr "Creando un código QR imprimible para la llave ::1 fichero::."
+
+#: success
+msgid "Operation successful:"
+msgstr "Operación con éxito:"
+
+#: success
+msgid "Creating a new tomb in ::1 tomb path::"
+msgstr "Creando una nueva tumba en ::1 tumba::"
+
+#: success
+msgid "Done digging ::1 tomb name::"
+msgstr "Se ha terminado de cavar ::1 tumba::."
+
+#: success
+msgid "Choose the  password of your key: ::1 tomb key::"
+msgstr "Elige una contraseña para tu llave: ::1 llave::"
+
+#: success
+msgid "Your key is ready:"
+msgstr "Tu llave está lista:"
 
-#~ msgid "Fatal error creating a directory for temporary files"
-#~ msgstr "Error fatal al crear un directorio para los ficheros temporales."
+#: success
+msgid "Locking ::1 tomb file:: with ::2 tomb key file::"
+msgstr "Asegurando ::1 tumba:: con ::2 llave::"
+
+#: success
+msgid "Your tomb is ready in ::1 tomb path:: and secured with key ::2 tomb key::"
+msgstr "Tu tumba está lista en ::1 tumba:: y asegurada con la llave ::2 llave::"
+
+#: success
+msgid "Changing lock on tomb ::1 tomb name::"
+msgstr "Cambiando el candado en la tumba ::1 tumba::."
+
+#: success
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
+msgstr "Se ha cambiado la clave con éxito para la tumba ::1 tumba::"
 
-#~ msgid "Cannot mount tmpfs in ::1 shm path::"
-#~ msgstr "No se puede montar tmpfs en ::1 ruta shm::"
+#: success
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Abriendo ::1 tumba:: en ::2 punto de montaje::."
 
-#~ msgid "Fatal error setting permissions on temporary file: ::1 temp file::"
-#~ msgstr ""
-#~ "Error fatal al establecer permisos en el fichero temporal :1 fichero:"
+#: success
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr "Se ha abierto el cerrojo de ::1 tumba:: con éxito."
 
-#~ msgid "Loopback mount called on invalid tomb: ::1 path::"
-#~ msgstr "Se ha intentado montar en loopback una tumba inválida: ::1 ruta::"
+#: success
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Se ha abierto ::1 tumba:: en ::2 punto de montaje:: con éxito."
 
-#~ msgid " passwd  change the password of a KEY"
-#~ msgstr " passwd   cambia la contraseña de una LLAVE"
+#: success
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr "Se han encontrado post-hooks, se ejecutarán con el usuario ::1 usuario::."
 
-#~ msgid " setkey  change the KEY locking a TOMB (needs old one)"
-#~ msgstr ""
-#~ " setkey   cambia la LLAVE que asegura una TUMBA (necesita la anterior)"
+#: success
+msgid "Creating and updating search indexes."
+msgstr "Creando y  actualizando índices de búsqueda."
 
-#~ msgid " bury    hide a KEY inside a JPEG image"
-#~ msgstr " bury   esconde una LLAVE dentro de una imagen JPEG"
+#: message
+msgid "Generating a new swish-e configuration file: ::1 swish conf::"
+msgstr "Generando un nuevo fichero de configuración de swish-e: ::1 conf::"
 
-#~ msgid " exhume  extract a KEY from a JPEG image"
-#~ msgstr " exhume   extrae una LLAVE de una imagen JPEG"
+#: success
+msgid "Searching for: ::1::"
+msgstr "Buscando ::1::"
 
-#~ msgid "Tomb close ::1::"
-#~ msgstr "Se ha cerrado la tumba ::1 tumba::"
+#: success
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr "Cerrando de un portazo la tumba ::1 nombre:: montada en ::2 punto de montaje::."
 
-#~ 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 ""
-#~ "Has especificado la opción ::1 opción::, que es PELIGROSA y sólo se "
-#~ "debería usar para el testeo\n"
-#~ "Si realmente quieres usarla, añade --unsecure-dev-mode"
+#: success
+msgid "Slamming tomb: killing all processes using this hook."
+msgstr "Cerrando tumba de un portazo: matando todos los procesos que usan este hook."
 
-#~ 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>"
+#: success
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr "Tumba ::1 tumba:: cerrada: tu huesos descansarán en paz."
 
-#~ 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."
+#: warning
+msgid "Pinentry error: ::1 error::"
+msgstr "Error de pinentry: ::1 error::"
 
-#~ msgid "Fatal error creating a directory in shared memory."
-#~ msgstr "Error fatal al crear un  directorio en memoria compartida."
+#: warning
+msgid "Empty password"
+msgstr "Contraseña vacia"
 
-#~ msgid "gpg-agent choice of pinentry: ::1 pinentry::"
-#~ msgstr "Elección de pinentry ::1 pinentry:: por gpg-agent"
diff --git a/extras/po/ru.po b/extras/po/ru.po
@@ -1,44 +1,285 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Tomb the Crypto Undertaker\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
+"Project-Id-Version: Tomb the Crypto Undertaker\n"
+"Language: ru\n"
 
 #: failure
-msgid "Failing to identify the user who is calling us"
-msgstr ""
+msgid "Operation aborted."
+msgstr "Операция отменена."
+
+#: warning
+msgid "often occurs on VPS and kernels that don't provide the loop module."
+msgstr "часто возникает на VPS и ядрах, которые не имеют модуля loop."
+
+#: warning
+msgid "It is impossible to use Tomb on this machine at this conditions."
+msgstr "Невозможно использовать Tomb на этой машине при таких условиях."
+
+#: message
+msgid "Waiting for the key to be piped from stdin... "
+msgstr "Ожидание передачи ключа через стандартный ввод..."
 
 #: failure
-msgid "Tomb won't work without a TOMBNAME."
-msgstr "Tomb не будет работать без ИМЕНИ_ГРОБНИЦЫ."
+msgid "This operation requires a key file to be specified using the -k option."
+msgstr "Эта операция требует указания файла ключа с помощью опции -k."
 
 #: failure
-msgid "Fatal error creating the temporary directory: ::1 temp dir::"
-msgstr ""
+msgid "Key not found, specify one using -k."
+msgstr "Ключ не найден, укажите его с помощью опции -k."
+
+#: warning
+msgid "User aborted password dialog."
+msgstr "Пользователь отменил диалог пароля."
+
+#: message
+msgid "Password OK."
+msgstr "Верный пароль."
 
 #: failure
-msgid "Fatal error setting the permission umask for temporary files"
-msgstr "Критическая ошибка при задании маски прав для временных файлов"
+msgid "Error: the newly generated keyfile does not seem valid."
+msgstr "Ошибка: сгенерированный файл ключа неверен."
 
 #: failure
-msgid "Someone is messing up with us trying to hijack temporary files."
-msgstr ""
+msgid "User aborted."
+msgstr "Отменено пользователем."
 
 #: failure
-msgid "Fatal error creating a temporary file: ::1 temp file::"
-msgstr "Критическая ошибка при создании временного файла ::1 temp file::"
+msgid "You set empty password, which is not possible."
+msgstr "Вы указали пустой пароль, так нельзя."
 
 #: failure
-msgid "Fatal error setting ownership on temporary file: ::1 temp file::"
-msgstr ""
-"Критическая ошибка при задании владельца временного файла ::1 temp file::"
+msgid "Wrong argument for --kdf: must be an integer number (iteration seconds)."
+msgstr "Неверный аргумент для --kdf: должно быть указано целое число (секунд итерации)."
 
-#: success
-msgid "All your swaps are belong to crypt.  Good."
-msgstr ""
+#: failure
+msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
+msgstr "gpg (GnuPG) не найден, Tomb не может работать без него."
+
+#: message
+msgid "Please confirm the key password for the encoding"
+msgstr "Пожалуйста, подтвердите пароль ключа для шифрования"
+
+#: warning
+msgid "Wrong password supplied."
+msgstr "Указан неверный пароль."
+
+#: failure
+msgid "You shall not bury a key whose password is unknown to you."
+msgstr "Вам не захоронить ключ, чей пароль не известен Вам."
+
+#: warning
+msgid "Encoding error: steghide reports problems."
+msgstr "Ошибка шифрования: steghide сообщает о проблемах."
+
+#: warning
+msgid "Make explicit use of --force to overwrite."
+msgstr "Явно укажите опцию --force для перезаписи."
+
+#: warning
+msgid "Use of --force selected: overwriting."
+msgstr "Указана опция --force: перезаписываю."
+
+#: failure
+msgid "A filename needs to be specified using -k to forge a new key."
+msgstr "Необходимо указать имя файла через опцию -k, чтобы выковать новый ключ."
+
+#: failure
+msgid "Forging this key would overwrite an existing file. Operation aborted."
+msgstr "Выковка этого ключа перезапишет существующий файл. Операция отменена."
+
+#: message
+msgid "This operation takes time, keep using this computer on other tasks,"
+msgstr "Эта операция займет некоторое время, выполняйте пока другие задачи,"
+
+#: message
+msgid "once done you will be asked to choose a password for your tomb."
+msgstr "по завершении Вас вопросят ввести пароль для гробницы."
+
+#: message
+msgid "To make it faster you can move the mouse around."
+msgstr "Чтобы ускорить операцию, подвигайте мышку."
+
+#: message
+msgid "If you are on a server, you can use an Entropy Generation Daemon."
+msgstr "Если Вы на сервере, можно использовать демон генерации энтропии."
+
+#: warning
+msgid "Cannot generate encryption key."
+msgstr "Не могу сгенерировать ключ шифрования."
+
+#: message
+msgid "(You can also change it later using 'tomb passwd'.)"
+msgstr "(Его можно потом изменить с помощью 'tomb passwd'.)"
+
+#: warning
+msgid "The key does not seem to be valid."
+msgstr "Ключ неверен."
+
+#: warning
+msgid "Dumping contents to screen:"
+msgstr "Выгрузка содержимого на экран:"
+
+#: failure
+msgid "Size argument missing, use -s"
+msgstr "Отсутствует размер, укажите его с помощью -s"
+
+#: warning
+msgid "A tomb exists already. I'm not digging here:"
+msgstr "Гробница существует. Я не буду копать здесь:"
+
+#: message
+msgid "Your tomb is not yet ready, you need to forge a key and lock it:"
+msgstr "Ваша гробница пока не готова, необходимо выковать ключ и запереть ее:"
+
+#: warning
+msgid "No tomb specified for locking."
+msgstr "Не указана гробница для запирания."
+
+#: warning
+msgid "Usage: tomb lock file.tomb file.tomb.key"
+msgstr "Использование: tomb lock file.tomb file.tomb.key"
+
+#: failure
+msgid "There is no tomb here. You have to it dig first."
+msgstr "Здесь нет гробницы. Сначала выкопайте ее."
+
+#: message
+msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
+msgstr "Проверяю, пуста ли гробница (мы никогда не ходим по чужим костям)."
+
+#: warning
+msgid "The tomb was already locked with another key."
+msgstr "Гробница уже заперта другим ключом."
+
+#: failure
+msgid "Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
+msgstr "Операция отменена. Я не могу запереть уже запертую гробницу. Выкопайте новую."
+
+#: message
+msgid "Fine, this tomb seems empty."
+msgstr "Так, эта гробница, вроде как, пуста."
+
+#: message
+msgid "Formatting Luks mapped device."
+msgstr "Форматирую устройство LUKS."
+
+#: warning
+msgid "cryptsetup luksFormat returned an error."
+msgstr "cryptsetup luksFormat вернул ошибку."
+
+#: message
+msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
+msgstr "Форматирую Вашу гробницу в файловую систему Ext3/Ext4."
+
+#: warning
+msgid "Tomb format returned an error."
+msgstr "Tomb format вернул ошибку."
+
+#: message
+msgid "Here below its status is reported:"
+msgstr "Ниже назодится отчет о его статусе:"
+
+#: message
+msgid "This tomb is a valid LUKS encrypted device."
+msgstr "Эта гробница - верное зашифрованное устройство LUKS."
+
+#: failure
+msgid "Failure mounting the encrypted file."
+msgstr "Не удалось примонтировать зашифрованный файл."
+
+#: warning
+msgid "How pitiful!  A tomb, and no HOME."
+msgstr "Как жаль! Гробница есть, но нет HOME."
+
+#. Don't know how to correctly translate "bind hook".
+#: warning
+#, fuzzy
+msgid "Cannot exec bind hooks without a mounted tomb."
+msgstr "Невозможно совершить привязки без примонтированной гробницы."
+
+#: failure
+msgid "I can't see any open tomb, may they all rest in peace."
+msgstr "Я не вижу открытых гробниц, да упокоятся они все с миром."
+
+#: message
+msgid "Search index updated."
+msgstr "Поисковый индекс обновлен."
+
+#: warning
+msgid "Run 'tomb index' to create indexes."
+msgstr "Запустите 'tomb index' для создания индексов."
+
+#: message
+msgid "Search completed."
+msgstr "Поиск завершен."
+
+#: failure
+msgid "No tomb name specified for resizing."
+msgstr "Не указано имя гробницы для изменения размера."
+
+#: failure
+msgid "Size is not an integer."
+msgstr "Размер не целое число."
+
+#: failure
+msgid "The new size must be greater then old tomb size."
+msgstr "Новый размер гробницы должен быть больше старого."
+
+#: failure
+msgid "There is no open tomb to be closed."
+msgstr "Нет открытой гробницы для закрытия."
+
+#: warning
+msgid "Too many tombs mounted, please specify one (see tomb list)"
+msgstr "Примонтировано слишком много гробниц, пожалуйста, укажите точнее (см. tomb list)"
+
+#: warning
+msgid "or issue the command 'tomb close all' to close them all."
+msgstr "или выполните команду 'tomb close all', чтобы закрыть их все."
+
+#: warning
+msgid "Please specify an existing tomb."
+msgstr "Пожалуйста, укажите существующую гробницу."
+
+#: message
+msgid "Kill all processes busy inside the tomb."
+msgstr "Убиваю все процессы, занятые в гробнице"
+
+#: warning
+msgid "Tomb is busy, cannot umount!"
+msgstr "Гробница занята, не могу отмонтировать!"
+
+#: failure
+msgid "Error parsing."
+msgstr "Ошибка парсинга."
+
+#: warning
+msgid "Some error occurred during option processing."
+msgstr "Произошла какая-то ошибка при обработке опций."
+
+#: warning
+msgid "The create command is deprecated, please use dig, forge and lock instead."
+msgstr "Команда create устарела, пожалуйста, используйте dig, forge и lock."
+
+#: warning
+msgid "For more informations see Tomb's manual page (man tomb)."
+msgstr "Для большей информации обратитесь к руководству Tomb (man tomb)."
+
+#: message
+msgid "Try -h for help."
+msgstr "Используйте -h для вызова справки."
+
+#: failure
+msgid "Tomb won't work without a TOMBNAME."
+msgstr "Tomb не будет работать без ИМЕНИ_ГРОБНИЦЫ."
+
+#: failure
+msgid "Fatal error creating a temporary file: ::1 temp file::"
+msgstr "Критическая ошибка при создании временного файла ::1 temp file::"
 
 #: warning
 msgid "You can deactivate all swap partitions using the command:"
@@ -50,12 +291,7 @@ msgstr " swapoff -a"
 
 #: warning
 msgid "But if you want to proceed like this, use the -f (force) flag."
-msgstr ""
-"Но если Вы все равно хотите продолжить работу, используйте флаг -f (force)."
-
-#: failure
-msgid "Operation aborted."
-msgstr "Операция отменена."
+msgstr "Но если Вы все равно хотите продолжить работу, используйте флаг -f (force)."
 
 #: failure
 msgid "Tomb file is missing from arguments."
@@ -93,14 +329,6 @@ msgstr "Найден верный файл гробницы: ::1 tomb path::"
 msgid "Loop mount of volumes is not possible on this machine, this error"
 msgstr "Loop-монтирование томов не поддерживается на этой машине, эта ошибка"
 
-#: warning
-msgid "often occurs on VPS and kernels that don't provide the loop module."
-msgstr "часто возникает на VPS и ядрах, которые не имеют модуля loop."
-
-#: warning
-msgid "It is impossible to use Tomb on this machine at this conditions."
-msgstr "Невозможно использовать Tomb на этой машине при таких условиях."
-
 #: print
 msgid "Syntax: tomb [options] command [arguments]"
 msgstr "Синтаксис: tomb [опции] команда [аргументы]"
@@ -162,36 +390,10 @@ msgid " // Operations on keys:"
 msgstr " // Операции с ключами: "
 
 #: print
-msgid " passwd  change the password of a KEY (needs old pass)"
-msgstr " passwd  изменить пароль КЛЮЧА (требуется старый пароль)"
-
-#: print
-msgid " setkey  change the KEY locking a TOMB (needs old key and pass)"
-msgstr ""
-" setkey  изменить КЛЮЧ, запирающий ГРОБНИЦУ (требуется старый ключ и пароль)"
-
-#: print
-msgid " // Backup on paper:"
-msgstr " // Резервная копия на бумаге:"
-
-#: print
 msgid " engrave makes a QR code of a KEY to be saved on paper"
 msgstr " engrave создает штрих-код для хранения КЛЮЧА на бумаге "
 
 #: print
-msgid " // Steganography:"
-msgstr " // Стеганография:"
-
-#: print
-msgid " bury    hide a KEY inside a JPEG image (for use with -k)"
-msgstr " bury   спрятать КЛЮЧ внутри изображения JPEG (для использования с -k)"
-
-#: print
-msgid " exhume  extract a KEY from a JPEG image (prints to stdout)"
-msgstr ""
-" exhume  извлечь КЛЮЧ из изображения JPEG (выводится в стандартный вывод)"
-
-#: print
 msgid "Options:"
 msgstr "Опции: "
 
@@ -205,12 +407,11 @@ msgstr " -k     путь к ключу ('-k -' для чтения из стан
 
 #: print
 msgid " -n     don't process the hooks found in tomb"
-msgstr " -n     не обрабатывать события, найденные в гробнице "
+msgstr " -n     не обрабатывать привязки, найденные в гробнице "
 
 #: print
 msgid " -o     mount options used to open (default: rw,noatime,nodev)"
-msgstr ""
-" -o     параметры монтирования при открытии (по умолчанию rw,noatime,nodev) "
+msgstr " -o     параметры монтирования при открытии (по умолчанию rw,noatime,nodev) "
 
 #: print
 msgid " -f     force operation (i.e. even if swap is active)"
@@ -242,36 +443,19 @@ msgstr "Больше информации по Tomb Вы можете найти
 
 #: print
 msgid "Please report bugs on <http://github.com/dyne/tomb/issues>."
-msgstr ""
-"Пожалуйста, сообщайте о найденных ошибках на <http://github.com/dyne/tomb/"
-"issues>."
+msgstr "Пожалуйста, сообщайте о найденных ошибках на <http://github.com/dyne/tomb/issues>."
 
 #: failure
 msgid "Missing required dependency ::1 command::.  Please install it."
-msgstr ""
-"Отсутствует необходимая зависимость: ::1 command::. Пожалуйста, установите "
-"ее."
-
-#: warning
-msgid "cleartext key from stdin selected: this is unsafe."
-msgstr "выбран ключ, явно указанный через стандартный ввод: это небезопасно."
-
-#: failure
-msgid "please use --unsafe if you really want to do this."
-msgstr "пожалуйчтв, используйте --unsafe, если Вы действительно этого хотите."
-
-#: warning
-msgid "received key in cleartext from stdin (unsafe mode)"
-msgstr "получен ключ в явном виде через стандартный ввод (небезопасный режим)"
+msgstr "Отсутствует необходимая зависимость: ::1 command::. Пожалуйста, установите ее."
 
 #: warning
 msgid "is_valid_key() called without an argument."
 msgstr "is_valid_key() вызвана без аргумента."
 
 #: message
-#, fuzzy
 msgid "Key is an image, it might be valid."
-msgstr "Ключ - изображение, такое возможно."
+msgstr "Ключ - изображение, может подойти."
 
 #: message
 msgid "Key is valid."
@@ -281,21 +465,8 @@ msgstr "Верный ключ."
 msgid "Attempting key recovery."
 msgstr "Попытка восстановления ключа."
 
-#: failure
-msgid "This operation requires a key file to be specified using the -k option."
-msgstr "Эта операция требует указания файла ключа с помощью опции -k."
-
-#: message
-msgid "Waiting for the key to be piped from stdin... "
-msgstr "Ожидание передачи ключа через стандартный ввод..."
-
-#: failure
-msgid "Key not found, specify one using -k."
-msgstr "Ключ не найден, укажите его с помощью опции -k."
-
 #: warning
-msgid ""
-"The key seems invalid or its format is not known by this version of Tomb."
+msgid "The key seems invalid or its format is not known by this version of Tomb."
 msgstr "Похоже, ключ неверен, либо его формат неизвестен этой версии Tomb."
 
 #: failure
@@ -310,14 +481,6 @@ msgstr "Внутренняя ошибка: ask_key_password() вызвана п
 msgid "A password is required to use key ::1 key::"
 msgstr "Для использования ключа ::1 key:: требуется пароль"
 
-#: warning
-msgid "User aborted password dialog."
-msgstr "Пользователь отменил диалог пароля."
-
-#: message
-msgid "Password OK."
-msgstr "Верный пароль."
-
 #: message
 msgid "Commanded to change password for tomb key ::1 key::"
 msgstr "Приказано изменить пароль для ключа ::1 key::"
@@ -326,37 +489,6 @@ msgstr "Приказано изменить пароль для ключа ::1 k
 msgid "No valid password supplied."
 msgstr "Не предоставлен верный пароль."
 
-#: success
-msgid "Changing password for ::1 key file::"
-msgstr ""
-
-#: failure
-msgid "Error: the newly generated keyfile does not seem valid."
-msgstr "Ошибка: сгенерированный файл ключа неверен."
-
-#: success
-msgid "Your passphrase was successfully updated."
-msgstr ""
-
-#: failure
-msgid "User aborted."
-msgstr "Отменено пользователем."
-
-#: failure
-msgid "You set empty password, which is not possible."
-msgstr "Вы указали пустой пароль, так нельзя."
-
-#: failure
-msgid ""
-"Wrong argument for --kdf: must be an integer number (iteration seconds)."
-msgstr ""
-"Неверный аргумент для --kdf: должно быть указано целое число (секунд "
-"итерации)."
-
-#: success
-msgid "Using KDF, iterations: ::1 microseconds::"
-msgstr ""
-
 #: message
 msgid "generating salt"
 msgstr "генерирую соль"
@@ -369,42 +501,10 @@ msgstr "вычисляю итерации"
 msgid "encoding the password"
 msgstr "кодирую пароль"
 
-#: failure
-msgid "gpg (GnuPG) is not found, Tomb cannot function without it."
-msgstr "gpg (GnuPG) не найден, Tomb не может работать без него."
-
 #: warning
 msgid "Encode failed: ::1 image file:: is not a jpeg image."
 msgstr "Шифрование не удалось: ::1 image file:: не jpeg-изображение."
 
-#: success
-msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
-msgstr ""
-
-#: message
-msgid "Please confirm the key password for the encoding"
-msgstr "Пожалуйста, подтвердите пароль ключа для шифрования"
-
-#: warning
-msgid "Wrong password supplied."
-msgstr "Указан неверный пароль."
-
-#: failure
-msgid "You shall not bury a key whose password is unknown to you."
-msgstr "Вам не захоронить ключ, чей пароль не известен Вам."
-
-#: warning
-msgid "Encoding error: steghide reports problems."
-msgstr "Ошибка шифрования: steghide сообщает о проблемах."
-
-#: success
-msgid "Tomb key encoded succesfully into image ::1 image file::"
-msgstr ""
-
-#: failure
-msgid "Exhume failed, no image specified"
-msgstr "Эксгумация не удалась, не указано изображения"
-
 #: failure
 msgid "Exhume failed, image file not found: ::1 image file::"
 msgstr "Эксгумация неудачна, файл изображения не найден: ::1 image file::"
@@ -425,14 +525,6 @@ msgstr "вывод эксгумированного ключа в стандар
 msgid "File exists: ::1 tomb key::"
 msgstr "Файл существует: ::1 tomb key::"
 
-#: warning
-msgid "Use of --force selected: overwriting."
-msgstr "Указана опция --force: перезаписываю."
-
-#: warning
-msgid "Make explicit use of --force to overwrite."
-msgstr "Явно укажите опцию --force для перезаписи."
-
 #: failure
 msgid "Refusing to overwrite file. Operation aborted."
 msgstr "Отказываюсь перезаписывать файл. Операция отменена."
@@ -441,26 +533,14 @@ msgstr "Отказываюсь перезаписывать файл. Опера
 msgid "Trying to exhume a key out of image ::1 image file::"
 msgstr "Пытаюсь эксгумировать ключ из изображения ::1 image file::"
 
-#: success
-msgid "Key succesfully exhumed to ::1 key::."
-msgstr ""
-
 #: warning
 msgid "Nothing found in ::1 image file::"
 msgstr "В ::1 image file:: ничего не найдено"
 
-#: success
-msgid "Rendering a printable QRCode for key: ::1 tomb key file::"
-msgstr ""
-
 #: failure
 msgid "QREncode reported an error."
 msgstr "QREncode сообщил об ошибке."
 
-#: success
-msgid "Operation successful:"
-msgstr ""
-
 #: message
 msgid "Commanded to dig tomb ::1 tomb path::"
 msgstr "Приказано выкопать гробницу ::1 tomb path::"
@@ -470,10 +550,6 @@ msgid "Missing path to tomb"
 msgstr "Отсутствует путь к гробнице"
 
 #: failure
-msgid "Size argument missing, use -s"
-msgstr "Отсутствует размер, укажите его с помощью -s"
-
-#: failure
 msgid "Size must be an integer (megabytes)"
 msgstr "Размер должен быть целым числом (в мегабатах)"
 
@@ -481,14 +557,6 @@ msgstr "Размер должен быть целым числом (в мега
 msgid "Tombs can't be smaller than 10 megabytes"
 msgstr "Гробницы не могут быть меньше 10 мегабайт"
 
-#: warning
-msgid "A tomb exists already. I'm not digging here:"
-msgstr "Гробница существует. Я не буду копать здесь:"
-
-#: success
-msgid "Creating a new tomb in ::1 tomb path::"
-msgstr ""
-
 #: message
 msgid "Generating ::1 tomb file:: of ::2 size::MiB"
 msgstr "Генерирую ::1 tomb file:: размером ::2 size::Мб"
@@ -497,14 +565,6 @@ msgstr "Генерирую ::1 tomb file:: размером ::2 size::Мб"
 msgid "Error creating the tomb ::1 tomb path::"
 msgstr "Ошибка при создании гробницы ::1 tomb path::"
 
-#: success
-msgid "Done digging ::1 tomb name::"
-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 "tomb forge ::1 tomb path::.key"
@@ -513,130 +573,30 @@ msgstr "tomb forge ::1 tomb path::.key"
 msgid "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
 msgstr "tomb lock ::1 tomb path:: -k ::1 tomb path::.key"
 
-#: failure
-msgid "A filename needs to be specified using -k to forge a new key."
-msgstr ""
-"Необходимо указать имя файла через опцию -k, чтобы выковать новый ключ."
-
 #: message
 msgid "Commanded to forge key ::1 key::"
 msgstr "Приказано выковать ключ ::1 key::"
 
-#: 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::"
-msgstr ""
-"Приказано выковать ключ ::1 key:: с алгоритмом шифрования ::2 algorithm::"
-
-#: message
-msgid "This operation takes time, keep using this computer on other tasks,"
-msgstr "Эта операция займет некоторое время, выполняйте пока другие задачи,"
-
-#: message
-msgid "once done you will be asked to choose a password for your tomb."
-msgstr "по завершении Вас вопросят ввести пароль для гробницы."
-
-#: message
-msgid "To make it faster you can move the mouse around."
-msgstr "Чтобы ускорить операцию, подвигайте мышку."
-
-#: message
-msgid "If you are on a server, you can use an Entropy Generation Daemon."
-msgstr "Если Вы на сервере, можно использовать демон генерации энтропии.."
-
-#: warning
-msgid "Cannot generate encryption key."
-msgstr "Не могу сгенерировать ключ шифрования."
-
-#: success
-msgid "Choose the  password of your key: ::1 tomb key::"
-msgstr ""
-
-#: message
-msgid "(You can also change it later using 'tomb passwd'.)"
-msgstr "(Его можно потом изменить с помощью 'tomb passwd'.)"
-
-#: warning
-msgid "The key does not seem to be valid."
-msgstr "Ключ неверен."
-
-#: warning
-msgid "Dumping contents to screen:"
-msgstr "Выгрузка содержимого на экран:"
+msgstr "Приказано выковать ключ ::1 key:: с алгоритмом шифрования ::2 algorithm::"
 
 #: message
 msgid "Done forging ::1 key file::"
 msgstr "Выкован ключ ::1 key file::"
 
-#: success
-msgid "Your key is ready:"
-msgstr ""
-
-#: warning
-msgid "No tomb specified for locking."
-msgstr "Не указана гробница для запирания."
-
-#: warning
-msgid "Usage: tomb lock file.tomb file.tomb.key"
-msgstr "Использование: tomb lock file.tomb file.tomb.key"
-
 #: message
 msgid "Commanded to lock tomb ::1 tomb file::"
 msgstr "Приказано запереть гробницу ::1 tomb file::"
 
-#: failure
-msgid "There is no tomb here. You have to it dig first."
-msgstr "Здесь нет гробницы. Сначала выкопайте ее."
-
-#: message
-msgid "Checking if the tomb is empty (we never step on somebody else's bones)."
-msgstr "Проверяю, пуста ли гробница (мы никогда не ходим по чужим костям)."
-
-#: warning
-msgid "The tomb was already locked with another key."
-msgstr "Гробница уже заперта другим ключом."
-
-#: failure
-msgid ""
-"Operation aborted. I cannot lock an already locked tomb. Go dig a new one."
-msgstr ""
-"Операция отменена. Я не могу запереть уже запертую гробницу. Выкопайте новую."
-
-#: message
-msgid "Fine, this tomb seems empty."
-msgstr "Так, эта гробница, вроде как, пуста."
-
 #: message
 msgid "Locking using cipher: ::1 cipher::"
 msgstr "Запираю, используя шифр ::1 cipher::"
 
-#: success
-msgid "Locking ::1 tomb file:: with ::2 tomb key file::"
-msgstr ""
-
-#: message
-msgid "Formatting Luks mapped device."
-msgstr "Форматирую устройство LUKS."
-
-#: warning
-msgid "cryptsetup luksFormat returned an error."
-msgstr "cryptsetup luksFormat вернул ошибку."
-
 #: warning
 msgid "cryptsetup luksOpen returned an error."
 msgstr "cryptsetup luksOpen возвратил ошибку."
 
-#: message
-msgid "Formatting your Tomb with Ext3/Ext4 filesystem."
-msgstr "Форматирую Вашу гробницу в файловую систему Ext3/Ext4."
-
-#: warning
-msgid "Tomb format returned an error."
-msgstr "Tomb format вернул ошибку."
-
 #: warning
 msgid "Your tomb ::1 tomb file:: may be corrupted."
 msgstr "Ваша гробница ::1 tomb file:: может быть повреждена."
@@ -645,11 +605,6 @@ msgstr "Ваша гробница ::1 tomb file:: может быть повре
 msgid "Done locking ::1 tomb name:: using Luks dm-crypt ::2 cipher::"
 msgstr "Запер ::1 tomb name:: с помощью LUKS dm-crypt ::2 cipher::"
 
-#: success
-msgid ""
-"Your tomb is ready in ::1 tomb path:: and secured with key ::2 tomb key::"
-msgstr ""
-
 #: message
 msgid "Commanded to reset key for tomb ::1 tomb path::"
 msgstr "Приказано сбросить ключ для гробницы ::1 tomb path::"
@@ -670,10 +625,6 @@ msgstr "Операция отменена."
 msgid "Not a valid LUKS encrypted volume: ::1 volume::"
 msgstr "Неверный зашифрованный том LUKS: ::1 volume::"
 
-#: success
-msgid "Changing lock on tomb ::1 tomb name::"
-msgstr ""
-
 #: message
 msgid "Old key: ::1 old key::"
 msgstr "Старый ключ: ::1 old key::"
@@ -702,10 +653,6 @@ msgstr "Неожиданная ошибка в luksChangeKey."
 msgid "Unexpected error in luksClose."
 msgstr "Неожиданная ошибка в luksClose."
 
-#: success
-msgid "Succesfully changed key for tomb: ::1 tomb file::"
-msgstr ""
-
 #: message
 msgid "The new key is: ::1 new key::"
 msgstr "Новый ключ: ::1 new key::"
@@ -724,80 +671,40 @@ msgstr "::1 tomb file:: неверный файл гробницы"
 
 #: message
 msgid "Mountpoint not specified, using default: ::1 mount point::"
-msgstr ""
-"Не указана точка монтирования, использую точку по умолчанию: ::1 mount "
-"point::"
+msgstr "Не указана точка монтирования, использую точку по умолчанию: ::1 mount point::"
 
 #: warning
 msgid "::1 tomb name:: is already open."
 msgstr "::1 tomb name:: уже открыт."
 
-#: message
-msgid "Here below its status is reported:"
-msgstr "Ниже назодится отчет о его статусе:"
-
-#: success
-msgid "Opening ::1 tomb file:: on ::2 mount point::"
-msgstr ""
-
 #: failure
 msgid "::1 tomb file:: is not a valid Luks encrypted storage file."
 msgstr "::1 tomb file:: - неверное зашифрованное устройство LUSK."
 
 #: message
-msgid "This tomb is a valid LUKS encrypted device."
-msgstr "Эта гробница - верное зашифрованное устройство LUKS."
-
-#: message
 msgid "Cipher is \"::1 cipher::\" mode \"::2 mode::\" hash \"::3 hash::\""
 msgstr "Шифр \"::1 cipher::\", режим \"::2 mode::\", хеш \"::3 hash::\""
 
 #: warning
-msgid ""
-"Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
-msgstr ""
-"Для этой гробницы разрешено использование нескольких ключей. Будьте "
-"осторожны: там может быть бэкдор."
-
-#: failure
-msgid "Failure mounting the encrypted file."
-msgstr "Не удалось примонтировать зашифрованный файл."
-
-#: success
-msgid "Success unlocking tomb ::1 tomb name::"
-msgstr ""
+msgid "Multiple key slots are enabled on this tomb. Beware: there can be a backdoor."
+msgstr "Для этой гробницы разрешено использование нескольких ключей. Будьте осторожны: там может быть бэкдор."
 
 #: message
 msgid "Checking filesystem via ::1::"
 msgstr "Проверка файловой системы через ::1::"
 
-#: success
-msgid "Success opening ::1 tomb file:: on ::2 mount point::"
-msgstr ""
-
 #: message
 msgid "Last visit by ::1 user::(::2 tomb build::) from ::3 tty:: on ::4 host::"
-msgstr ""
-"Последний визит нанес ::1 user::(::2 tomb build::) из ::3 tty:: на ::4 host::"
+msgstr "Последний визит нанес ::1 user::(::2 tomb build::) из ::3 tty:: на ::4 host::"
 
 #: message
 msgid "on date ::1 date::"
 msgstr "дата: ::1 date::"
 
 #: warning
-msgid "How pitiful!  A tomb, and no HOME."
-msgstr "Как жаль! Гробница есть, но нет HOME."
-
-#: warning
-#, fuzzy
-msgid "Cannot exec bind hooks without a mounted tomb."
-msgstr ""
-"Невозможно выполнить обработчики событий без примонтированной гробницы."
-
-#: warning
 #, fuzzy
 msgid "bind-hooks file is broken"
-msgstr "файл обработчиков битый"
+msgstr "файл bind-hooks битый"
 
 #: warning
 #, fuzzy
@@ -816,14 +723,8 @@ msgstr "Цель bind-hook не существует, пропускаю ::1 hom
 
 #: 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
-msgid "Post hooks found, executing as user ::1 user name::."
-msgstr ""
+msgid "bind-hook source not found in tomb, skipping ::1 mount point::/::2 subdir::"
+msgstr "Источник bind-hook не найден в гробнице, пропускаю ::1 mount point::/::2 subdir::"
 
 #: failure
 msgid "I can't see any ::1 status:: tomb, may they all rest in peace."
@@ -831,25 +732,19 @@ msgstr "Я не вижу ::1 status:: гробниц, да упокоятся о
 
 #: message
 msgid "::1 tombname:: open on ::2 tombmount:: using ::3 tombfsopts::"
-msgstr "::1 tombname:: открыта на ::2 tombmount:: с помощью ::3 tombfsopts::"
+msgstr "::1 tombname:: открыта на ::2 tombmount:: с параметрами ::3 tombfsopts::"
 
 #: message
 msgid "::1 tombname:: open since ::2 tombsince::"
 msgstr "::1 tombname:: открыта с ::2 tombsince::"
 
 #: message
-msgid ""
-"::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
-msgstr ""
-"::1 tombname:: открыл ::2 tombuser:: из ::3 tombtty:: на ::4 tombhost::"
+msgid "::1 tombname:: open by ::2 tombuser:: from ::3 tombtty:: on ::4 tombhost::"
+msgstr "::1 tombname:: открыл ::2 tombuser:: из ::3 tombtty:: на ::4 tombhost::"
 
-#: message
-msgid ""
-"::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::"
-"%) is used: ::4 tombavail:: free "
-msgstr ""
-"::1 tombname:: размер ::2 tombtot:: из которых ::3 tombused:: (::5 "
-"tombpercent::%) использовано: ::4 tombavail:: свободно "
+#: message
+msgid "::1 tombname:: size ::2 tombtot:: of which ::3 tombused:: (::5 tombpercent::%) is used: ::4 tombavail:: free "
+msgstr "::1 tombname:: размер ::2 tombtot:: из которых ::3 tombused:: (::5 tombpercent::%) использовано: ::4 tombavail:: свободно "
 
 #: warning
 msgid "::1 tombname:: warning: your tomb is almost full!"
@@ -865,9 +760,7 @@ msgstr "Внутренняя ошибка: list_tomb_binds вызвана без
 
 #: failure
 msgid "Cannot index tombs on this system: updatedb (mlocate) not installed."
-msgstr ""
-"Не могу проиндексировать гробницы на этой системе: updatedb (mlocate) не "
-"установлен."
+msgstr "Не могу проиндексировать гробницы на этой системе: updatedb (mlocate) не установлен."
 
 #: warning
 msgid "Cannot use GNU findutils for index/search commands."
@@ -881,14 +774,6 @@ msgstr "Для использования команды index необходи
 msgid "There seems to be no open tomb engraved as [::1::]"
 msgstr "Не похоже, что открыта гробница, гравированная как [::1::]"
 
-#: 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
 msgid "Skipping ::1 tomb name:: (.noindex found)."
 msgstr "Пропускаю ::1 tomb name:: (найден файл .noindex)."
@@ -902,18 +787,6 @@ msgid "Indexing ::1 tomb name:: contents..."
 msgstr "Индексирую содержимое ::1 tomb name::..."
 
 #: message
-msgid "Generating a new swish-e configuration file: ::1 swish conf::"
-msgstr ""
-
-#: message
-msgid "Search index updated."
-msgstr "Поисковый индекс обновлен."
-
-#: success
-msgid "Searching for: ::1::"
-msgstr ""
-
-#: message
 msgid "Searching filenames in tomb ::1 tomb name::"
 msgstr "Ищу в именах файлов гробницы ::1 tomb name::"
 
@@ -929,23 +802,9 @@ msgstr "Ищу в содержимом гробницы ::1 tomb name::"
 msgid "Skipping tomb ::1 tomb name::: not indexed."
 msgstr "Пропускаю гробницу ::1 tomb name::: она не индексирована."
 
-#: warning
-msgid "Run 'tomb index' to create indexes."
-msgstr "Запустите 'tomb index' для создания индексов."
-
-#: message
-msgid "Search completed."
-msgstr "Поиск завершен."
-
 #: message
 msgid "Commanded to resize tomb ::1 tomb name:: to ::2 size:: megabytes."
-msgstr ""
-"Приказано изменить размер гробницы ::1 tomb name::. Новый размер: ::2 size:: "
-"мегабайт."
-
-#: failure
-msgid "No tomb name specified for resizing."
-msgstr "Не указано имя гробницы для изменения размера."
+msgstr "Приказано изменить размер гробницы ::1 tomb name::. Новый размер: ::2 size:: мегабайт."
 
 #: failure
 msgid "Cannot find ::1::"
@@ -957,22 +816,13 @@ msgstr "Отмена операций: не указан новый размер
 
 #: failure
 msgid "Please close the tomb ::1 tomb name:: before trying to resize it."
-msgstr ""
-"Пожалуйста, закройте гробницу ::1 tomb name::, прежде чем менять ее размер."
+msgstr "Пожалуйста, закройте гробницу ::1 tomb name::, прежде чем менять ее размер."
 
 #: failure
 msgid "You must specify the new size of ::1 tomb name::"
 msgstr "Вы должны указать новый размер для ::1 tomb name::"
 
 #: failure
-msgid "Size is not an integer."
-msgstr "Размер не целое число."
-
-#: failure
-msgid "The new size must be greater then old tomb size."
-msgstr "Новый размер гробницы должен быть больше старого."
-
-#: failure
 msgid "Error creating the extra resize ::1 size::, operation aborted."
 msgstr "Ошибка создания дополнительного размера ::1 size::, операция отменена."
 
@@ -988,53 +838,22 @@ msgstr "e2fsck не смог проверить ::1 mapper::"
 msgid "resize2fs failed to resize ::1 mapper::"
 msgstr "resize2fs не смог изменить размер ::1 mapper::"
 
-#: failure
-msgid "There is no open tomb to be closed."
-msgstr "Нет открытой гробницы для закрытия."
-
-#: warning
-msgid "Too many tombs mounted, please specify one (see tomb list)"
-msgstr ""
-"Примонтировано слишком много гробниц, пожалуйста, укажите точнее (см. tomb "
-"list)"
-
-#: warning
-msgid "or issue the command 'tomb close all' to close them all."
-msgstr "или выполните команду 'tomb close all', чтобы закрыть их все."
-
 #: warning
 msgid "Tomb not found: ::1 tomb file::"
 msgstr "Гробница не найдена: ::1 tomb file::"
 
-#: warning
-msgid "Please specify an existing tomb."
-msgstr "Пожалуйста, укажите существующую гробницу."
-
-#: success
-msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
-msgstr ""
-
-#: message
-msgid "Kill all processes busy inside the tomb."
-msgstr "Убиваю все процессы, занятые в гробнице"
-
 #: failure
 msgid "Cannot slam the tomb ::1 tomb name::"
 msgstr "Не могу захлопнуть гробницу ::1 tomb name::"
 
 #: message
 msgid "Closing tomb ::1 tomb name:: mounted on ::2 mount point::"
-msgstr ""
-"Закрываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
+msgstr "Закрываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
 
 #: message
 #, fuzzy
 msgid "Closing tomb bind hook: ::1 hook::"
-msgstr "Закрываю обработчик событий гробницы: ::1 hook::"
-
-#: success
-msgid "Slamming tomb: killing all processes using this hook."
-msgstr ""
+msgstr "Закрываю привязку гробницы: ::1 hook::"
 
 #: failure
 msgid "Cannot slam the bind hook ::1 hook::"
@@ -1044,22 +863,10 @@ msgstr "Не могу захлопнуть обработчик ::1 hook::"
 msgid "Tomb bind hook ::1 hook:: is busy, cannot close tomb."
 msgstr "Обработчик гробницы ::1 hook:: занят, не могу закрыть гробницу."
 
-#: warning
-msgid "Tomb is busy, cannot umount!"
-msgstr "Гробница занята, не могу отмонтировать!"
-
 #: 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 ""
-
-#: failure
-msgid "Error parsing."
-msgstr "Ошибка парсинга."
-
 #: warning
 msgid "There's no such command \"::1 subcommand::\"."
 msgstr "Нет такой команды \"::1 subcommand::\"."
@@ -1068,10 +875,6 @@ msgstr "Нет такой команды \"::1 subcommand::\"."
 msgid "Please try -h for help."
 msgstr "Используйте -h для вызова справки."
 
-#: warning
-msgid "Some error occurred during option processing."
-msgstr "Произошла какая-то ошибка при обработке опций."
-
 #: failure
 msgid "See \"tomb help\" for more info."
 msgstr "Для дополнительной информации выполните \"tomb help\"."
@@ -1081,25 +884,6 @@ msgid "Unrecognized option ::1 arg:: for subcommand ::2 subcommand::"
 msgstr "Не распознана опция ::1 arg:: для подкоманды ::2 subcommand::"
 
 #: failure
-msgid ""
-"You specified option ::1 option::, which is DANGEROUS and should only be "
-"used for testing\n"
-"If you really want so, add --unsafe"
-msgstr ""
-"Вы указали опцию ::1 option::, которая ОПАСНА и должна быть использована "
-"только для тестирования\n"
-"Если Вы и правда этого хотите, добавьте параметр --unsafe"
-
-#: warning
-msgid ""
-"The create command is deprecated, please use dig, forge and lock instead."
-msgstr "Команда create устарела, пожалуйста, используйте dig, forge и lock."
-
-#: warning
-msgid "For more informations see Tomb's manual page (man tomb)."
-msgstr "Для большей информации обратитесь к руководству Tomb (man tomb)."
-
-#: failure
 msgid "Resize2fs not installed: cannot resize tombs."
 msgstr "Resize2fs не установлен: не могу менять размер гробниц."
 
@@ -1121,19 +905,11 @@ msgstr "Tomb ::1 version:: - стойкий и аккуратный хранит
 
 #: print
 msgid " Copyright (C) 2007-2014 Dyne.org Foundation, License GNU GPL v3+"
-msgstr ""
-" Все права защищены (C) 2007-2014 Dyne.org Foundation, Лицензия GNU GPL v3+"
+msgstr " Все права защищены (C) 2007-2014 Dyne.org Foundation, Лицензия GNU GPL v3+"
 
 #: print
 msgid " This is free software: you are free to change and redistribute it"
-msgstr ""
-" Это свободное программное обеспечение: Вы в праве изменять и распространять "
-"его"
-
-#: print
-msgid " For the latest sourcecode go to <http://dyne.org/software/tomb>"
-msgstr ""
-" За последним исходным кодом зайдите на <http://dyne.org/software/tomb>"
+msgstr " Это свободное программное обеспечение: Вы в праве изменять и распространять его"
 
 #: print
 msgid " This source code is distributed in the hope that it will be useful,"
@@ -1148,70 +924,205 @@ msgid " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr " ТОВАРОПРИГОДНОСТИ или ПОЛЕЗНОСТИ ДЛЯ КОНКРЕТНЫХ ЦЕЛЕЙ."
 
 #: print
-msgid " When in need please refer to <http://dyne.org/support>."
-msgstr " Если Вам нужна помощь, обращайтесь к <http://dyne.org/support>."
-
-#: print
 msgid "System utils:"
 msgstr "Системные утилиты:"
 
+#: warning
+msgid "Command \"::1 subcommand::\" not recognized."
+msgstr "Команда \"::1 subcommand::\" не распознана."
+
+#: print
+msgid " passwd  change the password of a KEY (needs old pass)"
+msgstr " passwd  изменить пароль КЛЮЧА (требуется старый пароль)"
+
+#: print
+msgid " setkey  change the KEY locking a TOMB (needs old key and pass)"
+msgstr " setkey  изменить КЛЮЧ, запирающий ГРОБНИЦУ (требуется старый ключ и пароль)"
+
+#: print
+msgid " // Backup on paper:"
+msgstr " // Резервная копия на бумаге:"
+
+#: print
+msgid " // Steganography:"
+msgstr " // Стеганография:"
+
+#: print
+msgid " bury    hide a KEY inside a JPEG image (for use with -k)"
+msgstr " bury   спрятать КЛЮЧ внутри изображения JPEG (для использования с -k)"
+
+#: print
+msgid " exhume  extract a KEY from a JPEG image (prints to stdout)"
+msgstr " exhume  извлечь КЛЮЧ из изображения JPEG (выводится в стандартный вывод)"
+
+#: failure
+msgid "Exhume failed, no image specified"
+msgstr "Эксгумация не удалась, не указано изображения"
+
+#: print
+msgid " For the latest sourcecode go to <http://dyne.org/software/tomb>"
+msgstr " За последним исходным кодом зайдите на <http://dyne.org/software/tomb>"
+
+#: print
+msgid " When in need please refer to <http://dyne.org/support>."
+msgstr " Если Вам нужна помощь, обращайтесь к <http://dyne.org/support>."
+
 #: print
 msgid "Optional utils:"
 msgstr "Дополнительные утилиты:"
 
+#: failure
+msgid "Fatal error setting the permission umask for temporary files"
+msgstr "Критическая ошибка при задании маски прав для временных файлов"
+
+#: failure
+msgid "Fatal error setting ownership on temporary file: ::1 temp file::"
+msgstr "Критическая ошибка при задании владельца временного файла ::1 temp file::"
+
 #: warning
-msgid "Command \"::1 subcommand::\" not recognized."
-msgstr "Команда \"::1 subcommand::\" не распознана."
+msgid "cleartext key from stdin selected: this is unsafe."
+msgstr "выбран ключ, явно указанный через стандартный ввод: это небезопасно."
 
-#: message
-msgid "Try -h for help."
-msgstr "Используйте -h для вызова справки."
+#: failure
+msgid "please use --unsafe if you really want to do this."
+msgstr "пожалуйчтв, используйте --unsafe, если Вы действительно этого хотите."
+
+#: warning
+msgid "received key in cleartext from stdin (unsafe mode)"
+msgstr "получен ключ в явном виде через стандартный ввод (небезопасный режим)"
+
+#: failure
+msgid "You specified option ::1 option::, which is DANGEROUS and should only be used for testing\n"
+"If you really want so, add --unsafe"
+msgstr "Вы указали опцию ::1 option::, которая ОПАСНА и должна быть использована только для тестирования\n"
+"Если Вы и правда этого хотите, добавьте параметр --unsafe"
+
+#: failure
+msgid "Failing to identify the user who is calling us"
+msgstr "Не удалось определить пользователя, вызвавшего меня"
+
+#: failure
+msgid "Fatal error creating the temporary directory: ::1 temp dir::"
+msgstr "Критическая ошибка при создании временной директории: ::1 temp dir::"
+
+#: failure
+msgid "Someone is messing up with us trying to hijack temporary files."
+msgstr "Кто-то наглый пытается похитить наши временные файлы."
+
+#: success
+msgid "All your swaps are belong to crypt.  Good."
+msgstr "All your swaps are belong to crypt.  Хорошо."
+
+#: success
+msgid "Changing password for ::1 key file::"
+msgstr "Меняю пароль для ::1 key file::"
+
+#: success
+msgid "Your passphrase was successfully updated."
+msgstr "Ваш пароль успешно обновлен."
+
+#: success
+msgid "Using KDF, iterations: ::1 microseconds::"
+msgstr "Использую KDF, итераций: ::1 microseconds::"
+
+#: success
+msgid "Encoding key ::1 tomb key:: inside image ::2 image file::"
+msgstr "Кодирую ключ ::1 tomb key:: в изображение ::2 image file::"
+
+#: success
+msgid "Tomb key encoded succesfully into image ::1 image file::"
+msgstr "Ключ от гробницы успешно закодирован в изображение ::1 image file::"
+
+#: success
+msgid "Key succesfully exhumed to ::1 key::."
+msgstr "Ключ успешно эксгумирован в ::1 key::"
+
+#: success
+msgid "Rendering a printable QRCode for key: ::1 tomb key file::"
+msgstr "Рендерю готовый для печати штрих-код для ключа: ::1 tomb key file::"
+
+#: success
+msgid "Operation successful:"
+msgstr "Операция успешна."
+
+#: success
+msgid "Creating a new tomb in ::1 tomb path::"
+msgstr "Создаю новую гробницу в ::1 tomb path::"
+
+#: success
+msgid "Done digging ::1 tomb name::"
+msgstr "::1 tomb name:: выкопана"
+
+#: success
+msgid "Choose the  password of your key: ::1 tomb key::"
+msgstr "Выберите пароль для вашего ключа: ::1 tomb key::"
+
+#: success
+msgid "Your key is ready:"
+msgstr "Ваш ключ готов:"
+
+#: success
+msgid "Locking ::1 tomb file:: with ::2 tomb key file::"
+msgstr "Запираю ::1 tomb file:: с помощью ::2 tomb key file::"
+
+#: success
+msgid "Your tomb is ready in ::1 tomb path:: and secured with key ::2 tomb key::"
+msgstr "Ваша гробница готова в ::1 tomb path:: и защищена ключом ::2 tomb key::"
 
-#~ msgid "Fatal error creating a directory for temporary files"
-#~ msgstr "Критическая ошибка при создании директории для временных файлов"
+#: success
+msgid "Changing lock on tomb ::1 tomb name::"
+msgstr "Меняю замок на гробнице ::1 tomb name::"
+
+#: success
+msgid "Succesfully changed key for tomb: ::1 tomb file::"
+msgstr "Ключ для гробницы ::1 tomb file:: успешно изменен"
 
-#~ msgid "Cannot mount tmpfs in ::1 shm path::"
-#~ msgstr "Не могу примонтировать tmpfs в ::1 shm path::"
+#: success
+msgid "Opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Открываю ::1 tomb file:: в ::2 mount point::"
 
-#~ msgid "Fatal error setting permissions on temporary file: ::1 temp file::"
-#~ msgstr ""
-#~ "Критическая ошибка при установке прав на временный файл ::1 temp file::"
+#: success
+msgid "Success unlocking tomb ::1 tomb name::"
+msgstr "Успешно отпер гробницу ::1 tomb name::"
 
-#~ msgid "Loopback mount called on invalid tomb: ::1 path::"
-#~ msgstr "Вызов loopback монтирования на неверную гробницу: ::1 path::"
+#: success
+msgid "Success opening ::1 tomb file:: on ::2 mount point::"
+msgstr "Успешно открыл ::1 tomb file:: в ::2 mount point::"
 
-#~ msgid " passwd  change the password of a KEY"
-#~ msgstr " passwd  изменить пароль КЛЮЧА "
+#: success
+msgid "Post hooks found, executing as user ::1 user name::."
+msgstr "Найдены пост-обработчики, выполняю как пользователь ::1 user name::."
 
-#~ msgid " setkey  change the KEY locking a TOMB (needs old one)"
-#~ msgstr " setkey  изменить КЛЮЧ для закрытия ГРОБНИЦЫ (нужен старый ключ) "
+#: success
+msgid "Creating and updating search indexes."
+msgstr "Создаю и обновляю индексы поиска."
 
-#~ msgid " bury    hide a KEY inside a JPEG image"
-#~ msgstr " bury    спрятать КЛЮЧ в JPEG изображении"
+#: message
+msgid "Generating a new swish-e configuration file: ::1 swish conf::"
+msgstr "Генерирую новый файл конфигурации swish-e: ::1 swish conf::"
 
-#~ msgid " exhume  extract a KEY from a JPEG image"
-#~ msgstr " exhume  извлечь КЛЮЧ из изображения JPEG"
+#: success
+msgid "Searching for: ::1::"
+msgstr "Ищу: ::1::"
 
-#~ msgid "Tomb close ::1::"
-#~ msgstr "Закрываю гробницу ::1::"
+#: success
+msgid "Slamming tomb ::1 tomb name:: mounted on ::2 mount point::"
+msgstr "Захлопываю гробницу ::1 tomb name::, примонтированную на ::2 mount point::"
 
-#~ 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 ""
-#~ "Вы указали опцию ::1 option::, которая ОПАСНА и должна быть использована "
-#~ "только для тестирования\n"
-#~ "Если Вы и правда этого хотите, добавьте параметр --unsecure-dev-mode"
+#: success
+#, fuzzy
+msgid "Slamming tomb: killing all processes using this hook."
+msgstr "Захлопываю гробницу: убиваю все процессы, использующие эту привязку."
 
-#~ msgid " The latest Tomb sourcecode is published on <http://tomb.dyne.org>"
-#~ msgstr " Последний исходный код Tomb опубликован на <http://tomb.dyne.org>"
+#: success
+msgid "Tomb ::1 tomb name:: closed: your bones will rest in peace."
+msgstr "Гробница ::1 tomb name:: закрыта: да упокоятся с миром Ваши кости."
 
-#~ msgid " Please refer to the GNU Public License for more details."
-#~ msgstr " За более подробной информацией обратитесь к GNU Public License."
+#: warning
+msgid "Pinentry error: ::1 error::"
+msgstr "Ошибка pinentry: ::1 error::"
 
-#~ msgid "Fatal error creating a directory in shared memory."
-#~ msgstr "Критическая ошибка при создании директории в разделяемой памяти."
+#: warning
+msgid "Empty password"
+msgstr "Пустой пароль"
 
-#~ msgid "gpg-agent choice of pinentry: ::1 pinentry::"
-#~ msgstr "Выбор pinentry для gpg-agent: ::1 pinentry::"