[svn] GPGol - r128 - in trunk: . po src
svn author wk
cvs at cvs.gnupg.org
Wed Nov 30 17:47:27 CET 2005
Author: wk
Date: 2005-11-30 17:47:27 +0100 (Wed, 30 Nov 2005)
New Revision: 128
Modified:
trunk/ChangeLog
trunk/po/de.po
trunk/src/ChangeLog
trunk/src/gpgmsg.cpp
trunk/src/gpgol-rsrcs.rc
trunk/src/olflange-ids.h
trunk/src/olflange-rsrcs.rc
trunk/src/olflange.cpp
trunk/src/passphrase-dialog.c
trunk/src/pgpmime.c
trunk/src/recipient-dialog.c
trunk/src/verify-dialog.c
Log:
More translations
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/ChangeLog 2005-11-30 16:47:27 UTC (rev 128)
@@ -1,5 +1,7 @@
2005-11-30 Werner Koch <wk at g10code.com>
+ * po/de.po: New.
+
* po/: New; created by autopoint.
* po/Makevars: New.
* m4/Makefile.am: Add new m4 files.
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/po/de.po 2005-11-30 16:47:27 UTC (rev 128)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: GPGol 0.9.4\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2005-11-30 12:02+0100\n"
-"PO-Revision-Date: 2005-11-30 12:55+0100\n"
+"POT-Creation-Date: 2005-11-30 17:02+0100\n"
+"PO-Revision-Date: 2005-11-30 17:06+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
@@ -37,11 +37,13 @@
#: src/engine-gpgme.c:955
msgid "Warning: The key used to create the signature expired at: "
-msgstr "Warnung: Der Schlüssel mit der diese Unterschrift erzeugt wurde verfiel am: "
+msgstr ""
+"Warnung: Der Schlüssel mit der diese Unterschrift erzeugt wurde verfiel am: "
#: src/engine-gpgme.c:961
msgid "Warning: At least one certification key has expired\n"
-msgstr "Warnung: Mindestens einer der Zertifizierungsschlüssel ist abgelaufen\n"
+msgstr ""
+"Warnung: Mindestens einer der Zertifizierungsschlüssel ist abgelaufen\n"
#: src/engine-gpgme.c:967
msgid "Warning: The signature expired at: "
@@ -49,7 +51,8 @@
#: src/engine-gpgme.c:973
msgid "Can't verify due to a missing key or certificate\n"
-msgstr "Aufrund eines fehlenden Schlüssels ist eine Überprüfung nicht möglich\n"
+msgstr ""
+"Aufrund eines fehlenden Schlüssels ist eine Überprüfung nicht möglich\n"
#: src/engine-gpgme.c:977
msgid "The CRL is not available\n"
@@ -71,17 +74,22 @@
msgid ""
"WARNING: We have NO indication whether the key belongs to the person named "
"as shown above\n"
-msgstr "WARNUNG: Es gibt keinen Hinweis darauf, ob der Schlüssel wirklich der Person gehört, die oben angezeigt ist\n"
+msgstr ""
+"WARNUNG: Es gibt keinen Hinweis darauf, ob der Schlüssel wirklich der Person "
+"gehört, die oben angezeigt ist\n"
#: src/engine-gpgme.c:1038
msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
-msgstr "WARNUNG: Der Schlüssel gehört NICHT der Person die oben angezeigt ist\n"
+msgstr ""
+"WARNUNG: Der Schlüssel gehört NICHT der Person die oben angezeigt ist\n"
#: src/engine-gpgme.c:1042
msgid ""
"WARNING: It is NOT certain that the key belongs to the person named as shown "
"above\n"
-msgstr "WARNING: Es ist nicht sicher, daß der Schlüssel der Person gehört, die oben angezeigt ist\n"
+msgstr ""
+"WARNING: Es ist nicht sicher, daß der Schlüssel der Person gehört, die oben "
+"angezeigt ist\n"
#: src/engine-gpgme.c:1075
msgid "Verification started at: "
@@ -125,8 +133,167 @@
#: src/gpgmsg.cpp:804
msgid "[No attestation computed (e.g. messages was not signed)"
-msgstr "[Kein Testat berechnet (z.B. da die Nachricht nicht unterschrieben war)"
+msgstr ""
+"[Kein Testat berechnet (z.B. da die Nachricht nicht unterschrieben war)"
+#: src/gpgmsg.cpp:926
+msgid "No valid OpenPGP data found."
+msgstr "Keine gültigen OpenPGP Daten gefunden"
+
+#: src/gpgmsg.cpp:927 src/gpgmsg.cpp:962 src/gpgmsg.cpp:974 src/gpgmsg.cpp:988
+#: src/gpgmsg.cpp:1064
+msgid "Decryption"
+msgstr "Entschlüsselung"
+
+#: src/gpgmsg.cpp:961 src/gpgmsg.cpp:973 src/gpgmsg.cpp:987
+msgid "Problem decrypting PGP/MIME message"
+msgstr "Problem bei Entschlüsseln einer PGP/MIME Nachricht"
+
+#: src/gpgmsg.cpp:1016
+msgid "Verification Failure"
+msgstr "Überprüfungsfehler"
+
+#: src/gpgmsg.cpp:1019
+msgid "Decryption Failure"
+msgstr "Entschlüsselungsfehler"
+
+#: src/gpgmsg.cpp:1058
+msgid ""
+"The message text cannot be displayed.\n"
+"You have to save the decrypted message to view it.\n"
+"Then you need to re-open the message.\n"
+"\n"
+"Do you want to save the decrypted message?"
+msgstr ""
+"Der Text der Nachricht kann nicht angezeigt werden.\n"
+"Sie sollten die entschlüsselte Nachricht abspeichern und\n"
+"sie dann wieder zum Betrachten öffnen.\n"
+"\n"
+"Möchten Sie die entschlüsselte Nachricht abspeichern?"
+
+#. TRANSLATORS: Keep the @LIST@ verbatim on a separate line; it
+#. will be expanded to a list of atatchment names.
+#: src/gpgmsg.cpp:1085
+msgid ""
+"Signed attachments found.\n"
+"\n"
+"@LIST@\n"
+"Do you want to verify the signatures?"
+msgstr ""
+"Es wurden unterschriebene Anhänge gefunden.\n"
+"\n"
+"@LIST@\n"
+"Möchten Sie diese Unterschriften überprüfen?"
+
+#: src/gpgmsg.cpp:1093
+msgid "Attachment Verification"
+msgstr "Überprüfung der Anhänge"
+
+#. TRANSLATORS: Keep the @LIST@ verbatim on a separate line; it
+#. will be expanded to a list of atatchment names.
+#: src/gpgmsg.cpp:1111
+msgid ""
+"Encrypted attachments found.\n"
+"\n"
+"@LIST@\n"
+"Do you want to decrypt and save them?"
+msgstr ""
+"Es wurde verschlüsselte Anhange gefunden.\n"
+"\n"
+"@LIST@\n"
+"Möchten Sie diese entschlüsseln und abspeichern?"
+
+#: src/gpgmsg.cpp:1118
+msgid "Attachment Decryption"
+msgstr "Entschlüsselung eines Anhangs"
+
+#: src/gpgmsg.cpp:1176
+msgid "Signing Failure"
+msgstr "Unterschrifterstellungsfehler"
+
+#: src/gpgmsg.cpp:1321
+msgid "Encryption Failure"
+msgstr "Verschlüsselungsfehler"
+
+#: src/gpgmsg.cpp:1357 src/gpgmsg.cpp:2651
+msgid "Attachment Encryption Failure"
+msgstr "Verschlüsselungsfehler eines Anhangs"
+
+#: src/gpgmsg.cpp:2058
+msgid "Attachment Verification Failure"
+msgstr "Überprüfungsfehler eines Anhangs"
+
+#: src/gpgmsg.cpp:2241 src/gpgmsg.cpp:2290
+msgid "Attachment Decryption Failure"
+msgstr "Entschlüsselungsfehler eines Anhangs"
+
+#: src/gpgmsg.cpp:2460
+msgid "Attachment Signing Failure"
+msgstr "Unterschrifterstellungsfehler eines Anhangs"
+
+#: src/olflange.cpp:883
+msgid ""
+"Sorry, we can only encrypt plain text messages and\n"
+"no RTF messages. Please make sure that only the text\n"
+"format has been selected."
+msgstr ""
+"Leider ist es nur möglich reine Textnachrichten aber keine\n"
+"Nachrichten im RTF Format zu verschlüsseln. Bitte stellen \n"
+"Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
+"(In der Menüleiste: \"Format\" => \"Nur Text\")"
+
+#: src/olflange.cpp:1268
+msgid "&Decrypt and verify message"
+msgstr "Entschlüsseln/Prüfen der Nachricht"
+
+#: src/olflange.cpp:1306
+msgid "GPG &encrypt message"
+msgstr "Mit GPG &verschlüsseln"
+
+#: src/olflange.cpp:1312
+msgid "GPG &sign message"
+msgstr "Mit GPG unter&schreiben"
+
+#: src/olflange.cpp:1358
+msgid "GPG Key &Manager"
+msgstr "GPG Schlüssel&verwaltung"
+
+#: src/olflange.cpp:1491
+msgid "Could not start Key-Manager"
+msgstr "Dei Schlüsselverwaltung konnte nicht aufgerufen werden"
+
+#: src/olflange.cpp:1537
+msgid "Decrypt and verify the message."
+msgstr "Entschlüsseln und Prüfen der Nachricht."
+
+#: src/olflange.cpp:1545
+msgid "Select this option to encrypt the message."
+msgstr "Wählen Sie diese Option zum Verschlüsseln der Nachricht."
+
+#: src/olflange.cpp:1551
+msgid "Select this option to sign the message."
+msgstr "Wählen Sie diese Option zum Unterschreiben der Nachricht."
+
+#: src/olflange.cpp:1560 src/olflange.cpp:1621 src/olflange.cpp:1703
+msgid "Open GPG Key Manager"
+msgstr "Die GPG Schlüsselverwaltung öffnen"
+
+#: src/olflange.cpp:1590 src/olflange.cpp:1654
+msgid "Decrypt message and verify signature"
+msgstr "Nachricht entschlüsseln und Unterschrift prüfen"
+
+#: src/olflange.cpp:1601 src/olflange.cpp:1672
+msgid "Encrypt message with GPG"
+msgstr "Nachricht mit GPG verschlüsseln"
+
+#: src/olflange.cpp:1610 src/olflange.cpp:1687
+msgid "Sign message with GPG"
+msgstr "Nachricht mit GPG unterschreiben"
+
+#: src/passphrase-dialog.c:83
+msgid "No key hint given."
+msgstr "Kein Hinweis auf den Schlüssel"
+
#: src/passphrase-dialog.c:322 src/passphrase-dialog.c:464
msgid "Invalid passphrase; please try again..."
msgstr "Ungültige Passphrase; bitte nochmal versuchen..."
@@ -137,7 +304,8 @@
"\n"
"Do you really want to cancel?"
msgstr ""
-"Wenn Sie diesen Dialog abbrechen, wird die Nachricht im Klartext ausgesendet!\n"
+"Wenn Sie diesen Dialog abbrechen, wird die Nachricht im Klartext "
+"ausgesendet!\n"
"\n"
"Möchten Sie wirklich abbrechen?"
@@ -147,29 +315,64 @@
"\n"
"Do you really want to cancel?"
msgstr ""
-"Wenn Sie diesen Dialog abbrechen, so wird die Nachricht ohne Unterschrift versendet.\n"
+"Wenn Sie diesen Dialog abbrechen, so wird die Nachricht ohne Unterschrift "
+"versendet.\n"
"\n"
"Möchten Sie wirklich abbrechen?"
+#: src/passphrase-dialog.c:419 src/passphrase-dialog.c:538
+msgid "Secret Key Dialog"
+msgstr "Auswahl des geheimen Schlüssels"
+
#: src/passphrase-dialog.c:529
msgid ""
"If you cancel this dialog, the message will be sent without signing.\n"
"Do you really want to cancel?"
msgstr ""
-"Wenn Sie diesen Dialog abbrechen, so wird die Nachricht ohne Unterschrift versendet.\n"
+"Wenn Sie diesen Dialog abbrechen, so wird die Nachricht ohne Unterschrift "
+"versendet.\n"
"\n"
"Möchten Sie wirklich abbrechen?"
+#: src/pgpmime.c:418
+msgid ""
+"Error creating file\n"
+"Please select another one"
+msgstr ""
+"Fehler bei der Erstellung der Datei.\n"
+"Bitte wählen Sie eine anderen Namen."
+
+#: src/pgpmime.c:420 src/pgpmime.c:553
+msgid "I/O-Error"
+msgstr "Ein-/Ausgabefehler"
+
+#: src/pgpmime.c:552
+msgid "Error writing file"
+msgstr "Dateischreibfehler"
+
+#: src/pgpmime.c:607
+msgid "[PGP/MIME message]"
+msgstr "[PGP/MIME Nachricht]"
+
+#: src/pgpmime.c:623
+msgid "[PGP/MIME message without plain text body]"
+msgstr "[PGP/MIME Nachricht ohne reinen Textkörper]"
+
#: src/recipient-dialog.c:459
msgid ""
"If you cancel this dialog, the message will be sent in cleartext.\n"
"\n"
"Do you really want to cancel?"
msgstr ""
-"Wenn Sie diesen Dialog abbrechen, so wird die NAchricht im Klartext versendet!\n"
+"Wenn Sie diesen Dialog abbrechen, so wird die NAchricht im Klartext "
+"versendet!\n"
"\n"
"Möchten Sie wirklich abbrechen?"
+#: src/recipient-dialog.c:462
+msgid "Recipient Dialog"
+msgstr "Auswahl des Empfängerschlüssels"
+
#: src/recipient-dialog.c:531 src/verify-dialog.c:152
msgid "User-ID not found"
msgstr "User-ID nicht gefunden"
@@ -202,3 +405,19 @@
msgid "Verification error"
msgstr "Überprüfungsfehler"
+#: src/verify-dialog.c:164
+#, c-format
+msgid "Signature expired on %s"
+msgstr "Unterschrift abgelaufen am %s"
+
+#: src/verify-dialog.c:176
+msgid "Signature issued by a key we do NOT trust."
+msgstr "Die Unterschrift stammt von einem Schlüssel dem wir NICHT vertrauen."
+
+#: src/verify-dialog.c:183
+msgid "Signature issued by a non-valid key."
+msgstr "Die Unterschrift stammt von einem ungültigen Schlüssel."
+
+#: src/verify-dialog.c:205
+msgid "Verification Result"
+msgstr "Prüfungsresultat"
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/ChangeLog 2005-11-30 16:47:27 UTC (rev 128)
@@ -1,5 +1,10 @@
2005-11-30 Werner Koch <wk at g10code.com>
+ * gpgmsg.cpp: Made more strings translatable.
+ * olflange.cpp: Replaced all LoadStrings by gettext calls.
+ * olflange-ids.h: Removed the IDS_ constants.
+ * olflange-rsrcs.rc: Removed the stringtables.
+
* common.c (get_root_key, read_w32_registry_string): New. Taken
for libgpg-error.
* main.c (i18n_init): New.
Modified: trunk/src/gpgmsg.cpp
===================================================================
--- trunk/src/gpgmsg.cpp 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/gpgmsg.cpp 2005-11-30 16:47:27 UTC (rev 128)
@@ -923,8 +923,8 @@
}
else
{
- MessageBox (hwnd, "No valid OpenPGP data found.",
- "GPG Decryption", MB_ICONWARNING|MB_OK);
+ MessageBox (hwnd, _("No valid OpenPGP data found."),
+ _("Decryption"), MB_ICONWARNING|MB_OK);
log_debug ("%s:%s: leave (no OpenPGP data)\n", SRCNAME, __func__);
}
@@ -958,8 +958,8 @@
{
log_error ("%s:%s: can't open PGP/MIME attachment 2: hr=%#lx",
SRCNAME, __func__, hr);
- MessageBox (hwnd, "Problem decrypting PGP/MIME message",
- "GPG Decryption", MB_ICONERROR|MB_OK);
+ MessageBox (hwnd, _("Problem decrypting PGP/MIME message"),
+ _("Decryption"), MB_ICONERROR|MB_OK);
log_debug ("%s:%s: leave (PGP/MIME problem)\n", SRCNAME, __func__);
release_attach_info (table);
return gpg_error (GPG_ERR_GENERAL);
@@ -970,8 +970,8 @@
{
log_error ("%s:%s: unsupported method %d for PGP/MIME attachment 2",
SRCNAME, __func__, method);
- MessageBox (hwnd, "Problem decrypting PGP/MIME message",
- "GPG Decryption", MB_ICONERROR|MB_OK);
+ MessageBox (hwnd, _("Problem decrypting PGP/MIME message"),
+ _("Decryption"), MB_ICONERROR|MB_OK);
log_debug ("%s:%s: leave (bad PGP/MIME method)\n",SRCNAME,__func__);
att->Release ();
release_attach_info (table);
@@ -984,8 +984,8 @@
{
log_error ("%s:%s: can't open data of attachment 2: hr=%#lx",
SRCNAME, __func__, hr);
- MessageBox (hwnd, "Problem decrypting PGP/MIME message",
- "GPG Decryption", MB_ICONERROR|MB_OK);
+ MessageBox (hwnd, _("Problem decrypting PGP/MIME message"),
+ _("Decryption"), MB_ICONERROR|MB_OK);
log_debug ("%s:%s: leave (OpenProperty failed)\n",SRCNAME,__func__);
att->Release ();
release_attach_info (table);
@@ -1013,10 +1013,10 @@
;
else if (mtype == OPENPGP_CLEARSIG)
MessageBox (hwnd, op_strerror (err),
- "GPG verification failed", MB_ICONERROR|MB_OK);
+ _("Verification Failure"), MB_ICONERROR|MB_OK);
else
MessageBox (hwnd, op_strerror (err),
- "GPG decryption failed", MB_ICONERROR|MB_OK);
+ _("Decryption Failure"), MB_ICONERROR|MB_OK);
}
else if (plaintext && *plaintext)
{
@@ -1054,14 +1054,14 @@
}
else if (!silent && update_display (hwnd, this, exchange_cb, is_html))
{
- const char s[] =
- "The message text cannot be displayed.\n"
- "You have to save the decrypted message to view it.\n"
- "Then you need to re-open the message.\n\n"
- "Do you want to save the decrypted message?";
+ const char *s =
+ _("The message text cannot be displayed.\n"
+ "You have to save the decrypted message to view it.\n"
+ "Then you need to re-open the message.\n\n"
+ "Do you want to save the decrypted message?");
int what;
- what = MessageBox (hwnd, s, "GPG Decryption",
+ what = MessageBox (hwnd, s, _("Decryption"),
MB_YESNO|MB_ICONWARNING);
if (what == IDYES)
{
@@ -1080,16 +1080,17 @@
verification might take long. */
if (!silent && n_signed && !pgpmime_succeeded)
{
- const char s[] =
- "Signed attachments found.\n\n"
- "@LIST@\n"
- "Do you want to verify the signatures?";
+ /* TRANSLATORS: Keep the @LIST@ verbatim on a separate line; it
+ will be expanded to a list of atatchment names. */
+ const char *s = _("Signed attachments found.\n\n"
+ "@LIST@\n"
+ "Do you want to verify the signatures?");
int what;
char *text;
text = text_from_attach_info (table, s, 2);
- what = MessageBox (hwnd, text, "Attachment Verification",
+ what = MessageBox (hwnd, text, _("Attachment Verification"),
MB_YESNO|MB_ICONINFORMATION);
xfree (text);
if (what == IDYES)
@@ -1105,15 +1106,16 @@
if (!silent && n_encrypted && !pgpmime_succeeded)
{
- const char s[] =
- "Encrypted attachments found.\n\n"
- "@LIST@\n"
- "Do you want to decrypt and save them?";
+ /* TRANSLATORS: Keep the @LIST@ verbatim on a separate line; it
+ will be expanded to a list of atatchment names. */
+ const char *s = _("Encrypted attachments found.\n\n"
+ "@LIST@\n"
+ "Do you want to decrypt and save them?");
int what;
char *text;
text = text_from_attach_info (table, s, 4);
- what = MessageBox (hwnd, text, "Attachment Decryption",
+ what = MessageBox (hwnd, text, _("Attachment Decryption"),
MB_YESNO|MB_ICONINFORMATION);
xfree (text);
if (what == IDYES)
@@ -1171,7 +1173,7 @@
if (err)
{
MessageBox (hwnd, op_strerror (err),
- "GPG Sign", MB_ICONERROR|MB_OK);
+ _("Signing Failure"), MB_ICONERROR|MB_OK);
goto leave;
}
}
@@ -1316,7 +1318,7 @@
if (err)
{
MessageBox (hwnd, op_strerror (err),
- "GPG Encryption", MB_ICONERROR|MB_OK);
+ _("Encryption Failure"), MB_ICONERROR|MB_OK);
goto leave;
}
@@ -1352,7 +1354,7 @@
if (err)
{
MessageBox (hwnd, op_strerror (err),
- "GPG Attachment Encryption", MB_ICONERROR|MB_OK);
+ _("Attachment Encryption Failure"), MB_ICONERROR|MB_OK);
goto leave;
}
}
@@ -2053,7 +2055,8 @@
log_debug ("%s:%s: verify detached signature failed: %s",
SRCNAME, __func__, op_strerror (err));
MessageBox (hwnd, op_strerror (err),
- "GPG Attachment Verification", MB_ICONERROR|MB_OK);
+ _("Attachment Verification Failure"),
+ MB_ICONERROR|MB_OK);
}
stream->Release ();
}
@@ -2235,7 +2238,8 @@
to->Release ();
from->Release ();
MessageBox (hwnd, op_strerror (err),
- "GPG Attachment Decryption", MB_ICONERROR|MB_OK);
+ _("Attachment Decryption Failure"),
+ MB_ICONERROR|MB_OK);
goto leave;
}
@@ -2283,7 +2287,8 @@
to->Release ();
from->Release ();
MessageBox (hwnd, op_strerror (err),
- "GPG Attachment Decryption", MB_ICONERROR|MB_OK);
+ _("Attachment Decryption Failure"),
+ MB_ICONERROR|MB_OK);
/* FIXME: We might need to delete outname now. However a
sensible implementation of the stream object should have
done it through the Revert call. */
@@ -2452,7 +2457,7 @@
SRCNAME, __func__, op_strerror (err));
to->Revert ();
MessageBox (hwnd, op_strerror (err),
- "GPG Attachment Signing", MB_ICONERROR|MB_OK);
+ _("Attachment Signing Failure"), MB_ICONERROR|MB_OK);
goto leave;
}
from->Release ();
@@ -2643,7 +2648,7 @@
SRCNAME, __func__, op_strerror (err));
to->Revert ();
MessageBox (hwnd, op_strerror (err),
- "GPG Attachment Encryption", MB_ICONERROR|MB_OK);
+ _("Attachment Encryption Failure"), MB_ICONERROR|MB_OK);
goto leave;
}
from->Release ();
Modified: trunk/src/gpgol-rsrcs.rc
===================================================================
--- trunk/src/gpgol-rsrcs.rc 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/gpgol-rsrcs.rc 2005-11-30 16:47:27 UTC (rev 128)
@@ -1,4 +1,4 @@
-/* gpgol-rsrcs.rc - Main resources for this DLL
+/* gpgol-rsrcs.rc - Main resources for this DLL -*- c -*-
* Copyright (C) 2004, 2005 g10 Code GmbH
*
* This file is part of GPGol.
Modified: trunk/src/olflange-ids.h
===================================================================
--- trunk/src/olflange-ids.h 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/olflange-ids.h 2005-11-30 16:47:27 UTC (rev 128)
@@ -6,42 +6,6 @@
#ifndef OLFLANGE_IDS_H
#define OLFLANGE_IDS_H
-#define IDS_DECRYPT_MENU_ITEM 1
-#define IDS_DECRYPT_HELP 2
-#define IDS_APP_NAME 3
-#define IDS_DECRYPT_STATUSBAR 4
-#define IDS_DECRYPT_TOOLTIP 5
-#define IDS_ENCRYPT_MENU_ITEM 6
-#define IDS_SIGN_MENU_ITEM 7
-#define IDS_ENCRYPT_HELP 8
-#define IDS_SIGN_HELP 9
-#define IDS_SIGN_STATUSBAR 10
-#define IDS_SIGN_TOOLTIP 11
-#define IDS_ENCRYPT_STATUSBAR 12
-#define IDS_ENCRYPT_TOOLTIP 13
-#define IDS_ADD_KEYS_MENU_ITEM 14
-#define IDS_ADD_KEYS_HELP 15
-#define IDS_ADD_KEYS_STATUSBAR 16
-#define IDS_ADD_KEYS_TOOLTIP 17
-#define IDS_KEY_MANAGER 18
-#define IDS_KEY_MANAGER_HELP 19
-#define IDS_KEY_MANAGER_STATUSBAR 20
-#define IDS_KEY_MANAGER_TOOLTIP 21
-#define IDS_ADD_STANDARD_KEY 22
-#define IDS_ADD_STANDARD_KEY_HELP 23
-#define IDS_ADD_STANDARD_KEY_STATUSBAR 24
-#define IDS_IMPORT_X_KEYS 25
-#define IDS_IMPORT_NO_NEW_OR_CHANGED_KEYS 26
-#define IDS_IMPORT_NO_KEYS 27
-#define IDS_ERR_REPLACE_TEXT 28
-#define IDS_ERR_EXPORT_KEY 29
-#define IDS_ATT_DECRYPT_AND_SAVE 30
-#define IDS_SAVE_ATT_TITLE 31
-#define IDS_SAVE_ATT_FILTER 32
-#define IDS_ERR_REPLACE_TEXT_ASK_SAVE 33
-#define IDS_ERR_ENCRYPT_ATTACHMENTS 34
-#define IDS_COPY_KEY_TO_CLIPBOARD 35
-#define IDS_ERR_ENCRYPT_EMBEDDED_OLE 36
#define IDB_DECRYPT 4000
#define IDC_TIME_PHRASES 4000
#define IDB_ENCRYPT 4001
Modified: trunk/src/olflange-rsrcs.rc
===================================================================
--- trunk/src/olflange-rsrcs.rc 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/olflange-rsrcs.rc 2005-11-30 16:47:27 UTC (rev 128)
@@ -1,4 +1,4 @@
-/* olflange-rsrcs.rc - Olflange specific resource.
+/* olflange-rsrcs.rc - Olflange specific resource. -*- c -*-
* Copyright (C) 2004, 2005 g10 Code GmbH
*
* This file is part of GPGol.
@@ -107,53 +107,6 @@
#endif // APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_DECRYPT_MENU_ITEM "&Decrypt and verify message"
- IDS_DECRYPT_HELP "Decrypt and verify the message."
- IDS_APP_NAME "GnuPG"
- IDS_DECRYPT_STATUSBAR "."
- IDS_DECRYPT_TOOLTIP "Decrypt message and verify signature"
- IDS_ENCRYPT_MENU_ITEM "GPG &encrypt message"
- IDS_SIGN_MENU_ITEM "GPG &sign message"
- IDS_ENCRYPT_HELP "Select this option to encrypt the message."
- IDS_SIGN_HELP "Select this option to sign the message."
- IDS_SIGN_STATUSBAR "."
- IDS_SIGN_TOOLTIP "Sign message with GPG"
- IDS_ENCRYPT_STATUSBAR "."
- IDS_ENCRYPT_TOOLTIP "Encrypt message with GPG"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_KEY_MANAGER "GnuPG Key &Manager"
- IDS_KEY_MANAGER_HELP "Open GnuPG Key Manager"
- IDS_KEY_MANAGER_STATUSBAR "."
- IDS_KEY_MANAGER_TOOLTIP "Open GnuPG Key Manager"
- IDS_ERR_REPLACE_TEXT "The message text could not be refreshed.\nPlease close the message and open it again."
- IDS_ATT_DECRYPT_AND_SAVE
- "Please close the message and open it again, to open the encrypted attachments or to save them."
- IDS_SAVE_ATT_TITLE "Save decrypted attachment"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
- IDS_SAVE_ATT_FILTER "All Files (*.*)|*.*||"
- IDS_ERR_REPLACE_TEXT_ASK_SAVE
- "The message text could not be refreshed. You can only read the message, when you save the decrypted message. Then you need to close it and open it again.\n\nShould the decrypted message be saved?"
- IDS_ERR_ENCRYPT_ATTACHMENTS
- "An error occured during the encryption of the attachments. The message cannot be sent."
- IDS_COPY_KEY_TO_CLIPBOARD
- "The key was written to the clipboard. Please add it to the message."
- IDS_ERR_ENCRYPT_EMBEDDED_OLE
- "Messaged with embedded OLE-objects cannot be encrypted."
-END
-
#endif // Deutsch (Deutschland) resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/olflange.cpp 2005-11-30 16:47:27 UTC (rev 128)
@@ -880,9 +880,9 @@
if (FAILED(pEECB->GetWindow (&hWnd)))
hWnd = NULL;
MessageBox (hWnd,
- "Sorry, we can only encrypt plain text messages and\n"
+ _("Sorry, we can only encrypt plain text messages and\n"
"no RTF messages. Please make sure that only the text\n"
- "format has been selected.",
+ "format has been selected."),
"GPGol", MB_ICONERROR|MB_OK);
m_bWriteFailed = TRUE;
@@ -1257,7 +1257,6 @@
{
int nTBIndex;
HWND hwndToolbar = NULL;
- CHAR szBuffer[128];
if (opt.compat.auto_decrypt)
watcher_set_callback_ctx ((void *)pEECB);
@@ -1265,9 +1264,8 @@
NULL, NULL, 0);
AppendMenu (hMenuTools, MF_SEPARATOR, 0, NULL);
- LoadString (glob_hinst, IDS_DECRYPT_MENU_ITEM, szBuffer, 128);
AppendMenu (hMenuTools, MF_BYPOSITION | MF_STRING,
- *pnCommandIDBase, szBuffer);
+ *pnCommandIDBase, _("&Decrypt and verify message"));
m_nCmdEncrypt = *pnCommandIDBase;
(*pnCommandIDBase)++;
@@ -1297,7 +1295,6 @@
if (m_lContext == EECONTEXT_SENDNOTEMESSAGE)
{
- CHAR szBuffer[128];
int nTBIndex;
HWND hwndToolbar = NULL;
@@ -1305,16 +1302,14 @@
NULL, NULL, 0);
AppendMenu(hMenuTools, MF_SEPARATOR, 0, NULL);
- LoadString(glob_hinst, IDS_ENCRYPT_MENU_ITEM, szBuffer, 128);
AppendMenu(hMenuTools, MF_STRING,
- *pnCommandIDBase, szBuffer);
+ *pnCommandIDBase, _("GPG &encrypt message"));
m_nCmdEncrypt = *pnCommandIDBase;
(*pnCommandIDBase)++;
- LoadString(glob_hinst, IDS_SIGN_MENU_ITEM, szBuffer, 128);
AppendMenu(hMenuTools, MF_STRING,
- *pnCommandIDBase, szBuffer);
+ *pnCommandIDBase, _("GPG &sign message"));
m_nCmdSign = *pnCommandIDBase;
(*pnCommandIDBase)++;
@@ -1352,7 +1347,6 @@
if (m_lContext == EECONTEXT_VIEWER)
{
- CHAR szBuffer[128];
int nTBIndex;
HWND hwndToolbar = NULL;
@@ -1360,9 +1354,8 @@
NULL, NULL, 0);
AppendMenu (hMenuTools, MF_SEPARATOR, 0, NULL);
- LoadString (glob_hinst, IDS_KEY_MANAGER, szBuffer, 128);
AppendMenu (hMenuTools, MF_BYPOSITION | MF_STRING,
- *pnCommandIDBase, szBuffer);
+ *pnCommandIDBase, _("GPG Key &Manager"));
m_nCmdEncrypt = *pnCommandIDBase;
(*pnCommandIDBase)++;
@@ -1495,7 +1488,7 @@
else if (m_lContext == EECONTEXT_VIEWER)
{
if (start_key_manager ())
- MessageBox (NULL, "Could not start Key-Manager",
+ MessageBox (NULL, _("Could not start Key-Manager"),
"GPGol", MB_ICONERROR|MB_OK);
}
@@ -1540,41 +1533,32 @@
{
if (m_lContext == EECONTEXT_READNOTEMESSAGE) {
if (nCommandID == m_nCmdEncrypt) {
- CHAR szBuffer[512];
- CHAR szAppName[128];
-
- LoadString (glob_hinst, IDS_DECRYPT_HELP, szBuffer, 511);
- LoadString (glob_hinst, IDS_APP_NAME, szAppName, 127);
- MessageBox (m_hWnd, szBuffer, szAppName, MB_OK);
+ MessageBox (m_hWnd,
+ _("Decrypt and verify the message."),
+ "GPGol", MB_OK);
return S_OK;
}
}
if (m_lContext == EECONTEXT_SENDNOTEMESSAGE) {
if (nCommandID == m_nCmdEncrypt) {
- CHAR szBuffer[512];
- CHAR szAppName[128];
- LoadString(glob_hinst, IDS_ENCRYPT_HELP, szBuffer, 511);
- LoadString(glob_hinst, IDS_APP_NAME, szAppName, 127);
- MessageBox(m_hWnd, szBuffer, szAppName, MB_OK);
+ MessageBox(m_hWnd,
+ _("Select this option to encrypt the message."),
+ "GPGol", MB_OK);
return S_OK;
}
- if (nCommandID == m_nCmdSign) {
- CHAR szBuffer[512];
- CHAR szAppName[128];
- LoadString(glob_hinst, IDS_SIGN_HELP, szBuffer, 511);
- LoadString(glob_hinst, IDS_APP_NAME, szAppName, 127);
- MessageBox(m_hWnd, szBuffer, szAppName, MB_OK);
+ else if (nCommandID == m_nCmdSign) {
+ MessageBox(m_hWnd,
+ _("Select this option to sign the message."),
+ "GPGol", MB_OK);
return S_OK;
}
}
if (m_lContext == EECONTEXT_VIEWER) {
if (nCommandID == m_nCmdEncrypt) {
- CHAR szBuffer[512];
- CHAR szAppName[128];
- LoadString(glob_hinst, IDS_KEY_MANAGER_HELP, szBuffer, 511);
- LoadString(glob_hinst, IDS_APP_NAME, szAppName, 127);
- MessageBox(m_hWnd, szBuffer, szAppName, MB_OK);
+ MessageBox(m_hWnd,
+ _("Open GPG Key Manager"),
+ "GPGol", MB_OK);
return S_OK;
}
}
@@ -1600,40 +1584,42 @@
if (m_lContext == EECONTEXT_READNOTEMESSAGE) {
if (nCommandID == m_nCmdEncrypt) {
if (lFlags == EECQHT_STATUS)
- LoadString (glob_hinst, IDS_DECRYPT_STATUSBAR,
- pszText, nCharCnt);
+ lstrcpyn (pszText, ".", nCharCnt);
if (lFlags == EECQHT_TOOLTIP)
- LoadString (glob_hinst, IDS_DECRYPT_TOOLTIP,
- pszText, nCharCnt);
+ lstrcpyn (pszText,
+ _("Decrypt message and verify signature"),
+ nCharCnt);
return S_OK;
}
}
if (m_lContext == EECONTEXT_SENDNOTEMESSAGE) {
if (nCommandID == m_nCmdEncrypt) {
if (lFlags == EECQHT_STATUS)
- LoadString (glob_hinst, IDS_ENCRYPT_STATUSBAR,
- pszText, nCharCnt);
+ lstrcpyn (pszText, ".", nCharCnt);
if (lFlags == EECQHT_TOOLTIP)
- LoadString (glob_hinst, IDS_ENCRYPT_TOOLTIP,
- pszText, nCharCnt);
+ lstrcpyn (pszText,
+ _("Encrypt message with GPG"),
+ nCharCnt);
return S_OK;
}
if (nCommandID == m_nCmdSign) {
if (lFlags == EECQHT_STATUS)
- LoadString (glob_hinst, IDS_SIGN_STATUSBAR, pszText, nCharCnt);
+ lstrcpyn (pszText, ".", nCharCnt);
if (lFlags == EECQHT_TOOLTIP)
- LoadString (glob_hinst, IDS_SIGN_TOOLTIP, pszText, nCharCnt);
+ lstrcpyn (pszText,
+ _("Sign message with GPG"),
+ nCharCnt);
return S_OK;
}
}
if (m_lContext == EECONTEXT_VIEWER) {
if (nCommandID == m_nCmdEncrypt) {
if (lFlags == EECQHT_STATUS)
- LoadString (glob_hinst, IDS_KEY_MANAGER_STATUSBAR,
- pszText, nCharCnt);
+ lstrcpyn (pszText, ".", nCharCnt);
if (lFlags == EECQHT_TOOLTIP)
- LoadString (glob_hinst, IDS_KEY_MANAGER_TOOLTIP,
- pszText, nCharCnt);
+ lstrcpyn (pszText,
+ _("Open GPG Key Manager"),
+ nCharCnt);
return S_OK;
}
}
@@ -1664,8 +1650,9 @@
pTBB->fsStyle = TBSTYLE_BUTTON;
pTBB->dwData = 0;
pTBB->iString = -1;
- LoadString(glob_hinst, IDS_DECRYPT_TOOLTIP,
- lpszDescription, nCharCnt);
+ lstrcpyn (lpszDescription,
+ _("Decrypt message and verify signature"),
+ nCharCnt);
return S_OK;
}
}
@@ -1681,8 +1668,9 @@
pTBB->fsStyle = TBSTYLE_BUTTON | TBSTYLE_CHECK;
pTBB->dwData = 0;
pTBB->iString = -1;
- LoadString(glob_hinst, IDS_ENCRYPT_TOOLTIP,
- lpszDescription, nCharCnt);
+ lstrcpyn (lpszDescription,
+ _("Encrypt message with GPG"),
+ nCharCnt);
return S_OK;
}
if (nToolbarButtonID == m_nToolbarButtonID2)
@@ -1695,8 +1683,9 @@
pTBB->fsStyle = TBSTYLE_BUTTON | TBSTYLE_CHECK;
pTBB->dwData = 0;
pTBB->iString = -1;
- LoadString(glob_hinst, IDS_SIGN_TOOLTIP,
- lpszDescription, nCharCnt);
+ lstrcpyn (lpszDescription,
+ _("Sign message with GPG"),
+ nCharCnt);
return S_OK;
}
}
@@ -1710,8 +1699,9 @@
pTBB->fsStyle = TBSTYLE_BUTTON;
pTBB->dwData = 0;
pTBB->iString = -1;
- LoadString(glob_hinst, IDS_KEY_MANAGER_TOOLTIP,
- lpszDescription, nCharCnt);
+ lstrcpyn (lpszDescription,
+ _("Open GPG Key Manager"),
+ nCharCnt);
return S_OK;
}
}
Modified: trunk/src/passphrase-dialog.c
===================================================================
--- trunk/src/passphrase-dialog.c 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/passphrase-dialog.c 2005-11-30 16:47:27 UTC (rev 128)
@@ -80,7 +80,7 @@
key_hint[i] = 0;
}
else
- key_hint = xstrdup ("No key hint given.");
+ key_hint = xstrdup (_("No key hint given."));
SendDlgItemMessage (dlg, ctrlid, CB_ADDSTRING, 0,
(LPARAM)(const char *)key_hint);
SendDlgItemMessage (dlg, ctrlid, CB_SETCURSEL, 0, 0);
@@ -416,7 +416,7 @@
if (warn)
{
- n = MessageBox (dlg, warn, "Secret Key Dialog",
+ n = MessageBox (dlg, warn, _("Secret Key Dialog"),
MB_ICONWARNING|MB_YESNO);
if (n == IDNO)
return FALSE;
@@ -535,7 +535,7 @@
if (warn)
{
- n = MessageBox (dlg, warn, "Secret Key Dialog",
+ n = MessageBox (dlg, warn, _("Secret Key Dialog"),
MB_ICONWARNING|MB_YESNO);
if (n == IDNO)
return FALSE;
Modified: trunk/src/pgpmime.c
===================================================================
--- trunk/src/pgpmime.c 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/pgpmime.c 2005-11-30 16:47:27 UTC (rev 128)
@@ -415,9 +415,9 @@
{
log_error ("%s:%s: can't create file `%s': hr=%#lx\n",
SRCNAME, __func__, ctx->filename, hr);
- MessageBox (ctx->hwnd, "Error creating file\n"
- "Please select anther one",
- "I/O-Error", MB_ICONERROR|MB_OK);
+ MessageBox (ctx->hwnd, _("Error creating file\n"
+ "Please select another one"),
+ _("I/O-Error"), MB_ICONERROR|MB_OK);
goto tryagain;
}
log_debug ("%s:%s: writing attachment to `%s'\n",
@@ -549,8 +549,8 @@
{
log_debug ("%s:%s: Write failed: hr=%#lx",
SRCNAME, __func__, hr);
- MessageBox (ctx->hwnd, "Error writing file",
- "I/O-Error", MB_ICONERROR|MB_OK);
+ MessageBox (ctx->hwnd, _("Error writing file"),
+ _("I/O-Error"), MB_ICONERROR|MB_OK);
ctx->parser_error = 1;
return 0; /* Error. */
}
@@ -604,7 +604,7 @@
goto leave;
err = op_decrypt_stream_to_gpgme (instream, plaintext, ttl,
- "[PGP/MIME message]", attestation);
+ _("[PGP/MIME message]"), attestation);
if (!err && (ctx->parser_error || ctx->line_too_long))
err = gpg_error (GPG_ERR_GENERAL);
@@ -620,7 +620,7 @@
}
}
else
- *body = xstrdup ("[PGP/MIME message without plain text body]");
+ *body = xstrdup (_("[PGP/MIME message without plain text body]"));
}
leave:
Modified: trunk/src/recipient-dialog.c
===================================================================
--- trunk/src/recipient-dialog.c 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/recipient-dialog.c 2005-11-30 16:47:27 UTC (rev 128)
@@ -459,7 +459,7 @@
warn = _("If you cancel this dialog, the message will be sent"
" in cleartext.\n\n"
"Do you really want to cancel?");
- i = MessageBox (dlg, warn, "Recipient Dialog",
+ i = MessageBox (dlg, warn, _("Recipient Dialog"),
MB_ICONWARNING|MB_YESNO);
if (i != IDNO)
{
Modified: trunk/src/verify-dialog.c
===================================================================
--- trunk/src/verify-dialog.c 2005-11-30 14:31:38 UTC (rev 127)
+++ trunk/src/verify-dialog.c 2005-11-30 16:47:27 UTC (rev 128)
@@ -159,9 +159,9 @@
valid = ctx->signatures->validity;
if (stat & GPGME_SIGSUM_SIG_EXPIRED)
{
- char *fmt;
+ const char *fmt;
- fmt = "Signature expired on %s";
+ fmt = _("Signature expired on %s");
s = get_timestamp (ctx->signatures->exp_timestamp);
p = xmalloc (strlen (s)+1+strlen (fmt)+2);
sprintf (p, fmt, s);
@@ -173,14 +173,14 @@
switch (valid)
{
case GPGME_VALIDITY_NEVER:
- s = "Signature issued by a key we do NOT trust.";
+ s = _("Signature issued by a key we do NOT trust.");
break;
default:
if (no_key)
s = "";
else
- s = "Signature issued by a non-valid key.";
+ s = _("Signature issued by a non-valid key.");
break;
}
SetDlgItemText (dlg, IDC_VRY_HINT, s);
@@ -195,15 +195,18 @@
switch (msg) {
case WM_INITDIALOG:
+
ctx = (struct dialog_context *)lparam;
load_sigbox (dlg, ctx->res);
center_window (dlg, NULL);
SetForegroundWindow (dlg);
if (ctx->filename)
{
- char *tmp = xmalloc (strlen (ctx->filename) + 100);
- strcpy (stpcpy (stpcpy (tmp, "Verification Result ("),
- ctx->filename), ")");
+ const char *s = _("Verification Result");
+ char *tmp = xmalloc (strlen (ctx->filename)
+ + strlen (s) + 100);
+ strcpy (stpcpy (stpcpy (stpcpy (tmp, s),
+ " ("), ctx->filename), ")");
SetWindowText (dlg, tmp);
xfree (tmp);
}
More information about the Gnupg-commits
mailing list