[git] GnuPG - branch, master, updated. gnupg-2.1.5-1-gee438d6

by Werner Koch cvs at cvs.gnupg.org
Thu Jun 11 15:40:02 CEST 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  ee438d677560d3350a76286b2ef294323210f486 (commit)
       via  9b7bdfae82f74a147a5dbf0fac0f78cde77a207b (commit)
       via  0cbd394ebbbd39d159e681f8e0f3dfd5204efd70 (commit)
       via  41a62a57a42bf6dd17c51ec7d976d62d7c2facdc (commit)
       via  6ac0042cffc8cb67ebd8fc2098b278f62126bdc0 (commit)
       via  82eaa9074dd1756e9d210592db4edd7f30a3de22 (commit)
      from  985918aab025cf0ac9db411b88a47c4b985e5e95 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ee438d677560d3350a76286b2ef294323210f486
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 11 15:37:50 2015 +0200

    Post release updates.
    
    --

diff --git a/NEWS b/NEWS
index 4f4f2f6..b760eb0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 2.1.6 (unreleased)
+------------------------------------------------
+
+
 Noteworthy changes in version 2.1.5 (2015-06-11)
 ------------------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 2e7125d..cf49647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.14"
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [1])
-m4_define([mym4_micro], [5])
+m4_define([mym4_micro], [6])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release

commit 9b7bdfae82f74a147a5dbf0fac0f78cde77a207b
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 11 14:43:57 2015 +0200

    Release 2.1.5

diff --git a/NEWS b/NEWS
index b59be51..4f4f2f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,16 @@
-Noteworthy changes in version 2.1.5 (unreleased)
+Noteworthy changes in version 2.1.5 (2015-06-11)
 ------------------------------------------------
 
+ * Support for an external passphrase cache.
+
+ * Support for the forthcoming version 3 OpenPGP smartcard.
+
+ * Manuals now show the actual used file names.
+
+ * Prepared for improved integration with Emacs.
+
+ * Code cleanups and minor bug fixes.
+
 
 Noteworthy changes in version 2.1.4 (2015-05-12)
 ------------------------------------------------

commit 0cbd394ebbbd39d159e681f8e0f3dfd5204efd70
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 11 14:43:38 2015 +0200

    w32: Adjust mkdefsinc.c for Windows
    
    --
    
    Under Windows the file names are determined at runtime.  To have
    somewhat useful names in the manuals, we provide replacements using
    the strings "INSTDIR" and "APPDATA" for the installation directory and
    the user specific application data.

diff --git a/doc/mkdefsinc.c b/doc/mkdefsinc.c
index c4f776f..9e17332 100644
--- a/doc/mkdefsinc.c
+++ b/doc/mkdefsinc.c
@@ -31,6 +31,16 @@
    values are not valid for the build platform but we need some values
    nevertheless.  */
 #include "config.h"
+/* When building for Windows some -D macros are not available.  We
+   provide replacements here.  */
+#ifdef HAVE_W32_SYSTEM
+# define GNUPG_BINDIR        "INSTDIR/bin"
+# define GNUPG_LIBEXECDIR    "INSTDIR/bin"
+# define GNUPG_LIBDIR        "INSTDIR/lib/" PACKAGE_NAME
+# define GNUPG_DATADIR       "INSTDIR/share/" PACKAGE_NAME
+# define GNUPG_SYSCONFDIR    "APPDATA/GNU/etc/" PACKAGE_NAME
+# define GNUPG_LOCALSTATEDIR "APPDATA/GNU"
+#endif /*HAVE_W32_SYSTEM*/
 
 
 static int verbose;

commit 41a62a57a42bf6dd17c51ec7d976d62d7c2facdc
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 11 13:05:53 2015 +0200

    po: Auto-update
    
    --

diff --git a/po/ca.po b/po/ca.po
index d5d6847..86b6e52 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -404,6 +404,9 @@ msgstr "error en la creació de la contrasenya: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
@@ -5517,6 +5520,14 @@ msgstr "error de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "no es pot crear el directori «%s»: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "no s'ha pogut obrir «%s»\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
@@ -5539,14 +5550,6 @@ msgstr "no s'ha pogut tancar «%s»: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "no es pot crear el directori «%s»: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "no s'ha pogut obrir «%s»\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
diff --git a/po/cs.po b/po/cs.po
index 368925c..b9e31bd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -402,6 +402,9 @@ msgstr "umožnit přednastavení hesla"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr "zapnout podporu pro OpenSSH"
 
