Commit 61de24ba authored by Yuri Chornoivan's avatar Yuri Chornoivan Committed by Dan Winship
parent 72da550f
......@@ -2675,7 +2675,7 @@ do_questionnaire_bond (char **mode, char **primary, char **miimon,
monitor_mode = g_strdup ("miimon");
once_more = strcmp (monitor_mode, "miimon") && strcmp (monitor_mode, "arp");
if (once_more) {
printf (_("Error: '%s' is not a valid monitoring mode'; use '%s' or '%s'.\n"),
printf (_("Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"),
monitor_mode, "miimon", "arp");
g_free (monitor_mode);
}
......@@ -4180,7 +4180,7 @@ cleanup_olpc:
} else {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: '%s' is a not valid connection type."),
_("Error: '%s' is not a valid connection type."),
con_type);
return FALSE;
}
......@@ -5180,7 +5180,7 @@ editor_main_help (const char *command)
switch (cmd) {
case NMC_EDITOR_MAIN_CMD_GOTO:
printf (_("goto <setting>[.<prop>] | <prop> :: enter setting/property for editation\n\n"
printf (_("goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n\n"
"This command enters into a setting or property for editing it.\n\n"
"Examples: nmcli> goto connection\n"
" nmcli connection> goto secondaries\n"
......@@ -5196,7 +5196,7 @@ editor_main_help (const char *command)
case NMC_EDITOR_MAIN_CMD_SET:
printf (_("set [<setting>.<prop> <value>] :: set property value\n\n"
"This command sets property value.\n\n"
"Example: nmcli> s con.id My connection\n"));
"Example: nmcli> set con.id My connection\n"));
break;
case NMC_EDITOR_MAIN_CMD_DESCRIBE:
printf (_("describe [<setting>.<prop>] :: describe property\n\n"
......@@ -5484,7 +5484,7 @@ editor_show_status_line (NMConnection *connection, gboolean dirty)
}
/*
* Submenu for detailed property editation
* Submenu for detailed property editing
* Return: TRUE - continue; FALSE - should quit
*/
static gboolean
......@@ -6289,7 +6289,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t
g_error_free (nmc_editor_error);
} else
printf (_("Connection '%s' (%s) sucessfully saved.\n"),
printf (_("Connection '%s' (%s) successfully saved.\n"),
nm_connection_get_id (connection),
nm_connection_get_uuid (connection));
......
......@@ -2910,8 +2910,8 @@ nmc_property_ipv6_describe_dns (NMSetting *setting, const char *prop)
"configuration method is 'auto' these DNS servers are appended "
"to those (if any) returned by automatic configuration. DNS "
"servers cannot be used with the 'shared' or 'link-local' IPv6 "
"configuration methods, as there is no usptream network. In "
"all other IPv6 configuration methods methods, these DNS "
"configuration methods, as there is no upstream network. In "
"all other IPv6 configuration methods, these DNS "
"servers are used as the only DNS servers for this connection.\n\n"
"Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n");
}
......
......@@ -103,7 +103,7 @@ The Device object is the NM representation of a network device. To refer to a N
DBUS Service: "org.freedesktop.NetworkManager"
DBUS Interface: "org.freedesktop.NetworkManager.Devices"
Note that there is no DBUS Object Path listed above, the object path will always the the NM Device identfier returned from such methods as "getActiveDevice" and "getDevices".
Note that there is no DBUS Object Path listed above, the object path will always the NM Device identfier returned from such methods as "getActiveDevice" and "getDevices".
Methods:
......
......@@ -1454,7 +1454,7 @@ _get_udev_property (NMDevice *device,
/* Balance the initial g_udev_client_query_by_subsystem_and_name() */
g_object_unref (udev_device);
/* Prefer the the encoded value which comes directly from the device
/* Prefer the encoded value which comes directly from the device
* over the hwdata database value.
*/
if (enc_value) {
......
......@@ -679,7 +679,7 @@ clear_one_hash (GHashTable *table)
/* Build up the list of connections; we can't emit "removed" during hash
* table iteration because emission of the "removed" signal may trigger code
* that explicitly removes the the connection from the hash table somewhere
* that explicitly removes the connection from the hash table somewhere
* else.
*/
g_hash_table_iter_init (&iter, table);
......
......@@ -68,7 +68,7 @@ typedef enum /*< flags >*/ {
/* Short display name of the VPN plugin */
#define NM_VPN_PLUGIN_UI_INTERFACE_NAME "name"
/* Longer description of the the VPN plugin */
/* Longer description of the VPN plugin */
#define NM_VPN_PLUGIN_UI_INTERFACE_DESC "desc"
/* D-Bus service name of the plugin's VPN service */
......
......@@ -263,7 +263,7 @@ nm_connection_get_setting (NMConnection *connection, GType setting_type)
* @name: a setting name
*
* Gets the #NMSetting with the given name, if one has been previously added
* the the #NMConnection.
* the #NMConnection.
*
* Returns: (transfer none): the #NMSetting, or %NULL if no setting with that name was previously
* added to the #NMConnection
......
......@@ -350,7 +350,7 @@ ipv4.may-fail: yes
nmcli> verify
Verify connection: OK
nmcli> save
Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) sucessfully saved.
Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully saved.
nmcli> quit
</screen>
</example>
......
......@@ -556,7 +556,7 @@ If <ID> is ambiguous, a keyword \fIid\fP, \fIuuid\fP, or \fIpath\fP can be used.
See \fBshow active\fP above for the description of the <ID>-specifying keywords.
Not providing an <ID> means that a new connection will be added.
.sp
The interactive editor will guide you through the connection editation and
The interactive editor will guide you through the connection editing and
allow you to change connection parameters according to your needs by means of
a simple menu-driven interface. The editor indicates what settings and
properties can be modified and provides an inline help.
......
......@@ -706,7 +706,7 @@ periodic_update (gpointer user_data)
/* In IBSS mode, most newer firmware/drivers do "BSS coalescing" where
* multiple IBSS stations using the same SSID will eventually switch to
* using the same BSSID to avoid network segmentation. When this happens,
* the card's reported BSSID will change, but the the new BSS may not
* the card's reported BSSID will change, but the new BSS may not
* be in the scan list, since scanning isn't done in ad-hoc mode for
* various reasons. So pull the BSSID from the card and update the
* current AP with it, if the current AP is adhoc.
......
......@@ -71,7 +71,7 @@ link_callback (NMPlatform *platform, int ifindex, NMPlatformLink *received, NMPl
if (data->received)
g_error ("Received signal '%s' a second time.", data->name);
debug ("Recieved signal '%s' ifindex %d ifname '%s'.", data->name, ifindex, received->name);
debug ("Received signal '%s' ifindex %d ifname '%s'.", data->name, ifindex, received->name);
data->received = TRUE;
/* Check the data */
......
......@@ -444,7 +444,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data)
* single time when the configuration is finished and updates can
* come at any time.
*/
debug ("Recieved router advertisement: %d at %d", rdisc->ifindex, (int) now);
debug ("Received router advertisement: %d at %d", rdisc->ifindex, (int) now);
if (priv->send_rs_id) {
g_source_remove (priv->send_rs_id);
......
......@@ -833,7 +833,7 @@ system_config_interface_init (NMSystemConfigInterface *sci_intf)
/*******************************************************************/
/* Factory function: this is the first entry point for NetworkManager, which
* gets called during NM startup to create the the instance of this plugin
* gets called during NM startup to create the instance of this plugin
* that NetworkManager will actually use. Since every plugin is a singleton
* we just return a singleton instance. This function should never be called
* twice.
......
......@@ -327,7 +327,7 @@ arping_wait_lan=2
# Please ensure your VLAN IDs are NOT zero-padded
vlans_eth0="1 2"
# You may not want to assign an IP the the physical interface, but we still
# You may not want to assign an IP to the physical interface, but we still
# need it up.
config_eth0=( "null" )
......@@ -361,7 +361,7 @@ vlan_start_eth0="no"
# To bond interfaces together
slaves_bond0="eth0 eth1 eth2"
config_bond0=( "null" ) # You may not want to assign an IP the the bond
config_bond0=( "null" ) # You may not want to assign an IP to the bond
# If any of the slaves require extra configuration - for example wireless or
# ppp devices - we need to depend function on the bonded interfaces
......
......@@ -129,7 +129,7 @@ nm_vpn_service_connections_stop (NMVPNService *service,
GSList *iter, *copy;
/* Copy because stopping the connection may remove it from the list
* in the the NMVPNService objects' VPN connection state handler.
* in the NMVPNService objects' VPN connection state handler.
*/
copy = g_slist_copy (priv->connections);
for (iter = copy; iter; iter = iter->next) {
......
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