[Winpt-commits] r99 - in trunk: Po Src

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Fri Nov 25 08:47:53 CET 2005


Author: twoaday
Date: 2005-11-25 08:47:51 +0100 (Fri, 25 Nov 2005)
New Revision: 99

Modified:
   trunk/Po/build-utf-mo.sh
   trunk/Po/de.po
   trunk/Src/ChangeLog
   trunk/Src/WinPT-en.rc
   trunk/Src/wptAboutDlgs.cpp
   trunk/Src/wptFileManagerDlg.cpp
   trunk/Src/wptKeyEditDlgs.cpp
   trunk/Src/wptKeyManagerDlg.cpp
   trunk/Src/wptKeygenCBDlg.cpp
   trunk/Src/wptKeylist.cpp
   trunk/Src/wptMDSumDlg.cpp
Log:
Updated translation.



Modified: trunk/Po/build-utf-mo.sh
===================================================================
--- trunk/Po/build-utf-mo.sh	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Po/build-utf-mo.sh	2005-11-25 07:47:51 UTC (rev 99)
@@ -4,5 +4,5 @@
 #sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=utf-8/"| 
 #msgfmt --output-file=winpt.mo -
 
-msgfmt --output-file=winpt.mo de.po
+msgfmt -v --check --output-file=winpt.mo de.po
 

Modified: trunk/Po/de.po
===================================================================
--- trunk/Po/de.po	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Po/de.po	2005-11-25 07:47:51 UTC (rev 99)
@@ -3002,7 +3002,7 @@
 
 #: c:\oss\winpt-gpgme\src\wptFileManagerDlg.cpp:671
 msgid "Are you sure you want to secure delete these files?"
-msgstr "Sollen diese Dateien wirklich sicher geloescht werden?"
+msgstr "Sollen diese Dateien wirklich sicher gelöscht werden?"
 
 msgid "&Yes"
 msgstr "&Ja"
@@ -3178,3 +3178,59 @@
 
 msgid "Do you want to delete the contents from the clipboard?"
 msgstr "Wollen sie den Inhalt der Zwischenablage löschen?"
+
+msgid "Groups"
+msgstr "Gruppen"
+
+msgid "Key Generation - Progress Dialog"
+msgstr "Schlüsselerzeugung - Fortschrittsdialog"
+
+
+msgid "Key..."
+msgstr "Schlüssel..."
+
+msgid "User ID..."
+msgstr "Benutzerkennung..."
+
+msgid "Photo ID..."
+msgstr "Photo ID..."
+
+msgid "Revoker..."
+msgstr "Revoker..."
+
+msgid "Anonymize (throw keyid)"
+msgstr "Anonymize (throw keyid)"
+
+msgid "&Select Key for signing"
+msgstr "&Schlüssel zum Signieren"
+
+msgid "Error during verification process."
+msgstr "Fehler während Verifikation"
+
+msgid "The signature is good."
+msgstr "Die Signatur is gut."
+
+msgid "The signature is BAD!"
+msgstr "Die Signatur wurde geändert!"
+
+msgid "The signature could not be checked due to a missing key."
+msgstr "Die Signature könnte durch einen fehlenden Key nicht geprüft werden."
+
+msgid "No valid OpenPGP signature."
+msgstr "Keine gültigen OpenPGP Signatur."
+
+msgid "Signature Error"
+msgstr "Fehler in Signatur"
+
+msgid "Good Signature (Expired Key)"
+msgstr "Gültige Signature (Abgelaufener Key)"
+
+msgid "Good Signature (Revoked Key)"
+msgstr "Gültige Signatur (Revoked Key)"
+
+msgid "Print Message Digest"
+msgstr "Ausgabe Prüfsummen"
+
+msgid "&Save..."
+msgstr "&Speichern..."
+

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/ChangeLog	2005-11-25 07:47:51 UTC (rev 99)
@@ -2,7 +2,11 @@
 
 	* wptPassphraseCB.cpp (passphrase_callback_proc): Localize
 	signing dialog items.
-	* wptMainProc.cpp (confirm_delclip_dlg): Localize dialog items. 
+	* wptMainProc.cpp (confirm_delclip_dlg): Localize dialog items.
+	* wptAboutDlgs.cpp (about_winpt_dlg_proc): Disable help for now.
+	* wptMDSumDlg.cpp (mdsum_dlg_proc): Localize missing items.
+	* wptKeylist.cpp (key_check_validity): Likewise.
+	* wptKeyEditDlgs.cpp (keyedit_addsubkey_dlg_proc): Likewise.
 	
 2005-11-22  Timo Schulz  <ts at g10code.com>
 

