gnome-keyring r1537 - trunk/daemon/pk

[nnielsen svn gnome org]

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

Log:
Remove gettext _() from unused files.

Modified:
   trunk/daemon/pk/gkr-pk-import.c
   trunk/daemon/pk/gkr-pk-index.c
   trunk/daemon/pk/gkr-pk-object.c
   trunk/daemon/pk/gkr-pk-storage.c

Modified: trunk/daemon/pk/gkr-pk-import.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-import.c	(original)
+++ trunk/daemon/pk/gkr-pk-import.c	Sun Feb  8 14:38:08 2009
@@ -42,7 +42,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <glib/gi18n.h>
 
 /* -------------------------------------------------------------------------------------
  * DECLARATIONS
@@ -85,39 +84,39 @@
 prepare_ask_title (GQuark type)
 {
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return _("Import private key");
+		return x("Import private key");
 	else if (type == GKR_PKIX_CERTIFICATE)
-		return _("Import certificate");
+		return x("Import certificate");
 	else if (type == GKR_PKIX_PUBLIC_KEY)
-		return _("Import public key");
+		return x("Import public key");
 	else 
-		return _("Import");
+		return x("Import");
 }
 
 static const gchar*
 prepare_ask_primary (GQuark type)
 {
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return _("Enter password to unlock the private key");
+		return x("Enter password to unlock the private key");
 	else if (type == GKR_PKIX_CERTIFICATE)
-		return _("Enter password to unlock the certificate");
+		return x("Enter password to unlock the certificate");
 	else if (type == GKR_PKIX_PUBLIC_KEY)
-		return _("Enter password to unlock the public key");
+		return x("Enter password to unlock the public key");
 	else 
-		return _("Enter password to unlock");
+		return x("Enter password to unlock");
 }
 
 static gchar*
 prepare_ask_secondary (GQuark type, const gchar *label)
 {
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return g_strdup_printf (_("The system wants to import the private key '%s', but it is locked"), label);
+		return g_strdup_printf (x("The system wants to import the private key '%s', but it is locked"), label);
 	else if (type == GKR_PKIX_CERTIFICATE)
-		return g_strdup_printf (_("The system wants to import the certificate '%s', but it is locked"), label);
+		return g_strdup_printf (x("The system wants to import the certificate '%s', but it is locked"), label);
 	else if (type == GKR_PKIX_PUBLIC_KEY)
-		return g_strdup_printf (_("The system wants to import the public key '%s', but it is locked"), label);
+		return g_strdup_printf (x("The system wants to import the public key '%s', but it is locked"), label);
 	else 
-		return g_strdup_printf (_("The system wants to import '%s', but it is locked"), label);
+		return g_strdup_printf (x("The system wants to import '%s', but it is locked"), label);
 }
 
 static gboolean

Modified: trunk/daemon/pk/gkr-pk-index.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-index.c	(original)
+++ trunk/daemon/pk/gkr-pk-index.c	Sun Feb  8 14:38:08 2009
@@ -90,11 +90,11 @@
 	g_assert (!*password);
 
 	/* And put together the ask request */
