po: msgmerge done

--

1 files changed, 51 insertions, 17 deletions

diff --git a/po/et.po b/po/et.po
index a06ce408e..6c6f7bfbb 100644
--- a/po/et.po
+++ b/po/et.po
@@ -120,6 +120,10 @@ msgstr "halb parool"
 msgid "does not match - try again"
 msgstr ""
 
+#, fuzzy
+msgid "Passphrases match."
+msgstr "halb parool"
+
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
@@ -1235,6 +1239,15 @@ msgstr "kirjutan salajase võtme faili `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "error creating `%s': %s\n"
+msgid "error creating '%s': %s\n"
+msgstr "viga `%s' loomisel: %s\n"
+
+#, fuzzy, c-format
+msgid "error closing '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
 #, c-format
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
@@ -1449,6 +1462,10 @@ msgstr "ei töödeldud"
 msgid "forced"
 msgstr ""
 
+#, c-format
+msgid "Please try command \"%s\" if the listing does not look correct\n"
+msgstr ""
+
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
@@ -1728,6 +1745,9 @@ msgstr "muuda omaniku usaldust"
 msgid "change the User Interaction Flag"
 msgstr "muuda omaniku usaldust"
 
+msgid "switch to the OpenPGP app"
+msgstr ""
+
 msgid "gpg/card> "
 msgstr ""
 
@@ -1978,11 +1998,6 @@ msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#, fuzzy, c-format
-#| msgid "error creating `%s': %s\n"
-msgid "error creating '%s': %s\n"
-msgstr "viga `%s' loomisel: %s\n"
-
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
@@ -2434,6 +2449,10 @@ msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
 #, fuzzy
+msgid "show signatures with invalid algorithms during signature listings"
+msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
+
+#, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
@@ -3066,6 +3085,10 @@ msgstr "jätsin vahele: avalik võti on juba olemas\n"
 msgid "key %s: error sending to agent: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
+#, c-format
+msgid "key %s: card reference is overridden by key material\n"
+msgstr ""
+
 #. TRANSLATORS: For a smartcard, each private key on host has a
 #. * reference (stub) to a smartcard and actual private key data
 #. * is stored on the card.  A single smartcard can have up to
@@ -3608,6 +3631,9 @@ msgstr "kustuta sekundaarne võti"
 msgid "add a revocation key"
 msgstr "lisa tühistamise võti"
 
+msgid "add an additional decryption subkey"
+msgstr ""
+
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan tõesti kõik kasutaja ID-de seaded? "
@@ -3682,6 +3708,10 @@ msgstr "Salajane võti on kasutatav.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
+msgid ""
+"Note: the local copy of the secret key will only be deleted with \"save\".\n"
+msgstr ""
+
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast võtit.\n"
 
@@ -3803,6 +3833,10 @@ msgstr "Salvestan muutused? "
 msgid "Quit without saving? (y/N) "
 msgstr "Väljun salvestamata? "
 
+#, fuzzy, c-format
+msgid "deleting copy of secret key failed: %s\n"
+msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
@@ -4047,6 +4081,18 @@ msgid ""
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
+msgid "Enter the fingerprint of the additional decryption subkey: "
+msgstr ""
+
+#, fuzzy, c-format
+#| msgid "(unless you specify the key by fingerprint)\n"
+msgid "Did you specify the fingerprint of a subkey?\n"
+msgstr "(kui te just ei määra võtit sõrmejäljega)\n"
+
+#, fuzzy, c-format
+msgid "key \"%s\" is already on this keyblock\n"
+msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
+
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5863,10 +5909,6 @@ msgid "key %s may not be used for signing in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
 #, c-format
-msgid "continuing verification anyway due to option %s\n"
-msgstr ""
-
-#, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "HOIATUS: allkirja lühend on teatega konfliktne\n"
 
@@ -8003,10 +8045,6 @@ msgid "failed to create temporary cache dir file '%s': %s\n"
 msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
 #, fuzzy, c-format
-msgid "error closing '%s': %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
-#, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
@@ -9870,10 +9908,6 @@ msgstr ""
 #~ msgstr "lülita salajaste või avalike võtmete loendi vahel"
 
 #, fuzzy
-#~ msgid "Passphrase"
-#~ msgstr "halb parool"
-
-#, fuzzy
 #~ msgid "WARNING: keyserver option '%s' is not used on this platform\n"
 #~ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"