summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-10-03 19:20:49 +0200
committerThomas Haller <thaller@redhat.com>2016-10-03 19:22:10 +0200
commit2f3f2680519150cc8d401410cdcb410069adf4e2 (patch)
treefe05b5832fff4019187d04da95c6c331e10f3391
parent47194f7a11984c47dc168ae9bd8696861f21d445 (diff)
parent473289874798054b36c1ec08b36674a81fd7245b (diff)
downloadnetwork-manager-applet-2f3f2680519150cc8d401410cdcb410069adf4e2.tar.gz
libnma: merge branch 'th/passwd-entry-i18n-bgo772069'
https://bugzilla.gnome.org/show_bug.cgi?id=772069
-rw-r--r--src/libnm-gtk/nm-ui-utils.c10
-rw-r--r--src/libnma/nma-ui-utils.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
index 451de53c..137800f4 100644
--- a/src/libnm-gtk/nm-ui-utils.c
+++ b/src/libnm-gtk/nm-ui-utils.c
@@ -642,7 +642,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
icon_name_table[item]);
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
GTK_ENTRY_ICON_SECONDARY,
- icon_desc_table[item]);
+ gettext (icon_desc_table[item]));
/* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
* Unfortunately, making GtkEntry insensitive will also make the icon
@@ -836,12 +836,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
group = NULL;
- item[0] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[0]);
+ item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
- item[1] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[1]);
- item[2] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[2]);
+ item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
+ item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
if (with_not_required)
- item[3] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[3]);
+ item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
index 65344159..e473c933 100644
--- a/src/libnma/nma-ui-utils.c
+++ b/src/libnma/nma-ui-utils.c
@@ -76,7 +76,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
icon_name_table[item]);
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
GTK_ENTRY_ICON_SECONDARY,
- icon_desc_table[item]);
+ gettext (icon_desc_table[item]));
/* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
* Unfortunately, making GtkEntry insensitive will also make the icon
@@ -270,12 +270,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
group = NULL;
- item[0] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[0]);
+ item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
- item[1] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[1]);
- item[2] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[2]);
+ item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
+ item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
if (with_not_required)
- item[3] = gtk_radio_menu_item_new_with_label (group, icon_desc_table[3]);
+ item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);