[git] GPA - branch, master, updated. gpa-0.9.6-7-g404f5d7
by Werner Koch
cvs at cvs.gnupg.org
Mon Dec 8 17:38:52 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 404f5d7396ac83d78fade4cfadd3df96ae44c5fa (commit)
via fbbc5ce0e0fe66ff1d58420394b3be610306eafb (commit)
from 3e643a33b9f2d5cbc229e5c1efc086c6aec65243 (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 404f5d7396ac83d78fade4cfadd3df96ae44c5fa
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 8 17:39:28 2014 +0100
po: Use the term "USB stick" for the backup message.
--
diff --git a/po/de.po b/po/de.po
index 2b054d3..0a21488 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-12-08 11:35+0100\n"
+"PO-Revision-Date: 2014-12-08 17:36+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -333,13 +333,14 @@ msgid ""
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, on a flash memory kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Eine Kopie Ihres geheimen Schlüssels wurde abgespeichert in der Datei:\n"
"\n"
"\t\"%s\"\n"
"\n"
-"Dies ist eine sicherheitskritische Information und muss sicher gespeichert werden\n"
+"Dies ist eine sicherheitskritische Information und muss sicher gespeichert "
+"werden\n"
"(z.B. auf einem USB Stick, der an einem sicheren Ort verwahrt wird)."
msgid "An error ocurred during the backup operation."
diff --git a/po/fr.po b/po/fr.po
index f32cdf8..72ef2f4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPA 0.8.0\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"PO-Revision-Date: 2011-12-12 10:12+0100\n"
+"PO-Revision-Date: 2014-12-08 17:37+0100\n"
"Last-Translator: Eric Lassauge <lassauge at users.sf.net>\n"
"Language-Team: <fr at li.org>\n"
"Language: fr\n"
@@ -150,6 +150,23 @@ msgstr "Avancé"
msgid "Expert"
msgstr "Expert"
+msgid "A keyserver has not been configured."
+msgstr ""
+
+#, fuzzy
+msgid "Configure backend to use a keyserver?"
+msgstr "Configurer les programmes « backend »"
+
+msgid "_Yes"
+msgstr "_Oui"
+
+msgid "_No"
+msgstr "_Non"
+
+#, fuzzy
+msgid "Configuring the backend to use a keyserver failed"
+msgstr "Configurer les programmes « backend »"
+
msgid "days"
msgstr "jours"
@@ -327,7 +344,7 @@ msgid ""
"\t\"%s\"\n"
"\n"
"This is sensitive information, and should be stored carefully\n"
-"(for example, in a floppy disk kept in a safe place)."
+"(for example, on a USB stick kept in a safe place)."
msgstr ""
"Une copie de votre clef secrète a été faite dans le fichier :\n"
"\n"
@@ -362,21 +379,22 @@ msgstr "Les clefs ont été exportées dans %s."
msgid "Only keys of the same procotol may be exported as a collection."
msgstr ""
-#, c-format
+#, fuzzy, c-format
msgid ""
-"The selected key will be sent to a public key\n"
-"server (\"%s\").\n"
-"Are you sure you want to distribute this key?"
+"The selected key(s) will be sent to a public key\n"
+"server (\"%s\")."
msgstr ""
"La clé sélectionnée sera envoyée au serveur de\n"
"clé publique (« %s »).\n"
"Êtes-vous certain de vouloir distribuer cette clé ?"
-msgid "_Yes"
-msgstr "_Oui"
+#, fuzzy
+msgid "Are you sure you want to distribute this key?"
+msgstr "Êtes-vous certain de vouloir effacer cette clef ?"
-msgid "_No"
-msgstr "_Non"
+#, fuzzy
+msgid "Error sending key(s) to the server."
+msgstr "Envoi de clefs au serveur"
msgid "The keys have been sent to the server."
msgstr "Les clés ont été envoyées au serveur."
@@ -2025,7 +2043,7 @@ msgid ""
"\n"
"A fresh standard card has set the Admin-PIN to the value <i>12345678</i>. "
"However, the issuer of your card might have initialized the card with a "
-"different Admin-PIN and that Admin-PIN might only be nown to the issuer. "
+"different Admin-PIN and that Admin-PIN might only be known to the issuer. "
"Please check the instructions of your issuer.\n"
"\n"
"If you proceed you will be asked to enter the current value of the <b>Admin-"
diff --git a/src/gpabackupop.c b/src/gpabackupop.c
index 5ff5921..316dbb0 100644
--- a/src/gpabackupop.c
+++ b/src/gpabackupop.c
@@ -223,7 +223,7 @@ gpa_backup_operation_do_backup (GpaBackupOperation *op, gchar *filename)
"\t\"%s\"\n\n"
"This is sensitive information, "
"and should be stored carefully\n"
- "(for example, on a flash memory "
+ "(for example, on a USB stick "
"kept in a safe place)."),
filename);
gpa_window_message (message, GPA_OPERATION (op)->window);
commit fbbc5ce0e0fe66ff1d58420394b3be610306eafb
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 8 11:46:01 2014 +0100
Add another OpenPGP card vendor.
--
To ease these things we should provide an API to read this list from
GnuPG.
diff --git a/src/cm-openpgp.c b/src/cm-openpgp.c
index b559dcd..cd901e0 100644
--- a/src/cm-openpgp.c
+++ b/src/cm-openpgp.c
@@ -140,6 +140,8 @@ get_manufacturer (unsigned int no)
case 0x002A: return "Magrathea";
+ case 0x1337: return "Warsaw Hackerspace";
+
case 0xF517: return "FSIJ";
/* 0x0000 and 0xFFFF are defined as test cards per spec,
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 7 ++++---
po/fr.po | 40 +++++++++++++++++++++++++++++-----------
src/cm-openpgp.c | 2 ++
src/gpabackupop.c | 2 +-
4 files changed, 36 insertions(+), 15 deletions(-)
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list