[svn] GPGol - r136 - in trunk: . po src

[svn author wk]

Author: wk
Date: 2006-01-16 13:01:18 +0100 (Mon, 16 Jan 2006)
New Revision: 136

Modified:
   trunk/NEWS
   trunk/configure.ac
   trunk/po/de.po
   trunk/src/ChangeLog
   trunk/src/gpgol-rsrcs.rc
   trunk/src/verify-dialog.c
Log:
Fixed 2 usability bugs


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-01-02 08:51:34 UTC (rev 135)
+++ trunk/NEWS	2006-01-16 12:01:18 UTC (rev 136)
@@ -1,3 +1,7 @@
+Noteworthy changes for version 0.9.6
+=================================================
+
+
 Noteworthy changes for version 0.9.5 (2005-12-07)
 =================================================
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-01-02 08:51:34 UTC (rev 135)
+++ trunk/configure.ac	2006-01-16 12:01:18 UTC (rev 136)
@@ -16,7 +16,7 @@
 # Version number: Remember to change it immediately *after* a release.
 #                 Make sure to run  "svn up" before a "make dist".
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(gpgol, 0.9.5, bug-gpgol at g10code.com)
+AC_INIT(gpgol, 0.9.6-cvs, bug-gpgol at g10code.com)
 
 NEED_GPGME_API=1
 NEED_GPGME_VERSION=1.1.0

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2006-01-02 08:51:34 UTC (rev 135)
+++ trunk/po/de.po	2006-01-16 12:01:18 UTC (rev 136)
@@ -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-12-07 17:27+0100\n"
-"PO-Revision-Date: 2005-12-07 17:31+0100\n"
+"POT-Creation-Date: 2006-01-16 12:15+0100\n"
+"PO-Revision-Date: 2006-01-16 12:16+0100\n"
 "Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: de\n"
 "MIME-Version: 1.0\n"
@@ -430,19 +430,23 @@
 msgstr "Überprüfungsfehler"
 
 #: src/verify-dialog.c:164
+msgid "This may be due to a wrong option setting"
+msgstr "Möglicherweise durch falsche Einstellungen verursacht"
+
+#: src/verify-dialog.c:170
 #, c-format
 msgid "Signature expired on %s"
 msgstr "Unterschrift abgelaufen am %s"
 
-#: src/verify-dialog.c:176
+#: src/verify-dialog.c:182
 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
+#: src/verify-dialog.c:189
 msgid "Signature issued by a non-valid key."
 msgstr "Die Unterschrift stammt von einem ungültigen Schlüssel."
 
-#: src/verify-dialog.c:205
+#: src/verify-dialog.c:211
 msgid "Verification Result"
 msgstr "Prüfungsresultat"
 

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-01-02 08:51:34 UTC (rev 135)
+++ trunk/src/ChangeLog	2006-01-16 12:01:18 UTC (rev 136)
@@ -1,3 +1,10 @@
+2006-01-16  Werner Koch  <wk at g10code.com>
+
+	* verify-dialog.c (load_sigbox): Give a hint in case of a bad
+	signature.
+
+	* gpgol-rsrcs.rc (IDD_ENC_DE): Add an informational header.
+
 2005-12-07  Werner Koch  <wk at g10code.com>
 
 	* olflange.cpp (Install): Cehck the version and print a warning.

Modified: trunk/src/gpgol-rsrcs.rc
===================================================================
--- trunk/src/gpgol-rsrcs.rc	2006-01-02 08:51:34 UTC (rev 135)
+++ trunk/src/gpgol-rsrcs.rc	2006-01-16 12:01:18 UTC (rev 136)
@@ -47,11 +47,13 @@
 BEGIN
     CONTROL         "List1",IDC_ENC_RSET1,"SysListView32",LVS_REPORT | 
                     WS_BORDER | WS_TABSTOP,8,4,314,92
+    LTEXT           "Ausgewählte Empfänger:",IDC_STATIC,
+                    8,98,130,8
     CONTROL         "List2",IDC_ENC_RSET2,"SysListView32",LVS_REPORT | 
-                    WS_BORDER | WS_TABSTOP,8,98,313,49
-    LTEXT           "Empfänger die NICHT gefunden wurden",IDC_ENC_INFO,8,149,
-                    128,8
-    LISTBOX         IDC_ENC_NOTFOUND,8,158,313,22,LBS_SORT | 
+                    WS_BORDER | WS_TABSTOP,8,110,313,49
+    LTEXT           "Empfänger die NICHT gefunden wurden:",IDC_ENC_INFO,
+                    8,161,128,8
+    LISTBOX         IDC_ENC_NOTFOUND,8,170,313,22,LBS_SORT | 
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "&OK",IDOK,221,196,50,14
     PUSHBUTTON      "&Abbrechen",IDCANCEL,273,196,50,14

Modified: trunk/src/verify-dialog.c
===================================================================
--- trunk/src/verify-dialog.c	2006-01-02 08:51:34 UTC (rev 135)
+++ trunk/src/verify-dialog.c	2006-01-16 12:01:18 UTC (rev 136)
@@ -157,8 +157,14 @@
   SetDlgItemText (dlg, IDC_VRY_PKALGO, s);
   
   valid = ctx->signatures->validity;
-  if (stat & GPGME_SIGSUM_SIG_EXPIRED) 
+  if (stat & GPGME_SIGSUM_RED)
     {
+      /* This is a BAD signature; give a hint to the user. */
+      SetDlgItemText (dlg, IDC_VRY_HINT, 
+               _("This may be due to a wrong option setting"));
+    }
+  else if (stat & GPGME_SIGSUM_SIG_EXPIRED) 
+    {
       const char *fmt;
     
       fmt = _("Signature expired on %s");