[git] GpgOL - branch, outlook14, updated. gpgol-1.1.3-36-g3d80d4e
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Jul 12 20:32:43 CEST 2013
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 "GnuPG extension for MS Outlook".
The branch, outlook14 has been updated
via 3d80d4e9fe7dad640a0b1c283d6f458ee36d53dc (commit)
via 4df9001367b5438937191466db288facdffe4204 (commit)
from 7963564cb41b4b3c8aede32bdc7a88e76bf326f3 (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 3d80d4e9fe7dad640a0b1c283d6f458ee36d53dc
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 12 18:08:22 2013 +0000
Fix operator priority
* src/ribbon-callbacks.cpp (decryptInspector): Fix operator
priorty in check for flags.
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index 2cb14d7..7462f20 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -539,7 +539,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
}
RELDISP (actExplorer);
- if ( !flags & DECRYPT_INSPECTOR_BODY)
+ if (!(flags & DECRYPT_INSPECTOR_BODY))
{
wordEditor = get_oom_object (context, "WordEditor");
wordApplication = get_oom_object (wordEditor, "get_Application");
@@ -548,7 +548,7 @@ decryptInspector (LPDISPATCH ctrl, int flags)
mailItem = get_oom_object (context, "CurrentItem");
if ((!wordEditor || !wordApplication || !selection || !mailItem) &&
- (!flags & DECRYPT_INSPECTOR_BODY))
+ !(flags & DECRYPT_INSPECTOR_BODY))
{
MessageBox (NULL,
"Internal error in GpgOL.\n"
commit 4df9001367b5438937191466db288facdffe4204
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jul 12 18:03:04 2013 +0000
Update translations
* po/de.po: Update German translations.
* po/pt.po, po/sv.po: Update generated files
diff --git a/po/de.po b/po/de.po
index 90f0457..e3114a3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.0.0\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-07-12 07:18+0000\n"
+"POT-Creation-Date: 2013-07-12 18:01+0000\n"
"PO-Revision-Date: 2009-06-18 19:18+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
@@ -41,9 +41,9 @@ msgstr ""
"um die gesamte Nachricht nochmal zu entschlüsseln. Danach können\n"
"Sie das Attachment wieder öffenen."
-#: src/common.c:217
-msgid "GpgOL - Save decrypted attachment"
-msgstr "GpgOL - Sichern der entschlüsselten Anlage"
+#: src/common.c:232
+msgid "GpgOL - Save attachment"
+msgstr "GpgOL - Anlage Speichern"
#: src/config-dialog.c:137
msgid "Debug output (for analysing problems)"
@@ -59,9 +59,13 @@ msgstr ""
#: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
#: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:593 src/gpgoladdin.cpp:594 src/ribbon-callbacks.cpp:119
-#: src/ribbon-callbacks.cpp:133 src/ribbon-callbacks.cpp:163
-#: src/ribbon-callbacks.cpp:486 src/ribbon-callbacks.cpp:500
+#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
+#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
+#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
+#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
+#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
+#: src/ribbon-callbacks.cpp:636
msgid "GpgOL"
msgstr "GpgOL"
@@ -356,7 +360,8 @@ msgstr "Dateischreibfehler"
msgid "I/O-Error"
msgstr "Ein-/Ausgabefehler"
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:593
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
+#: src/gpgoladdin.cpp:703
msgid "General"
msgstr "Allgemein"
@@ -684,35 +689,52 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Möchten Sie diesen Ordner von GpgOL befreien?"
-#: src/gpgoladdin.cpp:528
+#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+msgid "Start Certificate Manager"
+msgstr "Zertifikatsverwaltung starten"
+
+#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+msgid "Textbody"
+msgstr "Textkörper"
+
+#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: src/gpgoladdin.cpp:528 src/gpgoladdin.cpp:541 src/ribbon-callbacks.cpp:535
+#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
+#: src/gpgoladdin.cpp:639
msgid "Decrypt"
msgstr "Entschlüsseln"
-#: src/gpgoladdin.cpp:593
-msgid "Start Certificate Manager"
-msgstr "Zertifikatsverwaltung starten"
-
-#: src/gpgoladdin.cpp:594 src/gpgoladdin.cpp:595
+#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
msgid "Save and decrypt"
msgstr "Speichern und Entschlüsseln"
-#: src/ribbon-callbacks.cpp:132
+#: src/ribbon-callbacks.cpp:147
msgid "Please select text to encrypt."
msgstr "Bitte selektieren Sie den zu verschlüsselnden Text."
-#: src/ribbon-callbacks.cpp:162
+#: src/ribbon-callbacks.cpp:160
+msgid "Textbody empty."
+msgstr "Textkörper leer."
+
+#: src/ribbon-callbacks.cpp:191
msgid "Please add at least one recipent."
msgstr "Bitte fügen Sie mindestens einen Empfänger hinzu."
-#: src/ribbon-callbacks.cpp:499
+#: src/ribbon-callbacks.cpp:572
+msgid "Please select a Mail."
+msgstr "Bitte wäheln Sie eine Mail aus."
+
+#: src/ribbon-callbacks.cpp:586
msgid "Please select the data you wish to decrypt."
msgstr "Bitte selektieren Sie die zu entschlüsselnden Daten."
-#: src/ribbon-callbacks.cpp:604
+#: src/ribbon-callbacks.cpp:599
+msgid "Nothing to decrypt."
+msgstr "Nichts zu entschlüsseln."
+
+#: src/ribbon-callbacks.cpp:715
msgid "Plain text"
msgstr "Klartext"
diff --git a/po/pt.po b/po/pt.po
index 53d0a49..0140e54 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GpgOL 1.1.1\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-07-12 07:18+0000\n"
+"POT-Creation-Date: 2013-07-12 18:01+0000\n"
"PO-Revision-Date: 2010-07-18 20:41-0000\n"
"Last-Translator: Marco A.G.Pinto <marcoagpinto at mail.telepac.pt>\n"
"Language-Team: Portuguese <marcoagpinto at mail.telepac.pt>\n"
@@ -43,8 +43,9 @@ msgstr ""
"Por favor usa o botão Desencriptar/Verificar para desencriptar\n"
"a mensagem completa novamente. Depois abre este anexo."
-#: src/common.c:217
-msgid "GpgOL - Save decrypted attachment"
+#: src/common.c:232
+#, fuzzy
+msgid "GpgOL - Save attachment"
msgstr "GpgOL - Gravar anexo desencriptado"
#: src/config-dialog.c:137
@@ -61,9 +62,13 @@ msgstr ""
#: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
#: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:593 src/gpgoladdin.cpp:594 src/ribbon-callbacks.cpp:119
-#: src/ribbon-callbacks.cpp:133 src/ribbon-callbacks.cpp:163
-#: src/ribbon-callbacks.cpp:486 src/ribbon-callbacks.cpp:500
+#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
+#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
+#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
+#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
+#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
+#: src/ribbon-callbacks.cpp:636
msgid "GpgOL"
msgstr "GpgOL"
@@ -341,7 +346,8 @@ msgstr "Erro ao escrever no stream"
msgid "I/O-Error"
msgstr "I/O-Erro"
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:593
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
+#: src/gpgoladdin.cpp:703
msgid "General"
msgstr "Geral"
@@ -664,41 +670,59 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr "Queres reverter esta pasta?"
-#: src/gpgoladdin.cpp:528
+#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#, fuzzy
+msgid "Start Certificate Manager"
+msgstr "GnuPG Zertifikats&verwaltung"
+
+#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+msgid "Textbody"
+msgstr ""
+
+#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
#, fuzzy
msgid "Encrypt"
msgstr "Encriptação"
-#: src/gpgoladdin.cpp:528 src/gpgoladdin.cpp:541 src/ribbon-callbacks.cpp:535
+#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
+#: src/gpgoladdin.cpp:639
#, fuzzy
msgid "Decrypt"
msgstr "Entschlüsselung"
-#: src/gpgoladdin.cpp:593
-#, fuzzy
-msgid "Start Certificate Manager"
-msgstr "GnuPG Zertifikats&verwaltung"
-
-#: src/gpgoladdin.cpp:594 src/gpgoladdin.cpp:595
+#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
msgid "Save and decrypt"
msgstr ""
-#: src/ribbon-callbacks.cpp:132
+#: src/ribbon-callbacks.cpp:147
#, fuzzy
msgid "Please select text to encrypt."
msgstr "Por favor selecciona pelo menos um certificado de destinatário."
-#: src/ribbon-callbacks.cpp:162
+#: src/ribbon-callbacks.cpp:160
+msgid "Textbody empty."
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:191
#, fuzzy
msgid "Please add at least one recipent."
msgstr "Por favor selecciona pelo menos um certificado de destinatário."
-#: src/ribbon-callbacks.cpp:499
+#: src/ribbon-callbacks.cpp:572
+#, fuzzy
+msgid "Please select a Mail."
+msgstr "Por favor selecciona pelo menos um certificado de destinatário."
+
+#: src/ribbon-callbacks.cpp:586
#, fuzzy
msgid "Please select the data you wish to decrypt."
msgstr "Por favor selecciona pelo menos um certificado de destinatário."
-#: src/ribbon-callbacks.cpp:604
+#: src/ribbon-callbacks.cpp:599
+msgid "Nothing to decrypt."
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:715
msgid "Plain text"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 327c9c7..d998ed8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GPGol\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2013-07-12 07:18+0000\n"
+"POT-Creation-Date: 2013-07-12 18:01+0000\n"
"PO-Revision-Date: 2006-12-12 23:52+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -40,9 +40,9 @@ msgid ""
"entire message again. Then open this attachment."
msgstr ""
-#: src/common.c:217
+#: src/common.c:232
#, fuzzy
-msgid "GpgOL - Save decrypted attachment"
+msgid "GpgOL - Save attachment"
msgstr "GPG - Spara dekrypterad bilaga"
#: src/config-dialog.c:137
@@ -57,9 +57,13 @@ msgstr ""
#: src/engine.c:395 src/engine.c:405 src/main.c:699 src/main.c:705
#: src/message.cpp:303 src/explorers.cpp:204 src/explorers.cpp:209
-#: src/gpgoladdin.cpp:593 src/gpgoladdin.cpp:594 src/ribbon-callbacks.cpp:119
-#: src/ribbon-callbacks.cpp:133 src/ribbon-callbacks.cpp:163
-#: src/ribbon-callbacks.cpp:486 src/ribbon-callbacks.cpp:500
+#: src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635 src/gpgoladdin.cpp:703
+#: src/gpgoladdin.cpp:705 src/ribbon-callbacks.cpp:132
+#: src/ribbon-callbacks.cpp:148 src/ribbon-callbacks.cpp:161
+#: src/ribbon-callbacks.cpp:192 src/ribbon-callbacks.cpp:234
+#: src/ribbon-callbacks.cpp:556 src/ribbon-callbacks.cpp:573
+#: src/ribbon-callbacks.cpp:587 src/ribbon-callbacks.cpp:600
+#: src/ribbon-callbacks.cpp:636
msgid "GpgOL"
msgstr ""
@@ -324,7 +328,8 @@ msgstr "Fel vid skrivning av fil"
msgid "I/O-Error"
msgstr "In-/Ut-fel"
-#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:593
+#: src/olflange-dlgs.cpp:43 src/gpgoladdin.cpp:588 src/gpgoladdin.cpp:635
+#: src/gpgoladdin.cpp:703
msgid "General"
msgstr ""
@@ -624,41 +629,59 @@ msgstr ""
msgid "Do you want to revert this folder?"
msgstr ""
-#: src/gpgoladdin.cpp:528
+#: src/gpgoladdin.cpp:589 src/gpgoladdin.cpp:636 src/gpgoladdin.cpp:703
+#, fuzzy
+msgid "Start Certificate Manager"
+msgstr "GPG-nyckel&hanterare"
+
+#: src/gpgoladdin.cpp:590 src/gpgoladdin.cpp:637
+msgid "Textbody"
+msgstr ""
+
+#: src/gpgoladdin.cpp:591 src/gpgoladdin.cpp:598
#, fuzzy
msgid "Encrypt"
msgstr "Kryptering"
-#: src/gpgoladdin.cpp:528 src/gpgoladdin.cpp:541 src/ribbon-callbacks.cpp:535
+#: src/gpgoladdin.cpp:592 src/gpgoladdin.cpp:598 src/gpgoladdin.cpp:638
+#: src/gpgoladdin.cpp:639
#, fuzzy
msgid "Decrypt"
msgstr "Dekryptering"
-#: src/gpgoladdin.cpp:593
-#, fuzzy
-msgid "Start Certificate Manager"
-msgstr "GPG-nyckel&hanterare"
-
-#: src/gpgoladdin.cpp:594 src/gpgoladdin.cpp:595
+#: src/gpgoladdin.cpp:705 src/gpgoladdin.cpp:706
msgid "Save and decrypt"
msgstr ""
-#: src/ribbon-callbacks.cpp:132
+#: src/ribbon-callbacks.cpp:147
#, fuzzy
msgid "Please select text to encrypt."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:162
+#: src/ribbon-callbacks.cpp:160
+msgid "Textbody empty."
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:191
#, fuzzy
msgid "Please add at least one recipent."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:499
+#: src/ribbon-callbacks.cpp:572
+#, fuzzy
+msgid "Please select a Mail."
+msgstr "Välj åtminstone en mottagarnyckel."
+
+#: src/ribbon-callbacks.cpp:586
#, fuzzy
msgid "Please select the data you wish to decrypt."
msgstr "Välj åtminstone en mottagarnyckel."
-#: src/ribbon-callbacks.cpp:604
+#: src/ribbon-callbacks.cpp:599
+msgid "Nothing to decrypt."
+msgstr ""
+
+#: src/ribbon-callbacks.cpp:715
msgid "Plain text"
msgstr ""
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 60 ++++++++++++++++++++++++++++++--------------
po/pt.po | 62 +++++++++++++++++++++++++++++++--------------
po/sv.po | 61 +++++++++++++++++++++++++++++++--------------
src/ribbon-callbacks.cpp | 4 +-
4 files changed, 128 insertions(+), 59 deletions(-)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list