[network-manager-openvpn] Use Unicode in translatable strings
- From: Piotr Drąg <piotrdrag src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn] Use Unicode in translatable strings
- Date: Mon, 3 Oct 2016 20:58:26 +0000 (UTC)
commit b8d2e3f9b84399047881ebd8c60d534817a2880c
Author: Piotr Drąg <piotrdrag gmail com>
Date: Mon Oct 3 22:42:18 2016 +0200
Use Unicode in translatable strings
See https://developer.gnome.org/hig/stable/typography.html
auth-dialog/main.c | 2 +-
properties/auth-helpers.c | 10 ++++----
properties/import-export.c | 30 +++++++++++++-------------
properties/nm-openvpn-dialog.ui | 16 +++++++-------
src/nm-openvpn-service.c | 42 +++++++++++++++++++-------------------
5 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index df06d95..7f320a3 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -510,7 +510,7 @@ main (int argc, char *argv[])
*/
prompt = get_passwords_required (data, hints, &need_password, &need_certpass, &need_proxypass);
if (!prompt)
- prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network
'%s'."), vpn_name);
+ prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network
“%s”."), vpn_name);
/* Exit early if we don't need any passwords */
if (!need_password && !need_certpass && !need_proxypass)
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 9df5d64..7995143 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -176,7 +176,7 @@ tls_setup (GtkBuilder *builder,
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (cert), filter);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (cert), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (cert),
- _("Choose your personal certificate..."));
+ _("Choose your personal certificate…"));
g_signal_connect (G_OBJECT (cert), "selection-changed", G_CALLBACK (changed_cb), user_data);
if (s_vpn) {
@@ -194,7 +194,7 @@ tls_setup (GtkBuilder *builder,
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (key), filter);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (key), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (key),
- _("Choose your private key..."));
+ _("Choose your private key…"));
g_signal_connect (G_OBJECT (key), "selection-changed", G_CALLBACK (changed_cb), user_data);
if (s_vpn) {
@@ -310,7 +310,7 @@ tls_pw_init_auth_widget (GtkBuilder *builder,
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (ca), filter);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (ca), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (ca),
- _("Choose a Certificate Authority certificate..."));
+ _("Choose a Certificate Authority certificate…"));
g_signal_connect (G_OBJECT (ca), "selection-changed", G_CALLBACK (changed_cb), user_data);
if (s_vpn) {
@@ -354,7 +354,7 @@ sk_init_auth_widget (GtkBuilder *builder,
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget),
- _("Choose an OpenVPN static key..."));
+ _("Choose an OpenVPN static key…"));
g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (changed_cb), user_data);
if (s_vpn) {
@@ -1181,7 +1181,7 @@ populate_tls_remote_mode_entry_combo (GtkEntry* entry, GtkComboBox *box,
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
- TLS_REMOTE_MODE_COL_NAME, _("Don't verify certificate identification"),
+ TLS_REMOTE_MODE_COL_NAME, _("Don’t verify certificate identification"),
TLS_REMOTE_MODE_COL_VALUE, TLS_REMOTE_MODE_NONE,
-1);
diff --git a/properties/import-export.c b/properties/import-export.c
index 8d9ea4f..00abc84 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -218,9 +218,9 @@ args_params_check_arg_nonempty (const char **params,
if (params[n_param][0] == '\0') {
if (argument_name)
- *out_error = g_strdup_printf (_("argument %s of \"%s\" can not be empty"),
argument_name, params[0]);
+ *out_error = g_strdup_printf (_("argument %s of “%s” can not be empty"),
argument_name, params[0]);
else
- *out_error = g_strdup_printf (_("argument of \"%s\" can not be empty"), params[0]);
+ *out_error = g_strdup_printf (_("argument of “%s” can not be empty"), params[0]);
return FALSE;
}
return TRUE;
@@ -236,9 +236,9 @@ args_params_check_arg_utf8 (const char **params,
return FALSE;
if (!_is_utf8 (params[n_param])) {
if (argument_name)
- *out_error = g_strdup_printf (_("argument %s of \"%s\" must be UTF-8 encoded"),
argument_name, params[0]);
+ *out_error = g_strdup_printf (_("argument %s of “%s” must be UTF-8 encoded"),
argument_name, params[0]);
else
- *out_error = g_strdup_printf (_("argument of \"%s\" must be UTF-8 encoded"),
params[0]);
+ *out_error = g_strdup_printf (_("argument of “%s” must be UTF-8 encoded"), params[0]);
return FALSE;
}
return TRUE;
@@ -262,7 +262,7 @@ args_params_parse_int64 (const char **params,
v = _nm_utils_ascii_str_to_int64 (params[n_param], 10, min, max, -1);
if (errno) {
- *out_error = g_strdup_printf (_("invalid %uth argument to '%s' where number expected"),
+ *out_error = g_strdup_printf (_("invalid %uth argument to “%s” where number expected"),
n_param,
params[0]);
return FALSE;
@@ -303,7 +303,7 @@ args_params_parse_ip4 (const char **params,
&& NM_IN_STRSET (params[n_param], "vpn_gateway", "net_gateway", "remote_host")) {
/* we don't support these special destinations, as they currently cannot be expressed
* in a connection. */
- *out_error = g_strdup_printf (_("unsupported %uth argument %s to '%s'"),
+ *out_error = g_strdup_printf (_("unsupported %uth argument %s to “%s”"),
n_param,
params[n_param],
params[0]);
@@ -321,14 +321,14 @@ args_params_parse_ip4 (const char **params,
goto not_dns;
}
/* we also don't support specifing a FQDN. */
- *out_error = g_strdup_printf (_("unsupported %uth argument to '%s' which looks like a FQDN
but only IPv4 address supported"),
+ *out_error = g_strdup_printf (_("unsupported %uth argument to “%s” which looks like a FQDN
but only IPv4 address supported"),
n_param,
params[0]);
return FALSE;
}
not_dns:
- *out_error = g_strdup_printf (_("invalid %uth argument to '%s' where IPv4 address expected"),
+ *out_error = g_strdup_printf (_("invalid %uth argument to “%s” where IPv4 address expected"),
n_param,
params[0]);
return FALSE;
@@ -353,7 +353,7 @@ args_params_parse_key_direction (const char **params,
else if (nm_streq (params[n_param], "1"))
*out_key_direction = "1";
else {
- *out_error = g_strdup_printf (_("invalid %uth key-direction argument to '%s'"), n_param,
params[0]);
+ *out_error = g_strdup_printf (_("invalid %uth key-direction argument to “%s”"), n_param,
params[0]);
return FALSE;
}
return TRUE;
@@ -367,7 +367,7 @@ args_params_error_message_invalid_arg (const char **params, guint n_param)
g_return_val_if_fail (n_param > 0, FALSE);
g_return_val_if_fail (n_param < g_strv_length ((char **) params), FALSE);
- return g_strdup_printf (_("invalid %uth argument to '%s'"), n_param, params[0]);
+ return g_strdup_printf (_("invalid %uth argument to “%s”"), n_param, params[0]);
}
/*****************************************************************************/
@@ -717,7 +717,7 @@ inline_blob_mkdir_parents (const InlineBlobData *data, const char *filepath, cha
return TRUE;
if (g_file_test (dirname, G_FILE_TEST_EXISTS)) {
- *out_error = g_strdup_printf (_("'%s' is not a directory"), dirname);
+ *out_error = g_strdup_printf (_("“%s” is not a directory"), dirname);
return FALSE;
}
@@ -725,7 +725,7 @@ inline_blob_mkdir_parents (const InlineBlobData *data, const char *filepath, cha
return FALSE;
if (mkdir (dirname, 0755) < 0) {
- *out_error = g_strdup_printf (_("cannot create '%s' directory"), dirname);
+ *out_error = g_strdup_printf (_("cannot create “%s” directory"), dirname);
return FALSE;
}
@@ -762,7 +762,7 @@ inline_blob_write_out (const InlineBlobData *data, GError **error)
g_set_error (error,
NMV_EDITOR_PLUGIN_ERROR,
NMV_EDITOR_PLUGIN_ERROR_FAILED,
- _("cannot write <%s> blob from line %ld to file '%s'"),
+ _("cannot write <%s> blob from line %ld to file “%s”"),
data->token,
(long) data->token_start_line,
data->path);
@@ -1494,7 +1494,7 @@ handle_line_error:
g_set_error_literal (error,
NMV_EDITOR_PLUGIN_ERROR,
NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_VPN,
- _("The file to import wasn't a valid OpenVPN client configuration"));
+ _("The file to import wasn’t a valid OpenVPN client configuration"));
goto out_error;
}
@@ -1502,7 +1502,7 @@ handle_line_error:
g_set_error_literal (error,
NMV_EDITOR_PLUGIN_ERROR,
NMV_EDITOR_PLUGIN_ERROR_FILE_NOT_VPN,
- _("The file to import wasn't a valid OpenVPN configure (no remote)"));
+ _("The file to import wasn’t a valid OpenVPN configure (no remote)"));
goto out_error;
}
diff --git a/properties/nm-openvpn-dialog.ui b/properties/nm-openvpn-dialog.ui
index 9fbdd83..793b7ec 100644
--- a/properties/nm-openvpn-dialog.ui
+++ b/properties/nm-openvpn-dialog.ui
@@ -274,7 +274,7 @@ config: remote</property>
<object class="GtkFileChooserButton" id="tls_private_key_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Local peer's private key in
.pem format.
+ <property name="tooltip_text" translatable="yes">Local peer’s private key in
.pem format.
config: key</property>
<property name="hexpand">True</property>
</object>
@@ -351,7 +351,7 @@ config: ca</property>
<object class="GtkFileChooserButton" id="tls_user_cert_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Local peer's signed
certificate in .pem format (signed by CA of CA Certificate).
+ <property name="tooltip_text" translatable="yes">Local peer’s signed
certificate in .pem format (signed by CA of CA Certificate).
config: cert</property>
</object>
</child>
@@ -543,7 +543,7 @@ config: auth-user-pass</property>
<object class="GtkFileChooserButton" id="pw_tls_private_key_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Local peer's private key in
.pem format.
+ <property name="tooltip_text" translatable="yes">Local peer’s private key in
.pem format.
config: key</property>
</object>
</child>
@@ -609,7 +609,7 @@ config: auth-user-pass</property>
<object class="GtkFileChooserButton" id="pw_tls_user_cert_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Local peer's signed
certificate in .pem format (signed by CA of CA Certificate).
+ <property name="tooltip_text" translatable="yes">Local peer’s signed
certificate in .pem format (signed by CA of CA Certificate).
config: cert</property>
</object>
</child>
@@ -839,7 +839,7 @@ config: static <file></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Direction for Static Key
encryption mode (non-TLS).
-If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer
uses '1', this connection must use '0'. If you are unsure what value to use, contact your system
administrator.
+If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer
uses “1”, this connection must use “0”. If you are unsure what value to use, contact your system
administrator.
config: static <file> [direction]</property>
<property name="model">model1</property>
<child>
@@ -975,7 +975,7 @@ config: static <file> [direction]</property>
<object class="GtkLabel" id="label1">
<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_markup">True</property>
<property name="use_underline">True</property>
</object>
@@ -1339,7 +1339,7 @@ config: dev-type tun | tap</property>
<object class="GtkEntry" id="dev_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Use custom name for TUN/TAP virtual
device (instead of default "tun" or "tap").
+ <property name="tooltip_text" translatable="yes">Use custom name for TUN/TAP virtual
device (instead of default “tun” or “tap”).
config: dev <name></property>
<property name="width_chars">15</property>
</object>
@@ -2138,7 +2138,7 @@ config: tls-auth <file> [direction]</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Direction parameter for
static key mode.
-If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer
uses '1', this connection must use '0'. If you are unsure what value to use, contact your system
administrator.
+If key direction is used, it must be the opposite of that used on the VPN peer. For example, if the peer
uses “1”, this connection must use “0”. If you are unsure what value to use, contact your system
administrator.
config: tls-auth <file> [direction]</property>
<property name="model">model5</property>
<child>
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 38dc963..be39b8c 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -363,7 +363,7 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
g_set_error (info->error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("invalid address '%s'"),
+ _("invalid address “%s”"),
key);
break;
case G_TYPE_INT:
@@ -375,7 +375,7 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
g_set_error (info->error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("invalid integer property '%s' or out of range [%d -> %d]"),
+ _("invalid integer property “%s” or out of range [%d -> %d]"),
key, prop.int_min, prop.int_max);
break;
case G_TYPE_BOOLEAN:
@@ -386,14 +386,14 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
/* Translators: keep "yes" and "no" untranslated! */
- _("invalid boolean property '%s' (not yes or no)"),
+ _("invalid boolean property “%s” (not yes or no)"),
key);
break;
default:
g_set_error (info->error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("unhandled property '%s' type %s"),
+ _("unhandled property “%s” type %s"),
key, g_type_name (prop.type));
break;
}
@@ -404,7 +404,7 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
g_set_error (info->error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("property '%s' invalid or not supported"),
+ _("property “%s” invalid or not supported"),
key);
}
}
@@ -1209,7 +1209,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid port number '%s'."), port);
+ _("Invalid port number “%s”."), port);
return FALSE;
}
} else if (defport) {
@@ -1217,7 +1217,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid port number '%s'."),
+ _("Invalid port number “%s”."),
defport);
return FALSE;
}
@@ -1233,7 +1233,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid proto '%s'."), proto);
+ _("Invalid proto “%s”."), proto);
return FALSE;
}
} else if (proto_tcp && !strcmp (proto_tcp, "yes"))
@@ -1275,7 +1275,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid proxy type '%s'."),
+ _("Invalid proxy type “%s”."),
tmp);
return FALSE;
}
@@ -1323,7 +1323,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid ping duration '%s'."),
+ _("Invalid ping duration “%s”."),
tmp);
return FALSE;
}
@@ -1336,7 +1336,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid ping-exit duration '%s'."),
+ _("Invalid ping-exit duration “%s”."),
tmp);
return FALSE;
}
@@ -1349,7 +1349,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid ping-restart duration '%s'."),
+ _("Invalid ping-restart duration “%s”."),
tmp);
return FALSE;
}
@@ -1368,7 +1368,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid max-routes argument '%s'."),
+ _("Invalid max-routes argument “%s”."),
tmp);
return FALSE;
}
@@ -1423,7 +1423,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid keysize '%s'."),
+ _("Invalid keysize “%s”."),
tmp);
return FALSE;
}
@@ -1504,7 +1504,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid reneg seconds '%s'."),
+ _("Invalid reneg seconds “%s”."),
tmp);
return FALSE;
}
@@ -1538,7 +1538,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid TUN MTU size '%s'."),
+ _("Invalid TUN MTU size “%s”."),
tmp);
return FALSE;
}
@@ -1552,7 +1552,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Invalid fragment size '%s'."),
+ _("Invalid fragment size “%s”."),
tmp);
return FALSE;
}
@@ -1667,7 +1667,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Unknown connection type '%s'."),
+ _("Unknown connection type “%s”."),
connection_type);
return FALSE;
}
@@ -1686,7 +1686,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("User '%s' not found, check NM_OPENVPN_USER."),
+ _("User “%s” not found, check NM_OPENVPN_USER."),
nm_openvpn_user);
return FALSE;
}
@@ -1699,7 +1699,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
g_set_error (error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
- _("Group '%s' not found, check NM_OPENVPN_GROUP."),
+ _("Group “%s” not found, check NM_OPENVPN_GROUP."),
nm_openvpn_group);
return FALSE;
}
@@ -2060,7 +2060,7 @@ main (int argc, char *argv[])
GMainLoop *loop;
GOptionEntry options[] = {
- { "persist", 0, 0, G_OPTION_ARG_NONE, &persist, N_("Don't quit when VPN connection
terminates"), NULL },
+ { "persist", 0, 0, G_OPTION_ARG_NONE, &persist, N_("Don’t quit when VPN connection
terminates"), NULL },
{ "debug", 0, 0, G_OPTION_ARG_NONE, &gl.debug, N_("Enable verbose debug logging (may expose
passwords)"), NULL },
{ "bus-name", 0, 0, G_OPTION_ARG_STRING, &bus_name, N_("D-Bus name to use for this
instance"), NULL },
{NULL}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