Modified: trunk/Src/WinPT-en.rc
===================================================================
--- trunk/Src/WinPT-en.rc	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/WinPT-en.rc	2005-11-25 07:47:51 UTC (rev 99)
@@ -355,7 +355,7 @@
     LTEXT           "Please enter your passphrase",IDC_DECRYPT_PWDINFO,8,105,
                     145,8
     CONTROL         "&Hide Typing",IDC_DECRYPT_HIDE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,161,106,54,10
+                    WS_TABSTOP,153,106,65,10
     EDITTEXT        IDC_DECRYPT_PWD,8,117,206,13,ES_PASSWORD | 
                     ES_AUTOHSCROLL
     DEFPUSHBUTTON   "&OK",IDOK,116,137,48,14
@@ -548,7 +548,7 @@
     LTEXT           "Comment in armored files",IDC_GPGPREFS_CMTINF,11,169,
                     124,8
     EDITTEXT        IDC_GPGPREFS_COMMENT,11,180,188,12,ES_AUTOHSCROLL
-    LTEXT           "Encrypt to this key",IDC_GPGPREFS_ENCINF,11,199,59,8
+    LTEXT           "Encrypt to this key",IDC_GPGPREFS_ENCINF,11,199,66,8
     EDITTEXT        IDC_GPGPREFS_ENCTO,78,197,121,13,ES_AUTOHSCROLL
     PUSHBUTTON      "&OK",IDC_GPGPREFS_SAVE,159,219,55,14
     GROUPBOX        "",IDC_STATIC,6,70,209,34
@@ -635,18 +635,18 @@
 CAPTION "Add new Subkey"
 FONT 8, "MS Sans Serif"
 BEGIN
-    LTEXT           "Key type",IDC_ADDSUBKEY_INFALGO,8,8,37,8
-    LISTBOX         IDC_ADDSUBKEY_ALGO,60,7,108,47,LBS_NOINTEGRALHEIGHT | 
+    LTEXT           "Key type",IDC_ADDSUBKEY_INFALGO,8,8,49,8
+    LISTBOX         IDC_ADDSUBKEY_ALGO,63,7,108,47,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Size in bits",IDC_ADDSUBKEY_INFSIZE,8,63,37,9
-    COMBOBOX        IDC_ADDSUBKEY_SIZE,60,60,55,48,CBS_DROPDOWNLIST | 
+    LTEXT           "Size in bits",IDC_ADDSUBKEY_INFSIZE,8,63,49,9
+    COMBOBOX        IDC_ADDSUBKEY_SIZE,63,60,55,48,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Key expiration",IDC_ADDSUBKEY_INFVALID,8,79,45,8
-    CONTROL         "Never",IDC_ADDSUBKEY_EXPIRE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,80,35,10
+    LTEXT           "Key expiration",IDC_ADDSUBKEY_INFVALID,8,79,56,8
+    CONTROL         "&Never",IDC_ADDSUBKEY_EXPIRE,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,63,80,39,10
     CONTROL         "DateTimePicker1",IDC_ADDSUBKEY_EXPDATE,
-                    "SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,97,79,53,
-                    13
+                    "SysDateTimePick32",DTS_RIGHTALIGN | WS_TABSTOP,112,79,
+                    53,13
     DEFPUSHBUTTON   "&OK",IDOK,66,107,50,14
     PUSHBUTTON      "&Cancel",IDCANCEL,119,107,50,14
 END
@@ -771,13 +771,14 @@
                     LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,6,6,333,92
     GROUPBOX        "",IDC_STATIC,5,98,107,46
     CONTROL         "&Text Output",IDC_ENCRYPT_ARMOR,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,11,106,53,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,11,106,78,10
     CONTROL         "&Wipe Original",IDC_ENCRYPT_WIPE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,11,119,58,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,11,119,81,10
     CONTROL         "Anonymize (throw keyid)",IDC_ENCRYPT_ANON,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,11,132,92,10
-    CONTROL         "Select Key for signing",IDC_ENCRYPT_SIGN,"Button",
-                    BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,103,84,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,11,132,98,10
+    CONTROL         "&Select Key for signing",IDC_ENCRYPT_SIGN,"Button",
+                    BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,103,113,
+                    10
     COMBOBOX        IDC_ENCRYPT_SECLIST,116,115,154,41,CBS_DROPDOWNLIST | 
                     WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "&OK",IDOK,290,101,50,14
