[seahorse] Add context for 'Unknown' and validity strings



commit 0554925c7860cbf6f2634e6a1e13c142775db48e
Author: Stef Walter <stefw gnome org>
Date:   Sat Oct 13 21:08:08 2012 +0200

    Add context for 'Unknown' and validity strings
    
    https://bugzilla.gnome.org/show_bug.cgi?id=686086

 libseahorse/seahorse-validity.c             |   12 ++++++------
 pgp/seahorse-gpgme-subkey.c                 |    2 +-
 pgp/seahorse-pgp-key-properties.c           |    2 +-
 pgp/seahorse-pgp-private-key-properties.xml |   10 +++++-----
 pgp/seahorse-pgp-public-key-properties.xml  |   10 +++++-----
 pkcs11/seahorse-token.c                     |    2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/libseahorse/seahorse-validity.c b/libseahorse/seahorse-validity.c
index bf9ed90..0ac7f76 100644
--- a/libseahorse/seahorse-validity.c
+++ b/libseahorse/seahorse-validity.c
@@ -37,19 +37,19 @@ seahorse_validity_get_string (SeahorseValidity validity)
 {
 	switch (validity) {
 		case SEAHORSE_VALIDITY_UNKNOWN:
-			return _("Unknown");
+			return C_("Validity", "Unknown");
 		case SEAHORSE_VALIDITY_NEVER:
 			return C_("Validity", "Never");
 		case SEAHORSE_VALIDITY_MARGINAL:
-			return _("Marginal");
+			return C_("Validity", "Marginal");
 		case SEAHORSE_VALIDITY_FULL:
-			return _("Full");
+			return C_("Validity", "Full");
 		case SEAHORSE_VALIDITY_ULTIMATE:
-			return _("Ultimate");
+			return C_("Validity", "Ultimate");
 		case SEAHORSE_VALIDITY_DISABLED:
-			return _("Disabled");
+			return C_("Validity", "Disabled");
 		case SEAHORSE_VALIDITY_REVOKED:
-			return _("Revoked");
+			return C_("Validity", "Revoked");
 		default:
 			return NULL;
 	}
diff --git a/pgp/seahorse-gpgme-subkey.c b/pgp/seahorse-gpgme-subkey.c
index 51e10ac..7cf8882 100644
--- a/pgp/seahorse-gpgme-subkey.c
+++ b/pgp/seahorse-gpgme-subkey.c
@@ -194,7 +194,7 @@ seahorse_gpgme_subkey_set_subkey (SeahorseGpgmeSubkey *self, gpgme_subkey_t subk
 	/* Calculate the algorithm */
 	algo_type = gpgme_pubkey_algo_name (subkey->pubkey_algo);
 	if (algo_type == NULL)
-		algo_type = _("Unknown");
+		algo_type = C_("Algorithm", "Unknown");
 	else if (g_str_equal ("Elg", algo_type) || g_str_equal("ELG-E", algo_type))
 		algo_type = _("ElGamal");
 
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index 019d945..f3b0344 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -1251,7 +1251,7 @@ setup_details_trust (SeahorseWidget *swidget)
     if (etype != SEAHORSE_USAGE_PRIVATE_KEY) {
         gtk_list_store_append (model, &iter);
         gtk_list_store_set (model, &iter,
-                            TRUST_LABEL, _("Unknown"),
+                            TRUST_LABEL, C_("Validity", "Unknown"),
                             TRUST_VALIDITY,  SEAHORSE_VALIDITY_UNKNOWN,
                             -1);                               
        
diff --git a/pgp/seahorse-pgp-private-key-properties.xml b/pgp/seahorse-pgp-private-key-properties.xml
index 109cce6..3721943 100644
--- a/pgp/seahorse-pgp-private-key-properties.xml
+++ b/pgp/seahorse-pgp-private-key-properties.xml
@@ -9,19 +9,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Unknown</col>
+        <col id="0" translatable="yes" context="Validity">Unknown</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Never</col>
+        <col id="0" translatable="yes" context="Validity">Never</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Marginal</col>
+        <col id="0" translatable="yes" context="Validity">Marginal</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Full</col>
+        <col id="0" translatable="yes" context="Validity">Full</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Ultimate</col>
+        <col id="0" translatable="yes" context="Validity">Ultimate</col>
       </row>
     </data>
   </object>
diff --git a/pgp/seahorse-pgp-public-key-properties.xml b/pgp/seahorse-pgp-public-key-properties.xml
index ba5ffe5..60e618e 100644
--- a/pgp/seahorse-pgp-public-key-properties.xml
+++ b/pgp/seahorse-pgp-public-key-properties.xml
@@ -9,19 +9,19 @@
     </columns>
     <data>
       <row>
-        <col id="0" translatable="yes">Unknown</col>
+        <col id="0" translatable="yes" context="Validity">Unknown</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Never</col>
+        <col id="0" translatable="yes" context="Validity">Never</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Marginally</col>
+        <col id="0" translatable="yes" context="Validity">Marginally</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Fully</col>
+        <col id="0" translatable="yes" context="Validity">Fully</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Ultimately</col>
+        <col id="0" translatable="yes" context="Validity">Ultimately</col>
       </row>
     </data>
   </object>
diff --git a/pkcs11/seahorse-token.c b/pkcs11/seahorse-token.c
index cdf605e..e5d9727 100644
--- a/pkcs11/seahorse-token.c
+++ b/pkcs11/seahorse-token.c
@@ -573,7 +573,7 @@ seahorse_token_get_property (GObject *object,
 	case PROP_LABEL:
 		token = gck_slot_get_token_info (self->pv->slot);
 		if (token == NULL)
-			g_value_set_string (value, _("Unknown"));
+			g_value_set_string (value, C_("Label", "Unknown"));
 		else
 			g_value_set_string (value, token->label);
 		gck_token_info_free (token);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]