seahorse r2388 - in trunk: . libseahorse pgp

[sadam svn gnome org]

Author: sadam
Date: Tue Aug 26 21:42:48 2008
New Revision: 2388
URL: http://svn.gnome.org/viewvc/seahorse?rev=2388&view=rev

Log:
2008-08-26  Adam Schreiber  <sadam clemson edu>

    * libseahorse/seahorse-validity.c:
    * pgp/seahorse-pgp-key-properties.c: Clear up ambiguity by adding 
contexts.
    Fixes bug #549460


Modified:
   trunk/ChangeLog
   trunk/libseahorse/seahorse-validity.c
   trunk/pgp/seahorse-pgp-key-properties.c

Modified: trunk/libseahorse/seahorse-validity.c
==============================================================================
--- trunk/libseahorse/seahorse-validity.c	(original)
+++ trunk/libseahorse/seahorse-validity.c	Tue Aug 26 21:42:48 2008
@@ -31,7 +31,7 @@
 		case SEAHORSE_VALIDITY_UNKNOWN:
 			return _("Unknown");
 		case SEAHORSE_VALIDITY_NEVER:
-			return _("Never");
+			return C_("Validity", "Never");
 		case SEAHORSE_VALIDITY_MARGINAL:
 			return _("Marginal");
 		case SEAHORSE_VALIDITY_FULL:

Modified: trunk/pgp/seahorse-pgp-key-properties.c
==============================================================================
--- trunk/pgp/seahorse-pgp-key-properties.c	(original)
+++ trunk/pgp/seahorse-pgp-key-properties.c	Tue Aug 26 21:42:48 2008
@@ -1174,7 +1174,7 @@
        
         gtk_list_store_append (model, &iter);
         gtk_list_store_set (model, &iter,
-                            TRUST_LABEL, _("Never"),
+                            TRUST_LABEL, C_("Validity","Never"),
                             TRUST_VALIDITY,  SEAHORSE_VALIDITY_NEVER,
                             -1);
     }
@@ -1306,7 +1306,7 @@
         if (seahorse_key_get_location (skey) == SEAHORSE_LOCATION_REMOTE)
             fp_label = NULL;
         else if (subkey->expires == 0)
-            fp_label = g_strdup (_("Never"));
+            fp_label = g_strdup (C_("Expires", "Never"));
         else
             fp_label = seahorse_util_get_display_date_string (subkey->expires);
         gtk_label_set_text (GTK_LABEL (widget), fp_label);
@@ -1378,7 +1378,7 @@
         status = subkey->expired ? _("Expired") : _("Good");
 
         if (subkey->expires == 0)
-            expiration_date = g_strdup (_("Never"));
+            expiration_date = g_strdup (C_("Expires", "Never"));
         else
             expiration_date = seahorse_util_get_display_date_string (subkey->expires);