Re: Security issue / bad UI design in mutt CVS (encryption options)
On 8-Aug-2004 14:53 Thomas Roessler wrote:
|
| Since they also have to translate the shortcut string, that should
| better be the case.
Attached are two patches.
The first updates all .po files (including the previously broken
bg.po) to use the four new menu prompt strings. Notes:
1. The "(i)nline" and "PGP/M(i)ME" entries always use the same
key, even if it isn't (i).
2. Some S/MIME menus were still referencing the "mic" stuff,
so they were fixed accordingly. I think zh_TW.po and
zh_CN.po were untouched for this change.
3. Some S/MIME entries had their menu prompts updated to include
the "encrypt (w)ith" option, but the translation was not
updated with a key (any key) inserted into the correct
location. In some cases it was possible to include the
option in the menu prompt, but in others it was not.
Either way, an appropriate key was put into the correct
place in the string.
4. "(f)orget it" was translated literally in a few cases
(e.g. fr.po) and to something akin to "cancel" in quite
a few others. Most of them were updated to a semantically
more correct value (i.e. clear/erase).
5. zh_CN.po and/or zh_TW.po contains mostly wrong info for
the PGP and S/MIME menu/key entries.
6. Some translations of "inline" used a key other than (i),
but these were updated where possible to use a key that
was also in "PGP/MIME", such as (e) or even (g). Chars
already used elsewhere in the translation were never
candidates.
The second patch adds a variable crypt_menu_toggle (default
is off) that allows one to have the previous toggle behaviour
for encrypt/sign/both. Even if the non-toggle behaviour is
mostly preferred, it would still be nice to support the
toggle behaviour optionally.
--
-dale
Index: po/bg.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/bg.po,v
retrieving revision 1.6
diff --unified -r1.6 bg.po
--- po/bg.po 1 Feb 2004 18:26:11 -0000 1.6
+++ po/bg.po 10 Aug 2004 01:13:48 -0000
@@ -573,13 +573,12 @@
msgstr "Øèôðîâàíå c: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "
-msgstr ""
-"PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b) èëè áåç òÿõ(f)?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP øèôðîâàíå(e), ïîäïèñ(s), ïîäïèñ êàòî(a), è äâåòå(b), %s, èëè
èçòðèâàíå(c)?"
#: compose.c:166
-msgid "esabf"
-msgstr "esabf"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -588,14 +587,14 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"S/MIME øèôðîâàíå(e), ïîäïèñ(s), øèôðîâàíå ñ(w), ïîäïèñ êàòî(a), è äâåòå(b) "
-"èëè áåç òÿõ(f)?"
+"S/MIME øèôðîâàíå(e), ïîäïèñ(s), øèôðîâàíå ñ(w), ïîäïèñ êàòî(a), è äâåòå(b), "
+"èëè èçòðèâàíå(c)?"
#: compose.c:228
-msgid "eswabf"
-msgstr "eswabf"
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4200,3 +4199,9 @@
#~ msgid "ewsabf"
#~ msgstr "ewsabf"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "ïðèëîæåíà(i)"
Index: po/ca.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/ca.po,v
retrieving revision 3.15
diff --unified -r3.15 ca.po
--- po/ca.po 12 Apr 2004 21:19:27 -0000 3.15
+++ po/ca.po 10 Aug 2004 01:13:49 -0000
@@ -599,14 +599,14 @@
msgstr "Xifra amb: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, en (l)ínia, o en
(c)lar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o (n)eteja? "
# ivb (2003/03/26)
-# ivb (x)ifra, (s)igna, si(g)na com a, (a)mbdós, en (l)ínia, o en (c)lar
+# PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o (n)eteja?
#: compose.c:166
-msgid "esabif"
-msgstr "xsgalc"
+msgid "esabifc"
+msgstr "xsgaicn"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -615,15 +615,15 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"S/MIME: (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar? "
+"S/MIME: (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o (n)eteja? "
# ivb (2003/03/26)
# ivb (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar
#: compose.c:228
-msgid "eswabf"
-msgstr "xsfgac"
+msgid "eswabfc"
+msgstr "xsfgacn"
#: compose.c:236
msgid ""
@@ -4333,3 +4333,9 @@
#: thread.c:1087
msgid "Parent message is not available."
msgstr "El missatge pare no es troba disponible."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "en lín(i)a"
Index: po/cs.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/cs.po,v
retrieving revision 3.13
diff --unified -r3.13 cs.po
--- po/cs.po 12 Apr 2004 21:19:28 -0000 3.13
+++ po/cs.po 10 Aug 2004 01:13:49 -0000
@@ -681,13 +681,13 @@
#
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP - (¹)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, pøí(m)ý, èi
(n)ic?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP - (¹)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, %s, èi
(s)mazat?"
#
#: compose.c:166
-msgid "esabif"
-msgstr "¹pjomn"
+msgid "esabifc"
+msgstr "¹pjoins"
#
#. sign (a)s
@@ -698,13 +698,14 @@
#
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "S/MIME - (s)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, èi (n)ic?"
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr ""
+"S/MIME - (s)ifrovat, (p)odepsat, podepsat (j)ako, (o)bojí, èi (s)mazat?"
#
#: compose.c:228
-msgid "eswabf"
-msgstr "spzjon"
+msgid "eswabfc"
+msgstr "spzjons"
#: compose.c:236
msgid ""
@@ -4983,3 +4984,9 @@
#~ msgid "Authentication method is unknown."
#~ msgstr "Neznámá autentikaèní metoda"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "pøímý(i)"
Index: po/da.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/da.po,v
retrieving revision 3.12
diff --unified -r3.12 da.po
--- po/da.po 12 Apr 2004 21:19:28 -0000 3.12
+++ po/da.po 10 Aug 2004 01:13:49 -0000
@@ -576,12 +576,12 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "(k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, i(n)tegreret,
(i)ngen PGP"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "(k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, %s, i(n)gen PGP"
#: compose.c:166
-msgid "esabif"
-msgstr "kusbni"
+msgid "esabifc"
+msgstr "kusbin"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -591,13 +591,14 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "(k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, (i)ngen PGP"
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr ""
+"(k)ryptér, (u)nderskriv, underskriv (s)om, (b)egge, i(n)gen PGP"
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "kusbi"
+msgid "eswabfc"
+msgstr "kuwsbin"
#: compose.c:236
msgid ""
@@ -4191,3 +4192,9 @@
#, fuzzy
#~ msgid "Certificate *NOT* added."
#~ msgstr "Certifikat gemt"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)ntegreret"
Index: po/de.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/de.po,v
retrieving revision 3.17
diff --unified -r3.17 de.po
--- po/de.po 12 Apr 2004 21:19:28 -0000 3.17
+++ po/de.po 10 Aug 2004 01:13:50 -0000
@@ -567,11 +567,11 @@
msgstr "Verschlüsseln mit: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr "PGP (v)erschl., (s)ign., sign. (a)ls, (b)eides, (i)nline, (k)ein PGP? "
#: compose.c:166
-msgid "esabif"
+msgid "esabifc"
msgstr "vsabik"
#. sign (a)s
@@ -581,12 +581,12 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
"S/MIME (v)erschl., (s)ign., verschl. (m)it, sign. (a)ls, (b)eides, (k)eins? "
#: compose.c:228
-msgid "eswabf"
+msgid "eswabfc"
msgstr "vsmabk"
#: compose.c:236
@@ -4218,3 +4218,9 @@
#~ msgid "Authentication method is unknown."
#~ msgstr "Authentifizierungsmethode unbekannt."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/el.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/el.po,v
retrieving revision 3.13
diff --unified -r3.13 el.po
--- po/el.po 12 Apr 2004 21:19:28 -0000 3.13
+++ po/el.po 10 Aug 2004 01:13:50 -0000
@@ -698,14 +698,14 @@
#
# compose.c:132
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)êåßìåíï, Þ (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)êåßìåíï, Þ êáèáñéóìüò(c)?
"
#
# compose.c:133
#: compose.c:166
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#
#. sign (a)s
@@ -717,16 +717,16 @@
# compose.c:132
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, Þ (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, Þ êáèáñéóìüò(c)?
"
#
# compose.c:133
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "esabf"
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -5037,3 +5037,9 @@
# compose.c:133
#~ msgid "ewsabf"
#~ msgstr "ewsabf"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)êåßìåíï"
Index: po/eo.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/eo.po,v
retrieving revision 3.14
diff --unified -r3.14 eo.po
--- po/eo.po 12 Apr 2004 21:19:28 -0000 3.14
+++ po/eo.po 10 Aug 2004 01:13:50 -0000
@@ -569,12 +569,12 @@
msgstr "Æifri per: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, \"i(n)line\", aý
(f)orgesi? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP æ(i)fri, (s)ubskribi, subskribi (k)iel, (a)mbaý, %s, aý (b)orrar? "
#: compose.c:166
-msgid "esabif"
-msgstr "iskanf"
+msgid "esabifc"
+msgstr "iskaefb"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -583,14 +583,14 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
"S/MIME æ(i)fri, (s)ubskribi, subskribi (p)er, subskribi (k)iel, (a)mbaý, aý "
-"(f)orgesi? "
+"(b)orrar? "
#: compose.c:228
-msgid "eswabf"
-msgstr "ispkaf"
+msgid "eswabfc"
+msgstr "ispkafb"
#: compose.c:236
msgid ""
@@ -4200,3 +4200,9 @@
#~ msgid "Authentication method is unknown."
#~ msgstr "Rajtiøo-metodo ne estas konata."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/MIM(e)"
+
+msgid "(i)nline"
+msgstr "\"inlin(e)\""
Index: po/es.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/es.po,v
retrieving revision 3.15
diff --unified -r3.15 es.po
--- po/es.po 12 Apr 2004 21:19:28 -0000 3.15
+++ po/es.po 10 Aug 2004 01:13:51 -0000
@@ -574,13 +574,13 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, inc(l)uido, o ca(n)celar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s, %s, o ca(n)celar? "
#: compose.c:166
#, fuzzy
-msgid "esabif"
+msgid "esabifc"
msgstr "dicoln"
#. sign (a)s
@@ -591,13 +591,13 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr "¿co(d)ificar, f(i)rmar (c)omo, amb(o)s o ca(n)celar? "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "dicon"
+msgid "eswabfc"
+msgstr "diwcon"
#: compose.c:236
msgid ""
@@ -4285,3 +4285,9 @@
#~ msgid "Authentication method is unknown."
#~ msgstr "Método de verificación de autentidad desconocido."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/MIME(l)"
+
+msgid "(i)nline"
+msgstr "inc(l)uido"
Index: po/et.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/et.po,v
retrieving revision 3.14
diff --unified -r3.14 et.po
--- po/et.po 12 Apr 2004 21:19:28 -0000 3.14
+++ po/et.po 10 Aug 2004 01:13:51 -0000
@@ -569,11 +569,11 @@
msgstr "Krüpti kasutades: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, k(e)hasse, või
(u)nusta? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad, %s, või p(u)hasta? "
#: compose.c:166
-msgid "esabif"
+msgid "esabifc"
msgstr "kaimeu"
#. sign (a)s
@@ -583,13 +583,13 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "S/MIME (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad või (u)nusta? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr "S/MIME (k)rüpti, (a)llkiri, allk. ku(i), (m)õlemad või p(u)hasta? "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "kaimu"
+msgid "eswabfc"
+msgstr "kawimu"
#: compose.c:236
msgid ""
@@ -4167,3 +4167,9 @@
#~ msgid "ewsabf"
#~ msgstr "kaimu"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/MIM(e)"
+
+msgid "(i)nline"
+msgstr "k(e)hasse"
Index: po/fr.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/fr.po,v
retrieving revision 3.25
diff --unified -r3.25 fr.po
--- po/fr.po 12 Apr 2004 21:19:28 -0000 3.25
+++ po/fr.po 10 Aug 2004 01:13:51 -0000
@@ -594,12 +594,12 @@
msgstr "Chiffrer avec : "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, en (l)igne, ou
(o)ublier ? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, %s, ou e(f)facer?
"
#: compose.c:166
-msgid "esabif"
-msgstr "csedlo"
+msgid "esabifc"
+msgstr "csediof"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -608,14 +608,13 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"(c)hiffr S/MIME, (s)ign, ch. (a)vec, s. (e)n tant que, les (d)eux, (o)"
-"ublier ? "
+"(c)hiffr S/MIME, (s)ign, ch. (a)vec, s. (e)n tant que, les (d)eux, e(f)facer?
"
#: compose.c:228
msgid "eswabf"
-msgstr "csaedo"
+msgstr "csaedof"
#: compose.c:236
msgid ""
@@ -4328,3 +4327,9 @@
#: thread.c:1087
msgid "Parent message is not available."
msgstr "Le message père n'est pas disponible."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "en l(i)gne"
Index: po/gl.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/gl.po,v
retrieving revision 3.12
diff --unified -r3.12 gl.po
--- po/gl.po 12 Apr 2004 21:19:29 -0000 3.12
+++ po/gl.po 10 Aug 2004 01:13:52 -0000
@@ -578,12 +578,12 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou
(o)lvidar? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas, (i)nterior, ou
(l)impar? "
#: compose.c:166
-msgid "esabif"
-msgstr "efcaio"
+msgid "esabifc"
+msgstr "efcaiol"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -593,13 +593,13 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas ou (o)lvidar? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr "¿(e)ncriptar, (f)irmar, firmar (c)omo, (a)mbas ou (l)impar? "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "efcao"
+msgid "eswabfc"
+msgstr "efwcaol"
#: compose.c:236
msgid ""
@@ -4474,3 +4474,9 @@
#~ msgid "Saved output of child process to %s.\n"
#~ msgstr "Gardada saída do proceso fillo a %s.\n"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nterior"
Index: po/hu.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/hu.po,v
retrieving revision 3.13
diff --unified -r3.13 hu.po
--- po/hu.po 12 Apr 2004 21:19:29 -0000 3.13
+++ po/hu.po 10 Aug 2004 01:13:52 -0000
@@ -569,12 +569,12 @@
msgstr "Titkosítás: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír,
(b)eágyazott, mé(g)se? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (t)itkosít, (a)láír, aláír (m)int, titkosít é(s) aláír, %s,
tör(l)ése? "
#: compose.c:166
-msgid "esabif"
-msgstr "tamsbg"
+msgid "esabifc"
+msgstr "tamsegl"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -583,14 +583,14 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
"S/MIME (t)itkosít, (a)láír, titkosít (p)rg, aláír (m)int, titkosít é(s) "
-"aláír, mé(g)se? "
+"aláír, tör(l)ése? "
#: compose.c:228
-msgid "eswabf"
-msgstr "tapmsg"
+msgid "eswabfc"
+msgstr "tapmsgl"
#: compose.c:236
msgid ""
@@ -4161,3 +4161,9 @@
#: thread.c:1087
msgid "Parent message is not available."
msgstr "A nyitóüzenet nem áll rendelkezésre."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/MIM(e)"
+
+msgid "(i)nline"
+msgstr "b(e)ágyazott"
Index: po/id.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/id.po,v
retrieving revision 3.15
diff --unified -r3.15 id.po
--- po/id.po 12 Apr 2004 21:19:29 -0000 3.15
+++ po/id.po 10 Aug 2004 01:13:52 -0000
@@ -570,11 +570,11 @@
msgstr "Enkrip dengan: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, (i)nline,
(b)atal? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (e)nkrip, (t)andatangan, tandatangan (s)bg, ke(d)uanya, %s,
(b)ersihkan? "
#: compose.c:166
-msgid "esabif"
+msgid "esabifc"
msgstr "etsdib"
#. sign (a)s
@@ -584,13 +584,13 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
"S/MIME (e)nkrip, (t)andatangan, enkrip d(g), tandatangan (s)bg, ke(d)uanya, "
-"(b)atal? "
+"(b)ersihkan? "
#: compose.c:228
-msgid "eswabf"
+msgid "eswabfc"
msgstr "etgsdb"
#: compose.c:236
@@ -4314,3 +4314,9 @@
#~ msgid "Attachment saved"
#~ msgstr "Lampiran telah disimpan"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/it.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/it.po,v
retrieving revision 3.12
diff --unified -r3.12 it.po
--- po/it.po 12 Apr 2004 21:19:29 -0000 3.12
+++ po/it.po 10 Aug 2004 01:13:53 -0000
@@ -580,12 +580,12 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "cifra(e), firma(s), firma come(a), entrambi(b), in l(i)nea ,
annulla(f) "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "cifra(e), firma(s), firma come(a), entrambi(b), %s, pulis(c)i "
#: compose.c:166
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -595,13 +595,13 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "cifra(e), firma(s), firma come(a), entrambi(b), annulla(f) "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr "cifra(e), firma(s), firma come(a), entrambi(b), pulis(c)i "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "esabf"
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4197,3 +4197,9 @@
#, fuzzy
#~ msgid "Certificate *NOT* added."
#~ msgstr "Certificato salvato"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "in l(i)nea"
Index: po/ja.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/ja.po,v
retrieving revision 3.23
diff --unified -r3.23 ja.po
--- po/ja.po 12 Apr 2004 21:19:29 -0000 3.23
+++ po/ja.po 10 Aug 2004 01:13:53 -0000
@@ -567,12 +567,12 @@
msgstr " °Å¹æ²½Êý¼°: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (e)°Å¹æ²½,(s)½ð̾,(a)..¤È¤·¤Æ½ð̾,(b)ξ¼Ô,(i)nline,(f)²ò½ü?"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (e)°Å¹æ²½,(s)½ð̾,(a)..¤È¤·¤Æ½ð̾,(b)ξ¼Ô,%s,(c)²ò½ü?"
#: compose.c:166
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -581,13 +581,13 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"S/MIME (e)°Å¹æ²½,(s)½ð̾,(w)..¤Ç°Å¹æ²½,(a)..¤È¤·¤Æ½ð̾,(b)ξ¼Ô,(f)²ò½ü?"
+"S/MIME (e)°Å¹æ²½,(s)½ð̾,(w)..¤Ç°Å¹æ²½,(a)..¤È¤·¤Æ½ð̾,(b)ξ¼Ô,(c)²ò½ü?"
#: compose.c:228
-msgid "eswabf"
-msgstr "eswabf"
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4162,3 +4162,9 @@
#~ msgid "This ID's validity level is undefined."
#~ msgstr "¤³¤Î ID ¤Î¿®ÍÑÅÙ¤Ï̤ÄêµÁ¤Ç¤¢¤ë¡£"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/ko.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/ko.po,v
retrieving revision 3.18
diff --unified -r3.18 ko.po
--- po/ko.po 12 Apr 2004 21:19:29 -0000 3.18
+++ po/ko.po 10 Aug 2004 01:13:53 -0000
@@ -568,12 +568,12 @@
msgstr "¾ÏÈ£È ¹æ½Ä: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP ¾ÏÈ£È(e), ¼¸í(s), »ç¿ë ¼¸í(a), µÑ ´Ù(b), (i)nline, Ãë¼Ò(f)? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP ¾ÏÈ£È(e), ¼¸í(s), »ç¿ë ¼¸í(a), µÑ ´Ù(b), (i)nline, Ãë¼Ò(c)? "
#: compose.c:166
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -582,12 +582,12 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "S/MIME ¾ÏÈ£È(e), ¼¸í(s), ¹æ½Ä(w), »ç¿ë ¼¸í(a), µÑ ´Ù(b), Ãë¼Ò(f)? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr "S/MIME ¾ÏÈ£È(e), ¼¸í(s), ¹æ½Ä(w), »ç¿ë ¼¸í(a), µÑ ´Ù(b), Ãë¼Ò(c)? "
#: compose.c:228
-msgid "eswabf"
-msgstr "eswabf"
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4134,3 +4134,9 @@
#: thread.c:1087
msgid "Parent message is not available."
msgstr "ºÎ¸ð ¸ÞÀÏÀÌ Á¸ÀçÇÏÁö ¾ÊÀ½."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/lt.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/lt.po,v
retrieving revision 3.12
diff --unified -r3.12 lt.po
--- po/lt.po 12 Apr 2004 21:19:29 -0000 3.12
+++ po/lt.po 10 Aug 2004 01:13:54 -0000
@@ -576,15 +576,15 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr ""
-"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, (l)aiðke, "
-"ar (p)amirðti?"
+"(u)þðifruot, pa(s)iraðyt, pasiraðyt k(a)ip, a(b)u, %s, "
+"ar ið(v)alyti? "
#: compose.c:166
#, fuzzy
-msgid "esabif"
-msgstr "usablp"
+msgid "esabifc"
+msgstr "usabipv"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -594,14 +594,14 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"(u)þðifruot, pa(s)iraðyt, uþðifruo(t) su, pasiraðyt k(a)ip, a(b)u, ar
(p)amirðti?"
+"(u)þðifruot, pa(s)iraðyt, uþðifruo(t) su, pasiraðyt k(a)ip, a(b)u, ar
ið(v)alyti? "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "ustabp"
+msgid "eswabfc"
+msgstr "ustabpv"
#: compose.c:236
msgid ""
@@ -4298,3 +4298,9 @@
#~ msgid "Unknown MIC algorithm, valid ones are: pgp-md5, pgp-sha1, pgp-rmd160"
#~ msgstr "Neþinomas MIC algoritmas, galimi yra: pgp-md5, pgp-sha1, pgp-rmd160"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "la(i)ðke"
Index: po/nl.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/nl.po,v
retrieving revision 3.17
diff --unified -r3.17 nl.po
--- po/nl.po 12 Apr 2004 21:19:29 -0000 3.17
+++ po/nl.po 10 Aug 2004 01:13:54 -0000
@@ -566,12 +566,12 @@
msgstr "Versleutelen met: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, ber(i)cht,
(g)een? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s,
(w)issen? "
#: compose.c:166
-msgid "esabif"
-msgstr "voabig"
+msgid "esabifc"
+msgstr "voabigw"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -580,14 +580,13 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"S/MIME (v)ersleutel, (o)ndert, ondert (a)ls, (b)eiden, (m)ic selecteren, (g)"
-"een? "
+"S/MIME (v)ersleutel, (o)ndert, vers. (m)et, ondert (a)ls, (b)eiden, (w)issen?
"
#: compose.c:228
-msgid "eswabf"
-msgstr "vomabg"
+msgid "eswabfc"
+msgstr "vomabgw"
#: compose.c:236
msgid ""
@@ -4357,3 +4356,9 @@
#~ msgid "Deleting non-multipart messages not yet supported"
#~ msgstr "Alleen delen van multipart berichten kunnen gewist worden."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "ber(i)cht"
Index: po/pl.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/pl.po,v
retrieving revision 3.20
diff --unified -r3.20 pl.po
--- po/pl.po 20 Jul 2004 09:00:50 -0000 3.20
+++ po/pl.po 10 Aug 2004 01:13:54 -0000
@@ -3147,12 +3147,12 @@
msgstr "Nie mo¿na wywo³aæ PGP"
#: pgp.c:1463
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, (i)nline, b(e)z
PGP? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s, wy(c)zy¶æ? "
#: pgp.c:1464
-msgid "esabif"
-msgstr "zsabie"
+msgid "esabifc"
+msgstr "zsabiec"
#. sign (a)s
#: pgp.c:1477 smime.c:1985
@@ -3871,12 +3871,12 @@
msgstr "\n[-- Koniec danych podpisanych S/MIME. --]\n"
#: smime.c:1943
-msgid "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or
(f)orget it? "
-msgstr "S/MIME: (z)aszyfruj, (p)odpisz, (m)etoda, podp. (j)ako, (o)ba,
(a)nuluj?"
+msgid "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or
(c)lear? "
+msgstr "S/MIME: (z)aszyfruj, (p)odpisz, Zas. u¿y(w)aj±c, podp. (j)ako, (o)ba,
wy(c)zy¶æ? "
#: smime.c:1944
-msgid "eswabf"
-msgstr "zpmjoa"
+msgid "eswabfc"
+msgstr "zpwjoac"
#: smime.c:1952
msgid "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget
it? "
@@ -3906,3 +3906,8 @@
msgid "Parent message is not available."
msgstr "Pierwszy list tego w±tku nie jest dostêpny."
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/pt_BR.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/pt_BR.po,v
retrieving revision 3.13
diff --unified -r3.13 pt_BR.po
--- po/pt_BR.po 12 Apr 2004 21:19:30 -0000 3.13
+++ po/pt_BR.po 10 Aug 2004 01:13:55 -0000
@@ -579,14 +579,14 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr ""
-"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, em l(i)nha, ou es(q)uece? "
+"(e)ncripa, a(s)sina, assina (c)omo, (a)mbos, %s, ou (l)impar? "
#: compose.c:166
#, fuzzy
-msgid "esabif"
-msgstr "escaiq"
+msgid "esabifc"
+msgstr "escaiql"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -596,14 +596,14 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"(e)ncripa, a(s)sina, e(n)cripa com, assina (c)omo, (a)mbos, ou es(q)uece? "
+"(e)ncripa, a(s)sina, e(n)cripa com, assina (c)omo, (a)mbos, ou (l)impar? "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "esncaq"
+msgid "eswabfc"
+msgstr "esncaql"
#: compose.c:236
msgid ""
@@ -4564,3 +4564,9 @@
#~ msgid "Saved output of child process to %s.\n"
#~ msgstr "Saída do processo filho salva em %s.\n"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "em l(i)nha"
Index: po/ru.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/ru.po,v
retrieving revision 3.21
diff --unified -r3.21 ru.po
--- po/ru.po 12 Apr 2004 21:19:30 -0000 3.21
+++ po/ru.po 10 Aug 2004 01:13:55 -0000
@@ -575,12 +575,12 @@
msgstr "úÁÛÉÆÒÏ×ÁÔØ: "
#: compose.c:165
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, (i)nline,
(f)ÏÔËÁÚÁÔØÓÑ? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "PGP (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, %s, (c)ïÞÉÓÔÉÔØ? "
#: compose.c:166
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -589,13 +589,13 @@
#: compose.c:227
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"S/MIME (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (w)ÛÉÆÒ ËÁË, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, (f)ÏÔËÁÚ? "
+"S/MIME (e)ÛÉÆÒ, (s)ÐÏÄÐÉÓØ, (w)ÛÉÆÒ ËÁË, (a)ÐÏÄÐÉÓØ ËÁË, (b)ÏÂÁ, (c)ïÞÉÓÔÉÔØ?
"
#: compose.c:228
-msgid "eswabf"
-msgstr "eswabf"
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4168,3 +4168,9 @@
#: thread.c:1087
msgid "Parent message is not available."
msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅÄÏÓÔÕÐÎÏ."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/sk.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/sk.po,v
retrieving revision 3.12
diff --unified -r3.12 sk.po
--- po/sk.po 12 Apr 2004 21:19:30 -0000 3.12
+++ po/sk.po 10 Aug 2004 01:13:56 -0000
@@ -584,15 +584,14 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr ""
-"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, (i)nline, alebo (f)-zabudnú» "
-"na to? "
+"(e)-¹ifr, (s)-podp, podp (a)ko, o(b)e, %s, alebo (c)-vymaza»? "
#: compose.c:166
#, fuzzy
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -602,14 +601,14 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"(e)-¹ifr, (s)-podp, (w)-¹ifr s, podp (a)ko, o(b)e, alebo (f)-zabudnú» na to? "
+"(e)-¹ifr, (s)-podp, (w)-¹ifr s, podp (a)ko, o(b)e, alebo (c)-vymaza»? "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "eswabf"
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4530,3 +4529,9 @@
#~ msgid "%s is a boolean var!"
#~ msgstr "%s je logická premenná!"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/sv.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/sv.po,v
retrieving revision 3.14
diff --unified -r3.14 sv.po
--- po/sv.po 7 Aug 2004 05:23:33 -0000 3.14
+++ po/sv.po 10 Aug 2004 01:13:56 -0000
@@ -578,14 +578,13 @@
msgstr "Kryptera med: "
#: compose.c:174
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr ""
-"PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)åda, i(n)fogat, eller sk(i)ppa "
-"det?"
+"PGP: (k)ryptera, (s)ignera, signera s(o)m, (b)åda, %s, eller (r)ensa? "
#: compose.c:175
-msgid "esabif"
-msgstr "ksobni"
+msgid "esabifc"
+msgstr "ksobgir"
#. sign (a)s
#: compose.c:188 compose.c:291
@@ -594,13 +593,13 @@
#: compose.c:249
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"S/MIME: (k)ryptera, (s)ignera, signera s(o)m, (b)åda, eller sk(i)ppa det? "
+"S/MIME: (k)ryptera, (s)ignera, kry. (m)ed, sig. s(o)m, (b)åda, eller (r)ensa?
"
#: compose.c:250
-msgid "eswabf"
-msgstr "ksobi"
+msgid "eswabfc"
+msgstr "ksmobir"
#: compose.c:258
msgid ""
@@ -4166,3 +4165,9 @@
#: thread.c:1087
msgid "Parent message is not available."
msgstr "Första meddelandet är inte tillgängligt."
+
+msgid "PGP/M(i)ME"
+msgstr "P(g)P/MIME"
+
+msgid "(i)nline"
+msgstr "info(g)at"
Index: po/tr.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/tr.po,v
retrieving revision 3.12
diff --unified -r3.12 tr.po
--- po/tr.po 12 Apr 2004 21:19:30 -0000 3.12
+++ po/tr.po 10 Aug 2004 01:13:56 -0000
@@ -575,14 +575,13 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr ""
-"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (i)nline, "
-"yoksa i(p)talmý? "
+"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, %s, (t)emizle? "
#: compose.c:166
-msgid "esabif"
-msgstr "imfkip"
+msgid "esabifc"
+msgstr "imfkept"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -592,15 +591,14 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, mi(c) algoritmini seç "
-"yoksa i(p)talmý? "
+"þ(i)frele, i(m)zala, (f)arklý imzala, i(k)isi de, (t)emizle? "
#: compose.c:228
#, fuzzy
-msgid "eswabf"
-msgstr "imfkcp"
+msgid "eswabfc"
+msgstr "imwfkpt"
#: compose.c:236
msgid ""
@@ -4272,3 +4270,9 @@
#~ msgid "Authentication method is unknown."
#~ msgstr "Doðrulama metodu bilinmiyor."
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/MIM(e)"
+
+msgid "(i)nline"
+msgstr "inlin(e)"
Index: po/uk.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/uk.po,v
retrieving revision 3.13
diff --unified -r3.13 uk.po
--- po/uk.po 12 Apr 2004 21:19:31 -0000 3.13
+++ po/uk.po 10 Aug 2004 01:13:57 -0000
@@ -570,12 +570,12 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
-msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), (i)nline ÞÉ ×¦ÄͦÎÁ(f)? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b), %s, ÞÉ úÎÑÔÉ(c)? "
#: compose.c:166
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -585,12 +585,12 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
-msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b) ÞÉ ×¦ÄͦÎÁ(f)? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+msgstr "ÛÉÆÒ.(e), ЦÄÐ.(s), ЦÄÐ. ÑË(a), ÕÓÅ(b) ÞÉ úÎÑÔÉ(c)? "
#: compose.c:228
-msgid "eswabf"
-msgstr ""
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4334,3 +4334,9 @@
#~ msgid "Deleting non-multipart messages not yet supported"
#~ msgstr "÷ÉÄÁÌÅÎÎÑ ÌÉÓÔÁ, ÝÏ ÍÁ¤ ÏÄÎÕ ÞÁÓÔÉÎÕ, ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/zh_CN.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/zh_CN.po,v
retrieving revision 3.12
diff --unified -r3.12 zh_CN.po
--- po/zh_CN.po 12 Apr 2004 21:19:31 -0000 3.12
+++ po/zh_CN.po 10 Aug 2004 01:13:57 -0000
@@ -583,14 +583,13 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr ""
-"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, (i)nline, »ò (f)·Å"
-"Æú£¿"
+"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, %s, »ò (c)¹Ø±Õ? "
#: compose.c:166
-msgid "esabif"
-msgstr "esabif"
+msgid "esabifc"
+msgstr "esabifc"
#. sign (a)s
#: compose.c:179 compose.c:269
@@ -600,14 +599,13 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr ""
-"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, Ñ¡Ôñ (m)ic ÑÝËã·¨ »ò (f)·Å"
-"Æú£¿"
+"(e)¼ÓÃÜ, (s)Ç©Ãû, (a)ÓñðµÄÉí·ÝÇ©, (b)Á½Õß½ÔÒª, »ò (c)¹Ø±Õ? "
#: compose.c:228
-msgid "eswabf"
-msgstr ""
+msgid "eswabfc"
+msgstr "eswabfc"
#: compose.c:236
msgid ""
@@ -4566,3 +4564,9 @@
#~ msgid "Saved output of child process to %s.\n"
#~ msgstr "Êä³ö×Ó³ÌÐò´¢´æÖÁ %s.\n"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: po/zh_TW.po
===================================================================
RCS file: /home/roessler/cvs/mutt/po/zh_TW.po,v
retrieving revision 3.12
diff --unified -r3.12 zh_TW.po
--- po/zh_TW.po 12 Apr 2004 21:19:31 -0000 3.12
+++ po/zh_TW.po 10 Aug 2004 01:13:58 -0000
@@ -575,11 +575,11 @@
#: compose.c:165
#, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (i)nline, or (f)orget it? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
msgstr "(1)å? å¯?, (2)ç°½å??, (3)ç?¨å?¥ç??身份簽, (4)å?©è??ç??è¦?, æ??
(5)���"
#: compose.c:166
-msgid "esabif"
+msgid "esabifc"
msgstr "1234i5"
#. sign (a)s
@@ -590,11 +590,11 @@
#: compose.c:227
#, fuzzy
msgid ""
-"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "
+"S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
msgstr "(1)å? å¯?, (2)ç°½å??, (3)ç?¨å?¥ç??身份簽, (4)å?©è??ç??è¦?, æ??
(5)���"
#: compose.c:228
-msgid "eswabf"
+msgid "eswabfc"
msgstr "12345"
#: compose.c:236
@@ -4491,3 +4491,9 @@
#~ msgid "Saved output of child process to %s.\n"
#~ msgstr "輸å?ºå?ç¨?åº?å?²å?è?³ %s.\n"
+
+msgid "PGP/M(i)ME"
+msgstr "PGP/M(i)ME"
+
+msgid "(i)nline"
+msgstr "(i)nline"
Index: init.h
===================================================================
RCS file: /home/roessler/cvs/mutt/init.h,v
retrieving revision 3.55
diff --unified -r3.55 init.h
--- init.h 19 Jul 2004 21:44:23 -0000 3.55
+++ init.h 10 Aug 2004 01:18:26 -0000
@@ -361,6 +361,13 @@
** ``$$save_name'', ``$$force_name'' and ``$fcc-hook''.
*/
+ { "crypt_menu_toggle", DT_BOOL, R_NONE, OPTCRYPTMENUTOGGLE, 0 },
+ /*
+ ** .pp
+ ** This variable controls whether the sign/encrypt/both options act as
+ ** toggles or not (default) in the pgp/smime menus.
+ */
+
{ "crypt_use_gpgme", DT_BOOL, R_NONE, OPTCRYPTUSEGPGME, 0 },
/*
** .pp
Index: mutt.h
===================================================================
RCS file: /home/roessler/cvs/mutt/mutt.h,v
retrieving revision 3.34
diff --unified -r3.34 mutt.h
--- mutt.h 20 Jul 2004 08:17:21 -0000 3.34
+++ mutt.h 10 Aug 2004 01:18:27 -0000
@@ -464,6 +464,7 @@
OPTPGPSHOWUNUSABLE,
OPTPGPAUTOINLINE,
OPTPGPREPLYINLINE,
+ OPTCRYPTMENUTOGGLE,
/* pseudo options */
Index: pgp.c
===================================================================
RCS file: /home/roessler/cvs/mutt/pgp.c,v
retrieving revision 3.31
diff --unified -r3.31 pgp.c
--- pgp.c 8 Aug 2004 16:19:15 -0000 3.31
+++ pgp.c 10 Aug 2004 01:18:28 -0000
@@ -1471,13 +1471,27 @@
switch (mutt_multi_choice (prompt, _("esabifc")))
{
case 1: /* (e)ncrypt */
- msg->security |= ENCRYPT;
- msg->security &= ~SIGN;
+ if (option (OPTCRYPTMENUTOGGLE))
+ {
+ msg->security ^= ENCRYPT;
+ }
+ else
+ {
+ msg->security |= ENCRYPT;
+ msg->security &= ~SIGN;
+ }
break;
case 2: /* (s)ign */
- msg->security |= SIGN;
- msg->security &= ~ENCRYPT;
+ if (option (OPTCRYPTMENUTOGGLE))
+ {
+ msg->security ^= SIGN;
+ }
+ else
+ {
+ msg->security |= SIGN;
+ msg->security &= ~ENCRYPT;
+ }
break;
case 3: /* sign (a)s */
@@ -1505,7 +1519,15 @@
break;
case 4: /* (b)oth */
- msg->security |= (ENCRYPT | SIGN);
+ if (option (OPTCRYPTMENUTOGGLE) &&
+ (msg->security & (ENCRYPT | SIGN) == (ENCRYPT | SIGN)))
+ {
+ msg->security = 0;
+ }
+ else
+ {
+ msg->security |= (ENCRYPT | SIGN);
+ }
break;
case 5: /* (i)nline */
Index: smime.c
===================================================================
RCS file: /home/roessler/cvs/mutt/smime.c,v
retrieving revision 3.34
diff --unified -r3.34 smime.c
--- smime.c 8 Aug 2004 16:19:15 -0000 3.34
+++ smime.c 10 Aug 2004 01:18:30 -0000
@@ -1944,8 +1944,15 @@
_("eswabfc")))
{
case 1: /* (e)ncrypt */
- msg->security |= ENCRYPT;
- msg->security &= ~SIGN;
+ if (option (OPTCRYPTMENUTOGGLE))
+ {
+ msg->security ^= ENCRYPT;
+ }
+ else
+ {
+ msg->security |= ENCRYPT;
+ msg->security &= ~SIGN;
+ }
break;
case 3: /* encrypt (w)ith */
@@ -1977,6 +1984,10 @@
if(!SmimeDefaultKey)
mutt_message _("Can't sign: No key specified. Use Sign As.");
+ else if (option (OPTCRYPTMENUTOGGLE))
+ {
+ msg->security ^= SIGN;
+ }
else
{
msg->security |= SIGN;
@@ -2005,7 +2016,15 @@
break;
case 5: /* (b)oth */
- msg->security |= (ENCRYPT | SIGN);
+ if (option (OPTCRYPTMENUTOGGLE) &&
+ (msg->security & (ENCRYPT | SIGN) == (ENCRYPT | SIGN)))
+ {
+ msg->security = 0;
+ }
+ else
+ {
+ msg->security |= (ENCRYPT | SIGN);
+ }
break;
case 6: /* (f)orget it */