[git] GPA - branch, master, updated. gpa-0.9.4-56-ga46182f
by Werner Koch
cvs at cvs.gnupg.org
Fri Nov 21 11:39:26 CET 2014
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 Assistant".
The branch, master has been updated
via a46182fed6094502341d0192208e5567b6a2b155 (commit)
via 886e24fe1a6a93b323bc850c01dd0551769cd3f7 (commit)
via 89cd7eb5f68e91433ba6f0e118afc48f2e8841db (commit)
via e8c85c1cbf82b7501e5d3ad64bdde79b72707a4a (commit)
via 719bbe7ae59e0dfd7bd3951a01d5d31e80771800 (commit)
via 7fdf8d8f097ddd27267d8e6186a561748a60add2 (commit)
via 1a51becdf8f741be7083306f9000f97e283376fd (commit)
from 1ffb7d173b4268b61e2f955b3335ed37901e010c (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 a46182fed6094502341d0192208e5567b6a2b155
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 19 10:34:32 2014 +0100
Post release updates.
--
diff --git a/NEWS b/NEWS
index b9129ac..a66d0cc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Noteworthy changes in version 0.9.7 (unreleased)
+------------------------------------------------
+
+
Noteworthy changes in version 0.9.6 (2014-11-21)
------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 97beedd..4c35e71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ min_automake_version="1.10"
# (git tag -s gpa-1.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [0.9.6])
+m4_define([mym4_version], [0.9.7])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 886e24fe1a6a93b323bc850c01dd0551769cd3f7
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 19 10:34:32 2014 +0100
Release 0.9.6.
diff --git a/NEWS b/NEWS
index 799f78b..b9129ac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
-Noteworthy changes in version 0.9.6 (unreleased)
+Noteworthy changes in version 0.9.6 (2014-11-21)
------------------------------------------------
+ * Support keyserver operations for GnuPG 2.1.
+
+ * Implement the IMPORT_FILES server command.
+
+ * New "Refresh Key" action in the key manager's context menu.
+
Noteworthy changes in version 0.9.5 (2014-09-01)
------------------------------------------------
commit 89cd7eb5f68e91433ba6f0e118afc48f2e8841db
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 19 10:34:32 2014 +0100
Do not create gzipped tarball.
* Makefile.am (AUTOMAKE_OPTIONS): Remove.
* configure.ac (AM_INIT_AUTOMAKE): Add options here.
diff --git a/Makefile.am b/Makefile.am
index e24d01b..5aa9ade 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
SUBDIRS = m4 src po pixmaps doc
diff --git a/configure.ac b/configure.ac
index eac3a07..97beedd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ NEED_GPGME_VERSION=1.5.0
AC_CONFIG_AUX_DIR([build-aux])
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(src/gpa.c)
-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
commit e8c85c1cbf82b7501e5d3ad64bdde79b72707a4a
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 19 10:34:32 2014 +0100
po: Auto-update
--
diff --git a/po/ar.po b/po/ar.po
index e778a2c..f6f85c4 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -483,24 +483,14 @@ msgstr "يجري توليد المÙتاØ..."
msgid "Import keys from file"
msgstr "استورد المÙØ§ØªÙŠØ Ø§Ù„Ø¹Ù„Ù†ÙŠØ© من ملÙÙ‘"
-msgid "No keys were found."
-msgstr "لم توجد Ù…ÙاتيØ."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"Ù‚Ùرئت %i Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠØ©\n"
-"استÙورÙدت %i Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠØ©\n"
-"لم تتغير %i Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠØ©\n"
-"Ù‚Ùرئت %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©\n"
-"استÙورÙدت %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©\n"
-"لم تتغير %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©"
+
+msgid "No keys were found."
+msgstr "لم توجد Ù…ÙاتيØ."
msgid ""
"Invalid time given.\n"
@@ -527,6 +517,10 @@ msgstr "هذا المÙØªØ§Ø Ù…ÙˆÙ‚Ø¹ بمÙتاØÙƒ بالÙÙعل!"
msgid "You haven't selected a default key to sign with!"
msgstr "لم تختر Ù…ÙØªØ§Ø Ø§Ù„ØªÙˆÙ‚ÙŠØ¹ البدئي."
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "أي المÙØ§ØªÙŠØ ØªØ±ÙŠØ¯ استيراده؟ (يجب تØديده بمعرّÙ٠المÙتاØ)."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "أي المÙØ§ØªÙŠØ ØªØ±ÙŠØ¯ استيراده؟ (يجب تØديده بمعرّÙ٠المÙتاØ)."
@@ -876,6 +870,28 @@ msgstr "يمكن استخدام المÙØªØ§Ø ÙÙŠ التعمية Ùقط."
msgid "This key is useless."
msgstr "لا Ùائدة لهذا المÙتاØ."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"Ù‚Ùرئت %i Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠØ©\n"
+"استÙورÙدت %i Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠØ©\n"
+"لم تتغير %i Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠØ©\n"
+"Ù‚Ùرئت %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©\n"
+"استÙورÙدت %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©\n"
+"لم تتغير %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -902,14 +918,6 @@ msgid "Invalid character in comments."
msgstr ""
#, fuzzy
-msgid "Error"
-msgstr "عطل ÙÙŠ GPA"
-
-#, fuzzy
-msgid "Message"
-msgstr "رسالة GPA"
-
-#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "Ø´Ø±Ø Ù…Ø³Ø§Ø¹Ø¯ خصوصية جنو"
@@ -1289,6 +1297,14 @@ msgid "Retrieve keys from server"
msgstr ""
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "أنعش Øلقة المÙاتيØ"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/أر_سÙÙ„ المÙØ§ØªÙŠØ Ù„Ù„Ø®Ø§Ø¯ÙˆÙ…..."
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/Ùˆ_قّع المÙاتيØ..."
@@ -2233,6 +2249,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "عطل ÙÙŠ GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "رسالة GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "مساعد خصوصية جنو - الØاÙظة"
@@ -2600,6 +2624,3 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "Ù…ÙÙصَّلة"
-
-#~ msgid "refresh keyring"
-#~ msgstr "أنعش Øلقة المÙاتيØ"
diff --git a/po/cs.po b/po/cs.po
index 9fa3f8b..fd6cade 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -460,24 +460,14 @@ msgstr "Vytvářà se klÃÄ ..."
msgid "Import keys from file"
msgstr "Importovat klÃÄe ze souboru"
-msgid "No keys were found."
-msgstr "Nebyly nalezeny žádné klÃÄe."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i pÅ™eÄteno veÅ™ejných klÃÄů\n"
-"%i zÃskáno veÅ™ejných klÃÄů\n"
-"%i nezmÄ›nÄ›ných veÅ™ejných klÃÄů\n"
-"%i pÅ™eÄteno soukromých klÃÄů\n"
-"%i zÃskáno soukromých klÃÄů\n"
-"%i nezmÄ›nÄ›ných soukromých klÃÄů"
+
+msgid "No keys were found."
+msgstr "Nebyly nalezeny žádné klÃÄe."
msgid ""
"Invalid time given.\n"
@@ -502,6 +492,10 @@ msgstr "Tento klÃÄ už jste sám podepsal!"
msgid "You haven't selected a default key to sign with!"
msgstr "Nebyl vybrán výchozà klÃÄ pro podepisovánÃ!"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "Který klÃÄ chcete zÃskat? (MusÃte zadat ID klÃÄe)."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "Který klÃÄ chcete zÃskat? (MusÃte zadat ID klÃÄe)."
@@ -851,6 +845,28 @@ msgstr "Tento klÃÄ smà být použit pouze pro Å¡ifrovánÃ."
msgid "This key is useless."
msgstr "Tento klÃÄ je nepoužitelný."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i pÅ™eÄteno veÅ™ejných klÃÄů\n"
+"%i zÃskáno veÅ™ejných klÃÄů\n"
+"%i nezmÄ›nÄ›ných veÅ™ejných klÃÄů\n"
+"%i pÅ™eÄteno soukromých klÃÄů\n"
+"%i zÃskáno soukromých klÃÄů\n"
+"%i nezmÄ›nÄ›ných soukromých klÃÄů"
+
msgid "A required engine component is not installed."
msgstr "Požadovaná komponenta stroje nenà instalovaná."
@@ -875,12 +891,6 @@ msgstr "E-mailová adresa nenà platná."
msgid "Invalid character in comments."
msgstr "Neplatný znak v komentářÃch."
-msgid "Error"
-msgstr "Fehler"
-
-msgid "Message"
-msgstr "Zpráva"
-
msgid "GPA is the GNU Privacy Assistant."
msgstr "GPA je GNU Privacy Assistant"
@@ -1238,6 +1248,14 @@ msgstr "_ZÃskat klÃÄe..."
msgid "Retrieve keys from server"
msgstr "ZÃskat klÃÄe ze serveru"
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Aktualizovat keyring"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "ZÃskat klÃÄe ze serveru"
+
msgid "_Send Keys..."
msgstr "Ode_slat klÃÄe..."
@@ -2312,6 +2330,12 @@ msgstr ""
"Pro kartu %s nenà mnoho informacà ke zobrazenÃ. Zkuste použÃt tlaÄÃtko pro "
"volbu aplikace pro přepnutà na jinou aplikaci, která je na kartě k dispozici."
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "Message"
+#~ msgstr "Zpráva"
+
#~ msgid "[S]"
#~ msgstr "[S]"
diff --git a/po/de.po b/po/de.po
index fdb8ffe..dc3d699 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gpa\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"PO-Revision-Date: 2014-11-20 15:46+0100\n"
+"PO-Revision-Date: 2014-11-21 09:40+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -468,7 +468,8 @@ msgid ""
"Use the long keyid or a fingerprint for a better match"
msgstr ""
"Mehr als %d Schlüssel entsprechen Ihren Suchkriterien.\n"
-"Benutzen Sie die lange Schlüsselkennung oder den Fingerprint für eine verfeinerte Suche."
+"Benutzen Sie die lange Schlüsselkennung oder den Fingerprint für eine "
+"verfeinerte Suche."
msgid "No keys were found."
msgstr "Es wurde kein Schlüssel gefunden."
@@ -1265,6 +1266,12 @@ msgstr "_Schlüssel erhalten..."
msgid "Retrieve keys from server"
msgstr "Schlüssel _zum Key-Server senden"
+msgid "Re_fresh Keys"
+msgstr "Schlüssel auf_frischen"
+
+msgid "Refresh keys from server"
+msgstr "Schlüssel vom Key-Server auffrischen"
+
msgid "_Send Keys..."
msgstr "Schlüssel _Senden..."
@@ -2677,9 +2684,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detailliert"
-#~ msgid "refresh keyring"
-#~ msgstr "Schlüsselbund auffrischen"
-
#~ msgid "Key Validity"
#~ msgstr "Gültigkeit des Schlüssels"
diff --git a/po/es.po b/po/es.po
index 5b664c6..1dacda5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -488,24 +488,14 @@ msgstr "Generando Clave..."
msgid "Import keys from file"
msgstr "Importar claves públicas de fichero"
-msgid "No keys were found."
-msgstr "No se encontró ninguna clave."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i claves públicas leÃdas\n"
-"%i claves públicas importadas\n"
-"%i claces públicas sin cambios\n"
-"%i claves secretas leÃdas\n"
-"%i claves secretas importadas\n"
-"%i claves secretas sin cambios"
+
+msgid "No keys were found."
+msgstr "No se encontró ninguna clave."
msgid ""
"Invalid time given.\n"
@@ -532,6 +522,11 @@ msgstr "¡Esta clave ya ha sido firmada con la suya!"
msgid "You haven't selected a default key to sign with!"
msgstr "¡No ha seleccionado una clave por defecto con la que firmar!"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"¿Qué clave desea importar? (La clave debe especificarse por su ID de clave)."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"¿Qué clave desea importar? (La clave debe especificarse por su ID de clave)."
@@ -886,6 +881,28 @@ msgstr "Esta clave puede utilizarse tan sólo para cifrado."
msgid "This key is useless."
msgstr "Esta clave no vale para nada."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i claves públicas leÃdas\n"
+"%i claves públicas importadas\n"
+"%i claces públicas sin cambios\n"
+"%i claves secretas leÃdas\n"
+"%i claves secretas importadas\n"
+"%i claves secretas sin cambios"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -912,14 +929,6 @@ msgid "Invalid character in comments."
msgstr ""
#, fuzzy
-msgid "Error"
-msgstr "Error de GPA"
-
-#, fuzzy
-msgid "Message"
-msgstr "Mensaje de GPA"
-
-#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "Comprendiendo el GNU Privacy Assistant"
@@ -1316,6 +1325,14 @@ msgid "Retrieve keys from server"
msgstr ""
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "actualizar el anillo de llaves"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "E_nviar claves al servidor"
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/_Firmar Claves..."
@@ -2269,6 +2286,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Error de GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mensaje de GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Portapapeles"
@@ -2636,6 +2661,3 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detallada"
-
-#~ msgid "refresh keyring"
-#~ msgstr "actualizar el anillo de llaves"
diff --git a/po/fr.po b/po/fr.po
index 3f3113d..f32cdf8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -473,24 +473,14 @@ msgstr "Génération de clef…"
msgid "Import keys from file"
msgstr "Importer des clefs publiques d'un fichier"
-msgid "No keys were found."
-msgstr "Clefs introuvables."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i clefs publiques lues\n"
-"%i clefs publiques importées\n"
-"%i clefs publiques inchangées\n"
-"%i clefs secrètes lues\n"
-"%i clefs secrètes importées\n"
-"%i clefs secrètes inchangées"
+
+msgid "No keys were found."
+msgstr "Clefs introuvables."
msgid ""
"Invalid time given.\n"
@@ -517,6 +507,12 @@ msgstr "Cette clef a déjà été signée par la vôtre !"
msgid "You haven't selected a default key to sign with!"
msgstr "Pas de clef par défaut pour signer !"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Quelle clef désirez-vous importer (La clef doit être spécifiée par son ID de "
+"clef) ?"
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Quelle clef désirez-vous importer (La clef doit être spécifiée par son ID de "
@@ -876,6 +872,28 @@ msgstr "La clef peut être utilisée pour fins de chiffrement seulement."
msgid "This key is useless."
msgstr "Cette clef est inutilisable."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i clefs publiques lues\n"
+"%i clefs publiques importées\n"
+"%i clefs publiques inchangées\n"
+"%i clefs secrètes lues\n"
+"%i clefs secrètes importées\n"
+"%i clefs secrètes inchangées"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -901,14 +919,6 @@ msgstr ""
msgid "Invalid character in comments."
msgstr ""
-#, fuzzy
-msgid "Error"
-msgstr "Erreur GPA"
-
-#, fuzzy
-msgid "Message"
-msgstr "Message de GPA"
-
msgid "GPA is the GNU Privacy Assistant."
msgstr "GPA est l'assistant GNU Privacy."
@@ -1281,6 +1291,14 @@ msgstr "_Récupération de clefs…"
msgid "Retrieve keys from server"
msgstr "Récupérer des clefs depuis un serveur"
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Recharger le trousseau de clefs"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Récupérer des clefs depuis un serveur"
+
msgid "_Send Keys..."
msgstr "_Envoyer des clefs…"
@@ -2245,6 +2263,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Erreur GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Message de GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "Assistant GNU Privacy - Presse-papiers"
diff --git a/po/ja.po b/po/ja.po
index ae95e4f..c83a838 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -502,24 +502,14 @@ msgstr "
msgid "Import keys from file"
msgstr "¥Õ¥¡¥¤¥ë¤«¤é¸ø³«¸°¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë"
-msgid "No keys were found."
-msgstr "¸°¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£"
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i ¸Ä¤Î¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
-"%i ¸Ä¤Î¸ø³«¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤·¤¿\n"
-"%i ¸Ä¤Î¸ø³«¸°¤Ï̵Êѹ¹¤Ç¤¹\n"
-"%i ¸Ä¤ÎÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
-"%i ¸Ä¤ÎÈëÌ©¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤·¤¿\n"
-"%i ¸Ä¤ÎÈëÌ©¸°¤Ï̵Êѹ¹¤Ç¤¹"
+
+msgid "No keys were found."
+msgstr "¸°¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£"
msgid ""
"Invalid time given.\n"
@@ -544,6 +534,10 @@ msgstr "
msgid "You haven't selected a default key to sign with!"
msgstr "½ð̾¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÁªÂò¤·¤Æ¤¤¤Þ¤»¤ó¡ª"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "¤É¤Î¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¤«? (¸°¤Ï ID ¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹)"
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "¤É¤Î¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¤«? (¸°¤Ï ID ¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹)"
@@ -896,6 +890,28 @@ msgstr "
msgid "This key is useless."
msgstr "¤³¤Î¸°¤Ï»È¤¨¤Þ¤»¤ó¡£"
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i ¸Ä¤Î¸ø³«¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
+"%i ¸Ä¤Î¸ø³«¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤·¤¿\n"
+"%i ¸Ä¤Î¸ø³«¸°¤Ï̵Êѹ¹¤Ç¤¹\n"
+"%i ¸Ä¤ÎÈëÌ©¸°¤òÆɤ߹þ¤ß¤Þ¤·¤¿\n"
+"%i ¸Ä¤ÎÈëÌ©¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤·¤¿\n"
+"%i ¸Ä¤ÎÈëÌ©¸°¤Ï̵Êѹ¹¤Ç¤¹"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -921,13 +937,6 @@ msgstr ""
msgid "Invalid character in comments."
msgstr ""
-msgid "Error"
-msgstr "¥¨¥é¡¼"
-
-#, fuzzy
-msgid "Message"
-msgstr "GPA ¥á¥Ã¥»¡¼¥¸"
-
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "GNU Privacy Assistant ¤Ë¤Ä¤¤¤ÆÍý²ò¤¹¤ë"
@@ -1305,6 +1314,14 @@ msgid "Retrieve keys from server"
msgstr "¸°¤ò¥µ¡¼¥Ð¤«¤é¼õ¿®"
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "¸°¤òºï½ü"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "¸°¤ò¥µ¡¼¥Ð¤«¤é¼õ¿®"
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/¸°¤Ë½ð̾... (_S)"
@@ -2267,6 +2284,13 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "Error"
+#~ msgstr "¥¨¥é¡¼"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA ¥á¥Ã¥»¡¼¥¸"
+
#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
diff --git a/po/nl.po b/po/nl.po
index 38f9190..641498d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -499,24 +499,14 @@ msgstr "Genereren van de sleutel..."
msgid "Import keys from file"
msgstr "Importeer publieke sleutels vanuit een bestand"
-msgid "No keys were found."
-msgstr "Geen sleutels gevonden."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i publieke sleutels gelezen\n"
-"%i publieke sleutels geïmporteerd\n"
-"%i publieke sleutels onveranderd\n"
-"%i geheime sleutels gelezen\n"
-"%i geheime sleutels geïmporteerd\n"
-"%i geheime sleutels onveranderd"
+
+msgid "No keys were found."
+msgstr "Geen sleutels gevonden."
msgid ""
"Invalid time given.\n"
@@ -541,6 +531,12 @@ msgstr "Deze sleutel is al ondertekend met uw eigen sleutel!"
msgid "You haven't selected a default key to sign with!"
msgstr "U hebt geen sleutel geselecteerd voor ondertekening"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Welke sleutel wilt u importeren? (De sleutel moet aangeduid zijn\n"
+"met zijn sleutel id."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Welke sleutel wilt u importeren? (De sleutel moet aangeduid zijn\n"
@@ -898,6 +894,28 @@ msgstr "De sleutel kan alleen gebruikt worden voor versleuteling."
msgid "This key is useless."
msgstr "Deze sleutel is waardeloos."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i publieke sleutels gelezen\n"
+"%i publieke sleutels geïmporteerd\n"
+"%i publieke sleutels onveranderd\n"
+"%i geheime sleutels gelezen\n"
+"%i geheime sleutels geïmporteerd\n"
+"%i geheime sleutels onveranderd"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -923,13 +941,6 @@ msgstr ""
msgid "Invalid character in comments."
msgstr ""
-msgid "Error"
-msgstr "Fout"
-
-#, fuzzy
-msgid "Message"
-msgstr "GPA Bericht"
-
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "De GNU Privacy Assistent verstaan"
@@ -1312,6 +1323,14 @@ msgid "Retrieve keys from server"
msgstr "Ontvang sleutel van server:"
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Verwijder sleutel"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Ontvang sleutel van server:"
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/_Onderteken Sleutels..."
@@ -2272,6 +2291,13 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA Bericht"
+
#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Bestands beheerder"
diff --git a/po/pl.po b/po/pl.po
index d527047..09a5859 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -500,24 +500,14 @@ msgstr "Generowanie klucza..."
msgid "Import keys from file"
msgstr "Import kluczy publicznych z pliku"
-msgid "No keys were found."
-msgstr "Nie odnaleziono żadnych kluczy."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i publicznych kluczy odczytano\n"
-"%i publicznych kluczy zaimportowano\n"
-"%i publicznych kluczy nie uległo zmianie\n"
-"%i tajnych kluczy odczytano\n"
-"%i tajnych kluczy zaimportowano\n"
-"%i tajnych kluczy nie uległo zmianie"
+
+msgid "No keys were found."
+msgstr "Nie odnaleziono żadnych kluczy."
msgid ""
"Invalid time given.\n"
@@ -542,6 +532,10 @@ msgstr "Ten klucz został już podpisany przez ciebie!"
msgid "You haven't selected a default key to sign with!"
msgstr "Nie wybrano domyślnego klucza, który ma posłużyć do podpisania!"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "Który klucz chcesz importować? (Należy podać identyfikator klucza)."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "Który klucz chcesz importować? (Należy podać identyfikator klucza)."
@@ -899,6 +893,28 @@ msgstr "Ten klucz może być użyty tylko do szyfrowania."
msgid "This key is useless."
msgstr "Ten klucz jest bezużyteczny."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i publicznych kluczy odczytano\n"
+"%i publicznych kluczy zaimportowano\n"
+"%i publicznych kluczy nie uległo zmianie\n"
+"%i tajnych kluczy odczytano\n"
+"%i tajnych kluczy zaimportowano\n"
+"%i tajnych kluczy nie uległo zmianie"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -924,14 +940,6 @@ msgid "Invalid character in comments."
msgstr ""
#, fuzzy
-msgid "Error"
-msgstr "BÅ‚Ä…d GPA"
-
-#, fuzzy
-msgid "Message"
-msgstr "Komunikat GPA"
-
-#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "GNU Privacy Assistant - Menedżer plików "
@@ -1315,6 +1323,14 @@ msgid "Retrieve keys from server"
msgstr ""
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "odświeża zbiór kluczy"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/W_yślij klucze na serwer..."
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/_Podpisz klucze..."
@@ -2269,6 +2285,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Error"
+#~ msgstr "BÅ‚Ä…d GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Komunikat GPA"
+
+#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Menedżer plików "
@@ -2646,9 +2670,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "szczegółowy"
-#~ msgid "refresh keyring"
-#~ msgstr "odświeża zbiór kluczy"
-
#~ msgid "Sign files"
#~ msgstr "Podpisz pliki"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 053955a..334fc1e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -502,24 +502,14 @@ msgstr "/Chaves/_Gerar Chave..."
msgid "Import keys from file"
msgstr "Importar chave pública de um arquivo"
-msgid "No keys were found."
-msgstr "Nenhuma chave foi encontrada."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i chave pública lida\n"
-"%i chave pública importada\n"
-"%i chave pública sem alterações\n"
-"%i chave secreta lida\n"
-"%i chave secreta importada\n"
-"%i chave secreta sem alterações"
+
+msgid "No keys were found."
+msgstr "Nenhuma chave foi encontrada."
msgid ""
"Invalid time given.\n"
@@ -544,6 +534,9 @@ msgstr "Esta chave j
msgid "You haven't selected a default key to sign with!"
msgstr "Você não selecionou uma chave default para assinar!"
+msgid "Which key do you want to import?"
+msgstr ""
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
@@ -897,6 +890,28 @@ msgstr "E n
msgid "This key is useless."
msgstr ""
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i chave pública lida\n"
+"%i chave pública importada\n"
+"%i chave pública sem alterações\n"
+"%i chave secreta lida\n"
+"%i chave secreta importada\n"
+"%i chave secreta sem alterações"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -922,13 +937,6 @@ msgstr ""
msgid "Invalid character in comments."
msgstr ""
-msgid "Error"
-msgstr "Erro"
-
-#, fuzzy
-msgid "Message"
-msgstr "Mensagem do GPA"
-
#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "Compreendendo o GNU Privacy Assistant"
@@ -1312,6 +1320,14 @@ msgid "Retrieve keys from server"
msgstr "Receber chave de _servidor:"
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "_Chaveiro de chaves secretas"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Receber chave de _servidor:"
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/A_ssinar Chaves..."
@@ -2280,6 +2296,13 @@ msgid ""
"on this card."
msgstr ""
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Mensagem do GPA"
+
#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Gerenciador de arquivos"
@@ -2678,10 +2701,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detalhado"
-#, fuzzy
-#~ msgid "refresh keyring"
-#~ msgstr "_Chaveiro de chaves secretas"
-
#~ msgid "Sign files"
#~ msgstr "Arquivo assinado"
diff --git a/po/ru.po b/po/ru.po
index 836dbc2..d65db09 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -485,24 +485,14 @@ msgstr "Создание ключа..."
msgid "Import keys from file"
msgstr "Импорт открытого ключа из файла"
-msgid "No keys were found."
-msgstr "Ключи не обнаружены."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"Прочитано открытых ключей: %i\n"
-"Импортировано открытых ключей: %i\n"
-"Ðе изменено открытых ключей: %i\n"
-"Прочитано закрытых ключей: %i\n"
-"Импортировано закрытых ключей: %i\n"
-"Ðе изменено закрытых ключей: %i"
+
+msgid "No keys were found."
+msgstr "Ключи не обнаружены."
msgid ""
"Invalid time given.\n"
@@ -529,6 +519,10 @@ msgstr "Ðтот ключ уже подпиÑан вашим ключом!"
msgid "You haven't selected a default key to sign with!"
msgstr "Ðе выбран ключ по умолчанию Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи!"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "Какой ключ импортировать (ID ключа)?"
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "Какой ключ импортировать (ID ключа)?"
@@ -884,6 +878,28 @@ msgstr "Ключ может быть иÑпользован только длÑ
msgid "This key is useless."
msgstr "Данный ключ беÑполезен/неприменим."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"Прочитано открытых ключей: %i\n"
+"Импортировано открытых ключей: %i\n"
+"Ðе изменено открытых ключей: %i\n"
+"Прочитано закрытых ключей: %i\n"
+"Импортировано закрытых ключей: %i\n"
+"Ðе изменено закрытых ключей: %i"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -910,14 +926,6 @@ msgid "Invalid character in comments."
msgstr ""
#, fuzzy
-msgid "Error"
-msgstr "Ошибка GPA"
-
-#, fuzzy
-msgid "Message"
-msgstr "Сообщение GPA"
-
-#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "Как работает GNU Privacy Assistant"
@@ -1305,6 +1313,14 @@ msgid "Retrieve keys from server"
msgstr ""
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "обновить ÑвÑзку ключей"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/Отправить на Ñервер..."
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/ПодпиÑать ключи..."
@@ -2252,6 +2268,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "Ошибка GPA"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "Сообщение GPA"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Буфер"
@@ -2619,6 +2643,3 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "подробный"
-
-#~ msgid "refresh keyring"
-#~ msgstr "обновить ÑвÑзку ключей"
diff --git a/po/sv.po b/po/sv.po
index 0648cbe..c355482 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -468,24 +468,14 @@ msgstr "Genererar nyckel..."
msgid "Import keys from file"
msgstr "Importera publika nycklar från fil"
-msgid "No keys were found."
-msgstr "Inga nycklar hittades."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i publika nycklar inlästa\n"
-"%i publika nycklar importerade\n"
-"%i publika nycklar oförändrade\n"
-"%i hemliga nycklar inlästa\n"
-"%i hemliga nycklar importerade\n"
-"%i hemliga nycklar oförändrade"
+
+msgid "No keys were found."
+msgstr "Inga nycklar hittades."
msgid ""
"Invalid time given.\n"
@@ -512,6 +502,12 @@ msgstr "Den här nyckeln har redan signerats med din egen nyckel!"
msgid "You haven't selected a default key to sign with!"
msgstr "Du har inte valt en standardnyckel att signera med!"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Vilken nyckel vill du importera? (Nyckeln måste anges med dess "
+"nyckelidentitet)."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Vilken nyckel vill du importera? (Nyckeln måste anges med dess "
@@ -861,6 +857,28 @@ msgstr "Nyckeln kan endast användas för kryptering."
msgid "This key is useless."
msgstr "Den här nyckeln är oanvändbar."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i publika nycklar inlästa\n"
+"%i publika nycklar importerade\n"
+"%i publika nycklar oförändrade\n"
+"%i hemliga nycklar inlästa\n"
+"%i hemliga nycklar importerade\n"
+"%i hemliga nycklar oförändrade"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -886,14 +904,6 @@ msgstr ""
msgid "Invalid character in comments."
msgstr ""
-#, fuzzy
-msgid "Error"
-msgstr "GPA-fel"
-
-#, fuzzy
-msgid "Message"
-msgstr "GPA-meddelande"
-
msgid "GPA is the GNU Privacy Assistant."
msgstr "GPA är GNU Privacy Assistant."
@@ -1257,6 +1267,14 @@ msgstr "_Hämta nycklar..."
msgid "Retrieve keys from server"
msgstr "Hämta nycklar från server"
+#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "uppdatera nyckelring"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "Hämta nycklar från server"
+
msgid "_Send Keys..."
msgstr "_Skicka nycklar..."
@@ -2223,6 +2241,14 @@ msgid ""
"on this card."
msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "GPA-fel"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA-meddelande"
+
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Urklipp"
@@ -2608,9 +2634,6 @@ msgstr ""
#~ msgid "detailed"
#~ msgstr "detaljerat"
-#~ msgid "refresh keyring"
-#~ msgstr "uppdatera nyckelring"
-
#~ msgid "Sign files"
#~ msgstr "Signera filer"
diff --git a/po/tr.po b/po/tr.po
index 2153ff7..615292c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -494,24 +494,14 @@ msgstr "Anahtar Yarat
msgid "Import keys from file"
msgstr "Genel anahtarlarý dosyadan al"
-msgid "No keys were found."
-msgstr "Hiçbir anahtar bulunamadý."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i genel anahtar okundu\n"
-"%i genel anahtar dýþarýdan alýndý\n"
-"%i genel anahtar deðiþtirilmedi\n"
-"%i gizli anahtar okundu\n"
-"%i gizli anahtar dýþarýdan alýndý\n"
-"%i gizli anahtar deðiþtirilmedi"
+
+msgid "No keys were found."
+msgstr "Hiçbir anahtar bulunamadý."
msgid ""
"Invalid time given.\n"
@@ -536,6 +526,12 @@ msgstr "Bu anahtar zaten kendiniz taraf
msgid "You haven't selected a default key to sign with!"
msgstr "Ýmzalamak için varsayýlan bir anahtar seçmediniz!"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr ""
+"Hangi anahtarý dýþarýdan almak istiyorsunuz? (Anahtar, kimliði ile "
+"belirtilmeli)."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr ""
"Hangi anahtarý dýþarýdan almak istiyorsunuz? (Anahtar, kimliði ile "
@@ -892,6 +888,28 @@ msgstr "Anahtar sadece
msgid "This key is useless."
msgstr "Bu anahtar iþe yaramaz."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i genel anahtar okundu\n"
+"%i genel anahtar dýþarýdan alýndý\n"
+"%i genel anahtar deðiþtirilmedi\n"
+"%i gizli anahtar okundu\n"
+"%i gizli anahtar dýþarýdan alýndý\n"
+"%i gizli anahtar deðiþtirilmedi"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -917,14 +935,6 @@ msgid "Invalid character in comments."
msgstr ""
#, fuzzy
-msgid "Error"
-msgstr "GPA Hatasý"
-
-#, fuzzy
-msgid "Message"
-msgstr "GPA Mesajý"
-
-#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "GNU Gizlilik Asistanýný Anlamak"
@@ -1306,6 +1316,14 @@ msgid "Retrieve keys from server"
msgstr ""
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "Anahtarý Kaldýr"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "/Anahtarlarý Sunucuya _Gönder..."
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/Anahtarlarý Ým_zala..."
@@ -2260,6 +2278,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Error"
+#~ msgstr "GPA Hatasý"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA Mesajý"
+
+#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Gizlilik Asistaný - Dosya Yöneticisi"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9193b85..4d86b05 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -494,24 +494,14 @@ msgstr "
msgid "Import keys from file"
msgstr "¥ÑÀɮפ¤¶×¤J¤½Æ_"
-msgid "No keys were found."
-msgstr "§ä¤£¨ì±KÆ_."
-
#, c-format
msgid ""
-"%i public keys read\n"
-"%i public keys imported\n"
-"%i public keys unchanged\n"
-"%i secret keys read\n"
-"%i secret keys imported\n"
-"%i secret keys unchanged"
+"More than %d keys match your search pattern.\n"
+"Use the long keyid or a fingerprint for a better match"
msgstr ""
-"%i ¤½Æ_³QŪ¨ú\n"
-"%i ¤½Æ_¤w¶×¤J\n"
-"%i ¤½Æ_¨S§ïÅÜ\n"
-"%i ¨pÆ_³QŪ¨ú\n"
-"%i ¨pÆ_¤w¶×¤J\n"
-"%i ¨pÆ_¤w¶×¤J"
+
+msgid "No keys were found."
+msgstr "§ä¤£¨ì±KÆ_."
msgid ""
"Invalid time given.\n"
@@ -536,6 +526,10 @@ msgstr "
msgid "You haven't selected a default key to sign with!"
msgstr "¨S¦³¿ï¾Ü¹w³]ñ¸pªº±KÆ_!"
+#, fuzzy
+msgid "Which key do you want to import?"
+msgstr "¿ï¾Ün¶×¤Jªº±KÆ_. (½Ð¥²¶·´£¨Ñ±KÆ_ªº§Ç¸¹)."
+
msgid "Which key do you want to import? (The key must be specified by key ID)."
msgstr "¿ï¾Ün¶×¤Jªº±KÆ_. (½Ð¥²¶·´£¨Ñ±KÆ_ªº§Ç¸¹)."
@@ -885,6 +879,28 @@ msgstr "
msgid "This key is useless."
msgstr "±KÆ_¬O¤£¥i¨Ï¥Îªº."
+#, c-format
+msgid ""
+"%u file(s) read\n"
+"%u file(s) with errors"
+msgstr ""
+
+#, c-format
+msgid ""
+"%i public keys read\n"
+"%i public keys imported\n"
+"%i public keys unchanged\n"
+"%i secret keys read\n"
+"%i secret keys imported\n"
+"%i secret keys unchanged"
+msgstr ""
+"%i ¤½Æ_³QŪ¨ú\n"
+"%i ¤½Æ_¤w¶×¤J\n"
+"%i ¤½Æ_¨S§ïÅÜ\n"
+"%i ¨pÆ_³QŪ¨ú\n"
+"%i ¨pÆ_¤w¶×¤J\n"
+"%i ¨pÆ_¤w¶×¤J"
+
msgid "A required engine component is not installed."
msgstr ""
@@ -910,14 +926,6 @@ msgid "Invalid character in comments."
msgstr ""
#, fuzzy
-msgid "Error"
-msgstr "GPA ¿ù»~"
-
-#, fuzzy
-msgid "Message"
-msgstr "GPA °T®§"
-
-#, fuzzy
msgid "GPA is the GNU Privacy Assistant."
msgstr "¤F¸ÑGNU Privacy Assistant"
@@ -1289,6 +1297,14 @@ msgid "Retrieve keys from server"
msgstr ""
#, fuzzy
+msgid "Re_fresh Keys"
+msgstr "²¾°£±KÆ_"
+
+#, fuzzy
+msgid "Refresh keys from server"
+msgstr "±H¥X¤½Æ_¨ì¦øªA¾¹... (&N)"
+
+#, fuzzy
msgid "_Send Keys..."
msgstr "/ñ¸p¤½Æ_... (&S)"
@@ -2230,6 +2246,14 @@ msgid ""
msgstr ""
#, fuzzy
+#~ msgid "Error"
+#~ msgstr "GPA ¿ù»~"
+
+#, fuzzy
+#~ msgid "Message"
+#~ msgstr "GPA °T®§"
+
+#, fuzzy
#~ msgid "GNU Privacy Assistant - Clipboard"
#~ msgstr "GNU Privacy Assistant - Àɮ׺޲z"
commit 719bbe7ae59e0dfd7bd3951a01d5d31e80771800
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 19 10:34:32 2014 +0100
Get rid of Gtk+ warning
* src/server-access.c (wait_dialog): Remove GTK_DIALOG_NO_SEPARATOR.
--
The warning when used with GnupG < 2.1 was:
Gtk-WARNING **: The GTK_DIALOG_NO_SEPARATOR flag cannot be used for
GtkMessageDialog
diff --git a/src/server-access.c b/src/server-access.c
index 18ecdca..74bc3f5 100644
--- a/src/server-access.c
+++ b/src/server-access.c
@@ -359,7 +359,7 @@ wait_dialog (const gchar *server, GtkWidget *parent)
{
GtkWidget *dialog =
gtk_message_dialog_new (GTK_WINDOW (parent),
- GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_MODAL,
GTK_MESSAGE_INFO, GTK_BUTTONS_NONE,
_("Connecting to server \"%s\".\n"
"Please wait."), server);
commit 7fdf8d8f097ddd27267d8e6186a561748a60add2
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 19 10:34:32 2014 +0100
Add a Refresh Key function to the key manager's context menu.
* src/gpaimportbykeyidop.c: New.
* src/gpaimportbykeyidop.h: New.
* src/keymanager.c (key_manager_refresh_keys): New.
(key_manager_action_new): Add ServerRefresh Action top the popup.
--
This is currently limited to one key. It won't be complicated to
allow several keys but this has not been done because it is better
to first write code to get an array of gpgme key objects from the key
manager's selection instead of passing the selection (which has only
opaque types) to the import functions.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a2a408..6a2ab71 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,6 +96,7 @@ if ENABLE_KEYSERVER_SUPPORT
keyserver_support_sources = \
server-access.c \
gpaimportserverop.c \
+ gpaimportbykeyidop.c \
gpaexportserverop.c
else
keyserver_support_sources =
@@ -169,6 +170,7 @@ gpa_SOURCES = \
gpaimportfileop.h gpaimportfileop.c \
gpaimportclipop.h gpaimportclipop.c \
gpaimportserverop.h \
+ gpaimportbykeyidop.h \
gpagenkeyop.h gpagenkeyop.c \
gpagenkeyadvop.h gpagenkeyadvop.c \
gpagenkeysimpleop.h gpagenkeysimpleop.c \
diff --git a/src/gpaimportbykeyidop.c b/src/gpaimportbykeyidop.c
new file mode 100644
index 0000000..8e5d5ce
--- /dev/null
+++ b/src/gpaimportbykeyidop.c
@@ -0,0 +1,189 @@
+/* gpaimportbykeyidop.c - The GpaImportByKeyidOperation object.
+ * Copyright (C) 2014 g10 Code GmbH
+ *
+ * This file is part of GPA
+ *
+ * GPA is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPA is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <gpgme.h>
+#include <unistd.h>
+#include "gpa.h"
+#include "i18n.h"
+#include "gtktools.h"
+#include "gpaimportbykeyidop.h"
+#include "server-access.h"
+
+
+static GObjectClass *parent_class = NULL;
+
+static gboolean
+gpa_import_bykeyid_operation_get_source (GpaImportOperation *operation);
+static void
+gpa_import_bykeyid_operation_complete_import (GpaImportOperation *operation);
+
+/* GObject boilerplate */
+
+static void
+gpa_import_bykeyid_operation_finalize (GObject *object)
+{
+ GpaImportByKeyidOperation *op = GPA_IMPORT_BYKEYID_OPERATION (object);
+
+ gpgme_key_unref (op->key);
+ op->key = NULL;
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static void
+gpa_import_bykeyid_operation_init (GpaImportByKeyidOperation *op)
+{
+ op->key = NULL;
+}
+
+
+static GObject*
+gpa_import_bykeyid_operation_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
+{
+ GObject *object;
+ /* GpaImportByKeyidOperation *op; */
+
+ /* Invoke parent's constructor */
+ object = parent_class->constructor (type,
+ n_construct_properties,
+ construct_properties);
+ /* op = GPA_IMPORT_BYKEYID_OPERATION (object); */
+
+ return object;
+}
+
+
+static void
+gpa_import_bykeyid_operation_class_init (GpaImportByKeyidOperationClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GpaImportOperationClass *import_class = GPA_IMPORT_OPERATION_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->constructor = gpa_import_bykeyid_operation_constructor;
+ object_class->finalize = gpa_import_bykeyid_operation_finalize;
+
+ import_class->get_source = gpa_import_bykeyid_operation_get_source;
+ import_class->complete_import = gpa_import_bykeyid_operation_complete_import;
+}
+
+
+GType
+gpa_import_bykeyid_operation_get_type (void)
+{
+ static GType type = 0;
+
+ if (!type)
+ {
+ static const GTypeInfo info =
+ {
+ sizeof (GpaImportByKeyidOperationClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gpa_import_bykeyid_operation_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GpaImportByKeyidOperation),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gpa_import_bykeyid_operation_init,
+ };
+
+ type = g_type_register_static (GPA_IMPORT_OPERATION_TYPE,
+ "GpaImportByKeyidOperation",
+ &info, 0);
+ }
+
+ return type;
+}
+
+
+/* Virtual methods */
+
+static gboolean
+gpa_import_bykeyid_operation_get_source (GpaImportOperation *operation)
+{
+ GpaImportByKeyidOperation *op = GPA_IMPORT_BYKEYID_OPERATION (operation);
+ int i;
+
+ /* Better reset the source variables. */
+ gpgme_data_release (operation->source);
+ operation->source = NULL;
+ if (operation->source2)
+ {
+ for (i=0; operation->source2[i]; i++)
+ gpgme_key_unref (operation->source2[i]);
+ g_free (operation->source2);
+ operation->source2 = NULL;
+ }
+
+ if (!op->key
+ || op->key->protocol != GPGME_PROTOCOL_OpenPGP
+ || !op->key->subkeys
+ || !op->key->subkeys->keyid
+ || !*op->key->subkeys->keyid)
+ ;
+ else if (is_gpg_version_at_least ("2.1.0"))
+ {
+ operation->source2 = g_malloc0_n (1 + 1, sizeof *operation->source2);
+ gpgme_key_ref (op->key);
+ operation->source2[0] = op->key;
+ return TRUE;
+ }
+ else
+ {
+
+ if (server_get_key (gpa_options_get_default_keyserver
+ (gpa_options_get_instance ()),
+ op->key->subkeys->keyid,
+ &operation->source, GPA_OPERATION (op)->window))
+ {
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+
+static void
+gpa_import_bykeyid_operation_complete_import (GpaImportOperation *operation)
+{
+ (void)operation;
+}
+
+
+/* API */
+
+GpaImportByKeyidOperation*
+gpa_import_bykeyid_operation_new (GtkWidget *window, gpgme_key_t key)
+{
+ GpaImportByKeyidOperation *op;
+
+ op = g_object_new (GPA_IMPORT_BYKEYID_OPERATION_TYPE,
+ "window", window, NULL);
+ gpgme_key_ref (key);
+ op->key = key;
+
+ return op;
+}
diff --git a/src/gpaimportbykeyidop.h b/src/gpaimportbykeyidop.h
new file mode 100644
index 0000000..4fdc7e7
--- /dev/null
+++ b/src/gpaimportbykeyidop.h
@@ -0,0 +1,77 @@
+/* gpaimportbykeyidop.h - The GpaImportByKeyidOperation object.
+ * Copyright (C) 2014 g10 Code GmbH
+ *
+ * This file is part of GPA
+ *
+ * GPA is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GPA is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GPA_IMPORT_BYKEYID_OP_H
+#define GPA_IMPORT_BYKEYID_OP_H
+#ifdef ENABLE_KEYSERVER_SUPPORT
+
+#include "gpa.h"
+#include <glib.h>
+#include <glib-object.h>
+#include "gpaimportop.h"
+
+/* GObject stuff */
+#define GPA_IMPORT_BYKEYID_OPERATION_TYPE \
+ (gpa_import_bykeyid_operation_get_type ())
+
+#define GPA_IMPORT_BYKEYID_OPERATION(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GPA_IMPORT_BYKEYID_OPERATION_TYPE,\
+ GpaImportByKeyidOperation))
+
+#define GPA_IMPORT_BYKEYID_OPERATION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), GPA_IMPORT_BYKEYID_OPERATION_TYPE, \
+ GpaImportByKeyidOperationClass))
+
+#define GPA_IS_IMPORT_BYKEYID_OPERATION(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GPA_IMPORT_BYKEYID_OPERATION_TYPE))
+
+#define GPA_IS_IMPORT_BYKEYID_OPERATION_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), GPA_IMPORT_BYKEYID_OPERATION_TYPE))
+
+#define GPA_IMPORT_BYKEYID_OPERATION_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), GPA_IMPORT_BYKEYID_OPERATION_TYPE, \
+ GpaImportByKeyidOperationClass))
+
+typedef struct _GpaImportByKeyidOperation GpaImportByKeyidOperation;
+typedef struct _GpaImportByKeyidOperationClass GpaImportByKeyidOperationClass;
+
+struct _GpaImportByKeyidOperation
+{
+ GpaImportOperation parent;
+
+ gpgme_key_t key;
+};
+
+
+struct _GpaImportByKeyidOperationClass
+{
+ GpaImportOperationClass parent_class;
+};
+
+
+GType gpa_import_bykeyid_operation_get_type (void) G_GNUC_CONST;
+
+/* API */
+
+/* Creates a new import by keyid operation. */
+GpaImportByKeyidOperation *
+gpa_import_bykeyid_operation_new (GtkWidget *window, gpgme_key_t key);
+
+#endif /*ENABLE_KEYSERVER_SUPPORT*/
+#endif /*GPA_IMPORT_BYKEYID_OP_H*/
diff --git a/src/keymanager.c b/src/keymanager.c
index 84baf6a..d78eb94 100644
--- a/src/keymanager.c
+++ b/src/keymanager.c
@@ -61,6 +61,7 @@
#include "gpaimportfileop.h"
#include "gpaimportclipop.h"
#include "gpaimportserverop.h"
+#include "gpaimportbykeyidop.h"
#include "gpabackupop.h"
@@ -549,6 +550,32 @@ key_manager_retrieve (GtkAction *action, gpointer param)
#endif /*ENABLE_KEYSERVER_SUPPORT*/
+/* Refresh keys from the keyserver. */
+#ifdef ENABLE_KEYSERVER_SUPPORT
+static void
+key_manager_refresh_keys (GtkAction *action, gpointer param)
+{
+ GpaKeyManager *self = param;
+ GpaImportByKeyidOperation *op;
+ GList *selection;
+
+ /* FIXME: The refresh-from-server operation currently only supports
+ one key at a time. */
+ if (!key_manager_has_single_selection (self))
+ return;
+
+ selection = gpa_keylist_get_selected_keys (self->keylist,
+ GPGME_PROTOCOL_OPENPGP);
+ if (selection)
+ {
+ op = gpa_import_bykeyid_operation_new (GTK_WIDGET (self),
+ (gpgme_key_t) selection->data);
+ register_import_operation (self, GPA_IMPORT_OPERATION (op));
+ }
+}
+#endif /*ENABLE_KEYSERVER_SUPPORT*/
+
+
/* Send a key to the keyserver. */
#ifdef ENABLE_KEYSERVER_SUPPORT
static void
@@ -889,8 +916,8 @@ keyring_set_listing_cb (GtkAction *action,
/* Create and return the menu bar for the key ring editor. */
static void
key_manager_action_new (GpaKeyManager *self,
- GtkWidget **menu, GtkWidget **toolbar,
- GtkWidget **popup)
+ GtkWidget **menu, GtkWidget **toolbar,
+ GtkWidget **popup)
{
static const GtkActionEntry entries[] =
{
@@ -944,6 +971,9 @@ key_manager_action_new (GpaKeyManager *self,
{ "ServerRetrieve", NULL, N_("_Retrieve Keys..."), NULL,
N_("Retrieve keys from server"),
G_CALLBACK (key_manager_retrieve) },
+ { "ServerRefresh", NULL, N_("Re_fresh Keys"), NULL,
+ N_("Refresh keys from server"),
+ G_CALLBACK (key_manager_refresh_keys) },
{ "ServerSend", NULL, N_("_Send Keys..."), NULL,
N_("Send keys to server"), G_CALLBACK (key_manager_send) }
#endif /*ENABLE_KEYSERVER_SUPPORT*/
@@ -1042,6 +1072,7 @@ key_manager_action_new (GpaKeyManager *self,
" <separator/>"
" <menuitem action='KeysExport'/>"
#ifdef ENABLE_KEYSERVER_SUPPORT
+ " <menuitem action='ServerRefresh'/>"
" <menuitem action='ServerSend'/>"
#endif
" <menuitem action='KeysBackup'/>"
@@ -1117,6 +1148,9 @@ key_manager_action_new (GpaKeyManager *self,
key_manager_has_selection);
#ifdef ENABLE_KEYSERVER_SUPPORT
+ action = gtk_action_group_get_action (action_group, "ServerRefresh");
+ add_selection_sensitive_action (self, action,
+ key_manager_has_single_selection);
action = gtk_action_group_get_action (action_group, "ServerSend");
add_selection_sensitive_action (self, action,
key_manager_has_single_selection);
commit 1a51becdf8f741be7083306f9000f97e283376fd
Author: Zdeněk Hataš <zdenek.hatas at gmail.com>
Date: Thu Sep 11 09:20:32 2014 +0200
po: Update Czech translation
diff --git a/po/cs.po b/po/cs.po
index 22b55ec..9fa3f8b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"PO-Revision-Date: 2014-06-05 08:46+0100\n"
+"PO-Revision-Date: 2014-09-11 09:17+0100\n"
"Last-Translator: Zdeněk Hataš <zdenek.hatas at gmail.com>\n"
"Language-Team: czech <cs at li.org>\n"
"Language: cs\n"
@@ -269,9 +269,8 @@ msgstr "OtevÅ™Ãt schránku"
msgid "Open the settings dialog"
msgstr "OtevÅ™Ãt dialog nastavenÃ"
-#, fuzzy
msgid "Only start the UI server"
-msgstr "Povolit UI server"
+msgstr "Spustit pouze UI server"
msgid "Disable support for X.509"
msgstr "Vypnout podporu pro X.509"
@@ -280,7 +279,7 @@ msgid "Read options from file"
msgstr "ÄŒÃst možnosti ze souboru"
msgid "Do not connect to a running instance"
-msgstr ""
+msgstr "NepÅ™ipojujte se k běžÃcà instanci"
msgid "[FILE...]"
msgstr "[SOUBOR...]"
@@ -334,9 +333,9 @@ msgstr "V průběhu zálohovánà došlo k chybě."
msgid "Backup key to file"
msgstr "Zálohovat klÃÄ do souboru"
-#, fuzzy, c-format
+#, c-format
msgid "Generating backup of key: 0x%s"
-msgstr "Vytvářà se zálohu klÃÄe: %s"
+msgstr "Vytvářà se zálohu klÃÄe: 0x%s"
msgid "The keys have been copied to the clipboard."
msgstr "KlÃÄe byly zkopÃrovány do schránky."
@@ -536,47 +535,44 @@ msgstr "ID podklÃÄe"
msgid "Status"
msgstr "Stav"
-#, fuzzy
msgid "Algo"
msgstr "Algoritmus"
msgid "Size"
msgstr "Velikost"
-#, fuzzy
msgid "Created"
-msgstr "Vytvořen:"
+msgstr "Vytvořen"
-#, fuzzy
msgid "Expires"
-msgstr "Vypršela platnost"
+msgstr "Vypršà platnost"
msgid "S"
-msgstr ""
+msgstr "P"
msgid "Can sign"
msgstr "Smà podepisovat"
msgid "C"
-msgstr ""
+msgstr "C"
msgid "Can certify"
msgstr "Smà certifikovat"
msgid "E"
-msgstr ""
+msgstr "Å "
msgid "Can encrypt"
msgstr "Smà šifrovat"
msgid "A"
-msgstr ""
+msgstr "A"
msgid "Can authenticate"
msgstr "Smà autentizovat"
msgid "T"
-msgstr ""
+msgstr "K"
msgid "Secret key stored on a smartcard."
msgstr "Soukromý klÃÄ byl uložen na kartÄ›."
@@ -1118,9 +1114,8 @@ msgstr ""
msgid "The key ID is a short number to identify a certificate."
msgstr "ID klÃÄe je krátké ÄÃslo k identifikaci certifikátu."
-#, fuzzy
msgid "The Creation Date is the date the certificate was created."
-msgstr "Datum vypršenà je datum, do kterého je certifikát platný."
+msgstr "Datum vytvořenà je datum, kdy byl certifikát vytvořen."
msgid "The Expiry Date is the date until the certificate is valid."
msgstr "Datum vypršenà je datum, do kterého je certifikát platný."
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
NEWS | 12 ++-
configure.ac | 4 +-
po/ar.po | 73 +++++++++++-------
po/cs.po | 97 ++++++++++++++----------
po/de.po | 14 ++--
po/es.po | 74 +++++++++++-------
po/fr.po | 72 ++++++++++++------
po/ja.po | 68 +++++++++++------
po/nl.po | 70 +++++++++++------
po/pl.po | 73 +++++++++++-------
po/pt_BR.po | 71 ++++++++++-------
po/ru.po | 73 +++++++++++-------
po/sv.po | 75 +++++++++++-------
po/tr.po | 72 ++++++++++++------
po/zh_TW.po | 70 +++++++++++------
src/Makefile.am | 2 +
src/gpaimportbykeyidop.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++
src/gpaimportbykeyidop.h | 77 +++++++++++++++++++
src/keymanager.c | 38 +++++++++-
src/server-access.c | 2 +-
21 files changed, 907 insertions(+), 320 deletions(-)
create mode 100644 src/gpaimportbykeyidop.c
create mode 100644 src/gpaimportbykeyidop.h
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list