[gnome-keyring] Miscellaneous string fixes

[Stefan Walter <stefw src gnome org>]

commit 94b942945be15f65ad9fe703e79f7bfdbcaa56ad
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Oct 1 18:26:21 2010 +0000

    Miscellaneous string fixes
    
    Small grammar and punctuation fixes.

 egg/egg-oid.c                    |    2 +-
 gck/gck-misc.c                   |    6 +++---
 gcr/gcr-import-dialog.ui         |    7 +++++--
 gcr/gcr-unlock-options-widget.ui |    2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/egg/egg-oid.c b/egg/egg-oid.c
index 89a1d6d..d0bc6bf 100644
--- a/egg/egg-oid.c
+++ b/egg/egg-oid.c
@@ -43,7 +43,7 @@ static OidInfo oid_info[] = {
 	{ 0, "0.9.2342.19200300.100.1.1", "UID", N_("User ID"), 
 		EGG_OID_PRINTABLE | EGG_OID_IS_CHOICE },
 
-	{ 0, "1.2.840.113549.1.9.1", "EMAIL", N_("Email"), 
+	{ 0, "1.2.840.113549.1.9.1", "EMAIL", N_("Email Address"),
 		EGG_OID_PRINTABLE },
 	{ 0, "1.2.840.113549.1.9.7", NULL, NULL, 
 		EGG_OID_PRINTABLE | EGG_OID_IS_CHOICE },
diff --git a/gck/gck-misc.c b/gck/gck-misc.c
index 523e14b..663f9b3 100644
--- a/gck/gck-misc.c
+++ b/gck/gck-misc.c
@@ -126,7 +126,7 @@ gck_message_from_rv (CK_RV rv)
 	case CKR_DEVICE_ERROR:
 		return _("An error occurred on the device");
 	case CKR_DEVICE_MEMORY:
-		return _("Insufficient memory available on device");
+		return _("Insufficient memory available on the device");
 	case CKR_DEVICE_REMOVED:
 		return _("The device was removed or unplugged");
 	case CKR_ENCRYPTED_DATA_INVALID:
@@ -148,7 +148,7 @@ gck_message_from_rv (CK_RV rv)
 	case CKR_KEY_NEEDED:
 		return _("A key is needed");
 	case CKR_KEY_INDIGESTIBLE:
-		return _("Cannot include the key in digest");
+		return _("Cannot include the key in the digest");
 	case CKR_KEY_FUNCTION_NOT_PERMITTED:
 		return _("This operation cannot be done with this key");
 	case CKR_KEY_NOT_WRAPPABLE:
@@ -220,7 +220,7 @@ gck_message_from_rv (CK_RV rv)
 	case CKR_USER_ANOTHER_ALREADY_LOGGED_IN:
 		return _("Another user is already logged in");
 	case CKR_USER_TOO_MANY_TYPES:
-		return _("Too many users of different types logged in");
+		return _("Too many users of different types are logged in");
 	case CKR_WRAPPED_KEY_INVALID:
 		return _("Cannot import an invalid key");
 	case CKR_WRAPPED_KEY_LEN_RANGE:
diff --git a/gcr/gcr-import-dialog.ui b/gcr/gcr-import-dialog.ui
index 73c21d6..6d04550 100644
--- a/gcr/gcr-import-dialog.ui
+++ b/gcr/gcr-import-dialog.ui
@@ -30,9 +30,12 @@
               <object class="GtkLabel" id="primary-text">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;span size='large' weight='bold'&gt;Import Certificates and Keys&lt;/span&gt;</property>
-                <property name="use_markup">True</property>
+                <property name="label" translatable="yes">Import Certificates and Keys</property>
                 <property name="wrap">True</property>
+                <attributes>
+                  <attribute name="weight" value="PANGO_WEIGHT_BOLD"/>
+                  <attribute name="scale" value="1.2"/><!-- PANGO_SCALE_LARGE -->
+                </attributes>
               </object>
             </child>
             <child>
diff --git a/gcr/gcr-unlock-options-widget.ui b/gcr/gcr-unlock-options-widget.ui
index f59a1d1..ef59144 100644
--- a/gcr/gcr-unlock-options-widget.ui
+++ b/gcr/gcr-unlock-options-widget.ui
@@ -100,7 +100,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="xalign">0</property>
-            <property name="label" translatable="yes">minutes</property>
+            <property name="label" translatable="yes" comments="Translators: The 'minutes' from 'Lock this keyring if idle for x minutes'.">minutes</property>
           </object>
           <packing>
             <property name="expand">False</property>