@@ -5110,6 +5113,14 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "databáze důvěry: synchronizace selhala %s\n"
 
 #, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "pro „%s“ nelze vytvořit zámek\n"
+
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "„%s“ nelze zamknout\n"
+
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "záznam v databázi důvěry %lu: lseek() se nepodařil: %s\n"
 
@@ -5129,14 +5140,6 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: adresář neexistuje!\n"
 
 #, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "pro „%s“ nelze vytvořit zámek\n"
-
-#, c-format
-msgid "can't lock '%s'\n"
-msgstr "„%s“ nelze zamknout\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
 
diff --git a/po/da.po b/po/da.po
index c54590e..90effe0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -413,6 +413,9 @@ msgstr "tillad forhåndsindstilling af adgangsfrase"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
@@ -5347,6 +5350,16 @@ msgstr "læsefejl i »%s«: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronisering mislykkedes: %s\n"
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "kan ikke oprette lås for »%s«\n"
+
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "kan ikke låse »%s«\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek mislykkedes: %s\n"
@@ -5367,16 +5380,6 @@ msgstr "kan ikke tilgå »%s«: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: mappe findes ikke!\n"
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "kan ikke oprette lås for »%s«\n"
-
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "kan ikke låse »%s«\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: kunne ikke oprette versionspost: %s"
diff --git a/po/el.po b/po/el.po
index 04c912f..8e5f2c4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -380,6 +380,9 @@ msgstr "
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5390,6 +5393,14 @@ msgstr "
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync áðÝôõ÷å: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: áðïôõ÷ßá lseek: %s\n"
@@ -5409,14 +5420,6 @@ msgstr "
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ï öÜêåëïò äåí õðÜñ÷åé!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: áðïôõ÷ßá äçìéïõñãßáò ìéáò åããñáöÞò Ýêäïóçò: %s"
diff --git a/po/eo.po b/po/eo.po
index dbaf326..3e9e0e0 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -382,6 +382,9 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5345,6 +5348,14 @@ msgstr "kiraso: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "ne povas krei '%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "ne povas malfermi '%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
@@ -5364,14 +5375,6 @@ msgstr "ne povas fermi '%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "ne povas krei '%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "ne povas malfermi '%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
diff --git a/po/es.po b/po/es.po
index 0111dbd..0abc622 100644
--- a/po/es.po
+++ b/po/es.po
@@ -427,6 +427,9 @@ msgstr "permitir preestablecer frase contrase
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
@@ -5355,6 +5358,16 @@ msgstr "error de lectura `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronización: %s\n"
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "no se puede crear el bloqueo para `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "no se puede bloquear `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
@@ -5376,16 +5389,6 @@ msgstr "no se puede acceder a `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡el directorio no existe!\n"
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "no se puede crear el bloqueo para `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "no se puede bloquear `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creación del registro de versión: %s"
diff --git a/po/et.po b/po/et.po
index 5f0a400..fdf5462 100644
--- a/po/et.po
+++ b/po/et.po
@@ -378,6 +378,9 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5322,6 +5325,14 @@ msgstr "viga lugemisel: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync ebaõnnestus: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "`%s' ei õnnestu luua: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "`%s' ei õnnestu avada\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
@@ -5341,14 +5352,6 @@ msgstr "`%s' ei 
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "`%s' ei õnnestu avada\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei õnnestu: %s"
diff --git a/po/fi.po b/po/fi.po
index 9ae7699..47bbe27 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -394,6 +394,9 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5376,6 +5379,14 @@ msgstr "lukuvirhe: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "tiedostoa \"%s\" ei voi avata\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
@@ -5395,14 +5406,6 @@ msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "tiedostoa \"%s\" ei voi avata\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
diff --git a/po/fr.po b/po/fr.po
index 101b6e4..d9f2c48 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -384,6 +384,9 @@ msgstr "permettre de préconfigurer la phrase secrète"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr "activer la prise en charge de SSH"
 
@@ -5226,6 +5229,14 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance : échec de synchronisation : %s\n"
 
 #, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "impossible de créer un verrou pour « %s »\n"
+
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "impossible de verrouiller « %s »\n"
+
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu : échec de lseek : %s\n"
 
@@ -5246,14 +5257,6 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s : le répertoire n'existe pas.\n"
 
 #, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "impossible de créer un verrou pour « %s »\n"
