gnome-keyring r1538 - in trunk: . daemon daemon/pkcs11 gcr

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Feb  8 14:38:13 2009
New Revision: 1538
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1538&view=rev

Log:
Add translator comments.

Fixes bug #570529

Modified:
   trunk/ChangeLog
   trunk/daemon/gkr-daemon-ops.c
   trunk/daemon/pkcs11/gkr-pkcs11-auth.c
   trunk/gcr/gcr-importer.c

Modified: trunk/daemon/gkr-daemon-ops.c
==============================================================================
--- trunk/daemon/gkr-daemon-ops.c	(original)
+++ trunk/daemon/gkr-daemon-ops.c	Sun Feb  8 14:38:13 2009
@@ -305,41 +305,49 @@
 	
 	if (app->display_name && app->pathname) {
 		if (is_default) {
+			/* TRANSLATORS: The default keyring is locked */
 			message = g_markup_printf_escaped (_("The application '%s' (%s) wants access to "
 						           "the default keyring, but it is locked"),
 						           app->display_name, app->pathname);
 		} else {
+			/* TRANSLATORS: The keyring '%s' is locked */
 			message = g_markup_printf_escaped (_("The application '%s' (%s) wants access to "
 						           "the keyring '%s', but it is locked"),
 						           app->display_name, app->pathname, keyring_name);
 		}
 	} else if (app->display_name) {
 		if (is_default) {
+			/* TRANSLATORS: The default keyring is locked */
 			message = g_markup_printf_escaped (_("The application '%s' wants access to the "
 						           "default keyring, but it is locked"),
 						           app->display_name);
 		} else {
+			/* TRANSLATORS: The keyring '%s' is locked */
 			message = g_markup_printf_escaped (_("The application '%s' wants access to the "
 						           "keyring '%s', but it is locked"),
 						           app->display_name, keyring_name);
 		} 
 	} else if (app->pathname) {
 		if (is_default) {
+			/* TRANSLATORS: The default keyring is locked */
 			message = g_markup_printf_escaped (_("The application '%s' wants access to the "
 						           "default keyring, but it is locked"),
 						           app->pathname);
 		}
 		else {
+			/* TRANSLATORS: The keyring '%s' is locked */
 			message = g_markup_printf_escaped (_("The application '%s' wants access to the "
 						           "keyring '%s', but it is locked"),
 						           app->pathname, keyring_name);
 		}
 	} else { 
 		if (is_default) {
+			/* TRANSLATORS: The default keyring is locked */
 			message = g_markup_printf_escaped (_("An unknown application wants access to the "
 						           "default keyring, but it is locked"));
 		}
 		else {
+			/* TRANSLATORS: The keyring '%s' is locked */
 			message = g_markup_printf_escaped (_("An unknown application wants access to the "
 						           "keyring '%s', but it is locked"),
 						           keyring_name);
@@ -401,40 +409,48 @@
 
 	if (app->display_name && app->pathname) {
 		if (!is_default) {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("The application '%s' (%s) wants to create a new keyring called '%s'. "
 						           "You have to choose the password you want to use for it."),
 						           app->display_name, app->pathname, keyring_name);
 		} else {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("The application '%s' (%s) wants to create a new default keyring. "
 						           "You have to choose the password you want to use for it."),
 						           app->display_name, app->pathname);
 		} 
 	} else if (app->display_name) {
 		if (!is_default) {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("The application '%s' wants to create a new keyring called '%s'. "
 						           "You have to choose the password you want to use for it."),
 						           app->display_name, keyring_name);
 		} else {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("The application '%s' wants to create a new default keyring. "
 						           "You have to choose the password you want to use for it."),
 						           app->display_name);
 		} 
 	} else if (app->pathname) {
 		if (!is_default) {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("The application '%s' wants to create a new keyring called '%s'. "
 						           "You have to choose the password you want to use for it."),
 						           app->pathname, keyring_name);
 		} else {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("The application '%s' wants to create a new default keyring. "
 						           "You have to choose the password you want to use for it."),
 						           app->pathname);
 		} 
 	} else {
 		if (!is_default) {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("An unknown application wants to create a new keyring called '%s'. "
 						           "You have to choose the password you want to use for it."),
 						           keyring_name);
 		} else {
+			/* TRANSLATORS: The password is for the new keyring */
 			message = g_markup_printf_escaped (_("An unknown application wants to create a new default keyring. "
 						           "You have to choose the password you want to use for it."));
 		} 

