Commit 0050e8bd authored by Yuri Chornoivan's avatar Yuri Chornoivan Committed by Thomas Haller

all: fix typos in documentation, translated strings and comments

https://bugzilla.gnome.org/show_bug.cgi?id=783173
parent 7bafe6de
This diff is collapsed.
......@@ -204,7 +204,7 @@ gboolean _nm_utils_check_module_file (const char *name,
char *nm_utils_uuid_generate_from_string (const char *s, gssize slen, int uuid_type, gpointer type_args);
/* arbitrarily choosen namespace UUID for _nm_utils_uuid_generate_from_strings() */
/* arbitrarily chosen namespace UUID for _nm_utils_uuid_generate_from_strings() */
#define NM_UTILS_UUID_NS "b425e9fb-7598-44b4-9e3b-5a2e3aaa4905"
char *_nm_utils_uuid_generate_from_strings (const char *string1, ...) G_GNUC_NULL_TERMINATED;
......
......@@ -47,7 +47,7 @@ typedef struct {
* NMSettingConnection's 'type' property (which specifies the base type of the
* connection, eg ethernet or wifi) or the 802-11-wireless setting's
* 'security' property which specifies whether or not the AP requires
* encrpytion. This function handles translating those properties' values
* encryption. This function handles translating those properties' values
* from the real setting name to the more-readable alias.
*/
static void
......
......@@ -4174,7 +4174,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
*
* Specifies authentication flags to use in "phase 1" outer
* authentication using #NMSetting8021xAuthFlags options.
* The invidual TLS versions can be explicitly disabled. If a certain
* The individual TLS versions can be explicitly disabled. If a certain
* TLS disable flag is not set, it is up to the supplicant to allow
* or forbid it. The TLS options map to tls_disable_tlsv1_x settings.
* See the wpa_supplicant documentation for more details.
......
......@@ -1462,7 +1462,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
* hosts/devices yields different addresses.
*
* If the value is unset, an ID unique for the connection is used.
* Specifing a stable-id allows multiple connections to generate the
* Specifying a stable-id allows multiple connections to generate the
* same addresses. Another use is to generate IDs at runtime via
* dynamic substitutions.
*
......@@ -1642,7 +1642,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class)
/**
* NMSettingConnection:autoconnect-retries:
*
* The number of times a connection should be tried when autoctivating before
* The number of times a connection should be tried when autoactivating before
* giving up. Zero means forever, -1 means the global default (4 times if not
* overridden).
*/
......
......@@ -2970,7 +2970,7 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *setting_class)
* NMSettingIPConfig:route-metric:
*
* The default metric for routes that don't explicitly specify a metric.
* The default value -1 means that the metric is choosen automatically
* The default value -1 means that the metric is chosen automatically
* based on the device type.
* The metric applies to dynamic routes, manual (static) routes that
* don't have an explicit metric setting, address prefix routes, and
......
......@@ -663,7 +663,7 @@ nm_setting_ppp_class_init (NMSettingPppClass *setting_class)
/**
* NMSettingPpp:require-mppe:
*
* If %TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
* If %TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for
* the PPP session. If either 64-bit or 128-bit MPPE is not available the
* session will fail. Note that MPPE is not used on mobile broadband
* connections.
......@@ -679,7 +679,7 @@ nm_setting_ppp_class_init (NMSettingPppClass *setting_class)
/**
* NMSettingPpp:require-mppe-128:
*
* If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
* If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be
* required for the PPP session, and the "require-mppe" property must also
* be set to %TRUE. If 128-bit MPPE is not available the session will fail.
**/
......
......@@ -933,7 +933,7 @@ nm_setting_vpn_class_init (NMSettingVpnClass *setting_class)
*
* Timeout for the VPN service to establish the connection. Some services
* may take quite a long time to connect.
* Value of 0 means a default timeout, which is 60 seconds (unless overriden
* Value of 0 means a default timeout, which is 60 seconds (unless overridden
* by vpn.timeout in configuration file). Values greater than zero mean
* timeout in seconds.
*
......
......@@ -598,7 +598,7 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *setting_class)
/**
* NMSettingVxlan:id:
*
* Specifies the VXLAN Network Identifer (or VXLAN Segment Identifier) to
* Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to
* use.
*
* Since: 1.2
......
......@@ -1147,7 +1147,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class)
* If specified, request that the device use this MAC address instead.
* This is known as MAC cloning or spoofing.
*
* Beside explicitly specifing a MAC address, the special values "preserve", "permanent",
* Beside explicitly specifying a MAC address, the special values "preserve", "permanent",
* "random" and "stable" are supported.
* "preserve" means not to touch the MAC address on activation.
* "permanent" means to use the permanent hardware address of the device.
......
......@@ -1069,7 +1069,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
g_set_error (error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("'%s' can only be used with '%s=%s or '%s=%s'"),
_("'%s' can only be used with '%s=%s' or '%s=%s'"),
priv->pmf == NM_SETTING_WIRELESS_SECURITY_PMF_OPTIONAL ? "optional" : "required",
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-eap",
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk");
......
......@@ -1353,7 +1353,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_wireless_class)
* If specified, request that the device use this MAC address instead.
* This is known as MAC cloning or spoofing.
*
* Beside explicitly specifing a MAC address, the special values "preserve", "permanent",
* Beside explicitly specifying a MAC address, the special values "preserve", "permanent",
* "random" and "stable" are supported.
* "preserve" means not to touch the MAC address on activation.
* "permanent" means to use the permanent hardware address of the device.
......
......@@ -1776,7 +1776,7 @@ nm_client_new_finish (GAsyncResult *result, GError **error)
}
/*
* constructor() shouldn't be overriden in most cases, rather constructed()
* constructor() shouldn't be overridden in most cases, rather constructed()
* method is preferred and more useful.
* But, this serves as a workaround for bindings (use) calling the constructor()
* directly instead of nm_client_new() function, and neither providing
......
......@@ -1256,7 +1256,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
* NMSettingIP4Config:route-metric:
*
* The default metric for routes that don't explicitly specify a metric.
* The default value -1 means that the metric is choosen automatically
* The default value -1 means that the metric is chosen automatically
* based on the device type.
* The metric applies to dynamic routes, manual (static) routes that
* don't have an explicit metric setting, address prefix routes, and
......
......@@ -1204,7 +1204,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
* NMSettingIP6Config:route-metric:
*
* The default metric for routes that don't explicitly specify a metric.
* The default value -1 means that the metric is choosen automatically
* The default value -1 means that the metric is chosen automatically
* based on the device type.
* The metric applies to dynamic routes, manual (static) routes that
* don't have an explicit metric setting, address prefix routes, and
......
......@@ -685,7 +685,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
/**
* NMSettingPPP:require-mppe:
*
* If %TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for
* If %TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for
* the PPP session. If either 64-bit or 128-bit MPPE is not available the
* session will fail. Note that MPPE is not used on mobile broadband
* connections.
......@@ -701,7 +701,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
/**
* NMSettingPPP:require-mppe-128:
*
* If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be
* If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be
* required for the PPP session, and the "require-mppe" property must also
* be set to %TRUE. If 128-bit MPPE is not available the session will fail.
**/
......
......@@ -2138,7 +2138,7 @@ out:
* @callback: callback to be called when the reapply operation completes
* @user_data: caller-specific data passed to @callback
*
* Asynchronously begins an get the a currently applied connection.
* Asynchronously begins and gets the currently applied connection.
*
* Since: 1.2
**/
......
......@@ -41,7 +41,7 @@
* NMTST_SEED_RAND environment variable:
* Tests that use random numbers from nmtst_get_rand() get seeded randomly at each start.
* You can specify the seed by setting NMTST_SEED_RAND. Also, tests will print the seed
* to stdout, so that you know the choosen seed.
* to stdout, so that you know the chosen seed.
*
*
* NMTST_DEBUG environment variable:
......
......@@ -76,7 +76,7 @@ typedef struct {
* @factory: the #NMDeviceFactory
* @connection: the #NMConnection to return the parent name for, if supported
*
* Given a connection, returns the a parent interface name, parent connection
* Given a connection, returns the parent interface name, parent connection
* UUID, or parent device permanent hardware address for @connection.
*
* Returns: the parent interface name, parent connection UUID, parent
......
......@@ -3505,7 +3505,7 @@ nm_utils_stable_id_parse (const char *stable_id,
_stable_id_append (str, bootid ?: nm_utils_get_boot_id ());
else if (g_str_has_prefix (&stable_id[i], "${RANDOM}")) {
/* RANDOM makes not so much sense for cloned-mac-address
* as the result is simmilar to specifing "cloned-mac-address=random".
* as the result is simmilar to specyifing "cloned-mac-address=random".
* It makes however sense for RFC 7217 Stable Privacy IPv6 addresses
* where this is effectively the only way to generate a different
* (random) host identifier for each connect.
......
......@@ -304,7 +304,7 @@ guint8 *nm_utils_secret_key_read (gsize *out_key_len, GError **error);
const char *nm_utils_get_boot_id (void);
/* IPv6 Interface Identifer helpers */
/* IPv6 Interface Identifier helpers */
/**
* NMUtilsIPv6IfaceId:
......
......@@ -178,7 +178,7 @@ typedef struct {
* is enforced. NMDefaultRouteManager will actively remove any default
* route on such ifindexes.
* Also, for VPN sources in addition we track them so that a never-default
* VPN connection can be choosen by get_best_config() to receive the DNS configuration.
* VPN connection can be chosen by get_best_config() to receive the DNS configuration.
*
* (!synced && never_default): this combination makes no sense.
*/
......@@ -272,7 +272,7 @@ _platform_route_sync_add (const VTableIP *vtable, NMDefaultRouteManager *self, g
gboolean success;
/* Find the entries for the given metric.
* The effective metric for synced entries is choosen in a way that it
* The effective metric for synced entries is chosen in a way that it
* is unique (except for G_MAXUINT32, where a clash is not solvable). */
for (i = 0; i < entries->len; i++) {
Entry *e = g_ptr_array_index (entries, i);
......
......@@ -287,7 +287,7 @@ test_merge_subtract_mss_mtu (void)
g_assert_cmpuint (nm_ip4_config_get_mtu (cfg1), ==, expected_mtu2);
nm_ip4_config_merge (cfg1, cfg3, NM_IP_CONFIG_MERGE_DEFAULT);
/* ensure again the MSS and MTU in cfg1 got overriden */
/* ensure again the MSS and MTU in cfg1 got overridden */
g_assert_cmpuint (nm_ip4_config_get_mss (cfg1), ==, expected_mss3);
g_assert_cmpuint (nm_ip4_config_get_mtu (cfg1), ==, expected_mtu3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment