[Winpt-commits] r95 - in trunk: . Po Src
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Thu Nov 24 13:09:30 CET 2005
Author: twoaday
Date: 2005-11-24 13:09:28 +0100 (Thu, 24 Nov 2005)
New Revision: 95
Modified:
trunk/Makefile.am
trunk/Po/de.po
trunk/Src/ChangeLog
trunk/Src/WinPT-en.rc
trunk/Src/resource.h
trunk/Src/wptMainProc.cpp
trunk/Src/wptPassphraseCB.cpp
trunk/configure.ac
Log:
See ChangeLog.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/Makefile.am 2005-11-24 12:09:28 UTC (rev 95)
@@ -20,7 +20,7 @@
EXTRA_DIST = autogen.sh README.SVN keyserver.conf
-SUBDIRS = Gnupg w32gpgme PTD Src Include Ico icons m4
+SUBDIRS = Po Gnupg w32gpgme PTD Src Include Ico icons m4
dist-hook:
echo "$(VERSION)" > $(distdir)/VERSION
Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/Po/de.po 2005-11-24 12:09:28 UTC (rev 95)
@@ -3094,7 +3094,7 @@
msgstr "Kommentar in Armor-Dateien"
msgid "Encrypt to this key"
-msgstr ""
+msgstr "\"Encrypt to this key\""
msgid "Disabled"
msgstr "Inaktiv"
@@ -3172,3 +3172,9 @@
msgid "Designated Revoker Keys"
msgstr "List der Schlüsselwiderrufer"
+
+msgid "&Remember the answer"
+msgstr "Nicht mehr nachfragen"
+
+msgid "Do you want to delete the contents from the clipboard?"
+msgstr "Wollen sie den Inhalt der Zwischenablage löschen?"
Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/Src/ChangeLog 2005-11-24 12:09:28 UTC (rev 95)
@@ -1,3 +1,9 @@
+2005-11-24 Timo Schulz <ts at g10code.com>
+
+ * wptPassphraseCB.cpp (passphrase_callback_proc): Localize
+ signing dialog items.
+ * wptMainProc.cpp (confirm_delclip_dlg): Localize dialog items.
+
2005-11-22 Timo Schulz <ts at g10code.com>
* wptCardEditCB.cpp (gpg_write): Due to removed _DEBUG
Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/Src/WinPT-en.rc 2005-11-24 12:09:28 UTC (rev 95)
@@ -340,7 +340,7 @@
PUSHBUTTON "&Cancel",IDCANCEL,294,189,53,14
END
-IDD_WINPT_DECRYPT DIALOG DISCARDABLE 0, 0, 225, 150
+IDD_WINPT_DECRYPT DIALOG DISCARDABLE 0, 0, 225, 159
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Decryption"
FONT 8, "MS Sans Serif"
@@ -350,16 +350,16 @@
LISTBOX IDC_DECRYPT_LIST,8,15,207,35,LBS_SORT |
LBS_NOINTEGRALHEIGHT | LBS_NOSEL | WS_VSCROLL |
WS_TABSTOP
- GROUPBOX "",IDC_STATIC,8,52,208,43
- LTEXT "Passphrase info",IDC_DECRYPT_MSG,11,60,196,31
- LTEXT "Please enter your passphrase",IDC_DECRYPT_PWDINFO,8,96,
+ GROUPBOX "",IDC_STATIC,8,52,208,51
+ LTEXT "Passphrase info",IDC_DECRYPT_MSG,11,60,196,39
+ LTEXT "Please enter your passphrase",IDC_DECRYPT_PWDINFO,8,105,
145,8
CONTROL "&Hide Typing",IDC_DECRYPT_HIDE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,161,97,54,10
- EDITTEXT IDC_DECRYPT_PWD,8,108,206,13,ES_PASSWORD |
+ WS_TABSTOP,161,106,54,10
+ EDITTEXT IDC_DECRYPT_PWD,8,117,206,13,ES_PASSWORD |
ES_AUTOHSCROLL
- DEFPUSHBUTTON "&OK",IDOK,116,128,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,165,128,49,14
+ DEFPUSHBUTTON "&OK",IDOK,116,137,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,165,137,49,14
END
IDD_WINPT_KEYSERVER DIALOG DISCARDABLE 0, 0, 219, 215
@@ -848,7 +848,7 @@
DEFPUSHBUTTON "&OK",IDOK,9,34,50,14
PUSHBUTTON "&Cancel",IDCANCEL,62,34,50,14
CONTROL "&Hide Typing",IDC_PASSWD_HIDE,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,136,7,54,10
+ WS_TABSTOP,136,7,78,10
END
IDD_WINPT_DATE DIALOG DISCARDABLE 0, 0, 93, 58
@@ -870,21 +870,21 @@
ES_WANTRETURN | WS_DISABLED
END
-IDD_WINPT_DECRYPT_SIGN DIALOG DISCARDABLE 0, 0, 237, 103
+IDD_WINPT_DECRYPT_SIGN DIALOG DISCARDABLE 0, 0, 237, 110
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Signing"
FONT 8, "MS Sans Serif"
BEGIN
- GROUPBOX "",IDC_STATIC,7,4,220,44
- LTEXT "Passphrase info",IDC_DECRYPT_SIGN_MSG,13,15,210,28
+ GROUPBOX "",IDC_STATIC,7,4,220,52
+ LTEXT "Passphrase info",IDC_DECRYPT_SIGN_MSG,13,15,210,38
LTEXT "Please enter your passphrase",IDC_DECRYPT_SIGN_PWDINFO,
- 7,51,153,8
- EDITTEXT IDC_DECRYPT_SIGN_PWD,7,63,219,12,ES_PASSWORD |
+ 7,59,153,8
+ EDITTEXT IDC_DECRYPT_SIGN_PWD,7,71,219,12,ES_PASSWORD |
ES_AUTOHSCROLL
CONTROL "&Hide Typing",IDC_DECRYPT_SIGN_HIDE,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,174,51,54,10
- DEFPUSHBUTTON "&OK",IDOK,131,81,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,181,81,47,14
+ BS_AUTOCHECKBOX | WS_TABSTOP,174,59,54,10
+ DEFPUSHBUTTON "&OK",IDOK,131,89,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,181,89,47,14
END
IDD_WINPT_GROUP DIALOG DISCARDABLE 0, 0, 178, 66
@@ -1083,9 +1083,9 @@
FONT 8, "MS Sans Serif"
BEGIN
LTEXT "Do you want to delete the contents from the clipboard?",
- IDC_STATIC,6,7,116,20
+ IDC_CONFDELCLIP_INFO,6,7,116,20
CONTROL "&Remember the answer",IDC_CONFDELCLIP_BRAIN,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,6,33,87,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,6,33,111,10
DEFPUSHBUTTON "&Yes",IDYES,38,49,43,14
PUSHBUTTON "&No",IDNO,83,49,43,14
END
@@ -1454,7 +1454,7 @@
LEFTMARGIN, 4
RIGHTMARGIN, 218
TOPMARGIN, 3
- BOTTOMMARGIN, 144
+ BOTTOMMARGIN, 153
END
IDD_WINPT_KEYSERVER, DIALOG
@@ -1686,7 +1686,7 @@
LEFTMARGIN, 4
RIGHTMARGIN, 230
TOPMARGIN, 3
- BOTTOMMARGIN, 97
+ BOTTOMMARGIN, 104
END
IDD_WINPT_GROUP, DIALOG
Modified: trunk/Src/resource.h
===================================================================
--- trunk/Src/resource.h 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/Src/resource.h 2005-11-24 12:09:28 UTC (rev 95)
@@ -593,6 +593,7 @@
#define IDC_PREFS_CLIPINF 1479
#define IDC_PREFS_CURRINF 1480
#define IDC_KEYREVOKERS_INF 1481
+#define IDC_CONFDELCLIP_INFO 1482
#define ID_GPG_ENCRYPT 40003
#define ID_GPG_DECRYPT 40004
#define ID_GPG_SIGN 40005
@@ -763,7 +764,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 230
#define _APS_NEXT_COMMAND_VALUE 40176
-#define _APS_NEXT_CONTROL_VALUE 1482
+#define _APS_NEXT_CONTROL_VALUE 1483
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/Src/wptMainProc.cpp
===================================================================
--- trunk/Src/wptMainProc.cpp 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/Src/wptMainProc.cpp 2005-11-24 12:09:28 UTC (rev 95)
@@ -119,6 +119,8 @@
switch (msg) {
case WM_INITDIALOG:
SetWindowText (dlg, _("Delete Clipboard Contents"));
+ SetDlgItemText (dlg, IDC_CONFDELCLIP_BRAIN, _("&Remember the answer"));
+ SetDlgItemText (dlg, IDC_CONFDELCLIP_INFO, _("Do you want to delete the contents from the clipboard?"));
center_window (dlg, NULL);
SetForegroundWindow (dlg);
break;
Modified: trunk/Src/wptPassphraseCB.cpp
===================================================================
--- trunk/Src/wptPassphraseCB.cpp 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/Src/wptPassphraseCB.cpp 2005-11-24 12:09:28 UTC (rev 95)
@@ -87,8 +87,10 @@
_("Encrypted with the following public key(s)"));
CheckDlgButton (dlg, IDC_DECRYPT_HIDE, BST_CHECKED);
}
- else if (c->gpg_cmd == GPG_CMD_SIGN)
+ else if (c->gpg_cmd == GPG_CMD_SIGN) {
+ SetDlgItemText (dlg, IDC_DECRYPT_SIGN_HIDE, _("&Hide Typing"));
CheckDlgButton (dlg, IDC_DECRYPT_SIGN_HIDE, BST_CHECKED);
+ }
if (c->recipients)
recip = c->recipients; /* recipients were already extracted. */
else {
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-11-23 12:16:55 UTC (rev 94)
+++ trunk/configure.ac 2005-11-24 12:09:28 UTC (rev 95)
@@ -15,7 +15,7 @@
# Version number: Remember to change it immediately *after* a release.
# Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.2-cvs, http://www.winpt.org)
+AC_INIT(WinPT, 0.11.1, http://www.winpt.org)
NEED_GPGME_API=1
NEED_GPGME_VERSION=1.1.0
More information about the Winpt-commits
mailing list