-
-#, c-format
-msgid "can't lock '%s'\n"
-msgstr "impossible de verrouiller « %s »\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s : impossible de créer un enregistrement de version : %s"
 
diff --git a/po/gl.po b/po/gl.po
index 0e3eadf..f1abe61 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -380,6 +380,9 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5380,6 +5383,14 @@ msgstr "erro de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronización: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "non se pode crear `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "non se puido abrir `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
@@ -5400,14 +5411,6 @@ msgstr "non se pode pechar `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡o directorio non existe!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "non se pode crear `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "non se puido abrir `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versión: %s"
diff --git a/po/hu.po b/po/hu.po
index 1154cc5..7d7ee89 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -378,6 +378,9 @@ msgstr "Hiba a jelsz
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5352,6 +5355,14 @@ msgstr "Olvas
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "Nem tudom megnyitni %s-t!\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatbázis %lu. rekord: lseek sikertelen: %s.\n"
@@ -5371,14 +5382,6 @@ msgstr "Nem tudom bez
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Könyvtár nem létezik!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "Nem tudom megnyitni %s-t!\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem sikerült verziórekordot létrehoznom: %s"
diff --git a/po/id.po b/po/id.po
index 6683b6d..9327b9d 100644
--- a/po/id.po
+++ b/po/id.po
@@ -383,6 +383,9 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5342,6 +5345,14 @@ msgstr "kesalahan pembacaan: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "tidak dapat membuka `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
@@ -5361,14 +5372,6 @@ msgstr "tidak dapat menutup `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "tidak dapat membuat %s: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "tidak dapat membuka `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
diff --git a/po/it.po b/po/it.po
index 522e24f..4a08f01 100644
--- a/po/it.po
+++ b/po/it.po
@@ -378,6 +378,9 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5380,6 +5383,14 @@ msgstr "errore di lettura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "impossibile creare `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "impossibile aprire `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
@@ -5399,14 +5410,6 @@ msgstr "impossibile chiudere `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "impossibile creare `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "impossibile aprire `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
diff --git a/po/ja.po b/po/ja.po
index d3df2e2..7737c70 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -374,6 +374,9 @@ msgstr "パスフレーズの事前設定を認める"
 msgid "allow caller to override the pinentry"
 msgstr "pinentryより優先してパスフレーズ入力を認める"
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr "sshサポートを有功にする"
 
@@ -5000,6 +5003,14 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "信用データベース: 同期に失敗しました: %s\n"
 
 #, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "'%s'のロックを作成できません\n"
+
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "'%s'がロックできません\n"
+
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信用データベース レコード%lu: シークに失敗しました: %s\n"
 
@@ -5019,14 +5030,6 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: ディレクトリがありません!\n"
 
 #, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "'%s'のロックを作成できません\n"
-
-#, c-format
-msgid "can't lock '%s'\n"
-msgstr "'%s'がロックできません\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: バージョン・レコードの作成に失敗しました: %s"
 
diff --git a/po/nb.po b/po/nb.po
index 63f410d..9e5f207 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -390,6 +390,9 @@ msgstr "feil ved opprettelse av passfrase: %s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr ""
 
@@ -5203,6 +5206,16 @@ msgstr "lesefeil ved 
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "kan ikke opprette lås for «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "kan ikke låse «%s»\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
@@ -5223,16 +5236,6 @@ msgstr "kan ikke aksere 
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "kan ikke opprette lås for «%s»\n"
-
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "kan ikke låse «%s»\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 68a035a..cf0c727 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -404,6 +404,9 @@ msgstr "zezwolenie na predefiniowane has
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr ""
 
