Merge commit 'staz/dnd'

[empathy.git] / libempathy-gtk / empathy-account-widget-sip.c

diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 0ba4227e886f9621dd40a355fe6fd0d7e5d06356..cc32cde8c16c39ff38e397cd1c71648470b752d8 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -184,15 +184,15 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
       gtk_list_store_set (store, &iter, 0, "auto", 1, _("Auto"), -1);
 
       gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, "udp", 1, "UDP", -1);
+      gtk_list_store_set (store, &iter, 0, "udp", 1, _("UDP"), -1);
 
       gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, "tcp", 1, "TCP", -1);
+      gtk_list_store_set (store, &iter, 0, "tcp", 1, _("TCP"), -1);
 
       gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, "tls", 1, "TLS", -1);
+      gtk_list_store_set (store, &iter, 0, "tls", 1, _("TLS"), -1);
 
-      account_widget_setup_widget (self, settings->combobox_transport,
+      empathy_account_widget_setup_widget (self, settings->combobox_transport,
           "transport");
 
       gtk_table_attach_defaults (GTK_TABLE (table_advanced),
@@ -217,10 +217,14 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
       gtk_list_store_set (store, &iter, 0, "auto", 1, _("Auto"), -1);
 
       gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, "register", 1, "Register", -1);
+      /* translators: this string is very specific to SIP's internal; maybe
+       * best to keep the English version. */
+      gtk_list_store_set (store, &iter, 0, "register", 1, _("Register"), -1);
 
       gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, "options", 1, "Options", -1);
+      /* translators: this string is very specific to SIP's internal; maybe
+       * best to keep the English version. */
+      gtk_list_store_set (store, &iter, 0, "options", 1, _("Options"), -1);
 
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter, 0, "none", 1, _("None"), -1);
@@ -228,7 +232,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
       g_signal_connect (settings->combobox_keep_alive_mechanism, "changed",
           G_CALLBACK (keep_alive_mechanism_combobox_change_cb), settings);
 
-      account_widget_setup_widget (self,
+      empathy_account_widget_setup_widget (self,
           settings->combobox_keep_alive_mechanism, "keepalive-mechanism");
 
       gtk_table_attach_defaults (GTK_TABLE (table_advanced),