Index: pk/gkr-pk-object-storage.c
===================================================================
--- pk/gkr-pk-object-storage.c	(révision 1049)
+++ pk/gkr-pk-object-storage.c	(copie de travail)
@@ -155,23 +155,16 @@
 		
 	/* We know the type so add that to the strings */
 	} else {
-		/* 
-		 * TRANSLATORS: 
-	 	 *  display_type will be the type of the object like 'certificate' or 'key'
-	 	 */
 		display_type = gkr_pkix_parsed_type_to_display (type);
 
-		/* 
-		 * TRANSLATORS: 
-	 	 *  display_type will be the type of the object like 'certificate' or 'key'
-	 	 */
-		title = g_strdup_printf (_("Unlock %s"), display_type);
+		title = g_strdup_printf (_("Unlock key/certificate"));
 
-		/* 
-		 * TRANSLATORS: 
-	 	 *  display_type will be the type of the object like 'certificate' or 'key'
-	 	 */
-		primary = g_strdup_printf (_("Enter password for the %s to unlock"), display_type);
+		if (display_type == "private key")
+			primary = g_strdup_printf (_("Enter password for the private key to unlock");
+		else if (display_type == "certificate")
+			primary = g_strdup_printf (_("Enter password for the certificate to unlock");
+		else if (display_type == "public key")
+			primary = g_strdup_printf (_("Enter password for the public key to unlock");
 	}
 	
 	if (custom_label != NULL)
@@ -180,36 +173,22 @@
 	/* When we've already indexed this data */
 	if (have_indexed) {
 		if (display_type) {
-			/* 
-			 * TRANSLATORS: 
-	 		 *  display_type will be the type of the object like 'certificate' or 'key'
-		 	 *  label is replaced with the name of the locked object.
-		 	 */
-			secondary = g_strdup_printf (_("An application wants access to the %s '%s', but it is locked"), 
-			                             display_type, label);
+			/* TRANSLATORS: (%s) will be the type of the object like 'certificate' or 'key' */
+			secondary = g_strdup_printf (_("An application wants access to '%s' (%s), but it is locked"), 
+			                             label, display_type);
 		} else {
-			/* 
-			 * TRANSLATORS: 
-	 		 *  label is replaced with the name of the locked object.
-		 	 */
+			/* TRANSLATORS: %s is replaced with the name of the locked object. */
 			secondary = g_strdup_printf (_("An application wants access to '%s', but it is locked"), label);
 		}
 			
 	/* Never before seen this data */ 
 	} else {
 		if (display_type) {
-			/* 
-			 * TRANSLATORS: 
-	 		 *  display_type will be the type of the object like 'certificate' or 'key'
-		 	 *  label is replaced with the name of the locked object.
-		 	 */
-			secondary = g_strdup_printf(_("The system wants to import the %s '%s', but it is locked."),
-			                            display_type, label);
+			/* TRANSLATORS: (%s) will be the type of the object like 'certificate' or 'key' */
+			secondary = g_strdup_printf(_("The system wants to import '%s' (%s), but it is locked."),
+			                            label, display_type);
 		} else {
-			/* 
-			 * TRANSLATORS: 
-	 		 *  label is replaced with the name of the locked object.
-		 	 */			
+			/* TRANSLATORS: %s is replaced with the name of the locked object. */
 			secondary = g_strdup_printf(_("The system wants to import '%s', but it is locked."), label);
 		}
 	}
@@ -223,11 +202,7 @@
 	g_free (secondary);
 		
 	if (gkr_keyring_login_is_usable ()) {
-		/* 
-		 * TRANSLATORS: 
- 		 *  display_type will be the type of the object like 'certificate' or 'key'
-		 */
-		check = g_strdup_printf (_("Automatically unlock this %s when I log in."), display_type);
+		check = g_strdup_printf (_("Automatically unlock this object when I log in."));
 		gkr_ask_request_set_check_option (ask, check);
 		g_free (check);
 	}
@@ -239,10 +214,7 @@
 	} else {
 		ret = gkr_secure_strdup (ask->typed_password);
 		if (ask->checked) {
-			/* 
-			 * TRANSLATORS: 
-		 	 *  label is the name of the object to unlock.
-		 	 */
+			/* TRANSLATORS: label is the name of the object to unlock. */
 			display_name =  g_strdup_printf (_("Unlock password for %s"), label);
 			gkr_keyring_login_attach_secret (GNOME_KEYRING_ITEM_ENCRYPTION_KEY_PASSWORD,
 			                                 display_name, ret,