Modified: trunk/daemon/pkcs11/gkr-pkcs11-auth.c
==============================================================================
--- trunk/daemon/pkcs11/gkr-pkcs11-auth.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-auth.c	Sun Feb  8 14:38:13 2009
@@ -126,12 +126,16 @@
 {
 	switch (klass) {
 	case CKO_PRIVATE_KEY:
+		/* TRANSLATORS: The private key is locked */
 		return g_strdup_printf (_("An application wants access to the private key '%s', but it is locked"), label);
 	case CKO_CERTIFICATE:
+		/* TRANSLATORS: The certificate is locked */
 		return g_strdup_printf (_("An application wants access to the certificate '%s', but it is locked"), label);
 	case CKO_PUBLIC_KEY:
+		/* TRANSLATORS: The public key is locked */
 		return g_strdup_printf (_("An application wants access to the public key '%s', but it is locked"), label);
 	default:
+		/* TRANSLATORS: The object '%s' is locked */
 		return g_strdup_printf (_("An application wants access to '%s', but it is locked"), label);
 	}
 }
@@ -367,6 +371,7 @@
 	ask = gkr_ask_request_new (_("Unlock certificate/key storage"), 
 	                           _("Enter password to unlock the certificate/key storage"), flags); 
 	
+	/* TRANSLATORS: The storage is locked, and needs unlocking before the application can use it. */
 	secondary = g_strdup_printf (_("An application wants access to the certificate/key storage '%s', but it is locked"), label);
 	gkr_ask_request_set_secondary (ask, secondary);
 	g_free (secondary);

Modified: trunk/gcr/gcr-importer.c
==============================================================================
--- trunk/gcr/gcr-importer.c	(original)
+++ trunk/gcr/gcr-importer.c	Sun Feb  8 14:38:13 2009
@@ -368,19 +368,27 @@
 prepare_auth_secondary (CK_OBJECT_CLASS klass, const gchar *label)
 {
 	if (label == NULL) {
-		if (klass == CKO_PRIVATE_KEY)
+		if (klass == CKO_PRIVATE_KEY) {
+			/* TRANSLATORS: The key is locked. */
 			return g_strdup (_("In order to import the private key, it must be unlocked"));
-		else if (klass == CKO_CERTIFICATE)
+		} else if (klass == CKO_CERTIFICATE) {
+			/* TRANSLATORS: The certificate is locked. */
 			return g_strdup (_("In order to import the certificate, it must be unlocked"));
-		else 
+		} else {
+			/* TRANSLATORS: The data is locked. */
 			return g_strdup (_("In order to import the data, it must be unlocked"));
+		}
 	} else {
-		if (klass == CKO_PRIVATE_KEY)
+		if (klass == CKO_PRIVATE_KEY) {
+			/* TRANSLATORS: The key is locked. */
 			return g_strdup_printf (_("In order to import the private key '%s', it must be unlocked"), label);
-		else if (klass == CKO_CERTIFICATE)
+		} else if (klass == CKO_CERTIFICATE) {
+			/* TRANSLATORS: The certificate is locked. */
 			return g_strdup_printf (_("In order to import the certificate '%s', it must be unlocked"), label);
-		else 
+		} else {
+			/* TRANSLATORS: The object '%s' is locked. */
 			return g_strdup_printf (_("In order to import '%s', it must be unlocked"), label);
+		}
 	}
 }