@@ -882,7 +883,7 @@
     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,59,54,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,164,59,66,10
     DEFPUSHBUTTON   "&OK",IDOK,131,89,48,14
     PUSHBUTTON      "&Cancel",IDCANCEL,181,89,47,14
 END

Modified: trunk/Src/wptAboutDlgs.cpp
===================================================================
--- trunk/Src/wptAboutDlgs.cpp	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/wptAboutDlgs.cpp	2005-11-25 07:47:51 UTC (rev 99)
@@ -109,8 +109,11 @@
                          "more details. "));
 	SetDlgItemText (dlg, IDC_ABOUT_GPG, _("&About GPG..."));
 	SetDlgItemText (dlg, IDC_ABOUT_HELP, _("&Help"));
-	SetDlgItemText (dlg, IDC_WINPT_VERSION, PACKAGE_VERSION);
+	SetDlgItemText (dlg, IDC_WINPT_VERSION, PACKAGE_FULL_VERSION);
 
+        /* XXX provide full CHM help file. */
+        EnableWindow (GetDlgItem (dlg, IDC_ABOUT_HELP), FALSE);
+
 	center_window (dlg, NULL);
 	SetForegroundWindow (dlg);
 	return TRUE;

Modified: trunk/Src/wptFileManagerDlg.cpp
===================================================================
--- trunk/Src/wptFileManagerDlg.cpp	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/wptFileManagerDlg.cpp	2005-11-25 07:47:51 UTC (rev 99)
@@ -79,6 +79,9 @@
         SetWindowText (dlg, _("File Encrypt"));
         SetDlgItemText (dlg, IDC_ENCRYPT_ARMOR, _("&Text Output"));
 	SetDlgItemText (dlg, IDC_ENCRYPT_WIPE, _("&Wipe Original"));
+	SetDlgItemText (dlg, IDC_ENCRYPT_ANON, _("Anonymize (throw keyid)"));
+	SetDlgItemText (dlg, IDC_ENCRYPT_SIGN, _("&Select Key for signing"));
+	SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
 
 	/* XXX: support --hidden-recipient */
 	EnableWindow (GetDlgItem (dlg, IDC_ENCRYPT_ANON), FALSE);

Modified: trunk/Src/wptKeyEditDlgs.cpp
===================================================================
--- trunk/Src/wptKeyEditDlgs.cpp	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/wptKeyEditDlgs.cpp	2005-11-25 07:47:51 UTC (rev 99)
@@ -429,12 +429,12 @@
         ctx = (KEYEDIT_CB *)lparam;
         if( !ctx )
             dlg_fatal_error(dlg, "Could not get dialog param!");
-    #ifndef LANG_DE
+
         SetWindowText (dlg, _("Add new User ID"));
         SetDlgItemText (dlg, IDC_ADDUID_INFNAME, _("&Name"));
         SetDlgItemText (dlg, IDC_ADDUID_INFEMAIL, _("&Email"));
         SetDlgItemText (dlg, IDC_ADDUID_INFCOMMENT, _("&Comment"));
-    #endif
+
         SetForegroundWindow (dlg);
         return FALSE;
         
@@ -563,12 +563,13 @@
         if (!ctx)
             dlg_fatal_error (dlg, "Could not get dialog param!");
 	keygen = (KEYGEN_CB *)ctx->opaque;
-#ifndef LANG_DE
+
         SetWindowText (dlg, _("Add new Subkey"));
         SetDlgItemText (dlg, IDC_ADDSUBKEY_INFALGO, _("Key type"));
         SetDlgItemText (dlg, IDC_ADDSUBKEY_INFSIZE, _("Size in bits"));
         SetDlgItemText (dlg, IDC_ADDSUBKEY_INFVALID, _("Key expiration"));
-#endif
+	SetDlgItemText (dlg, IDC_ADDSUBKEY_EXPIRE, _("&Never"));
+
         lb = GetDlgItem (dlg, IDC_ADDSUBKEY_ALGO);
         listbox_add_string (lb, "DSA (sign only)");
         listbox_add_string (lb, "ElGamal (encrypt only)");

Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/wptKeyManagerDlg.cpp	2005-11-25 07:47:51 UTC (rev 99)
@@ -691,6 +691,8 @@
 	set_menu_text_bypos (menu, 1, _("Edit"));
 	set_menu_text_bypos (menu, 2, _("View"));
 	set_menu_text_bypos (menu, 3, _("Key"));
