diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-03 20:52:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-03 20:52:25 +0200 |
| commit | 05c64b282ffc7b9a205c509dd3c7b747cacff62f (patch) | |
| tree | aefd4f6d12e9c8ca6229b9c7f554f85364e3afc1 | |
| parent | 2f3f2680519150cc8d401410cdcb410069adf4e2 (diff) | |
| parent | 1d8872de165607d7ba3296e715be5b4533e65a53 (diff) | |
| download | network-manager-applet-05c64b282ffc7b9a205c509dd3c7b747cacff62f.tar.gz | |
all: merge branch 'unicode-strings-bgo695967'
https://bugzilla.gnome.org/show_bug.cgi?id=695967
48 files changed, 306 insertions, 306 deletions
diff --git a/src/applet-device-broadband.c b/src/applet-device-broadband.c index 64c57c91..6e7952ca 100644 --- a/src/applet-device-broadband.c +++ b/src/applet-device-broadband.c @@ -249,7 +249,7 @@ unlock_dialog_response (GtkDialog *dialog, g_assert (lock == MM_MODEM_LOCK_SIM_PIN || lock == MM_MODEM_LOCK_SIM_PUK); /* Start the spinner to show the progress of the unlock */ - applet_mobile_pin_dialog_start_spinner (info->dialog, _("Sending unlock code...")); + applet_mobile_pin_dialog_start_spinner (info->dialog, _("Sending unlock code…")); code1 = applet_mobile_pin_dialog_get_entry1 (info->dialog); if (!code1 || !strlen (code1)) { @@ -798,7 +798,7 @@ add_menu_item (NMDevice *device, } } else { /* Default connection item */ - item = gtk_check_menu_item_new_with_label (_("New Mobile Broadband connection...")); + item = gtk_check_menu_item_new_with_label (_("New Mobile Broadband connection…")); add_connection_item (device, NULL, item, menu, applet); } } diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c index 455eea69..099c8c5a 100644 --- a/src/applet-device-bt.c +++ b/src/applet-device-bt.c @@ -113,20 +113,20 @@ bt_get_icon (NMDevice *device, switch (state) { case NM_DEVICE_STATE_PREPARE: - *tip = g_strdup_printf (_("Preparing mobile broadband connection '%s'..."), id); + *tip = g_strdup_printf (_("Preparing mobile broadband connection “%s”…"), id); break; case NM_DEVICE_STATE_CONFIG: - *tip = g_strdup_printf (_("Configuring mobile broadband connection '%s'..."), id); + *tip = g_strdup_printf (_("Configuring mobile broadband connection “%s”…"), id); break; case NM_DEVICE_STATE_NEED_AUTH: - *tip = g_strdup_printf (_("User authentication required for mobile broadband connection '%s'..."), id); + *tip = g_strdup_printf (_("User authentication required for mobile broadband connection “%s”…"), id); break; case NM_DEVICE_STATE_IP_CONFIG: - *tip = g_strdup_printf (_("Requesting a network address for '%s'..."), id); + *tip = g_strdup_printf (_("Requesting a network address for “%s”…"), id); break; case NM_DEVICE_STATE_ACTIVATED: *out_icon_name = "nm-device-wwan"; - *tip = g_strdup_printf (_("Mobile broadband connection '%s' active"), id); + *tip = g_strdup_printf (_("Mobile broadband connection “%s” active"), id); break; default: break; diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c index 174b7902..cc737dda 100644 --- a/src/applet-device-ethernet.c +++ b/src/applet-device-ethernet.c @@ -158,20 +158,20 @@ ethernet_get_icon (NMDevice *device, switch (state) { case NM_DEVICE_STATE_PREPARE: - *tip = g_strdup_printf (_("Preparing ethernet network connection '%s'..."), id); + *tip = g_strdup_printf (_("Preparing ethernet network connection “%s”…"), id); break; case NM_DEVICE_STATE_CONFIG: - *tip = g_strdup_printf (_("Configuring ethernet network connection '%s'..."), id); + *tip = g_strdup_printf (_("Configuring ethernet network connection “%s”…"), id); break; case NM_DEVICE_STATE_NEED_AUTH: - *tip = g_strdup_printf (_("User authentication required for ethernet network connection '%s'..."), id); + *tip = g_strdup_printf (_("User authentication required for ethernet network connection “%s”…"), id); break; case NM_DEVICE_STATE_IP_CONFIG: - *tip = g_strdup_printf (_("Requesting an ethernet network address for '%s'..."), id); + *tip = g_strdup_printf (_("Requesting an ethernet network address for “%s”…"), id); break; case NM_DEVICE_STATE_ACTIVATED: *out_icon_name = "nm-device-wired"; - *tip = g_strdup_printf (_("Ethernet network connection '%s' active"), id); + *tip = g_strdup_printf (_("Ethernet network connection “%s” active"), id); break; default: break; diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c index 9944fb40..50d02b02 100644 --- a/src/applet-device-wifi.c +++ b/src/applet-device-wifi.c @@ -227,7 +227,7 @@ nma_menu_add_hidden_network_item (GtkWidget *menu, NMApplet *applet) GtkWidget *label; menu_item = gtk_menu_item_new (); - label = gtk_label_new_with_mnemonic (_("_Connect to Hidden Wi-Fi Network...")); + label = gtk_label_new_with_mnemonic (_("_Connect to Hidden Wi-Fi Network…")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_container_add (GTK_CONTAINER (menu_item), label); gtk_widget_show_all (menu_item); @@ -278,7 +278,7 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet) GtkWidget *label; menu_item = gtk_menu_item_new (); - label = gtk_label_new_with_mnemonic (_("Create _New Wi-Fi Network...")); + label = gtk_label_new_with_mnemonic (_("Create _New Wi-Fi Network…")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_container_add (GTK_CONTAINER (menu_item), label); gtk_widget_show_all (menu_item); @@ -1181,7 +1181,7 @@ idle_check_avail_access_point_notification (gpointer datap) _("Use the network menu to connect to a Wi-Fi network"), "nm-device-wireless", "dont-show", - _("Don't show this message again"), + _("Don’t show this message again"), wifi_available_dont_show_cb, applet); return FALSE; @@ -1361,7 +1361,7 @@ wifi_notify_connected (NMDevice *device, else signal_strength_icon = mobile_helper_get_quality_icon_name (nm_access_point_get_strength (ap)); - ssid_msg = g_strdup_printf (_("You are now connected to the Wi-Fi network '%s'."), esc_ssid); + ssid_msg = g_strdup_printf (_("You are now connected to the Wi-Fi network “%s”."), esc_ssid); applet_do_notify_with_pref (applet, _("Connection Established"), ssid_msg, signal_strength_icon, PREF_DISABLE_CONNECTED_NOTIFICATIONS); @@ -1396,16 +1396,16 @@ wifi_get_icon (NMDevice *device, switch (state) { case NM_DEVICE_STATE_PREPARE: - *tip = g_strdup_printf (_("Preparing Wi-Fi network connection '%s'..."), id); + *tip = g_strdup_printf (_("Preparing Wi-Fi network connection “%s”…"), id); break; case NM_DEVICE_STATE_CONFIG: - *tip = g_strdup_printf (_("Configuring Wi-Fi network connection '%s'..."), id); + *tip = g_strdup_printf (_("Configuring Wi-Fi network connection “%s”…"), id); break; case NM_DEVICE_STATE_NEED_AUTH: - *tip = g_strdup_printf (_("User authentication required for Wi-Fi network '%s'..."), id); + *tip = g_strdup_printf (_("User authentication required for Wi-Fi network “%s”…"), id); break; case NM_DEVICE_STATE_IP_CONFIG: - *tip = g_strdup_printf (_("Requesting a Wi-Fi network address for '%s'..."), id); + *tip = g_strdup_printf (_("Requesting a Wi-Fi network address for “%s”…"), id); break; case NM_DEVICE_STATE_ACTIVATED: strength = ap ? nm_access_point_get_strength (ap) : 0; @@ -1416,11 +1416,11 @@ wifi_get_icon (NMDevice *device, if (ap) { char *ssid = get_ssid_utf8 (ap); - *tip = g_strdup_printf (_("Wi-Fi network connection '%s' active: %s (%d%%)"), + *tip = g_strdup_printf (_("Wi-Fi network connection “%s” active: %s (%d%%)"), id, ssid, strength); g_free (ssid); } else - *tip = g_strdup_printf (_("Wi-Fi network connection '%s' active"), id); + *tip = g_strdup_printf (_("Wi-Fi network connection “%s” active"), id); break; default: break; diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c index b4144baf..20391ece 100644 --- a/src/applet-dialogs.c +++ b/src/applet-dialogs.c @@ -1037,7 +1037,7 @@ applet_mobile_password_dialog_new (NMConnection *connection, s_con = nm_connection_get_setting_connection (connection); id = nm_setting_connection_get_id (s_con); g_assert (id); - tmp = g_strdup_printf (_("A password is required to connect to '%s'."), id); + tmp = g_strdup_printf (_("A password is required to connect to “%s”."), id); w = gtk_label_new (tmp); g_free (tmp); @@ -1337,7 +1337,7 @@ applet_mobile_pin_dialog_new (const char *unlock_required, title = _("SIM PIN unlock required"); header = _("SIM PIN Unlock Required"); /* FIXME: some warning about # of times you can enter incorrect PIN */ - desc = g_strdup_printf (_("The mobile broadband device '%s' requires a SIM PIN code before it can be used."), device_description); + desc = g_strdup_printf (_("The mobile broadband device “%s” requires a SIM PIN code before it can be used."), device_description); /* Translators: PIN code entry label */ label1 = _("PIN code:"); label1_min = 4; @@ -1348,7 +1348,7 @@ applet_mobile_pin_dialog_new (const char *unlock_required, title = _("SIM PUK unlock required"); header = _("SIM PUK Unlock Required"); /* FIXME: some warning about # of times you can enter incorrect PUK */ - desc = g_strdup_printf (_("The mobile broadband device '%s' requires a SIM PUK code before it can be used."), device_description); + desc = g_strdup_printf (_("The mobile broadband device “%s” requires a SIM PUK code before it can be used."), device_description); /* Translators: PUK code entry label */ label1 = _("PUK code:"); label1_min = label1_max = 8; diff --git a/src/applet.c b/src/applet.c index 8b6b6164..5af3a895 100644 --- a/src/applet.c +++ b/src/applet.c @@ -754,7 +754,7 @@ void applet_do_notify_with_pref (NMApplet *applet, return; applet_do_notify (applet, NOTIFY_URGENCY_LOW, summary, message, icon, pref, - _("Don't show this message again"), + _("Don’t show this message again"), notify_dont_show_cb, applet); } @@ -841,35 +841,35 @@ make_vpn_failure_message (NMVpnConnection *vpn, switch (reason) { case NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because the network connection was interrupted."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because the network connection was interrupted."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because the VPN service stopped unexpectedly."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because the VPN service stopped unexpectedly."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because the VPN service returned invalid configuration."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because the VPN service returned invalid configuration."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because the connection attempt timed out."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because the connection attempt timed out."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because the VPN service did not start in time."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because the VPN service did not start in time."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because the VPN service failed to start."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because the VPN service failed to start."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because there were no valid VPN secrets."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because there were no valid VPN secrets."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED: - return g_strdup_printf (_("\nThe VPN connection '%s' failed because of invalid VPN secrets."), + return g_strdup_printf (_("\nThe VPN connection “%s” failed because of invalid VPN secrets."), nm_connection_get_id (connection)); default: break; } - return g_strdup_printf (_("\nThe VPN connection '%s' failed."), nm_connection_get_id (connection)); + return g_strdup_printf (_("\nThe VPN connection “%s” failed."), nm_connection_get_id (connection)); } static char * @@ -885,16 +885,16 @@ make_vpn_disconnection_message (NMVpnConnection *vpn, switch (reason) { case NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED: - return g_strdup_printf (_("\nThe VPN connection '%s' disconnected because the network connection was interrupted."), + return g_strdup_printf (_("\nThe VPN connection “%s” disconnected because the network connection was interrupted."), nm_connection_get_id (connection)); case NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED: - return g_strdup_printf (_("\nThe VPN connection '%s' disconnected because the VPN service stopped."), + return g_strdup_printf (_("\nThe VPN connection “%s” disconnected because the VPN service stopped."), nm_connection_get_id (connection)); default: break; } - return g_strdup_printf (_("\nThe VPN connection '%s' disconnected."), nm_connection_get_id (connection)); + return g_strdup_printf (_("\nThe VPN connection “%s” disconnected."), nm_connection_get_id (connection)); } static void @@ -987,10 +987,10 @@ activate_vpn_cb (GObject *client, name = g_dbus_error_get_remote_error (error); if (strstr (name, "ServiceStartFailed")) { - msg = g_strdup_printf (_("\nThe VPN connection '%s' failed because the VPN service failed to start.\n\n%s"), + msg = g_strdup_printf (_("\nThe VPN connection “%s” failed because the VPN service failed to start.\n\n%s"), info->vpn_name, error->message); } else { - msg = g_strdup_printf (_("\nThe VPN connection '%s' failed to start.\n\n%s"), + msg = g_strdup_printf (_("\nThe VPN connection “%s” failed to start.\n\n%s"), info->vpn_name, error->message); } @@ -1495,10 +1495,10 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet) /* Draw a separator, but only if we have VPN connections above it */ if (list->len) { nma_menu_add_separator_item (GTK_WIDGET (vpn_menu)); - item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Configure VPN..."))); + item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Configure VPN…"))); g_signal_connect (item, "activate", G_CALLBACK (nma_menu_configure_vpn_item_activate), applet); } else { - item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Add a VPN connection..."))); + item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_Add a VPN connection…"))); g_signal_connect (item, "activate", G_CALLBACK (nma_menu_add_vpn_item_activate), applet); } gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (item)); @@ -1604,7 +1604,7 @@ static void nma_menu_show_cb (GtkWidget *menu, NMApplet *applet) gtk_status_icon_set_tooltip_text (applet->status_icon, NULL); if (!nm_client_get_nm_running (applet->nm_client)) { - nma_menu_add_text_item (menu, _("NetworkManager is not running...")); + nma_menu_add_text_item (menu, _("NetworkManager is not running…")); return; } @@ -1869,7 +1869,7 @@ static GtkWidget *nma_context_menu_create (NMApplet *applet) gtk_menu_shell_append (menu, applet->info_menu_item); /* 'Edit Connections...' item */ - applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections...")); + applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections…")); g_signal_connect (applet->connections_menu_item, "activate", G_CALLBACK (nma_edit_connections_cb), @@ -2168,7 +2168,7 @@ foo_device_state_changed_cb (NMDevice *device, connection = applet_find_active_connection_for_device (device, applet, NULL); if (connection) { - str = g_strdup_printf (_("You are now connected to '%s'."), + str = g_strdup_printf (_("You are now connected to “%s”."), nm_connection_get_id (connection)); } @@ -2478,16 +2478,16 @@ get_tip_for_device_state (NMDevice *device, switch (state) { case NM_DEVICE_STATE_PREPARE: case NM_DEVICE_STATE_CONFIG: - tip = g_strdup_printf (_("Preparing network connection '%s'..."), id); + tip = g_strdup_printf (_("Preparing network connection “%s”…"), id); break; case NM_DEVICE_STATE_NEED_AUTH: - tip = g_strdup_printf (_("User authentication required for network connection '%s'..."), id); + tip = g_strdup_printf (_("User authentication required for network connection “%s”…"), id); break; case NM_DEVICE_STATE_IP_CONFIG: - tip = g_strdup_printf (_("Requesting a network address for '%s'..."), id); + tip = g_strdup_printf (_("Requesting a network address for “%s”…"), id); break; case NM_DEVICE_STATE_ACTIVATED: - tip = g_strdup_printf (_("Network connection '%s' active"), id); + tip = g_strdup_printf (_("Network connection “%s” active"), id); break; default: break; @@ -2561,13 +2561,13 @@ get_tip_for_vpn (NMActiveConnection *active, NMVpnConnectionState state, NMApple switch (state) { case NM_VPN_CONNECTION_STATE_CONNECT: case NM_VPN_CONNECTION_STATE_PREPARE: - tip = g_strdup_printf (_("Starting VPN connection '%s'..."), id); + tip = g_strdup_printf (_("Starting VPN connection “%s”…"), id); break; case NM_VPN_CONNECTION_STATE_NEED_AUTH: - tip = g_strdup_printf (_("User authentication required for VPN connection '%s'..."), id); + tip = g_strdup_printf (_("User authentication required for VPN connection “%s”…"), id); break; case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: - tip = g_strdup_printf (_("Requesting a VPN address for '%s'..."), id); + tip = g_strdup_printf (_("Requesting a VPN address for “%s”…"), id); break; case NM_VPN_CONNECTION_STATE_ACTIVATED: tip = g_strdup_printf (_("VPN connection active")); diff --git a/src/connection-editor/ce-ip4-routes.ui b/src/connection-editor/ce-ip4-routes.ui index 704609aa..259d936f 100644 --- a/src/connection-editor/ce-ip4-routes.ui +++ b/src/connection-editor/ce-ip4-routes.ui @@ -80,7 +80,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> + <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the “Add” button to add an IP address.</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff --git a/src/connection-editor/ce-ip6-routes.ui b/src/connection-editor/ce-ip6-routes.ui index ba3c3417..c549b839 100644 --- a/src/connection-editor/ce-ip6-routes.ui +++ b/src/connection-editor/ce-ip6-routes.ui @@ -80,7 +80,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> + <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the “Add” button to add an IP address.</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff --git a/src/connection-editor/ce-new-connection.ui b/src/connection-editor/ce-new-connection.ui index cb623628..2fdad0d5 100644 --- a/src/connection-editor/ce-new-connection.ui +++ b/src/connection-editor/ce-new-connection.ui @@ -25,7 +25,7 @@ <object class="GtkDialog" id="new_connection_type_dialog"> <property name="can_focus">False</property> <property name="border_width">5</property> - <property name="title" translatable="yes"> </property> + <property name="title"> </property> <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center-always</property> diff --git a/src/connection-editor/ce-page-dcb.ui b/src/connection-editor/ce-page-dcb.ui index 4da5808b..dad02446 100644 --- a/src/connection-editor/ce-page-dcb.ui +++ b/src/connection-editor/ce-page-dcb.ui @@ -373,7 +373,7 @@ </child> <child> <object class="GtkButton" id="pfc_options_button"> - <property name="label" translatable="yes">Options...</property> + <property name="label" translatable="yes">Options…</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -448,7 +448,7 @@ </child> <child> <object class="GtkButton" id="pg_options_button"> - <property name="label" translatable="yes">Options...</property> + <property name="label" translatable="yes">Options…</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -469,14 +469,14 @@ <property name="active_id">0</property> <items> <item id="0" translatable="yes">default</item> - <item id="1" translatable="yes">0</item> - <item id="2" translatable="yes">1</item> - <item id="3" translatable="yes">2</item> - <item id="4" translatable="yes">3</item> - <item id="5" translatable="yes">4</item> - <item id="6" translatable="yes">5</item> - <item id="7" translatable="yes">6</item> - <item id="8" translatable="yes">7</item> + <item id="1">0</item> + <item id="2">1</item> + <item id="3">2</item> + <item id="4">3</item> + <item id="5">4</item> + <item id="6">5</item> + <item id="7">6</item> + <item id="8">7</item> </items> </object> <packing> @@ -494,14 +494,14 @@ <property name="active_id">0</property> <items> <item id="0" translatable="yes">default</item> - <item id="1" translatable="yes">0</item> - <item id="2" translatable="yes">1</item> - <item id="3" translatable="yes">2</item> - <item id="4" translatable="yes">3</item> - <item id="5" translatable="yes">4</item> - <item id="6" translatable="yes">5</item> - <item id="7" translatable="yes">6</item> - <item id="8" translatable="yes">7</item> + <item id="1">0</item> + <item id="2">1</item> + <item id="3">2</item> + <item id="4">3</item> + <item id="5">4</item> + <item id="6">5</item> + <item id="7">6</item> + <item id="8">7</item> </items> </object> <packing> @@ -519,14 +519,14 @@ <property name="active_id">0</property> <items> <item id="0" translatable="yes">default</item> - <item id="1" translatable="yes">0</item> - <item id="2" translatable="yes">1</item> - <item id="3" translatable="yes">2</item> - <item id="4" translatable="yes">3</item> - <item id="5" translatable="yes">4</item> - <item id="6" translatable="yes">5</item> - <item id="7" translatable="yes">6</item> - <item id="8" translatable="yes">7</item> + <item id="1">0</item> + <item id="2">1</item> + <item id="3">2</item> + <item id="4">3</item> + <item id="5">4</item> + <item id="6">5</item> + <item id="7">6</item> + <item id="8">7</item> </items> </object> <packing> @@ -1154,14 +1154,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -1204,14 +1204,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -1254,14 +1254,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -1304,14 +1304,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -1354,14 +1354,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -1404,14 +1404,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -1454,14 +1454,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -1504,14 +1504,14 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> </items> </object> <packing> @@ -2594,15 +2594,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -2645,15 +2645,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -2696,15 +2696,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -2747,15 +2747,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -2798,15 +2798,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -2849,15 +2849,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -2900,15 +2900,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -2951,15 +2951,15 @@ <property name="can_focus">False</property> <property name="active_id">0</property> <items> - <item translatable="yes">0</item> - <item translatable="yes">1</item> - <item translatable="yes">2</item> - <item translatable="yes">3</item> - <item translatable="yes">4</item> - <item translatable="yes">5</item> - <item translatable="yes">6</item> - <item translatable="yes">7</item> - <item translatable="yes">15</item> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>15</item> </items> </object> <packing> @@ -3000,7 +3000,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Enter the allowed link bandwidth percent each Priority Group may use. The sum of all groups must total 100%.</property> + <property name="label" translatable="yes">Enter the allowed link bandwidth percent each Priority Group may use. The sum of all groups must total 100%.</property> <property name="wrap">True</property> <attributes> <attribute name="style" value="italic"/> diff --git a/src/connection-editor/ce-page-ethernet.ui b/src/connection-editor/ce-page-ethernet.ui index 15fe2d78..6b20a07c 100644 --- a/src/connection-editor/ce-page-ethernet.ui +++ b/src/connection-editor/ce-page-ethernet.ui @@ -213,7 +213,7 @@ <object class="GtkEntry" id="ethernet_cloned_mac"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">The MAC address entered here will be used as hardware address for the network device this connection is activated on. This feature is known as MAC cloning or spoofing. Example: 00:11:22:33:44:55</property> + <property name="tooltip_text" translatable="yes">The MAC address entered here will be used as hardware address for the network device this connection is activated on. This feature is known as MAC cloning or spoofing. Example: 00:11:22:33:44:55</property> </object> <packing> <property name="left_attach">1</property> diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui index 11c077fe..fc75caad 100644 --- a/src/connection-editor/ce-page-ip4.ui +++ b/src/connection-editor/ce-page-ip4.ui @@ -190,7 +190,7 @@ <object class="GtkEntry" id="ip4_dhcp_client_id_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">The DHCP client identifier allows the network administrator to customize your computer's configuration. If you wish to use a DHCP client identifier, enter it here.</property> + <property name="tooltip_text" translatable="yes">The DHCP client identifier allows the network administrator to customize your computer’s configuration. If you wish to use a DHCP client identifier, enter it here.</property> <property name="invisible_char">●</property> </object> <packing> diff --git a/src/connection-editor/ce-page-mobile.ui b/src/connection-editor/ce-page-mobile.ui index 5c2ea8aa..3c2d534a 100644 --- a/src/connection-editor/ce-page-mobile.ui +++ b/src/connection-editor/ce-page-mobile.ui @@ -230,7 +230,7 @@ </child> <child> <object class="GtkButton" id="mobile_apn_button"> - <property name="label" translatable="yes">Change...</property> + <property name="label" translatable="yes">Change…</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/src/connection-editor/ce-page-team-port.ui b/src/connection-editor/ce-page-team-port.ui index baea45c1..f6849e5c 100644 --- a/src/connection-editor/ce-page-team-port.ui +++ b/src/connection-editor/ce-page-team-port.ui @@ -41,7 +41,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Ad_vanced...</property> + <property name="label" translatable="yes">Ad_vanced…</property> <property name="use_underline">True</property> </object> <packing> @@ -799,7 +799,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkButton" id="import_config_button"> - <property name="label" translatable="yes">Im_port team configuration from a file...</property> + <property name="label" translatable="yes">Im_port team configuration from a file…</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/src/connection-editor/ce-page-team.ui b/src/connection-editor/ce-page-team.ui index bf2a978d..eab5c301 100644 --- a/src/connection-editor/ce-page-team.ui +++ b/src/connection-editor/ce-page-team.ui @@ -388,7 +388,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Ad_vanced...</property> + <property name="label" translatable="yes">Ad_vanced…</property> <property name="use_underline">True</property> </object> <packing> @@ -826,7 +826,7 @@ <object class="GtkComboBox" id="hwaddr_policy"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">This defines the policy of how hardware addresses of team device and port devices should be set during the team lifetime.</property> + <property name="tooltip_text" translatable="yes">This defines the policy of how hardware addresses of team device and port devices should be set during the team lifetime.</property> <property name="model">hwaddr_policy_model</property> <property name="active">0</property> <property name="id_column">0</property> @@ -848,7 +848,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, LACPDU frames are sent along the configured links periodically. If not, it acts as "speak when spoken to".</property> + <property name="tooltip_text" translatable="yes">If checked, LACPDU frames are sent along the configured links periodically. If not, it acts as “speak when spoken to”.</property> <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> @@ -865,7 +865,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Option specifies the rate at which our link partner is asked to transmit LACPDU packets. If checked, packets will be sent once per second. Otherwise they will be sent every 30 seconds.</property> + <property name="tooltip_text" translatable="yes">Option specifies the rate at which our link partner is asked to transmit LACPDU packets. If checked, packets will be sent once per second. Otherwise they will be sent every 30 seconds.</property> <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> @@ -1488,7 +1488,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkButton" id="import_config_button"> - <property name="label" translatable="yes">Im_port team configuration from a file...</property> + <property name="label" translatable="yes">Im_port team configuration from a file…</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/src/connection-editor/ce-page-wifi.ui b/src/connection-editor/ce-page-wifi.ui index fa4c4099..f91e1f09 100644 --- a/src/connection-editor/ce-page-wifi.ui +++ b/src/connection-editor/ce-page-wifi.ui @@ -155,7 +155,7 @@ <object class="GtkEntry" id="wifi_cloned_mac"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">The MAC address entered here will be used as hardware address for the network device this connection is activated on. This feature is known as MAC cloning or spoofing. Example: 00:11:22:33:44:55</property> + <property name="tooltip_text" translatable="yes">The MAC address entered here will be used as hardware address for the network device this connection is activated on. This feature is known as MAC cloning or spoofing. Example: 00:11:22:33:44:55</property> </object> <packing> <property name="left_attach">1</property> diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h index f1b0810f..f375ed42 100644 --- a/src/connection-editor/ce-page.h +++ b/src/connection-editor/ce-page.h @@ -99,14 +99,14 @@ typedef CEPage* (*CEPageNewFunc)(NMConnectionEditor *editor, const char **out_secrets_setting_name, GError **error); -#define CE_TOOLTIP_ADDR_AUTO _("IP addresses identify your computer on the network. " \ - "Click the \"Add\" button to add static IP address to be " \ +#define CE_TOOLTIP_ADDR_AUTO _("IP addresses identify your computer on the network. " \ + "Click the “Add” button to add static IP address to be " \ "configured in addition to the automatic ones.") -#define CE_TOOLTIP_ADDR_MANUAL _("IP addresses identify your computer on the network. " \ - "Click the \"Add\" button to add an IP address.") +#define CE_TOOLTIP_ADDR_MANUAL _("IP addresses identify your computer on the network. " \ + "Click the “Add” button to add an IP address.") #define CE_TOOLTIP_ADDR_SHARED _("The IP address identify your computer on the network and " \ - "determines the address range distributed to other computers. " \ - "Click the \"Add\" button to add an IP address. "\ + "determines the address range distributed to other computers. " \ + "Click the “Add” button to add an IP address. "\ "If no address is provided, one in the 10.42.x.x range will " \ "be used.") diff --git a/src/connection-editor/ce-ppp-auth-methods.ui b/src/connection-editor/ce-ppp-auth-methods.ui index eeb1d9e7..e805808d 100644 --- a/src/connection-editor/ce-ppp-auth-methods.ui +++ b/src/connection-editor/ce-ppp-auth-methods.ui @@ -167,7 +167,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">In most cases, the provider's PPP servers will support all authentication methods. If connections fail, try disabling support for some methods.</property> + <property name="label" translatable="yes">In most cases, the provider’s PPP servers will support all authentication methods. If connections fail, try disabling support for some methods.</property> <property name="wrap">True</property> <attributes> <attribute name="style" value="italic"/> diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c index 322f4b3e..85261ef5 100644 --- a/src/connection-editor/connection-helpers.c +++ b/src/connection-editor/connection-helpers.c @@ -367,9 +367,9 @@ next: gtk_list_store_append (model, &iter); if (show_headers) - markup = g_strdup_printf (" %s", _("Import a saved VPN configuration...")); + markup = g_strdup_printf (" %s", _("Import a saved VPN configuration…")); else - markup = g_strdup (_("Import a saved VPN configuration...")); + markup = g_strdup (_("Import a saved VPN configuration…")); gtk_list_store_append (model, &iter); gtk_list_store_set (model, &iter, COL_MARKUP, markup, diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c index 128c7b52..aefe858c 100644 --- a/src/connection-editor/nm-connection-editor.c +++ b/src/connection-editor/nm-connection-editor.c @@ -184,7 +184,7 @@ connection_editor_validate (NMConnectionEditor *editor) GError *error = NULL; if (!editor_is_initialized (editor)) { - validation_error = g_strdup (_("Editor initializing...")); + validation_error = g_strdup (_("Editor initializing…")); goto done; } diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui index 6975d137..292972ee 100644 --- a/src/connection-editor/nm-connection-editor.ui +++ b/src/connection-editor/nm-connection-editor.ui @@ -203,7 +203,7 @@ <property name="spacing">6</property> <child> <object class="GtkButton" id="export_button"> - <property name="label" translatable="yes">_Export...</property> + <property name="label" translatable="yes">_Export…</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_underline">True</property> diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c index 9f5a75ee..32101689 100644 --- a/src/connection-editor/nm-connection-list.c +++ b/src/connection-editor/nm-connection-list.c @@ -915,7 +915,7 @@ nm_connection_list_create (NMConnectionList *self, GType ctype, const char *deta _("No VPN plugins are installed.")); } else { nm_connection_editor_error (NULL, _("Error creating connection"), - _("Don't know how to create '%s' connections"), g_type_name (ctype)); + _("Don’t know how to create “%s” connections"), g_type_name (ctype)); } } else { new_connection_of_type (GTK_WINDOW (self->dialog), @@ -939,7 +939,7 @@ nm_connection_list_edit (NMConnectionList *self, const gchar *uuid) if (!connection) { nm_connection_editor_error (NULL, _("Error editing connection"), - _("Did not find a connection with UUID '%s'"), uuid); + _("Did not find a connection with UUID “%s”"), uuid); return; } diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c index 9cc5c6da..2d3c0c5f 100644 --- a/src/connection-editor/page-ethernet.c +++ b/src/connection-editor/page-ethernet.c @@ -73,7 +73,7 @@ ethernet_private_init (CEPageEthernet *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_combo), _("This option locks this connection to the network device specified " "either by its interface name or permanent MAC or both. Examples: " - "\"em1\", \"3C:97:0E:42:1A:19\", \"em1 (3C:97:0E:42:1A:19)\"")); + "“em1”, “3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”")); vbox = GTK_WIDGET (gtk_builder_get_object (builder, "ethernet_device_vbox")); gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_combo)); diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c index 3cf7cd6b..14417371 100644 --- a/src/connection-editor/page-infiniband.c +++ b/src/connection-editor/page-infiniband.c @@ -56,8 +56,8 @@ infiniband_private_init (CEPageInfiniband *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_combo), _("This option locks this connection to the network device specified " "either by its interface name or permanent MAC or both. Examples: " - "\"ib0\", \"80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65\", " - "\"ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)\"")); + "“ib0”, “80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, " + "“ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”")); vbox = GTK_WIDGET (gtk_builder_get_object (builder, "infiniband_device_vbox")); gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_combo)); diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c index 9f4dbc86..a845df17 100644 --- a/src/connection-editor/page-ip4.c +++ b/src/connection-editor/page-ip4.c @@ -1318,7 +1318,7 @@ ui_to_setting (CEPageIP4 *self, GError **error) if ( !addr || !nm_utils_ipaddr_valid (AF_INET, addr) || is_address_unspecified (addr)) { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 address \"%s\" invalid"), addr ? addr : ""); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 address “%s” invalid"), addr ? addr : ""); g_free (addr); g_free (netmask); g_free (addr_gw); @@ -1326,7 +1326,7 @@ ui_to_setting (CEPageIP4 *self, GError **error) } if (!parse_netmask (netmask, &prefix)) { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 address netmask \"%s\" invalid"), netmask ? netmask : ""); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 address netmask “%s” invalid"), netmask ? netmask : ""); g_free (addr); g_free (netmask); g_free (addr_gw); @@ -1335,7 +1335,7 @@ ui_to_setting (CEPageIP4 *self, GError **error) /* Gateway is optional... */ if (addr_gw && *addr_gw && !nm_utils_ipaddr_valid (AF_INET, addr_gw)) { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 gateway \"%s\" invalid"), addr_gw); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 gateway “%s” invalid"), addr_gw); g_free (addr); g_free (netmask); g_free (addr_gw); @@ -1378,7 +1378,7 @@ ui_to_setting (CEPageIP4 *self, GError **error) if (inet_pton (AF_INET, stripped, &tmp_addr)) g_ptr_array_add (tmp_array, g_strdup (stripped)); else { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 DNS server \"%s\" invalid"), stripped); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv4 DNS server “%s” invalid"), stripped); g_strfreev (items); g_ptr_array_free (tmp_array, TRUE); goto out; diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c index 5bebf419..b591bc04 100644 --- a/src/connection-editor/page-ip6.c +++ b/src/connection-editor/page-ip6.c @@ -1269,7 +1269,7 @@ ui_to_setting (CEPageIP6 *self, GError **error) if ( !addr_str || !nm_utils_ipaddr_valid (AF_INET6, addr_str) || is_address_unspecified (addr_str)) { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 address \"%s\" invalid"), addr_str ? addr_str : ""); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 address “%s” invalid"), addr_str ? addr_str : ""); g_free (addr_str); g_free (prefix_str); g_free (addr_gw_str); @@ -1277,7 +1277,7 @@ ui_to_setting (CEPageIP6 *self, GError **error) } if (!is_prefix_valid (prefix_str, &prefix)) { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 prefix \"%s\" invalid"), prefix_str ? prefix_str : ""); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 prefix “%s” invalid"), prefix_str ? prefix_str : ""); g_free (addr_str); g_free (prefix_str); g_free (addr_gw_str); @@ -1286,7 +1286,7 @@ ui_to_setting (CEPageIP6 *self, GError **error) /* Gateway is optional... */ if (addr_gw_str && *addr_gw_str && !nm_utils_ipaddr_valid (AF_INET6, addr_gw_str)) { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 gateway \"%s\" invalid"), addr_gw_str); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 gateway “%s” invalid"), addr_gw_str); g_free (addr_str); g_free (prefix_str); g_free (addr_gw_str); @@ -1328,7 +1328,7 @@ ui_to_setting (CEPageIP6 *self, GError **error) if (inet_pton (AF_INET6, stripped, &tmp_addr)) { nm_setting_ip_config_add_dns (priv->setting, stripped); } else { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 DNS server \"%s\" invalid"), stripped); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("IPv6 DNS server “%s” invalid"), stripped); g_strfreev (items); goto out; } diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c index d85bed76..2b744f28 100644 --- a/src/connection-editor/page-master.c +++ b/src/connection-editor/page-master.c @@ -246,7 +246,7 @@ check_new_slave_physical_port (CEPageMaster *self, NMConnection *conn) if (dev == dev2) { nm_connection_editor_warning (CE_PAGE (self)->parent_window, _("Duplicate slaves"), - _("Slaves '%s' and '%s' both apply to device '%s'"), + _("Slaves “%s” and “%s” both apply to device “%s”"), nm_connection_get_id (conn), nm_connection_get_id (conn2), nm_device_get_iface (dev)); @@ -257,8 +257,8 @@ check_new_slave_physical_port (CEPageMaster *self, NMConnection *conn) if (self->aggregating && id && id2 && !strcmp (id, id2)) { nm_connection_editor_warning (CE_PAGE (self)->parent_window, _("Duplicate slaves"), - _("Slaves '%s' and '%s' apply to different virtual " - "ports ('%s' and '%s') of the same physical device."), + _("Slaves “%s” and “%s” apply to different virtual " + "ports (“%s” and “%s”) of the same physical device."), nm_connection_get_id (conn), nm_connection_get_id (conn2), nm_device_get_iface (dev), diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c index 149db659..572d3864 100644 --- a/src/connection-editor/page-mobile.c +++ b/src/connection-editor/page-mobile.c @@ -554,7 +554,7 @@ mobile_connection_new (GtkWindow *parent, vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, FALSE, 0); - label = gtk_label_new (_("Select the technology your mobile broadband provider uses. If you are unsure, ask your provider.")); + label = gtk_label_new (_("Select the technology your mobile broadband provider uses. If you are unsure, ask your provider.")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 12); diff --git a/src/connection-editor/page-team-port.c b/src/connection-editor/page-team-port.c index c2977341..791c03c1 100644 --- a/src/connection-editor/page-team-port.c +++ b/src/connection-editor/page-team-port.c @@ -220,7 +220,7 @@ import_button_clicked_cb (GtkWidget *widget, CEPageTeamPort *self) g_file_get_contents (filename, &buf, &buf_len, NULL); if (buf_len > 100000) { g_free (buf); - buf = g_strdup (_("Error: file doesn't contain a valid JSON configuration")); + buf = g_strdup (_("Error: file doesn’t contain a valid JSON configuration")); } buffer = gtk_text_view_get_buffer (priv->json_config_widget); diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c index a03ab795..9be28bea 100644 --- a/src/connection-editor/page-team.c +++ b/src/connection-editor/page-team.c @@ -358,7 +358,7 @@ import_button_clicked_cb (GtkWidget *widget, CEPageTeam *self) g_file_get_contents (filename, &buf, &buf_len, NULL); if (buf_len > 100000) { g_free (buf); - buf = g_strdup (_("Error: file doesn't contain a valid JSON configuration")); + buf = g_strdup (_("Error: file doesn’t contain a valid JSON configuration")); } buffer = gtk_text_view_get_buffer (priv->json_config_widget); diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c index e0211433..ef39a7d7 100644 --- a/src/connection-editor/page-vlan.c +++ b/src/connection-editor/page-vlan.c @@ -411,7 +411,7 @@ build_vlan_parent_list (CEPageVlan *self, GSList *devices) /* Translators: the first %s is a device name (eg, "em1"), the * second is a connection name (eg, "Auto Ethernet"). */ - parent->label = g_strdup_printf (_("%s (via \"%s\")"), iface, id); + parent->label = g_strdup_printf (_("%s (via “%s”)"), iface, id); g_ptr_array_add (parents, parent); /* no break here; the connection may apply to multiple devices */ } @@ -423,7 +423,7 @@ build_vlan_parent_list (CEPageVlan *self, GSList *devices) parent = g_slice_new (VlanParent); parent->device = NULL; parent->connection = NULL; - parent->label = g_strdup_printf (_("New connection...")); + parent->label = g_strdup_printf (_("New connection…")); g_ptr_array_add (parents, parent); g_ptr_array_add (parents, NULL); diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c index a6888665..90fda536 100644 --- a/src/connection-editor/page-vpn.c +++ b/src/connection-editor/page-vpn.c @@ -110,7 +110,7 @@ ce_page_vpn_new (NMConnectionEditor *editor, priv->plugin = vpn_get_plugin_by_service (service_type); if (!priv->plugin) { - g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not find VPN plugin for '%s'."), service_type); + g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("Could not find VPN plugin for “%s”."), service_type); g_object_unref (self); return NULL; } @@ -119,7 +119,7 @@ ce_page_vpn_new (NMConnectionEditor *editor, priv->editor = nm_vpn_editor_plugin_get_editor (priv->plugin, CE_PAGE (self)->connection, &local); if (!priv->editor) { g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, - _("Could not load editor VPN plugin for '%s' (%s)."), + _("Could not load editor VPN plugin for “%s” (%s)."), service_type, local ? local->message : _("unknown failure")); g_clear_error (&local); g_object_unref (self); @@ -264,7 +264,7 @@ vpn_connection_import (GtkWindow *parent, } #define NEW_VPN_CONNECTION_PRIMARY_LABEL _("Choose a VPN Connection Type") -#define NEW_VPN_CONNECTION_SECONDARY_LABEL _("Select the type of VPN you wish to use for the new connection. If the type of VPN connection you wish to create does not appear in the list, you may not have the correct VPN plugin installed.") +#define NEW_VPN_CONNECTION_SECONDARY_LABEL _("Select the type of VPN you wish to use for the new connection. If the type of VPN connection you wish to create does not appear in the list, you may not have the correct VPN plugin installed.") static gboolean vpn_type_filter_func (GType type, gpointer user_data) diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c index 7bf9987f..8f7c6c14 100644 --- a/src/connection-editor/page-wifi.c +++ b/src/connection-editor/page-wifi.c @@ -74,7 +74,7 @@ wifi_private_init (CEPageWifi *self) priv->bssid = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new_with_entry ()); gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (priv->bssid), 0); gtk_widget_set_tooltip_text (GTK_WIDGET (priv->bssid), - _("This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here. Example: 00:11:22:33:44:55")); + _("This option locks this connection to the Wi-Fi access point (AP) specified by the BSSID entered here. Example: 00:11:22:33:44:55")); vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_bssid_vbox")); gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->bssid)); @@ -87,7 +87,7 @@ wifi_private_init (CEPageWifi *self) gtk_widget_set_tooltip_text (GTK_WIDGET (priv->device_combo), _("This option locks this connection to the network device specified " "either by its interface name or permanent MAC or both. Examples: " - "\"wlan0\", \"3C:97:0E:42:1A:19\", \"wlan0 (3C:97:0E:42:1A:19)\"")); + "“wlan0”, “3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”")); vbox = GTK_WIDGET (gtk_builder_get_object (builder, "wifi_device_vbox")); gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->device_combo)); diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c index 5031d83f..a444d0d5 100644 --- a/src/connection-editor/vpn-helpers.c +++ b/src/connection-editor/vpn-helpers.c @@ -140,7 +140,7 @@ import_vpn_from_file_cb (GtkWidget *dialog, gint response, gpointer user_data) GTK_BUTTONS_OK, _("Cannot import VPN connection")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), - _("The file '%s' could not be read or does not contain recognized VPN connection information\n\nError: %s."), + _("The file “%s” could not be read or does not contain recognized VPN connection information\n\nError: %s."), bname, error ? error->message : _("unknown error")); g_free (bname); g_signal_connect (err_dialog, "delete-event", G_CALLBACK (gtk_widget_destroy), NULL); @@ -215,7 +215,7 @@ export_vpn_to_file_cb (GtkWidget *dialog, gint response, gpointer user_data) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, - _("A file named \"%s\" already exists."), + _("A file named “%s” already exists."), bname); gtk_dialog_add_buttons (GTK_DIALOG (replace_dialog), _("_Replace"), GTK_RESPONSE_OK, NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (replace_dialog), @@ -257,7 +257,7 @@ done: GTK_BUTTONS_OK, _("Cannot export VPN connection")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), - _("The VPN connection '%s' could not be exported to %s.\n\nError: %s."), + _("The VPN connection “%s” could not be exported to %s.\n\nError: %s."), id ? id : "(unknown)", bname, error ? error->message : "unknown error"); g_free (bname); g_signal_connect (err_dialog, "delete-event", G_CALLBACK (gtk_widget_destroy), NULL); @@ -292,7 +292,7 @@ vpn_export (NMConnection *connection) return; } - dialog = gtk_file_chooser_dialog_new (_("Export VPN connection..."), + dialog = gtk_file_chooser_dialog_new (_("Export VPN connection…"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, diff --git a/src/libnm-gtk/nm-mobile-wizard.c b/src/libnm-gtk/nm-mobile-wizard.c index afc6cc0c..f490bd62 100644 --- a/src/libnm-gtk/nm-mobile-wizard.c +++ b/src/libnm-gtk/nm-mobile-wizard.c @@ -246,7 +246,7 @@ confirm_setup (NMAMobileWizard *self) if (self->will_connect_after) { alignment = gtk_alignment_new (0, 0.5, 1, 0); - label = gtk_label_new (_("A connection will now be made to your mobile broadband provider using the settings you selected. If the connection fails or you cannot access network resources, double-check your settings. To modify your mobile broadband connection settings, choose \"Network Connections\" from the System >> Preferences menu.")); + label = gtk_label_new (_("A connection will now be made to your mobile broadband provider using the settings you selected. If the connection fails or you cannot access network resources, double-check your settings. To modify your mobile broadband connection settings, choose “Network Connections” from the System → Preferences menu.")); gtk_widget_set_size_request (label, 500, -1); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_misc_set_padding (GTK_MISC (label), 0, 6); @@ -498,7 +498,7 @@ plan_setup (NMAMobileWizard *self) gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - label = gtk_label_new (_("Warning: Selecting an incorrect plan may result in billing issues for your broadband account or may prevent connectivity.\n\nIf you are unsure of your plan please ask your provider for your plan's APN.")); + label = gtk_label_new (_("Warning: Selecting an incorrect plan may result in billing issues for your broadband account or may prevent connectivity.\n\nIf you are unsure of your plan please ask your provider for your plan’s APN.")); gtk_widget_set_size_request (label, 500, -1); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (label), 60); @@ -555,7 +555,7 @@ plan_prepare (NMAMobileWizard *self) gtk_tree_store_set (GTK_TREE_STORE (self->plan_store), &method_iter, PLAN_COL_NAME, - _("My plan is not listed..."), + _("My plan is not listed…"), PLAN_COL_MANUAL, TRUE, -1); @@ -746,7 +746,7 @@ providers_setup (NMAMobileWizard *self) gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0); self->provider_unlisted_radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (self->providers_view_radio), - _("I can't find my provider and I wish to enter it _manually:")); + _("I can’t find my provider and I wish to enter it _manually:")); g_signal_connect (self->providers_view_radio, "toggled", G_CALLBACK (providers_radio_toggled), self); gtk_box_pack_start (GTK_BOX (vbox), self->provider_unlisted_radio, FALSE, TRUE, 0); @@ -1124,7 +1124,7 @@ country_setup (NMAMobileWizard *self) gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 6); self->country_idx = gtk_assistant_append_page (GTK_ASSISTANT (self->assistant), vbox); - gtk_assistant_set_page_title (GTK_ASSISTANT (self->assistant), vbox, _("Choose your Provider's Country or Region")); + gtk_assistant_set_page_title (GTK_ASSISTANT (self->assistant), vbox, _("Choose your Provider’s Country or Region")); gtk_assistant_set_page_type (GTK_ASSISTANT (self->assistant), vbox, GTK_ASSISTANT_PAGE_CONTENT); gtk_assistant_set_page_complete (GTK_ASSISTANT (self->assistant), vbox, TRUE); gtk_widget_show_all (vbox); @@ -1369,7 +1369,7 @@ intro_setup (NMAMobileWizard *self) gtk_container_add (GTK_CONTAINER (alignment), info_vbox); gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 6); - s = g_strdup_printf ("• %s", _("Your broadband provider's name")); + s = g_strdup_printf ("• %s", _("Your broadband provider’s name")); label = gtk_label_new (s); g_free (s); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c index 1bf1bf45..303857c3 100644 --- a/src/libnm-gtk/nm-wifi-dialog.c +++ b/src/libnm-gtk/nm-wifi-dialog.c @@ -462,7 +462,7 @@ connection_combo_init (NMAWifiDialog *self, NMConnection *connection) gtk_list_store_append (store, &tree_iter); gtk_list_store_set (store, &tree_iter, - C_NAME_COLUMN, _("New..."), + C_NAME_COLUMN, _("New…"), C_NEW_COLUMN, TRUE, -1); gtk_list_store_append (store, &tree_iter); @@ -1158,7 +1158,7 @@ internal_init (NMAWifiDialog *self, if (ssid) esc_ssid = nm_utils_ssid_to_utf8 (ssid); - tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network '%s'."), + tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network “%s”."), esc_ssid ? esc_ssid : "<unknown>"); gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required")); label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s", diff --git a/src/libnm-gtk/wifi.ui b/src/libnm-gtk/wifi.ui index 023e285d..26d88ff7 100644 --- a/src/libnm-gtk/wifi.ui +++ b/src/libnm-gtk/wifi.ui @@ -9,7 +9,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> @@ -20,7 +20,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> diff --git a/src/libnma/nma-mobile-wizard.c b/src/libnma/nma-mobile-wizard.c index ddfb129e..a035c8d4 100644 --- a/src/libnma/nma-mobile-wizard.c +++ b/src/libnma/nma-mobile-wizard.c @@ -245,7 +245,7 @@ confirm_setup (NMAMobileWizard *self) if (self->will_connect_after) { alignment = gtk_alignment_new (0, 0.5, 1, 0); - label = gtk_label_new (_("A connection will now be made to your mobile broadband provider using the settings you selected. If the connection fails or you cannot access network resources, double-check your settings. To modify your mobile broadband connection settings, choose \"Network Connections\" from the System >> Preferences menu.")); + label = gtk_label_new (_("A connection will now be made to your mobile broadband provider using the settings you selected. If the connection fails or you cannot access network resources, double-check your settings. To modify your mobile broadband connection settings, choose “Network Connections” from the System → Preferences menu.")); gtk_widget_set_size_request (label, 500, -1); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); gtk_misc_set_padding (GTK_MISC (label), 0, 6); @@ -497,7 +497,7 @@ plan_setup (NMAMobileWizard *self) gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); - label = gtk_label_new (_("Warning: Selecting an incorrect plan may result in billing issues for your broadband account or may prevent connectivity.\n\nIf you are unsure of your plan please ask your provider for your plan's APN.")); + label = gtk_label_new (_("Warning: Selecting an incorrect plan may result in billing issues for your broadband account or may prevent connectivity.\n\nIf you are unsure of your plan please ask your provider for your plan’s APN.")); gtk_widget_set_size_request (label, 500, -1); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_max_width_chars (GTK_LABEL (label), 60); @@ -554,7 +554,7 @@ plan_prepare (NMAMobileWizard *self) gtk_tree_store_set (GTK_TREE_STORE (self->plan_store), &method_iter, PLAN_COL_NAME, - _("My plan is not listed..."), + _("My plan is not listed…"), PLAN_COL_MANUAL, TRUE, -1); @@ -745,7 +745,7 @@ providers_setup (NMAMobileWizard *self) gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0); self->provider_unlisted_radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (self->providers_view_radio), - _("I can't find my provider and I wish to enter it _manually:")); + _("I can’t find my provider and I wish to enter it _manually:")); g_signal_connect (self->providers_view_radio, "toggled", G_CALLBACK (providers_radio_toggled), self); gtk_box_pack_start (GTK_BOX (vbox), self->provider_unlisted_radio, FALSE, TRUE, 0); @@ -1123,7 +1123,7 @@ country_setup (NMAMobileWizard *self) gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 6); self->country_idx = gtk_assistant_append_page (GTK_ASSISTANT (self->assistant), vbox); - gtk_assistant_set_page_title (GTK_ASSISTANT (self->assistant), vbox, _("Choose your Provider's Country or Region")); + gtk_assistant_set_page_title (GTK_ASSISTANT (self->assistant), vbox, _("Choose your Provider’s Country or Region")); gtk_assistant_set_page_type (GTK_ASSISTANT (self->assistant), vbox, GTK_ASSISTANT_PAGE_CONTENT); gtk_assistant_set_page_complete (GTK_ASSISTANT (self->assistant), vbox, TRUE); gtk_widget_show_all (vbox); @@ -1368,7 +1368,7 @@ intro_setup (NMAMobileWizard *self) gtk_container_add (GTK_CONTAINER (alignment), info_vbox); gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 6); - s = g_strdup_printf ("• %s", _("Your broadband provider's name")); + s = g_strdup_printf ("• %s", _("Your broadband provider’s name")); label = gtk_label_new (s); g_free (s); gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c index 557cf657..ca989fc3 100644 --- a/src/libnma/nma-wifi-dialog.c +++ b/src/libnma/nma-wifi-dialog.c @@ -462,7 +462,7 @@ connection_combo_init (NMAWifiDialog *self, NMConnection *connection) gtk_list_store_append (store, &tree_iter); gtk_list_store_set (store, &tree_iter, - C_NAME_COLUMN, _("New..."), + C_NAME_COLUMN, _("New…"), C_NEW_COLUMN, TRUE, -1); gtk_list_store_append (store, &tree_iter); @@ -1154,7 +1154,7 @@ internal_init (NMAWifiDialog *self, if (ssid) esc_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid)); - tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network '%s'."), + tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the Wi-Fi network “%s”."), esc_ssid ? esc_ssid : "<unknown>"); gtk_window_set_title (GTK_WINDOW (self), _("Wi-Fi Network Authentication Required")); label = g_strdup_printf ("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s", diff --git a/src/libnma/wifi.ui b/src/libnma/wifi.ui index f23f89d1..b1049586 100644 --- a/src/libnma/wifi.ui +++ b/src/libnma/wifi.ui @@ -9,7 +9,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> @@ -20,7 +20,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c index 8969fd3b..81b2ac36 100644 --- a/src/mobile-helpers.c +++ b/src/mobile-helpers.c @@ -328,7 +328,7 @@ mobile_helper_save_pin_in_keyring (const char *devid, char *name; char *error_msg; - name = g_strdup_printf (_("PIN code for SIM card '%s' on '%s'"), + name = g_strdup_printf (_("PIN code for SIM card “%s” on “%s”"), simid ? simid : "unknown", devid); @@ -596,16 +596,16 @@ mobile_helper_get_icon (NMDevice *device, switch (state) { case NM_DEVICE_STATE_PREPARE: - *tip = g_strdup_printf (_("Preparing mobile broadband connection '%s'..."), id); + *tip = g_strdup_printf (_("Preparing mobile broadband connection “%s”…"), id); break; case NM_DEVICE_STATE_CONFIG: - *tip = g_strdup_printf (_("Configuring mobile broadband connection '%s'..."), id); + *tip = g_strdup_printf (_("Configuring mobile broadband connection “%s”…"), id); break; case NM_DEVICE_STATE_NEED_AUTH: - *tip = g_strdup_printf (_("User authentication required for mobile broadband connection '%s'..."), id); + *tip = g_strdup_printf (_("User authentication required for mobile broadband connection “%s”…"), id); break; case NM_DEVICE_STATE_IP_CONFIG: - *tip = g_strdup_printf (_("Requesting a network address for '%s'..."), id); + *tip = g_strdup_printf (_("Requesting a network address for “%s”…"), id); break; case NM_DEVICE_STATE_ACTIVATED: *out_pixbuf = mobile_helper_get_status_pixbuf (quality, @@ -619,12 +619,12 @@ mobile_helper_get_icon (NMDevice *device, if ((mb_state != MB_STATE_UNKNOWN) && quality_valid) { gboolean roaming = (mb_state == MB_STATE_ROAMING); - *tip = g_strdup_printf (_("Mobile broadband connection '%s' active: (%d%%%s%s)"), + *tip = g_strdup_printf (_("Mobile broadband connection “%s” active: (%d%%%s%s)"), id, quality, roaming ? ", " : "", roaming ? _("roaming") : ""); } else - *tip = g_strdup_printf (_("Mobile broadband connection '%s' active"), id); + *tip = g_strdup_printf (_("Mobile broadband connection “%s” active"), id); break; default: break; diff --git a/src/wireless-security/eap-method-fast.ui b/src/wireless-security/eap-method-fast.ui index dcaa43b3..8413dbba 100644 --- a/src/wireless-security/eap-method-fast.ui +++ b/src/wireless-security/eap-method-fast.ui @@ -8,7 +8,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> diff --git a/src/wireless-security/eap-method-peap.ui b/src/wireless-security/eap-method-peap.ui index 7e08675d..5fb8aadd 100644 --- a/src/wireless-security/eap-method-peap.ui +++ b/src/wireless-security/eap-method-peap.ui @@ -8,7 +8,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c index 9855b2e0..b2460210 100644 --- a/src/wireless-security/eap-method-tls.c +++ b/src/wireless-security/eap-method-tls.c @@ -316,7 +316,7 @@ private_key_picker_helper (EAPMethod *parent, const char *filename, gboolean cha _("Unencrypted private keys are insecure")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", - _("The selected private key does not appear to be protected by a password. This could allow your security credentials to be compromised. Please select a password-protected private key.\n\n(You can password-protect your private key with openssl)")); + _("The selected private key does not appear to be protected by a password. This could allow your security credentials to be compromised. Please select a password-protected private key.\n\n(You can password-protect your private key with openssl)")); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } diff --git a/src/wireless-security/eap-method-ttls.ui b/src/wireless-security/eap-method-ttls.ui index acc7dde9..11b6ec82 100644 --- a/src/wireless-security/eap-method-ttls.ui +++ b/src/wireless-security/eap-method-ttls.ui @@ -8,7 +8,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> diff --git a/src/wireless-security/ws-dynamic-wep.ui b/src/wireless-security/ws-dynamic-wep.ui index e8868f94..f5c3b20f 100644 --- a/src/wireless-security/ws-dynamic-wep.ui +++ b/src/wireless-security/ws-dynamic-wep.ui @@ -8,7 +8,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> diff --git a/src/wireless-security/ws-wep-key.ui b/src/wireless-security/ws-wep-key.ui index 779c4759..cc4c667a 100644 --- a/src/wireless-security/ws-wep-key.ui +++ b/src/wireless-security/ws-wep-key.ui @@ -11,13 +11,13 @@ <col id="0" translatable="yes">1 (Default)</col> </row> <row> - <col id="0" translatable="yes">2</col> + <col id="0">2</col> </row> <row> - <col id="0" translatable="yes">3</col> + <col id="0">3</col> </row> <row> - <col id="0" translatable="yes">4</col> + <col id="0">4</col> </row> </data> </object> diff --git a/src/wireless-security/ws-wpa-eap.ui b/src/wireless-security/ws-wpa-eap.ui index b00e0298..2283aabe 100644 --- a/src/wireless-security/ws-wpa-eap.ui +++ b/src/wireless-security/ws-wpa-eap.ui @@ -8,7 +8,7 @@ </columns> <data> <row> - <col id="0" translatable="yes"> </col> + <col id="0"> </col> </row> </data> </object> |