@@ -5374,6 +5377,16 @@ msgstr "b
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiod³a siê %s\n"
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "nie mo¿na utworzyæ blokady dla ,,%s''\n"
+
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "nie mo¿na zablokowaæ ,,%s''\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiod³a siê: %s\n"
@@ -5394,16 +5407,6 @@ msgstr "nie mo
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "nie mo¿na utworzyæ blokady dla ,,%s''\n"
-
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "nie mo¿na zablokowaæ ,,%s''\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiod³o siê: %s"
diff --git a/po/pt.po b/po/pt.po
index 1e4166b..3962b42 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -383,6 +383,9 @@ msgstr "erro na cria
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5352,6 +5355,14 @@ msgstr "armadura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confiança: sincronização falhou: %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "impossível criar `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "impossível abrir `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confiança rec %lu: lseek falhou: %s\n"
@@ -5371,14 +5382,6 @@ msgstr "imposs
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "impossível criar `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "impossível abrir `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de versão: %s"
diff --git a/po/ro.po b/po/ro.po
index 830ef04..d71286c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -393,6 +393,9 @@ msgstr "eroare la crearea frazei-parol
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5339,6 +5342,16 @@ msgstr "eroare citire 
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a eºuat: %s\n"
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "nu pot încuia (lock) `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a eºuat: %s\n"
@@ -5359,16 +5372,6 @@ msgstr "nu pot accesa `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu existã!\n"
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "nu pot încuia (lock) `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am eºuat sã creez înregistrare versiune: %s"
diff --git a/po/ru.po b/po/ru.po
index 5475d54..5a27736 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -36,7 +36,6 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|Отмена (_C)"
 
-#| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|Да (_Y)"
 
@@ -46,7 +45,6 @@ msgstr "|pinentry-label|Нет (_N)"
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|Сохранить в диспетчере паролей (_S)"
 
@@ -374,6 +372,9 @@ msgstr "разрешить предустанавливать фразу-пар
 msgid "allow caller to override the pinentry"
 msgstr "разрешить клиентам замещать собой pinentry"
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr "включить поддержку ssh"
 
@@ -5052,6 +5053,14 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "таблица доверия: сбой синхронизации: %s\n"
 
 #, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "невозможно создать блокировку для '%s'\n"
+
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "невозможно заблокировать '%s'\n"
+
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "таблица доверия, запись %lu: сбой lseek: %s\n"
 
@@ -5071,14 +5080,6 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не существует!\n"
 
 #, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "невозможно создать блокировку для '%s'\n"
-
-#, c-format
-msgid "can't lock '%s'\n"
-msgstr "невозможно заблокировать '%s'\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: сбой создания записи о версии: %s"
 
diff --git a/po/sk.po b/po/sk.po
index e00fb22..1d34221 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -381,6 +381,9 @@ msgstr "chyba pri vytv
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5366,6 +5369,14 @@ msgstr "chyba pri 
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
 
+#, fuzzy, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "nemô¾em vytvori» `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock '%s'\n"
+msgstr "nemo¾no otvori» `%s'\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "záznam v databáze dôvery %lu: lseek() sa nepodaril: %s\n"
@@ -5385,14 +5396,6 @@ msgstr "nem
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresár neexistuje!\n"
 
-#, fuzzy, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "nemô¾em vytvori» `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock '%s'\n"
-msgstr "nemo¾no otvori» `%s'\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvori» záznam verzie: %s"
diff --git a/po/sv.po b/po/sv.po
index 87717ae..aae01e8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -427,6 +427,9 @@ msgstr "tillåt förinställning av lösenfras"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
@@ -5446,6 +5449,17 @@ msgstr "läsfel i \"%s\":  %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "kan inte skapa lås för \"%s\"\n"
+
+# se förra kommentaren
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "kan inte låsa \"%s\"\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
@@ -5466,17 +5480,6 @@ msgstr "kan inte komma åt \"%s\": %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "kan inte skapa lås för \"%s\"\n"
-
-# se förra kommentaren
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "kan inte låsa \"%s\"\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
diff --git a/po/tr.po b/po/tr.po
index e1b3124..c47a67d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -396,6 +396,9 @@ msgstr "anahtar parolasının önceden atanmasına izin verilir"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
@@ -5382,6 +5385,16 @@ msgstr "`%s' için okuma hatası: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "`%s' için kilit oluşturulamıyor\n"
+
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "`%s' kiltlenemedi\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
@@ -5402,16 +5415,6 @@ msgstr "'%s' eriÅŸilemiyor: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "`%s' için kilit oluşturulamıyor\n"
-
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "`%s' kiltlenemedi\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
diff --git a/po/uk.po b/po/uk.po
index 1bab67c..21911c7 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -379,6 +379,9 @@ msgstr "дозволити попереднє встановлення паро
 msgid "allow caller to override the pinentry"
 msgstr "дозволити функції виклику перевизначати pinentry"
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr "увімкнути підтримку ssh"
 
@@ -5153,6 +5156,14 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: помилка синхронізації: %s\n"
 
 #, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "не вдалося створити блокування для «%s»\n"
+
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "не вдалося заблокувати «%s»\n"
+
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "запис trustdb %lu: помилка lseek: %s\n"
 