+	set_menu_text_bypos (menu, 4, _("Groups"));
+	
 	set_menu_text (menu, ID_KEYMISC_EDITKEY, _("Edit"));
 	set_menu_text (menu, ID_KEYMISC_MAIL, _("Send Mail..."));
 	set_menu_text (menu, ID_KEYMISC_OT, _("Ownertrust")); /* XXX */
@@ -898,7 +900,7 @@
 		GetCursorPos (&p);
 		hm = LoadMenu (glob_hinst, MAKEINTRESOURCE (IDR_WINPT_KEYMISC_CTX));
 		popup = GetSubMenu (hm, 0);
-	    #ifndef LANG_DE
+
 		set_menu_text (popup, ID_KEYCTX_UID_COPY, _("Copy User ID to Clipboard"));
 		set_menu_text (popup, ID_KEYCTX_KEYID_COPY, _("Copy Key ID to Clipboard"));
 		set_menu_text (popup, ID_KEYCTX_FPR_COPY, _("Copy Fingerprint to Clipboard"));
@@ -923,7 +925,12 @@
 		set_menu_text_bypos (popup, 0, _("Key Attributes"));
 		set_menu_text_bypos (popup, 6, _("Add"));
 		set_menu_text_bypos (popup, 19, _("Send to Keyserver"));
-	    #endif
+		
+		set_menu_text (popup, ID_KEYCTX_ADDKEY, _("Key..."));
+		set_menu_text (popup, ID_KEYCTX_ADDUID, _("User ID..."));
+		set_menu_text (popup, ID_KEYCTX_ADDPHOTO, _("Photo ID..."));
+		set_menu_text (popup, ID_KEYCTX_ADDREV, _("Revoker..."));
+		
 		idx = listview_get_curr_pos (kmi->lv);
 		if (km_check_for_seckey (kmi->lv, idx, &i))
 		    set_menu_state (popup, ID_KEYCTX_SETDEFKEY, MF_ENABLED);

Modified: trunk/Src/wptKeygenCBDlg.cpp
===================================================================
--- trunk/Src/wptKeygenCBDlg.cpp	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/wptKeygenCBDlg.cpp	2005-11-25 07:47:51 UTC (rev 99)
@@ -43,6 +43,7 @@
     case WM_INITDIALOG:
         SetDlgItemText (dlg, IDC_KEYPROG_CB, "");
         SetForegroundWindow (dlg);
+        SetWindowText (dlg, _("Key Generation - Progress Dialog"));
 	center_window (dlg, NULL);
         dlg_hwnd = dlg;
         return TRUE;

Modified: trunk/Src/wptKeylist.cpp
===================================================================
--- trunk/Src/wptKeylist.cpp	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/wptKeylist.cpp	2005-11-25 07:47:51 UTC (rev 99)
@@ -882,10 +882,10 @@
 static int
 key_check_validity (const char *validity) 
 {    
-    if (strstr (validity, "Unknown") ||
-	strstr (validity, "Undefined") ||
-	strstr (validity, "Never") ||
-	strstr (validity, "None"))
+    if (strstr (validity, _("Unknown")) ||
+	strstr (validity, _("Undefined")) ||
+	strstr (validity, _("Never")) ||
+	strstr (validity, _("None")))
 	return 0;  
     return 1;
 }

Modified: trunk/Src/wptMDSumDlg.cpp
===================================================================
--- trunk/Src/wptMDSumDlg.cpp	2005-11-24 14:27:41 UTC (rev 98)
+++ trunk/Src/wptMDSumDlg.cpp	2005-11-25 07:47:51 UTC (rev 99)
@@ -17,16 +17,14 @@
  * along with WinPT; if not, write to the Free Software Foundation, 
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 #include <windows.h>
 #include <stdio.h>
+
 #include "resource.h"
-
 #include "wptTypes.h"
 #include "wptW32API.h"
 #include "wptGPG.h"
@@ -36,7 +34,6 @@
 #include "wptErrors.h"
 #include "wptCrypto.h"
 
-
 /* Return a printable digest of the buffer @mdbuf. */
 static const char*
 printable_digest (byte *mdbuf, size_t n)
@@ -86,7 +83,10 @@
 		}
 	    }
 	}
-	SetForegroundWindow( dlg );
+	SetDlgItemText (dlg, IDC_MDSUM_COPY, _("&Save..."));
+	SetDlgItemText (dlg, IDOK, _("&Exit"));
+	SetWindowText (dlg, _("Print Message Digest"));
+	SetForegroundWindow (dlg);
 	break;
 
     case WM_DESTROY:



More information about the Winpt-commits mailing list