# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1083845837 0
# Node ID 4f7c365c5c5a5d342bd0bc9d2e85b354b026c7d4
# Parent  6c98b883580a191ff2c6bceb69470c13ad0801b7
[gaim-migrate @ 9660]
i18n fixes for SILC from Ambrose Li and ?ric Boumaour.

committer: Tailor Script <tailor@pidgin.im>

diff -r 6c98b883580a -r 4f7c365c5c5a src/protocols/silc/buddy.c
--- a/src/protocols/silc/buddy.c	Thu May 06 06:27:26 2004 +0000
+++ b/src/protocols/silc/buddy.c	Thu May 06 12:17:17 2004 +0000
@@ -1076,14 +1076,16 @@
 		gaim_request_field_list_add(f, tmp, clients[i]);
 	}
 
-	g_snprintf(tmp, sizeof(tmp),
-		   _("More than one users were found with the same %s. Select "
-		     "the correct user from the list to add to the buddy list."),
-		   r->pubkey_search ? "public key" : "name");
 	gaim_request_fields(NULL, _("Add Buddy"),
-			    _("Select correct user"), tmp, fields,
-			    "OK", G_CALLBACK(silcgaim_add_buddy_select_cb),
-			    "Cancel", G_CALLBACK(silcgaim_add_buddy_select_cancel), r);
+				_("Select correct user"),
+				r->pubkey_search
+					? _("More than one user was found with the same public key. Select "
+						"the correct user from the list to add to the buddy list.")
+					: _("More than one user was found with the same name. Select "
+						"the correct user from the list to add to the buddy list."),
+				fields,
+				_("OK"), G_CALLBACK(silcgaim_add_buddy_select_cb),
+				_("Cancel"), G_CALLBACK(silcgaim_add_buddy_select_cancel), r);
 }
 
 static void
diff -r 6c98b883580a -r 4f7c365c5c5a src/protocols/silc/chat.c
--- a/src/protocols/silc/chat.c	Thu May 06 06:27:26 2004 +0000
+++ b/src/protocols/silc/chat.c	Thu May 06 12:17:17 2004 +0000
@@ -889,10 +889,10 @@
 	   give a way to change it afterwards when mode changes. */
 		tmp2 = silc_client_chumode_char(chu->mode);
 		if (tmp2)
-			g_snprintf(tmp, sizeof(tmp), _("%s%s"), tmp2,
+			g_snprintf(tmp, sizeof(tmp), "%s%s", tmp2,
 				   chu->client->nickname);
 		else
-			g_snprintf(tmp, sizeof(tmp), _("%s"),
+			g_snprintf(tmp, sizeof(tmp), "%s",
 				   chu->client->nickname);
 		silc_free(tmp2);
 
diff -r 6c98b883580a -r 4f7c365c5c5a src/protocols/silc/ops.c
--- a/src/protocols/silc/ops.c	Thu May 06 06:27:26 2004 +0000
+++ b/src/protocols/silc/ops.c	Thu May 06 12:17:17 2004 +0000
@@ -260,7 +260,7 @@
 			break;
 
 		/* Join user to channel */
-		g_snprintf(buf, sizeof(buf), _("%s@%s"),
+		g_snprintf(buf, sizeof(buf), "%s@%s",
 			   client_entry->username, client_entry->hostname);
 		gaim_conv_chat_add_user(GAIM_CONV_CHAT(convo),
 					g_strdup(client_entry->nickname), buf);
@@ -950,7 +950,7 @@
 						silc_free(m);
 
 					}
-					g_string_append_printf(s, _("%s\n"), tmp);
+					g_string_append_printf(s, "%s\n", tmp);
 					silc_free(umodes);
 				}
 			}
diff -r 6c98b883580a -r 4f7c365c5c5a src/protocols/silc/silc.c
--- a/src/protocols/silc/silc.c	Thu May 06 06:27:26 2004 +0000
+++ b/src/protocols/silc/silc.c	Thu May 06 12:17:17 2004 +0000
@@ -1019,8 +1019,8 @@
 	N_("SILC Protocol Plugin"),
 	/**  description    */
 	N_("Secure Internet Live Conferencing (SILC) Protocol"),
-	N_("Pekka Riikonen"),                             /**< author         */
-	N_("http://silcnet.org/"),                        /**< homepage       */
+	"Pekka Riikonen",                                 /**< author         */
+	"http://silcnet.org/",                            /**< homepage       */
 
 	NULL,                                             /**< load           */
 	NULL,                                             /**< unload         */
@@ -1052,11 +1052,11 @@
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #if 0   /* XXX Public key auth interface with explicit key pair is
 	   broken in SILC Toolkit */
-	g_snprintf(tmp, sizeof(tmp), _("%s/public_key.pub"), silcgaim_silcdir());
+	g_snprintf(tmp, sizeof(tmp), "%s/public_key.pub", silcgaim_silcdir());
 	option = gaim_account_option_string_new(_("Public Key File"),
 						"public-key", tmp);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-	g_snprintf(tmp, sizeof(tmp), _("%s/private_key.prv"), silcgaim_silcdir());
+	g_snprintf(tmp, sizeof(tmp), "%s/private_key.prv", silcgaim_silcdir());
 	option = gaim_account_option_string_new(_("Private Key File"),
 						"public-key", tmp);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
@@ -1081,9 +1081,9 @@
 	gaim_prefs_add_bool("/plugins/prpl/silc/verify_im", FALSE);
 	gaim_prefs_add_bool("/plugins/prpl/silc/sign_chat", FALSE);
 	gaim_prefs_add_bool("/plugins/prpl/silc/verify_chat", FALSE);
-	g_snprintf(tmp, sizeof(tmp), _("%s/public_key.pub"), silcgaim_silcdir());
+	g_snprintf(tmp, sizeof(tmp), "%s/public_key.pub", silcgaim_silcdir());
 	gaim_prefs_add_string("/plugins/prpl/silc/pubkey", tmp);
-	g_snprintf(tmp, sizeof(tmp), _("%s/private_key.prv"), silcgaim_silcdir());
+	g_snprintf(tmp, sizeof(tmp), "%s/private_key.prv", silcgaim_silcdir());
 	gaim_prefs_add_string("/plugins/prpl/silc/privkey", tmp);
 	gaim_prefs_add_string("/plugins/prpl/silc/vcard", "");
 }