@@ -5172,14 +5183,6 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: каталогу не існує!\n"
 
 #, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "не вдалося створити блокування для «%s»\n"
-
-#, c-format
-msgid "can't lock '%s'\n"
-msgstr "не вдалося заблокувати «%s»\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: не вдалося створити запис щодо версії: %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 26ff559..301c432 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -390,6 +390,9 @@ msgstr "生成密码的时候发生错误:%s\n"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
@@ -5199,6 +5202,16 @@ msgstr "读取‘%s’错误:%s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库:同步失败:%s\n"
 
+#, fuzzy, c-format
+#| msgid "can't create lock for `%s'\n"
+msgid "can't create lock for '%s'\n"
+msgstr "不能为‘%s’创建锁定\n"
+
+#, fuzzy, c-format
+#| msgid "can't lock `%s'\n"
+msgid "can't lock '%s'\n"
+msgstr "无法锁定‘%s’\n"
+
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数据库记录 %lu:lseek 失败:%s\n"
@@ -5219,16 +5232,6 @@ msgstr "无法存取‘%s’:%s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s:目录不存在!\n"
 
-#, fuzzy, c-format
-#| msgid "can't create lock for `%s'\n"
-msgid "can't create lock for '%s'\n"
-msgstr "不能为‘%s’创建锁定\n"
-
-#, fuzzy, c-format
-#| msgid "can't lock `%s'\n"
-msgid "can't lock '%s'\n"
-msgstr "无法锁定‘%s’\n"
-
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s:建立版本记录失败:%s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f355074..53a18c6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -368,6 +368,9 @@ msgstr "允許預先設定密語"
 msgid "allow caller to override the pinentry"
 msgstr ""
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr ""
+
 msgid "enable ssh support"
 msgstr "啟用 ssh 支援"
 
@@ -4969,6 +4972,14 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
 #, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "無法為 '%s' 建立鎖定\n"
+
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "無法鎖定 '%s'\n"
+
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
@@ -4988,14 +4999,6 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
 #, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "無法為 '%s' 建立鎖定\n"
-
-#, c-format
-msgid "can't lock '%s'\n"
-msgstr "無法鎖定 '%s'\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 

commit 6ac0042cffc8cb67ebd8fc2098b278f62126bdc0
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 11 13:04:31 2015 +0200

    po: Update German translation
    
    --

diff --git a/po/de.po b/po/de.po
index 1789dc2..80586f0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-05-12 13:19+0200\n"
+"PO-Revision-Date: 2015-06-11 13:03+0200\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: German <de at li.org>\n"
 "Language: de\n"
@@ -377,6 +377,9 @@ msgstr "Erlaube ein \"preset\" von Passphrases"
 msgid "allow caller to override the pinentry"
 msgstr "Aufrufer darf das Pinentry ersetzen"
 
+msgid "allow passphrase to be prompted through Emacs"
+msgstr "Erlaube die Eingabe einer Passphrase über Emacs"
+
 msgid "enable ssh support"
 msgstr "SSH Unterstützung einschalten"
 
@@ -5183,6 +5186,14 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
 #, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "Datei `%s' konnte nicht gesperrt werden\n"
+
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "'%s' kann nicht gesperrt werden\n"
+
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
@@ -5202,14 +5213,6 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
 #, c-format
-msgid "can't create lock for '%s'\n"
-msgstr "Datei `%s' konnte nicht gesperrt werden\n"
-
-#, c-format
-msgid "can't lock '%s'\n"
-msgstr "'%s' kann nicht gesperrt werden\n"
-
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 

commit 82eaa9074dd1756e9d210592db4edd7f30a3de22
Author: Ineiev <ineiev at gnu.org>
Date:   Thu Jun 11 13:01:17 2015 +0200

    po: Update Russian translation
    
    --

diff --git a/po/ru.po b/po/ru.po
index c5e5db2..5475d54 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.1.0\n"
 "Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-02-12 17:17+0000\n"
+"PO-Revision-Date: 2015-05-23 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev at gnu.org>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
 "Language: ru\n"
@@ -36,36 +36,28 @@ msgstr "|pinentry-label|_OK"
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|Отмена (_C)"
 
-#, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
-msgstr "|pinentry-label|_OK"
+msgstr "|pinentry-label|Да (_Y)"
 