-	ask = gkr_ask_request_new (_("Create Storage for Key Information"), 
-	                           _("Choose password to protect storage"),
+	ask = gkr_ask_request_new (x("Create Storage for Key Information"), 
+	                           x("Choose password to protect storage"),
 	 	                   GKR_ASK_REQUEST_NEW_PASSWORD);
 	
-	gkr_ask_request_set_secondary (ask, _("The system wants to store information about your keys and certificates. "
+	gkr_ask_request_set_secondary (ask, x("The system wants to store information about your keys and certificates. "
 					      "In order to protect this information, choose a password with which it will be locked."));
 	
 	gkr_ask_request_set_location (ask, location);
@@ -121,18 +121,18 @@
 		return FALSE;
 	
 	/* And put together the ask request */
-	ask = gkr_ask_request_new (_("Unlock Storage for Key Information"), 
-	                           _("Enter password to unlock storage"),
+	ask = gkr_ask_request_new (x("Unlock Storage for Key Information"), 
+	                           x("Enter password to unlock storage"),
 	                           GKR_ASK_REQUEST_PROMPT_PASSWORD);
 	
-	gkr_ask_request_set_secondary (ask, _("The system wants to access information about your keys and certificates, "
+	gkr_ask_request_set_secondary (ask, x("The system wants to access information about your keys and certificates, "
 					      "but it is locked."));
 	
 	gkr_ask_request_set_location (ask, index->keyring->location);
 	gkr_ask_request_set_object (ask, G_OBJECT (index->keyring));
 	
 	if (gkr_keyring_login_is_usable ())
-		gkr_ask_request_set_check_option (ask, _("Automatically unlock this keyring when I log in."));
+		gkr_ask_request_set_check_option (ask, x("Automatically unlock this keyring when I log in."));
 
 	/* Intercept item access requests to see if we still need to prompt */
 	g_signal_connect (ask, "check-request", G_CALLBACK (gkr_keyring_ask_check_unlock), NULL);

Modified: trunk/daemon/pk/gkr-pk-object.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-object.c	(original)
+++ trunk/daemon/pk/gkr-pk-object.c	Sun Feb  8 14:38:08 2009
@@ -886,13 +886,13 @@
 			/* TODO: This should be a virtual function, or class prop */
 			type = G_OBJECT_TYPE (xobj);
 			if (type == GKR_TYPE_PK_CERT) {
-				pv->label = g_strdup (_("Certificate"));
+				pv->label = g_strdup (x("Certificate"));
 			} else if (type == GKR_TYPE_PK_PRIVKEY) {
-				pv->label = g_strdup (_("Private Key"));
+				pv->label = g_strdup (x("Private Key"));
 			} else if (type == GKR_TYPE_PK_PUBKEY) {
-				pv->label = g_strdup (_("Public Key"));
+				pv->label = g_strdup (x("Public Key"));
 			} else if (type == GKR_TYPE_PK_NETSCAPE_TRUST) {
-				pv->label = g_strdup (_("Trust Association"));
+				pv->label = g_strdup (x("Trust Association"));
 			} else {
 				g_warning ("no default label for objects of type: %s",
 				           G_OBJECT_TYPE_NAME (xobj));

Modified: trunk/daemon/pk/gkr-pk-storage.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-storage.c	(original)
+++ trunk/daemon/pk/gkr-pk-storage.c	Sun Feb  8 14:38:08 2009
@@ -133,13 +133,13 @@
 	 * for translations to work properly.
 	 */
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return _("Unlock private key");
+		return x("Unlock private key");
 	else if (type == GKR_PKIX_CERTIFICATE)
-		return _("Unlock certificate");
+		return x("Unlock certificate");
 	else if (type == GKR_PKIX_PUBLIC_KEY)
-		return _("Unlock public key");
+		return x("Unlock public key");
 	else 
-		return _("Unlock");
+		return x("Unlock");
 }
 
 static const gchar*
@@ -150,9 +150,9 @@
 	 * for translations to work properly.
 	 */
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return _("Lock private key");
+		return x("Lock private key");
 	else 
-		return _("Lock");
+		return x("Lock");
 }
 
 static const gchar*
@@ -163,13 +163,13 @@
 	 * for translations to work properly.
 	 */
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return _("Enter password to unlock the private key");
+		return x("Enter password to unlock the private key");
 	else if (type == GKR_PKIX_CERTIFICATE)
-		return _("Enter password to unlock the certificate");
+		return x("Enter password to unlock the certificate");
 	else if (type == GKR_PKIX_PUBLIC_KEY)
-		return _("Enter password to unlock the public key");
+		return x("Enter password to unlock the public key");
 	else 
-		return _("Enter password to unlock");
+		return x("Enter password to unlock");
 }
 
 static const gchar*
@@ -180,9 +180,9 @@
 	 * for translations to work properly.
 	 */
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return _("Enter password to protect the private key");
+		return x("Enter password to protect the private key");
 	else 
-		return _("Enter password to protect storage");
+		return x("Enter password to protect storage");
 }
 
 static const gchar*
@@ -193,26 +193,26 @@
 	 * for translations to work properly.
 	 */
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return _("Automatically unlock this private key when I log in.");
+		return x("Automatically unlock this private key when I log in.");
 	else if (type == GKR_PKIX_CERTIFICATE)
-		return _("Automatically unlock this certificate when I log in.");
+		return x("Automatically unlock this certificate when I log in.");
 	else if (type == GKR_PKIX_PUBLIC_KEY)
-		return _("Automatically unlock this public key when I log in.");
+		return x("Automatically unlock this public key when I log in.");
 	else 
-		return _("Automatically unlock this when I log in");
+		return x("Automatically unlock this when I log in");
 }
 
 static gchar*
 prepare_ask_load_secondary (GQuark type, const gchar *label)
 {
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return g_strdup_printf (_("An application wants access to the private key '%s', but it is locked"), label);
+		return g_strdup_printf (x("An application wants access to the private key '%s', but it is locked"), label);
 	else if (type == GKR_PKIX_CERTIFICATE)
-		return g_strdup_printf (_("An application wants access to the certificate '%s', but it is locked"), label);
+		return g_strdup_printf (x("An application wants access to the certificate '%s', but it is locked"), label);
 	else if (type == GKR_PKIX_PUBLIC_KEY)
-		return g_strdup_printf (_("An application wants access to the public key '%s', but it is locked"), label);
+		return g_strdup_printf (x("An application wants access to the public key '%s', but it is locked"), label);
 	else 
-		return g_strdup_printf (_("An application wants access to '%s', but it is locked"), label);
+		return g_strdup_printf (x("An application wants access to '%s', but it is locked"), label);
 
 }
 
@@ -225,9 +225,9 @@
 	 */
 
 	if (type == GKR_PKIX_PRIVATE_KEY)
-		return g_strdup_printf (_("The system wants to store the private key '%s' on your disk. Please enter a password to lock it with."), label);
+		return g_strdup_printf (x("The system wants to store the private key '%s' on your disk. Please enter a password to lock it with."), label);
 	else 
-		return g_strdup_printf (_("The system wants to store '%s' on your disk. Please enter a password to lock it with."), label);
+		return g_strdup_printf (x("The system wants to store '%s' on your disk. Please enter a password to lock it with."), label);
 }
 
 static void