-#, fuzzy
-#| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
-msgstr "|pinentry-label|_OK"
+msgstr "|pinentry-label|Нет (_N)"
 
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
-msgstr "|pinentry-label|Отмена (_C)"
+msgstr "|pinentry-label|Сохранить в диспетчере паролей (_S)"
 
-#, fuzzy
-#| msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgid "Do you really want to make your passphrase visible on the screen?"
-msgstr "Вы действительно хотите навсегда удалить закрытый ключ OpenPGP:"
+msgstr "Вы действительно хотите, чтобы фраза-пароль была видна на экране?"
 
 msgid "|pinentry-tt|Make passphrase visible"
-msgstr ""
+msgstr "|pinentry-tt|Показывать фразу-пароль"
 
-#, fuzzy
-#| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
-msgstr "Введите новую фразу-пароль"
+msgstr "pinentry-tt|Скрывать фразу-пароль"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
@@ -355,10 +347,8 @@ msgstr "|PGM|использовать программу PGM как демон 
 msgid "do not use the SCdaemon"
 msgstr "не использовать демон криптографических карт"
 
-#, fuzzy
-#| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
-msgstr "|NAME|подключиться к хосту NAME"
+msgstr "|NAME|принимать некоторые команды по NAME"
 
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены терминала"
@@ -372,10 +362,8 @@ msgstr "|N|сбрасывать запомненный PIN через N секу
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать запомненный PIN при подписывании"
 
-#, fuzzy
-#| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
-msgstr "не разрешать повторное использование старых фраз-паролей"
+msgstr "не позволять пользоваться внешней памятью паролей"
 
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "не позволять клиентам помечать ключи как \"доверенные\""
@@ -1708,10 +1696,8 @@ msgstr "создать новую пару ключей"
 msgid "quickly generate a new key pair"
 msgstr "быстро создать новую пару ключей"
 
-#, fuzzy
-#| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
-msgstr "быстро создать новую пару ключей"
+msgstr "быстро добавить новый ID пользователя"
 
 msgid "full featured key pair generation"
 msgstr "создание полноценной пары ключей"
@@ -4019,7 +4005,7 @@ msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
 
 msgid "override proxy options set for dirmngr"
-msgstr ""
+msgstr "переназначить настройки промежуточного сервера для dirmngr"
 
 msgid "include revoked keys in search results"
 msgstr "включить в результаты поиска отозванные ключи"
@@ -4028,7 +4014,7 @@ msgid "include subkeys when searching by key ID"
 msgstr "искать по ID ключа, включая подключи"
 
 msgid "override timeout options set for dirmngr"
-msgstr ""
+msgstr "переназначить настройки времени ожидания для dirmngr"
 
 msgid "automatically retrieve keys when verifying signatures"
 msgstr "автоматически получать ключи при проверке подписей"

-----------------------------------------------------------------------

Summary of changes:
 NEWS            | 16 +++++++++++++++-
 configure.ac    |  2 +-
 doc/mkdefsinc.c | 10 ++++++++++
 po/ca.po        | 19 +++++++++++--------
 po/cs.po        | 19 +++++++++++--------
 po/da.po        | 23 ++++++++++++----------
 po/de.po        | 21 +++++++++++---------
 po/el.po        | 19 +++++++++++--------
 po/eo.po        | 19 +++++++++++--------
 po/es.po        | 23 ++++++++++++----------
 po/et.po        | 19 +++++++++++--------
 po/fi.po        | 19 +++++++++++--------
 po/fr.po        | 19 +++++++++++--------
 po/gl.po        | 19 +++++++++++--------
 po/hu.po        | 19 +++++++++++--------
 po/id.po        | 19 +++++++++++--------
 po/it.po        | 19 +++++++++++--------
 po/ja.po        | 19 +++++++++++--------
 po/nb.po        | 23 ++++++++++++----------
 po/pl.po        | 23 ++++++++++++----------
 po/pt.po        | 19 +++++++++++--------
 po/ro.po        | 23 ++++++++++++----------
 po/ru.po        | 59 ++++++++++++++++++++++-----------------------------------
 po/sk.po        | 19 +++++++++++--------
 po/sv.po        | 25 +++++++++++++-----------
 po/tr.po        | 23 ++++++++++++----------
 po/uk.po        | 19 +++++++++++--------
 po/zh_CN.po     | 23 ++++++++++++----------
 po/zh_TW.po     | 19 +++++++++++--------
 29 files changed, 342 insertions(+), 256 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list