summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli/src/connections.c9
-rw-r--r--cli/src/network-manager.c121
-rw-r--r--configure.ac1
-rw-r--r--libnm-util/nm-setting-gsm.c39
-rw-r--r--libnm-util/tests/test-general.c69
-rw-r--r--man/NetworkManager.conf.5.in19
-rw-r--r--man/nmcli.1.in51
-rw-r--r--po/de.po1507
-rw-r--r--po/es.po316
-rw-r--r--po/pa.po540
-rw-r--r--po/sl.po2127
-rw-r--r--src/bluez-manager/nm-bluez-manager.c6
-rw-r--r--src/system-settings/nm-sysconfig-settings.c2
-rw-r--r--system-settings/plugins/keyfile/Makefile.am30
-rw-r--r--system-settings/plugins/keyfile/common.h37
-rw-r--r--system-settings/plugins/keyfile/errors.c35
-rw-r--r--system-settings/plugins/keyfile/io/Makefile.am20
-rw-r--r--system-settings/plugins/keyfile/nm-keyfile-connection.c105
-rw-r--r--system-settings/plugins/keyfile/nm-keyfile-connection.h2
-rw-r--r--system-settings/plugins/keyfile/plugin.c111
-rw-r--r--system-settings/plugins/keyfile/reader.c (renamed from system-settings/plugins/keyfile/io/reader.c)230
-rw-r--r--system-settings/plugins/keyfile/reader.h (renamed from system-settings/plugins/keyfile/io/reader.h)4
-rw-r--r--system-settings/plugins/keyfile/tests/Makefile.am4
-rw-r--r--system-settings/plugins/keyfile/tests/keyfiles/Makefile.am3
-rw-r--r--system-settings/plugins/keyfile/tests/keyfiles/Test_String_SSID11
-rw-r--r--system-settings/plugins/keyfile/tests/test-keyfile.c172
-rw-r--r--system-settings/plugins/keyfile/writer.c (renamed from system-settings/plugins/keyfile/io/writer.c)58
-rw-r--r--system-settings/plugins/keyfile/writer.h (renamed from system-settings/plugins/keyfile/io/writer.h)0
28 files changed, 3898 insertions, 1731 deletions
diff --git a/cli/src/connections.c b/cli/src/connections.c
index 9a20753391..5099b502d9 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -65,9 +65,10 @@ static NmcOutputField nmc_fields_con_status[] = {
{"DBUS-SERVICE", N_("DBUS-SERVICE"), 45, NULL, 0}, /* 5 */
{"SPEC-OBJECT", N_("SPEC-OBJECT"), 10, NULL, 0}, /* 6 */
{"VPN", N_("VPN"), 5, NULL, 0}, /* 7 */
+ {"DBUS-PATH", N_("DBUS-PATH"), 51, NULL, 0}, /* 8 */
{NULL, NULL, 0, NULL, 0}
};
-#define NMC_FIELDS_CON_STATUS_ALL "NAME,UUID,DEVICES,SCOPE,DEFAULT,VPN,DBUS-SERVICE,SPEC-OBJECT"
+#define NMC_FIELDS_CON_STATUS_ALL "NAME,UUID,DEVICES,SCOPE,DEFAULT,VPN,DBUS-SERVICE,DBUS-PATH,SPEC-OBJECT"
#define NMC_FIELDS_CON_STATUS_COMMON "NAME,UUID,DEVICES,SCOPE,DEFAULT,VPN"
/* Available fields for 'con list' */
@@ -80,9 +81,10 @@ static NmcOutputField nmc_fields_con_list[] = {
{"TIMESTAMP-REAL", N_("TIMESTAMP-REAL"), 34, NULL, 0}, /* 5 */
{"AUTOCONNECT", N_("AUTOCONNECT"), 13, NULL, 0}, /* 6 */
{"READONLY", N_("READONLY"), 10, NULL, 0}, /* 7 */
+ {"DBUS-PATH", N_("DBUS-PATH"), 42, NULL, 0}, /* 8 */
{NULL, NULL, 0, NULL, 0}
};
-#define NMC_FIELDS_CON_LIST_ALL "NAME,UUID,TYPE,SCOPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,READONLY"
+#define NMC_FIELDS_CON_LIST_ALL "NAME,UUID,TYPE,SCOPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,READONLY,DBUS-PATH"
#define NMC_FIELDS_CON_LIST_COMMON "NAME,UUID,TYPE,SCOPE,TIMESTAMP-REAL"
@@ -376,6 +378,7 @@ show_connection (NMConnection *data, gpointer user_data)
timestamp = nm_setting_connection_get_timestamp (s_con);
timestamp_str = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp);
strftime (timestamp_real_str, sizeof (timestamp_real_str), "%c", localtime ((time_t *) &timestamp));
+
nmc->allowed_fields[0].value = nm_setting_connection_get_id (s_con);
nmc->allowed_fields[1].value = nm_setting_connection_get_uuid (s_con);
nmc->allowed_fields[2].value = nm_setting_connection_get_connection_type (s_con);
@@ -384,6 +387,7 @@ show_connection (NMConnection *data, gpointer user_data)
nmc->allowed_fields[5].value = timestamp ? timestamp_real_str : _("never");
nmc->allowed_fields[6].value = nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no");
nmc->allowed_fields[7].value = nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no");
+ nmc->allowed_fields[8].value = nm_connection_get_path (connection);
nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */
print_fields (nmc->print_fields, nmc->allowed_fields);
@@ -604,6 +608,7 @@ show_active_connection (gpointer data, gpointer user_data)
info->nmc->allowed_fields[5].value = nm_active_connection_get_service_name (active);
info->nmc->allowed_fields[6].value = nm_active_connection_get_specific_object (active);
info->nmc->allowed_fields[7].value = NM_IS_VPN_CONNECTION (active) ? _("yes") : _("no");
+ info->nmc->allowed_fields[8].value = nm_object_get_path (NM_OBJECT (active));
info->nmc->print_fields.flags &= ~NMC_PF_FLAG_MAIN_HEADER_ADD & ~NMC_PF_FLAG_MAIN_HEADER_ONLY & ~NMC_PF_FLAG_FIELD_NAMES; /* Clear header flags */
print_fields (info->nmc->print_fields, info->nmc->allowed_fields);
diff --git a/cli/src/network-manager.c b/cli/src/network-manager.c
index b65dfcd7bd..23a2ef11e7 100644
--- a/cli/src/network-manager.c
+++ b/cli/src/network-manager.c
@@ -34,14 +34,16 @@
static NmcOutputField nmc_fields_nm_status[] = {
{"RUNNING", N_("RUNNING"), 15, NULL, 0}, /* 0 */
{"STATE", N_("STATE"), 15, NULL, 0}, /* 1 */
- {"WIFI-HARDWARE", N_("WIFI-HARDWARE"), 15, NULL, 0}, /* 2 */
- {"WIFI", N_("WIFI"), 10, NULL, 0}, /* 3 */
- {"WWAN-HARDWARE", N_("WWAN-HARDWARE"), 15, NULL, 0}, /* 4 */
- {"WWAN", N_("WWAN"), 10, NULL, 0}, /* 5 */
+ {"NET-ENABLED", N_("NET-ENABLED"), 13, NULL, 0}, /* 2 */
+ {"WIFI-HARDWARE", N_("WIFI-HARDWARE"), 15, NULL, 0}, /* 3 */
+ {"WIFI", N_("WIFI"), 10, NULL, 0}, /* 4 */
+ {"WWAN-HARDWARE", N_("WWAN-HARDWARE"), 15, NULL, 0}, /* 5 */
+ {"WWAN", N_("WWAN"), 10, NULL, 0}, /* 6 */
{NULL, NULL, 0, NULL, 0}
};
-#define NMC_FIELDS_NM_STATUS_ALL "RUNNING,STATE,WIFI-HARDWARE,WIFI,WWAN-HARDWARE,WWAN"
+#define NMC_FIELDS_NM_STATUS_ALL "RUNNING,STATE,NET-ENABLED,WIFI-HARDWARE,WIFI,WWAN-HARDWARE,WWAN"
#define NMC_FIELDS_NM_STATUS_COMMON "RUNNING,STATE,WIFI-HARDWARE,WIFI,WWAN-HARDWARE,WWAN"
+#define NMC_FIELDS_NM_NET_ENABLED "NET-ENABLED"
#define NMC_FIELDS_NM_WIFI "WIFI"
#define NMC_FIELDS_NM_WWAN "WWAN"
@@ -60,10 +62,10 @@ usage (void)
{
fprintf (stderr,
_("Usage: nmcli nm { COMMAND | help }\n\n"
- " COMMAND := { status | sleep | wakeup | wifi | wwan }\n\n"
+ " COMMAND := { status | enable | sleep | wifi | wwan }\n\n"
" status\n"
- " sleep\n"
- " wakeup\n"
+ " enable [true|false]\n"
+ " sleep [true|false]\n"
" wifi [on|off]\n"
" wwan [on|off]\n\n"));
}
@@ -97,6 +99,7 @@ static NMCResultCode
show_nm_status (NmCli *nmc)
{
gboolean nm_running;
+ gboolean net_enabled;
NMState state;
const char *wireless_hw_enabled_str, *wireless_enabled_str;
const char *wwan_hw_enabled_str, *wwan_enabled_str;
@@ -136,6 +139,7 @@ show_nm_status (NmCli *nmc)
nm_running = nm_client_get_manager_running (nmc->client);
state = nm_client_get_state (nmc->client);
+ net_enabled = nm_client_networking_get_enabled (nmc->client);
if (nm_running) {
wireless_hw_enabled_str = nm_client_wireless_hardware_get_enabled (nmc->client) ? _("enabled") : _("disabled");
wireless_enabled_str = nm_client_wireless_get_enabled (nmc->client) ? _("enabled") : _("disabled");
@@ -147,10 +151,11 @@ show_nm_status (NmCli *nmc)
nmc->allowed_fields[0].value = nm_running ? _("running") : _("not running");
nmc->allowed_fields[1].value = nm_state_to_string (state);
- nmc->allowed_fields[2].value = wireless_hw_enabled_str;
- nmc->allowed_fields[3].value = wireless_enabled_str;
- nmc->allowed_fields[4].value = wwan_hw_enabled_str;
- nmc->allowed_fields[5].value = wwan_enabled_str;
+ nmc->allowed_fields[2].value = net_enabled ? _("enabled") : _("disabled");
+ nmc->allowed_fields[3].value = wireless_hw_enabled_str;
+ nmc->allowed_fields[4].value = wireless_enabled_str;
+ nmc->allowed_fields[5].value = wwan_hw_enabled_str;
+ nmc->allowed_fields[6].value = wwan_enabled_str;
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag;
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */
@@ -158,12 +163,49 @@ show_nm_status (NmCli *nmc)
return NMC_RESULT_SUCCESS;
}
+/* libnm-glib doesn't provide API fro Sleep method - implement D-Bus call ourselves */
+static void networking_set_sleep (NmCli *nmc, gboolean in_sleep)
+{
+ DBusGConnection *connection = NULL;
+ DBusGProxy *proxy = NULL;
+ GError *err = NULL;
+
+ connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &err);
+ if (!connection) {
+ g_string_printf (nmc->return_text, _("Error: Couldn't connect to system bus: %s"), err->message);
+ nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
+ g_error_free (err);
+ goto gone;
+ }
+
+ proxy = dbus_g_proxy_new_for_name (connection,
+ "org.freedesktop.NetworkManager",
+ "/org/freedesktop/NetworkManager",
+ "org.freedesktop.NetworkManager");
+ if (!proxy) {
+ g_string_printf (nmc->return_text, _("Error: Couldn't create D-Bus object proxy."));
+ nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
+ goto gone;
+ }
+
+ if (!dbus_g_proxy_call (proxy, "Sleep", &err, G_TYPE_BOOLEAN, in_sleep, G_TYPE_INVALID, G_TYPE_INVALID)) {
+ g_string_printf (nmc->return_text, _("Error in sleep: %s"), err->message);
+ nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
+ g_error_free (err);
+ }
+
+gone:
+ if (connection) dbus_g_connection_unref (connection);
+ if (proxy) g_object_unref (proxy);
+}
/* entry point function for global network manager related commands 'nmcli nm' */
NMCResultCode
do_network_manager (NmCli *nmc, int argc, char **argv)
{
GError *error = NULL;
+ gboolean sleep_flag;
+ gboolean enable_net;
gboolean enable_wifi;
gboolean enable_wwan;
guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0;
@@ -186,11 +228,54 @@ do_network_manager (NmCli *nmc, int argc, char **argv)
goto opt_error;
nmc->return_value = show_nm_status (nmc);
}
- else if (matches (*argv, "sleep") == 0) {
- nm_client_sleep (nmc->client, TRUE);
+ else if (matches (*argv, "enable") == 0) {
+ if (next_arg (&argc, &argv) != 0) {
+ /* no argument, show current state of networking */
+ if (!nmc_terse_option_check (nmc->print_output, nmc->required_fields, &error))
+ goto opt_error;
+ if (nmc->required_fields && strcasecmp (nmc->required_fields, "NET-ENABLED")) {
+ g_string_printf (nmc->return_text, _("Error: '--fields' value '%s' is not valid here; allowed fields: %s"),
+ nmc->required_fields, NMC_FIELDS_NM_NET_ENABLED);
+ nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
+ goto end;
+ }
+ nmc->allowed_fields = nmc_fields_nm_status;
+ nmc->print_fields.indices = parse_output_fields (NMC_FIELDS_NM_NET_ENABLED, nmc->allowed_fields, NULL);
+ nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_MAIN_HEADER_ADD | NMC_PF_FLAG_FIELD_NAMES;
+ nmc->print_fields.header_name = _("Networking enabled");
+ print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */
+ nmc->allowed_fields[2].value = nm_client_networking_get_enabled (nmc->client) ? _("enabled") : _("disabled");
+ nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag;
+ print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */
+ } else {
+ if (!strcmp (*argv, "true"))
+ enable_net = TRUE;
+ else if (!strcmp (*argv, "false"))
+ enable_net = FALSE;
+ else {
+ g_string_printf (nmc->return_text, _("Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."), *argv);
+ nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
+ goto end;
+ }
+ nm_client_networking_set_enabled (nmc->client, enable_net);
+ }
}
- else if (matches (*argv, "wakeup") == 0) {
- nm_client_sleep (nmc->client, FALSE);
+ else if (matches (*argv, "sleep") == 0) {
+ if (next_arg (&argc, &argv) != 0) {
+ g_string_printf (nmc->return_text, _("Error: Sleeping status is not exported by NetworkManager."));
+ nmc->return_value = NMC_RESULT_ERROR_UNKNOWN;
+ } else {
+ if (!strcmp (*argv, "true"))
+ sleep_flag = TRUE;
+ else if (!strcmp (*argv, "false"))
+ sleep_flag = FALSE;
+ else {
+ g_string_printf (nmc->return_text, _("Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."), *argv);
+ nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
+ goto end;
+ }
+ networking_set_sleep (nmc, sleep_flag);
+ }
}
else if (matches (*argv, "wifi") == 0) {
if (next_arg (&argc, &argv) != 0) {
@@ -208,7 +293,7 @@ do_network_manager (NmCli *nmc, int argc, char **argv)
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_MAIN_HEADER_ADD | NMC_PF_FLAG_FIELD_NAMES;
nmc->print_fields.header_name = _("WiFi enabled");
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */
- nmc->allowed_fields[3].value = nm_client_wireless_get_enabled (nmc->client) ? _("enabled") : _("disabled");
+ nmc->allowed_fields[4].value = nm_client_wireless_get_enabled (nmc->client) ? _("enabled") : _("disabled");
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag;
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */
} else {
@@ -240,7 +325,7 @@ do_network_manager (NmCli *nmc, int argc, char **argv)
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_MAIN_HEADER_ADD | NMC_PF_FLAG_FIELD_NAMES;
nmc->print_fields.header_name = _("WWAN enabled");
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */
- nmc->allowed_fields[5].value = nm_client_wwan_get_enabled (nmc->client) ? _("enabled") : _("disabled");
+ nmc->allowed_fields[6].value = nm_client_wwan_get_enabled (nmc->client) ? _("enabled") : _("disabled");
nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag;
print_fields (nmc->print_fields, nmc->allowed_fields); /* Print header */
} else {
diff --git a/configure.ac b/configure.ac
index ac391c6037..db28815783 100644
--- a/configure.ac
+++ b/configure.ac
@@ -521,7 +521,6 @@ system-settings/plugins/ifcfg-rh/tests/Makefile
system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
system-settings/plugins/ifcfg-suse/Makefile
system-settings/plugins/keyfile/Makefile
-system-settings/plugins/keyfile/io/Makefile
system-settings/plugins/keyfile/tests/Makefile
system-settings/plugins/keyfile/tests/keyfiles/Makefile
cli/Makefile
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index 4b4560cd6d..e9d06bea10 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -231,12 +231,30 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
return FALSE;
}
- if (priv->apn && (strlen (priv->apn) < 1 || strchr (priv->apn, '"'))) {
- g_set_error (error,
- NM_SETTING_GSM_ERROR,
- NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
- NM_SETTING_GSM_APN);
- return FALSE;
+ if (priv->apn) {
+ guint32 apn_len = strlen (priv->apn);
+ guint32 i;
+
+ if (apn_len < 1 || apn_len > 64) {
+ g_set_error (error,
+ NM_SETTING_GSM_ERROR,
+ NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
+ NM_SETTING_GSM_APN);
+ return FALSE;
+ }
+
+ /* APNs roughly follow the same rules as DNS domain names. Allowed
+ * characters are a-z, 0-9, . and -. GSM 03.60 Section 14.9.
+ */
+ for (i = 0; i < apn_len; i++) {
+ if (!isalnum (priv->apn[i]) && (priv->apn[i] != '.') && (priv->apn[i] != '-')) {
+ g_set_error (error,
+ NM_SETTING_GSM_ERROR,
+ NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
+ NM_SETTING_GSM_APN);
+ return FALSE;
+ }
+ }
}
if (priv->username && !strlen (priv->username)) {
@@ -342,11 +360,11 @@ set_property (GObject *object, guint prop_id,
break;
case PROP_APN:
g_free (priv->apn);
- priv->apn = g_value_dup_string (value);
+ priv->apn = g_strstrip (g_value_dup_string (value));
break;
case PROP_NETWORK_ID:
g_free (priv->network_id);
- priv->network_id = g_value_dup_string (value);
+ priv->network_id = g_strstrip (g_value_dup_string (value));
break;
case PROP_NETWORK_TYPE:
priv->network_type = g_value_get_int (value);
@@ -503,6 +521,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
* the user will be billed for their network usage and whether the user has
* access to the Internet or just a provider-specific walled-garden, so it
* is important to use the correct APN for the user's mobile broadband plan.
+ * The APN may only be composed of the characters a-z, 0-9, ., and - per
+ * GSM 03.60 Section 14.9.
**/
g_object_class_install_property
(object_class, PROP_APN,
@@ -515,7 +535,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
"user has access to the Internet or just a provider-"
"specific walled-garden, so it is important to use "
"the correct APN for the user's mobile broadband "
- "plan.",
+ "plan. The APN may only be composed of the characters "
+ "a-z, 0-9, ., and - per GSM 03.60 Section 14.9.",
NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 9530445959..e91e2b5ce2 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -28,6 +28,7 @@
#include "nm-setting-connection.h"
#include "nm-setting-vpn.h"
+#include "nm-setting-gsm.h"
#include "nm-setting-ip6-config.h"
#include "nm-dbus-glib-types.h"
@@ -222,6 +223,72 @@ test_setting_ip6_config_old_address_array (void)
g_object_unref (s_ip6);
}
+static void
+test_setting_gsm_apn_spaces (void)
+{
+ NMSettingGsm *s_gsm;
+ const char *tmp;
+
+ s_gsm = (NMSettingGsm *) nm_setting_gsm_new ();
+ ASSERT (s_gsm != NULL,
+ "gsm-apn-spaces",
+ "error creating GSM setting");
+
+ /* Trailing space */
+ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar ", NULL);
+ tmp = nm_setting_gsm_get_apn (s_gsm);
+ ASSERT (tmp != NULL,
+ "gsm-apn-spaces", "empty APN");
+ ASSERT (strcmp (tmp, "foobar") == 0,
+ "gsm-apn-spaces", "unexpected APN");
+
+ /* Leading space */
+ g_object_set (s_gsm, NM_SETTING_GSM_APN, " foobar", NULL);
+ tmp = nm_setting_gsm_get_apn (s_gsm);
+ ASSERT (tmp != NULL,
+ "gsm-apn-spaces", "empty APN");
+ ASSERT (strcmp (tmp, "foobar") == 0,
+ "gsm-apn-spaces", "unexpected APN");
+}
+
+static void
+test_setting_gsm_apn_bad_chars (void)
+{
+ NMSettingGsm *s_gsm;
+
+ s_gsm = (NMSettingGsm *) nm_setting_gsm_new ();
+ ASSERT (s_gsm != NULL,
+ "gsm-apn-bad-chars",
+ "error creating GSM setting");
+
+ g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL);
+
+ /* Make sure a valid APN works */
+ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar123.-baz", NULL);
+ ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == TRUE,
+ "gsm-apn-bad-chars", "unexpectedly invalid GSM setting");
+
+ /* Random invalid chars */
+ g_object_set (s_gsm, NM_SETTING_GSM_APN, "@#%$@#%@#%", NULL);
+ ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE,
+ "gsm-apn-bad-chars", "unexpectedly valid GSM setting");
+
+ /* Spaces */
+ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar baz", NULL);
+ ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE,
+ "gsm-apn-bad-chars", "unexpectedly valid GSM setting");
+
+ /* 0 characters long */
+ g_object_set (s_gsm, NM_SETTING_GSM_APN, "", NULL);
+ ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE,
+ "gsm-apn-bad-chars", "unexpectedly valid GSM setting");
+
+ /* 65-character long */
+ g_object_set (s_gsm, NM_SETTING_GSM_APN, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl1", NULL);
+ ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE,
+ "gsm-apn-bad-chars", "unexpectedly valid GSM setting");
+}
+
int main (int argc, char **argv)
{
GError *error = NULL;
@@ -237,6 +304,8 @@ int main (int argc, char **argv)
/* The tests */
test_setting_vpn_items ();
test_setting_ip6_config_old_address_array ();
+ test_setting_gsm_apn_spaces ();
+ test_setting_gsm_apn_bad_chars ();
base = g_path_get_basename (argv[0]);
fprintf (stdout, "%s: SUCCESS\n", base);
diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in
index bd9b2cc5a8..4e2bae9eb6 100644
--- a/man/NetworkManager.conf.5.in
+++ b/man/NetworkManager.conf.5.in
@@ -2,7 +2,7 @@
.\"
.\" Copyright (C) 2010 Red Hat, Inc.
.\"
-.TH "NetworkManager.conf" "5" "1 February 2010" ""
+.TH "NetworkManager.conf" "5" "16 September 2010" ""
.SH NAME
NetworkManager.conf \- NetworkManager configuration file
.SH SYNOPSIS
@@ -89,6 +89,23 @@ This key sets up what DHCP client NetworkManager will use. Presently
be available on your system too. If this key is missing, available DHCP clients
are looked for in this order: dhclient, dhcpcd.
.TP
+.B no-auto-default=\fI<hwaddr>\fP,\fI<hwaddr>\fP,...
+Set devices for which NetworkManager shouldn't create default wired connection
+(Auto eth0). NetworkManager creates a default wired connection for any wired
+device that is managed and doesn't have a connection configured. List a device
+in this option to inhibit creating the default connection for the device.
+.br
+When the default wired connection is deleted or saved to a new persistent connection
+by a plugin, the MAC address of the wired device is automatically added to this list
+to prevent creating the default connection for that device again.
+Devices are specified by their MAC addresses, in lowercase. Multiple
+entries are separated by commas.
+.br
+Example:
+.nf
+no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
+.fi
+.TP
.B dns=\fIplugin1\fP,\fIplugin2\fP, ...
List DNS plugin names separated by ','. DNS plugins are used to provide local
caching nameserver functionality (which speeds up DNS queries) and to push
diff --git a/man/nmcli.1.in b/man/nmcli.1.in
index 260d076516..44e9558ad2 100644
--- a/man/nmcli.1.in
+++ b/man/nmcli.1.in
@@ -22,7 +22,7 @@
.\"
.\" Copyright (C) 2010 Red Hat, Inc.
.\"
-.TH NMCLI "1" "26 August 2010"
+.TH NMCLI "1" "22 September 2010"
.SH NAME
nmcli \- command-line tool for controlling NetworkManager
@@ -131,7 +131,7 @@ NetworkManager
.br
Use this object to inquire and change state of NetworkManager.
.TP
-.SS \fICOMMAND\fP := { status | sleep | wakeup | wifi | wwan }
+.SS \fICOMMAND\fP := { status | enable | sleep | wifi | wwan }
.sp
.RS
.TP
@@ -145,28 +145,31 @@ command is provided to \fInm\fP object.
No simple reference.
.fi
.TP
-.B sleep
+.B enable [true|false]
.br
-Put NetworkManager to sleeping mode. Thus all interfaces that NetworkManager
-manages are deactivated.
+Get networking-enabled status or enable/disable networking by NetworkManager.
+All interfaces managed by NetworkManager are deactivated when networking has
+been disabled.
.br
.nf
\fBReference to D-Bus:\fP
interface: org.freedesktop.NetworkManager
-method: Sleep
-arguments: TRUE
+method: Enable
+arguments: TRUE or FALSE
.fi
.TP
-.B wakeup
+.B sleep [true|false]
.br
-Awake NetworkManager from sleep. When NetworkManager is awaken, devices are
-available to be activated.
+Get sleep status or put to sleep/awake NetworkManager. All interfaces managed by NetworkManager
+are deactivated when it falls asleep. This command is not meant for user to enable/disable
+networking, use \fIenable\fP for that. D-Bus \fISleep\fP method is designed
+to put NetworkManager to sleep or awake for suspending/resuming computer.
.br
.nf
\fBReference to D-Bus:\fP
interface: org.freedesktop.NetworkManager
method: Sleep
-arguments: FALSE
+arguments: TRUE or FALSE
.fi
.TP
.B wifi [on|off]
@@ -312,6 +315,32 @@ No simple reference.
.fi
.RE
+.SH ENVIRONMENT VARIABLES
+\fInmcli\fP's behavior is affected by the following environment variables.
+.IP "LC_ALL" 13
+If set to a non-empty string value, override the values of all the other
+internationalization variables.
+.IP "LC_MESSAGES" 13
+Determines the locale to be used for internationalised messages.
+.IP "LANG" 13
+Provides a default value for the internationalization variables that are unset
+or null.
+
+.RE
+Notes about localization:
+.br
+Be aware that \fInmcli\fP is localized and that's why the output depends on
+your environment. It's important to realize that especially when you parse the
+output.
+.br
+Call \fInmcli\fP as \fBLC_ALL=C nmcli\fP to be sure the locale is
+set to "C" while executing in a script.
+
+\fBLC_ALL\fP, \fBLC_MESSAGES\fP, \fBLANG\fP variables specify the LC_MESSAGES
+locale category (in that order), which determines the language that \fInmcli\fP
+uses for messages. The "C" locale is used if none of these variables are set,
+and this locale uses English messages.
+
.SH EXIT STATUS
\fInmcli\fP exits with status 0 if it succeeds, a value greater than 0 is returned if errors occur.
.IP "0" 4
diff --git a/po/de.po b/po/de.po
index 89490d0d87..07a6a3b242 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,23 +8,92 @@
# Andre Klapper <ak-47@gmx.net>, 2007.
# Hauke Mehrtens <hauke@hauke-m.de>, 2008.
# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010.
-# Daniel Schury <surst@gmx.net>, 2010.
+# Daniel Schury <Daniel.Schury@physik.uni-giessen.de>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: NetworkManager HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-04-30 03:24+0000\n"
-"PO-Revision-Date: 2010-05-15 11:50+0200\n"
-"Last-Translator: Daniel Schury <surst@gmx.net>\n"
-"Language-Team: Deutsch <gnome-de@gnome.org>\n"
+"POT-Creation-Date: 2010-09-18 15:24+0000\n"
+"PO-Revision-Date: 2010-09-18 23:56+0200\n"
+"Last-Translator: Daniel Schury <Daniel.Schury@physik.uni-giessen.de>\n"
+"Language-Team: Deutsch <translators-de@lists.ubuntu-eu.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111
+#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145
+#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174
+msgid "NAME"
+msgstr "NAME"
+
+#. 0
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
+msgid "UUID"
+msgstr "UUID"
+
+#. 1
+#: ../cli/src/connections.c:62
+msgid "DEVICES"
+msgstr "GERÄTE"
+
+#. 2
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
+msgid "SCOPE"
+msgstr "BANDBREITE"
+
+#. 3
+#: ../cli/src/connections.c:64
+msgid "DEFAULT"
+msgstr "VORGABE"
+
+#. 4
+#: ../cli/src/connections.c:65
+msgid "DBUS-SERVICE"
+msgstr "DBUS-SERVICE"
+
+#. 5
+#: ../cli/src/connections.c:66
+msgid "SPEC-OBJECT"
+msgstr "SPEC-OBJECT"
+
+#. 6
+#: ../cli/src/connections.c:67
+msgid "VPN"
+msgstr "VPN"
+
+#. 1
+#. 0
+#. 1
+#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
+msgid "TYPE"
+msgstr "TYP"
+
+#. 3
+#: ../cli/src/connections.c:79
+msgid "TIMESTAMP"
+msgstr "ZEITSTEMPEL"
+
+#. 4
+#: ../cli/src/connections.c:80
+msgid "TIMESTAMP-REAL"
+msgstr "ZEITSTEMPEL-ECHT"
+
+#. 5
+#: ../cli/src/connections.c:81
+msgid "AUTOCONNECT"
+msgstr "AUTO-VERBINDEN"
+
+#. 6
+#: ../cli/src/connections.c:82
+msgid "READONLY"
+msgstr "NUR-LESEN"
-#: ../cli/src/connections.c:86
+#: ../cli/src/connections.c:158
#, c-format
msgid ""
"Usage: nmcli con { COMMAND | help }\n"
@@ -45,312 +114,526 @@ msgstr ""
"<timeout>]\n"
" down id <id> | uuid <id>\n"
-#: ../cli/src/connections.c:158
-msgid "Connections"
-msgstr "Verbindungen"
-
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/devices.c:298 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "Type"
-msgstr "Typ"
-
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "UUID"
-msgstr "UUID"
-
-#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
-#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
-#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Name"
-msgstr "Name"
-
-#: ../cli/src/connections.c:163
+#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
#, c-format
-msgid "System connections:\n"
-msgstr "Systemverbindungen:\n"
+msgid "Error: 'con list': %s"
+msgstr "Fehler: »Verb. Liste«: %s"
-#: ../cli/src/connections.c:167
+#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
#, c-format
-msgid "User connections:\n"
-msgstr "Benutzerverbindungen:\n"
+msgid "Error: 'con list': %s; allowed fields: %s"
+msgstr "Fehler: »Verb. Liste«: %s; erlaubte Felder: %s"
+
+#: ../cli/src/connections.c:208
+msgid "Connection details"
+msgstr "Verbindungsinformationen"
+
+#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
+msgid "system"
+msgstr "System"
+
+#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
+msgid "user"
+msgstr "Benutzer"
+
+#: ../cli/src/connections.c:384
+msgid "never"
+msgstr "nie"
+
+#. "CAPABILITIES"
+#. Print header
+#. "WIFI-PROPERTIES"
+#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
+#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
+#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
+#: ../cli/src/settings.c:1056 ../cli/src/settings.c:1057
+#: ../cli/src/settings.c:1058 ../cli/src/settings.c:1137
+#: ../cli/src/settings.c:1138 ../cli/src/settings.c:1139
+#: ../cli/src/settings.c:1140 ../cli/src/settings.c:1141
+#: ../cli/src/settings.c:1142 ../cli/src/settings.c:1143
+#: ../cli/src/settings.c:1144 ../cli/src/settings.c:1145
+#: ../cli/src/settings.c:1146 ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148 ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1224
+msgid "yes"
+msgstr "ja"
+
+#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
+#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
+#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
+#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
+#: ../cli/src/settings.c:931 ../cli/src/settings.c:1056
+#: ../cli/src/settings.c:1057 ../cli/src/settings.c:1058
+#: ../cli/src/settings.c:1137 ../cli/src/settings.c:1138
+#: ../cli/src/settings.c:1139 ../cli/src/settings.c:1140
+#: ../cli/src/settings.c:1141 ../cli/src/settings.c:1142
+#: ../cli/src/settings.c:1143 ../cli/src/settings.c:1144
+#: ../cli/src/settings.c:1145 ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147 ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149 ../cli/src/settings.c:1224
+msgid "no"
+msgstr "nein"
+
+#: ../cli/src/connections.c:458 ../cli/src/connections.c:501
+msgid "System connections"
+msgstr "Systemverbindungen"
+
+#: ../cli/src/connections.c:463 ../cli/src/connections.c:514
+msgid "User connections"
+msgstr "Benutzerverbindungen"
-#: ../cli/src/connections.c:178 ../cli/src/connections.c:967
-#: ../cli/src/connections.c:983 ../cli/src/connections.c:992
-#: ../cli/src/connections.c:1003 ../cli/src/connections.c:1085
-#: ../cli/src/devices.c:604 ../cli/src/devices.c:614 ../cli/src/devices.c:699
-#: ../cli/src/devices.c:785 ../cli/src/devices.c:792
+#: ../cli/src/connections.c:475 ../cli/src/connections.c:1335
+#: ../cli/src/connections.c:1351 ../cli/src/connections.c:1360
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1456
+#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074
+#: ../cli/src/devices.c:1081
#, c-format
msgid "Error: %s argument is missing."
msgstr "Fehler: Argument %s fehlt."
-#: ../cli/src/connections.c:189
+#: ../cli/src/connections.c:488
#, c-format
msgid "Error: %s - no such connection."
msgstr "Fehler: Verbindung %s existiert nicht."
-#: ../cli/src/connections.c:196
-msgid "System-wide connections"
-msgstr "Systemweite Verbindungen"
-
-#: ../cli/src/connections.c:205
-msgid "User connections"
-msgstr "Benutzerverbindungen"
-
-#: ../cli/src/connections.c:212 ../cli/src/connections.c:1016
-#: ../cli/src/connections.c:1103 ../cli/src/devices.c:446
-#: ../cli/src/devices.c:494 ../cli/src/devices.c:628 ../cli/src/devices.c:706
-#: ../cli/src/devices.c:798
+#: ../cli/src/connections.c:520 ../cli/src/connections.c:1384
+#: ../cli/src/connections.c:1474 ../cli/src/devices.c:785
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087
#, c-format
msgid "Unknown parameter: %s\n"
msgstr "Unbekannter Parameter: %s\n"
-#: ../cli/src/connections.c:221
+#: ../cli/src/connections.c:529
#, c-format
msgid "Error: no valid parameter specified."
msgstr "Fehler: Es wurde kein gültiger Parameter angegeben."
-#. FIXME: Fix the output
-#: ../cli/src/connections.c:268 ../cli/src/devices.c:302
-#: ../cli/src/devices.c:321 ../cli/src/devices.c:353 ../cli/src/devices.c:355
-#: ../cli/src/devices.c:357 ../cli/src/devices.c:359 ../cli/src/devices.c:361
-msgid "yes"
-msgstr "ja"
+#: ../cli/src/connections.c:544 ../cli/src/connections.c:1577
+#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359
+#, c-format
+msgid "Error: %s."
+msgstr "Fehler: %s."
-#: ../cli/src/connections.c:268 ../cli/src/devices.c:304
-msgid "no"
-msgstr "nein"
+#: ../cli/src/connections.c:650
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "Fehler: »Verb. Status«: %s"
+
+#: ../cli/src/connections.c:652
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "Fehler: »Verb. Status«: %s; erlaubte Felder: %s"
-#: ../cli/src/connections.c:297
+#: ../cli/src/connections.c:659
msgid "Active connections"
msgstr "Aktive Verbindungen"
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-#: ../cli/src/devices.c:302 ../cli/src/devices.c:304
-msgid "Default"
-msgstr "Vorgabe"
-
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Service"
-msgstr "Dienst"
-
-#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
-msgid "Devices"
-msgstr "Geräte"
-
-#: ../cli/src/connections.c:659
+#: ../cli/src/connections.c:1027
#, c-format
msgid "no active connection on device '%s'"
msgstr "Keine aktive Verbindung auf Gerät »%s«"
-#: ../cli/src/connections.c:667
+#: ../cli/src/connections.c:1035
#, c-format
msgid "no active connection or device"
msgstr "Keine aktive Verbindung oder Gerät"
-#: ../cli/src/connections.c:730
+#: ../cli/src/connections.c:1085
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel"
+
+#: ../cli/src/connections.c:1087
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden"
+
+#: ../cli/src/connections.c:1098
msgid "activating"
msgstr "wird aktiviert"
-#: ../cli/src/connections.c:732
+#: ../cli/src/connections.c:1100
msgid "activated"
msgstr "aktiviert"
-#: ../cli/src/connections.c:735 ../cli/src/connections.c:758
-#: ../cli/src/connections.c:791 ../cli/src/devices.c:111
-#: ../cli/src/network-manager.c:76 ../cli/src/network-manager.c:98
+#: ../cli/src/connections.c:1103 ../cli/src/connections.c:1126
+#: ../cli/src/connections.c:1159 ../cli/src/devices.c:246
+#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473
msgid "unknown"
msgstr "unbekannt"
-#: ../cli/src/connections.c:744
+#: ../cli/src/connections.c:1112
msgid "VPN connecting (prepare)"
msgstr "VPN wird verbunden (wird vorbereitet)"
-#: ../cli/src/connections.c:746
+#: ../cli/src/connections.c:1114
msgid "VPN connecting (need authentication)"
msgstr "VPN wird verbunden (Legitimierung wird benötigt)"
-#: ../cli/src/connections.c:748
+#: ../cli/src/connections.c:1116
msgid "VPN connecting"
msgstr "VPN wird verbunden"
-#: ../cli/src/connections.c:750
+#: ../cli/src/connections.c:1118
msgid "VPN connecting (getting IP configuration)"
msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)"
-#: ../cli/src/connections.c:752
+#: ../cli/src/connections.c:1120
msgid "VPN connected"
msgstr "VPN verbunden"
-#: ../cli/src/connections.c:754
+#: ../cli/src/connections.c:1122
msgid "VPN connection failed"
msgstr "VPN-Verbindung gescheitert"
-#: ../cli/src/connections.c:756
+#: ../cli/src/connections.c:1124
msgid "VPN disconnected"
msgstr "VPN getrennt"
-#: ../cli/src/connections.c:767
+#: ../cli/src/connections.c:1135
msgid "unknown reason"
msgstr "unbekannter Grund"
-#: ../cli/src/connections.c:769
+#: ../cli/src/connections.c:1137
msgid "none"
msgstr "kein"
-#: ../cli/src/connections.c:771
+#: ../cli/src/connections.c:1139
msgid "the user was disconnected"
msgstr "Der Benutzer wurde getrennt"
-#: ../cli/src/connections.c:773
+#: ../cli/src/connections.c:1141
msgid "the base network connection was interrupted"
msgstr "Die Basisverbindung wurde unterbrochen"
-#: ../cli/src/connections.c:775
+#: ../cli/src/connections.c:1143
msgid "the VPN service stopped unexpectedly"
msgstr "Der VPN-Dienst wurde unerwartet gestoppt"
-#: ../cli/src/connections.c:777
+#: ../cli/src/connections.c:1145
msgid "the VPN service returned invalid configuration"
msgstr "Der VPN-Dienst gab ungültige Einstellungen zurück"
-#: ../cli/src/connections.c:779
+#: ../cli/src/connections.c:1147
msgid "the connection attempt timed out"
msgstr "Der Verbindungsversuch benötigte zu viel Zeit"
-#: ../cli/src/connections.c:781
+#: ../cli/src/connections.c:1149
msgid "the VPN service did not start in time"
msgstr "Der VPN-Dienst wurde nicht rechtzeitig gestartet"
-#: ../cli/src/connections.c:783
+#: ../cli/src/connections.c:1151
msgid "the VPN service failed to start"
msgstr "Der VPN-Dienst konnte nicht gestartet werden"
-#: ../cli/src/connections.c:785
+#: ../cli/src/connections.c:1153
msgid "no valid VPN secrets"
msgstr "Keine gültigen VPN-Schlüssel"
-#: ../cli/src/connections.c:787
+#: ../cli/src/connections.c:1155
msgid "invalid VPN secrets"
msgstr "Ungültige VPN-Schlüssel"
-#: ../cli/src/connections.c:789
+#: ../cli/src/connections.c:1157
msgid "the connection was removed"
msgstr "Die Verbindung wurde entfernt"
-#: ../cli/src/connections.c:803
+#: ../cli/src/connections.c:1171
#, c-format
msgid "state: %s\n"
msgstr "Status: %s\n"
-#: ../cli/src/connections.c:806 ../cli/src/connections.c:832
+#: ../cli/src/connections.c:1174 ../cli/src/connections.c:1200
#, c-format
msgid "Connection activated\n"
msgstr "Verbindung aktiviert\n"
-#: ../cli/src/connections.c:809
+#: ../cli/src/connections.c:1177
#, c-format
msgid "Error: Connection activation failed."
msgstr "Fehler: Aktivierung der Verbindung ist gescheitert."
-#: ../cli/src/connections.c:828
+#: ../cli/src/connections.c:1196
#, c-format
msgid "state: %s (%d)\n"
msgstr "Status: %s (%d)\n"
-#: ../cli/src/connections.c:838
+#: ../cli/src/connections.c:1206
#, c-format
msgid "Error: Connection activation failed: %s."
msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s."
-#: ../cli/src/connections.c:855 ../cli/src/devices.c:551
+#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
#, c-format
msgid "Error: Timeout %d sec expired."
msgstr "Fehler: Zeitbeschränkung von %d Sekunden ist abgelaufen."
-#: ../cli/src/connections.c:898
+#: ../cli/src/connections.c:1266
#, c-format
msgid "Error: Connection activation failed: %s"
msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s"
-#: ../cli/src/connections.c:912
+#: ../cli/src/connections.c:1280
#, c-format
msgid "Error: Obtaining active connection for '%s' failed."
msgstr "Fehler: Ermittlung der aktiven Verbindung für »%s« ist gescheitert."
-#: ../cli/src/connections.c:921
+#: ../cli/src/connections.c:1289
#, c-format
msgid "Active connection state: %s\n"
msgstr "Status der aktiven Verbindung: %s\n"
-#: ../cli/src/connections.c:922
+#: ../cli/src/connections.c:1290
#, c-format
msgid "Active connection path: %s\n"
msgstr "Pfad der aktiven Verbindung: %s\n"
-#: ../cli/src/connections.c:976 ../cli/src/connections.c:1094
+#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
#, c-format
msgid "Error: Unknown connection: %s."
msgstr "Fehler: Unbekannte Verbindung: %s."
-#: ../cli/src/connections.c:1011 ../cli/src/devices.c:622
+#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
#, c-format
msgid "Error: timeout value '%s' is not valid."
msgstr "Fehler: Der Wert »%s« ist keine gültige Zeitangabe."
-#: ../cli/src/connections.c:1024 ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
#, c-format
msgid "Error: id or uuid has to be specified."
msgstr "Fehler: id oder uuid müssen angegeben werden."
-#: ../cli/src/connections.c:1044
+#: ../cli/src/connections.c:1412
#, c-format
msgid "Error: No suitable device found: %s."
msgstr "Fehler: Es wurde kein passendes Gerät gefunden: %s."
-#: ../cli/src/connections.c:1046
+#: ../cli/src/connections.c:1414
#, c-format
msgid "Error: No suitable device found."
msgstr "Fehler: Es wurde kein passendes Gerät gefunden."
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1509
#, c-format
msgid "Warning: Connection not active\n"
msgstr "Warnung: Verbindung ist nicht aktiv\n"
-#: ../cli/src/connections.c:1189
+#: ../cli/src/connections.c:1566
#, c-format
msgid "Error: 'con' command '%s' is not valid."
msgstr "Fehler: Der »con«-Befehl »%s« ist ungültig."
-#: ../cli/src/connections.c:1216
+#: ../cli/src/connections.c:1602
#, c-format
msgid "Error: could not connect to D-Bus."
msgstr "Fehler: Verbindung zu D-Bus konnte nicht hergestellt werden."
-#: ../cli/src/connections.c:1223
+#: ../cli/src/connections.c:1609
#, c-format
msgid "Error: Could not get system settings."
msgstr "Fehler: Systemeinstellungen konnten nicht ermittelt werden."
-#: ../cli/src/connections.c:1231
+#: ../cli/src/connections.c:1617
#, c-format
msgid "Error: Could not get user settings."
msgstr "Fehler: Benutzereinstellungen konnten nicht ermittelt werden."
-#: ../cli/src/connections.c:1241
+#: ../cli/src/connections.c:1627
#, c-format
msgid "Error: Can't obtain connections: settings services are not running."
msgstr ""
"Fehler: Verbindungen konnten nicht ermittelt werden: Die Einstellungsdienste "
"werden nicht ausgeführt."
+#. 0
+#. 9
+#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
+msgid "DEVICE"
+msgstr "GERÄT"
+
+#. 1
+#. 4
+#. 0
+#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
+#: ../cli/src/network-manager.c:36
+msgid "STATE"
+msgstr "STATUS"
+
+#: ../cli/src/devices.c:72
+msgid "GENERAL"
+msgstr "ALLGEMEIN"
+
+#. 0
#: ../cli/src/devices.c:73
+msgid "CAPABILITIES"
+msgstr "RESSOURCEN"
+
+#. 1
+#: ../cli/src/devices.c:74
+msgid "WIFI-PROPERTIES"
+msgstr "WLAN-EIGENSCHAFTEN"
+
+#. 2
+#: ../cli/src/devices.c:75
+msgid "AP"
+msgstr "AP"
+
+#. 3
+#: ../cli/src/devices.c:76
+msgid "WIRED-PROPERTIES"
+msgstr "KABEL-EIGENSCHAFTEN"
+
+#. 4
+#: ../cli/src/devices.c:77
+msgid "IP4-SETTINGS"
+msgstr "IP4-EINSTELLUNGEN"
+
+#. 5
+#: ../cli/src/devices.c:78
+msgid "IP4-DNS"
+msgstr "IP4-DNS"
+
+#. 6
+#: ../cli/src/devices.c:79
+msgid "IP6-SETTINGS"
+msgstr "IP6-EINSTELLUNGEN"
+
+#. 7
+#: ../cli/src/devices.c:80
+msgid "IP6-DNS"
+msgstr "IP6-DNS"
+
+#. 2
+#: ../cli/src/devices.c:91
+msgid "DRIVER"
+msgstr "TREIBER"
+
+#. 3
+#: ../cli/src/devices.c:92
+msgid "HWADDR"
+msgstr "HWADDR"
+
+#. 0
+#: ../cli/src/devices.c:102
+msgid "CARRIER-DETECT"
+msgstr "TRÄGERFREQUENZERKENNUNG"
+
+#. 1
+#: ../cli/src/devices.c:103
+msgid "SPEED"
+msgstr "GESCHWINDIGKEIT"
+
+#. 0
+#: ../cli/src/devices.c:112
+msgid "CARRIER"
+msgstr "TRÄGERFREQUENZ"
+
+#. 0
+#: ../cli/src/devices.c:122
+msgid "WEP"
+msgstr "WEP"
+
+#. 1
+#: ../cli/src/devices.c:123
+msgid "WPA"
+msgstr "WPA"
+
+#. 2
+#: ../cli/src/devices.c:124
+msgid "WPA2"
+msgstr "WPA2"
+
+#. 3
+#: ../cli/src/devices.c:125
+msgid "TKIP"
+msgstr "TKIP"
+
+#. 4
+#: ../cli/src/devices.c:126
+msgid "CCMP"
+msgstr "CCMP"
+
+#. 0
+#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
+msgid "ADDRESS"
+msgstr "ADRESSE"
+
+#. 1
+#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
+msgid "PREFIX"
+msgstr "PRÄFIX"
+
+#. 2
+#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
+msgid "GATEWAY"
+msgstr "GATEWAY"
+
+#. 0
+#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
+msgid "DNS"
+msgstr "DNS"
+
+#. 0
+#: ../cli/src/devices.c:175
+msgid "SSID"
+msgstr "SSID"
+
+#. 1
+#: ../cli/src/devices.c:176
+msgid "BSSID"
+msgstr "BSSID"
+
+#. 2
+#: ../cli/src/devices.c:177
+msgid "MODE"
+msgstr "MODUS"
+
+#. 3
+#: ../cli/src/devices.c:178
+msgid "FREQ"
+msgstr "FREQUENZ"
+
+#. 4
+#: ../cli/src/devices.c:179
+msgid "RATE"
+msgstr "RATE"
+
+#. 5
+#: ../cli/src/devices.c:180
+msgid "SIGNAL"
+msgstr "SIGNAL"
+
+#. 6
+#: ../cli/src/devices.c:181
+msgid "SECURITY"
+msgstr "SICHERHEIT"
+
+#. 7
+#: ../cli/src/devices.c:182
+msgid "WPA-FLAGS"
+msgstr "WPA-SCHALTER"
+
+#. 8
+#: ../cli/src/devices.c:183
+msgid "RSN-FLAGS"
+msgstr "RSN-SCHALTER"
+
+#. 10
+#: ../cli/src/devices.c:185
+msgid "ACTIVE"
+msgstr "AKTIV"
+
+#: ../cli/src/devices.c:208
#, c-format
msgid ""
"Usage: nmcli dev { COMMAND | help }\n"
@@ -360,7 +643,7 @@ msgid ""
" status\n"
" list [iface <iface>]\n"
" disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-" wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+" wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
"\n"
msgstr ""
"Aufruf: nmcli dev { BEFEHL | help }\n"
@@ -370,458 +653,396 @@ msgstr ""
" status\n"
" list [iface <iface>]\n"
" disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
-" wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+" wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
"\n"
-#: ../cli/src/devices.c:93
+#: ../cli/src/devices.c:228
msgid "unmanaged"
msgstr "nicht verwaltet"
-#: ../cli/src/devices.c:95
+#: ../cli/src/devices.c:230
msgid "unavailable"
msgstr "nicht verfügbar"
-#: ../cli/src/devices.c:97 ../cli/src/network-manager.c:73
+#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
msgid "disconnected"
msgstr "nicht verbunden"
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:234
msgid "connecting (prepare)"
msgstr "wird verbunden (wird vorbereitet)"
-#: ../cli/src/devices.c:101
+#: ../cli/src/devices.c:236
msgid "connecting (configuring)"
msgstr "wird verbunden (wird eingerichtet)"
-#: ../cli/src/devices.c:103
+#: ../cli/src/devices.c:238
msgid "connecting (need authentication)"
msgstr "wird verbunden (Legitimierung wird benötigt)"
-#: ../cli/src/devices.c:105
+#: ../cli/src/devices.c:240
msgid "connecting (getting IP configuration)"
msgstr "wird verbunden (IP-Einstellungen werden ermittelt)"
-#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:71
+#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
msgid "connected"
msgstr "verbunden"
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:244
msgid "connection failed"
msgstr "Verbindung gescheitert"
-#: ../cli/src/devices.c:132 ../cli/src/devices.c:876
+#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
msgid "Unknown"
msgstr "Unbekannt"
-#. print them
-#: ../cli/src/devices.c:164 ../cli/src/devices.c:266 ../cli/src/devices.c:861
-#: ../cli/src/devices.c:879
+#: ../cli/src/devices.c:299
msgid "(none)"
msgstr "(keine)"
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:324
#, c-format
msgid "%s: error converting IP4 address 0x%X"
msgstr "%s: Fehler bei Umwandlung der IPv4-Addresse 0x%X"
-#: ../cli/src/devices.c:238
+#: ../cli/src/devices.c:393
#, c-format
-msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
-msgstr "%s, %s, Frequenz %d MHz, Durchsatz %d Mb/s, Stärke %d"
+msgid "%u MHz"
+msgstr "%u MHz"
-#: ../cli/src/devices.c:239
-msgid "Ad-Hoc"
-msgstr "Ad-Hoc"
+#: ../cli/src/devices.c:394
+#, c-format
+msgid "%u MB/s"
+msgstr "%u MB/s"
-#: ../cli/src/devices.c:248
-msgid ", Encrypted: "
-msgstr ", Verschlüsselt: "
+#: ../cli/src/devices.c:403
+msgid "Encrypted: "
+msgstr "Verschlüsselt: "
-#: ../cli/src/devices.c:253
-msgid " WEP"
-msgstr " WEP"
+#: ../cli/src/devices.c:408
+msgid "WEP "
+msgstr "WEP"
-#: ../cli/src/devices.c:255
-msgid " WPA"
-msgstr " WPA"
+#: ../cli/src/devices.c:410
+msgid "WPA "
+msgstr "WPA"
-#: ../cli/src/devices.c:257
-msgid " WPA2"
-msgstr " WPA2"
+#: ../cli/src/devices.c:412
+msgid "WPA2 "
+msgstr "WPA2"
# Das ergibt z.B. WPA-Enterprise, klingt komisch mit »Unternehmen«
-#: ../cli/src/devices.c:260
-msgid " Enterprise"
-msgstr " Enterprise"
-
-#: ../cli/src/devices.c:294 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "Device"
-msgstr "Gerät"
-
-#: ../cli/src/devices.c:299
-msgid "Driver"
-msgstr "Treiber"
-
-#: ../cli/src/devices.c:299 ../cli/src/devices.c:567
-msgid "(unknown)"
-msgstr "(unbekannt)"
-
-#: ../cli/src/devices.c:300 ../cli/src/devices.c:458 ../cli/src/devices.c:460
-msgid "State"
-msgstr "Status"
-
-#: ../cli/src/devices.c:313
-msgid "HW Address"
-msgstr "Hardwareadresse"
+#: ../cli/src/devices.c:415
+msgid "Enterprise "
+msgstr "Enterprise"
-#: ../cli/src/devices.c:319
-#, c-format
-msgid ""
-"\n"
-" Capabilities:\n"
-msgstr ""
-"\n"
-" Fähigkeiten:\n"
+#: ../cli/src/devices.c:424
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
-#: ../cli/src/devices.c:321
-msgid "Carrier Detect"
-msgstr "Trägersignalkennung"
+#: ../cli/src/devices.c:424
+msgid "Infrastructure"
+msgstr "Infrastuktur"
-#: ../cli/src/devices.c:336
+#: ../cli/src/devices.c:486
#, c-format
-msgid "%u Mb/s"
-msgstr "%u Mb/s"
+msgid "Error: 'dev list': %s"
+msgstr "Fehler: »Geräteliste«: %s"
-#: ../cli/src/devices.c:337
-msgid "Speed"
-msgstr "Geschwindigkeit"
-
-#: ../cli/src/devices.c:348
+#: ../cli/src/devices.c:488
#, c-format
-msgid ""
-"\n"
-" Wireless Properties\n"
-msgstr ""
-"\n"
-" Eigenschaften der Funkverbindung\n"
+msgid "Error: 'dev list': %s; allowed fields: %s"
+msgstr "Fehler: »Geräteliste«: %s; erlaubte Felder: %s"
-#: ../cli/src/devices.c:353
-msgid "WEP Encryption"
-msgstr "WEP-Verschlüsselung"
+#: ../cli/src/devices.c:497
+msgid "Device details"
+msgstr "Geräteinformationen"
-#: ../cli/src/devices.c:355
-msgid "WPA Encryption"
-msgstr "WPA-Verschlüsselung"
-
-#: ../cli/src/devices.c:357
-msgid "WPA2 Encryption"
-msgstr "WPA2-Verschlüsselung"
-
-#: ../cli/src/devices.c:359
-msgid "TKIP cipher"
-msgstr "TKIP-Chiffre"
-
-#: ../cli/src/devices.c:361
-msgid "CCMP cipher"
-msgstr "CCMP-Chiffre"
-
-#: ../cli/src/devices.c:368
-#, c-format
-msgid ""
-"\n"
-" Wireless Access Points %s\n"
-msgstr ""
-"\n"
-" Funknetzwerk-Zugangspunkte %s\n"
+#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
+msgid "(unknown)"
+msgstr "(unbekannt)"
-#: ../cli/src/devices.c:368
-msgid "(* = current AP)"
-msgstr "(* = momentaner Zugangspunkt)"
+#: ../cli/src/devices.c:528
+msgid "unknown)"
+msgstr "unbekannt)"
-#: ../cli/src/devices.c:374
+#: ../cli/src/devices.c:554
#, c-format
-msgid ""
-"\n"
-" Wired Properties\n"
-msgstr ""
-"\n"
-" Eigenschaften der kabelgebundenen Verbindung\n"
-
-#: ../cli/src/devices.c:377 ../cli/src/devices.c:379
-msgid "Carrier"
-msgstr "Trägersignal"
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
-#: ../cli/src/devices.c:377
+#. Print header
+#. "WIRED-PROPERTIES"
+#: ../cli/src/devices.c:627
msgid "on"
msgstr "an"
-#: ../cli/src/devices.c:379
+#: ../cli/src/devices.c:627
msgid "off"
msgstr "aus"
-#: ../cli/src/devices.c:387
+#: ../cli/src/devices.c:808
#, c-format
-msgid ""
-"\n"
-" IPv4 Settings:\n"
-msgstr ""
-"\n"
-" IPv4-Einstellungen:\n"
+msgid "Error: 'dev status': %s"
+msgstr "Fehler: »Gerätestatus«: %s"
-#: ../cli/src/devices.c:395
-msgid "Address"
-msgstr "Adresse"
-
-#: ../cli/src/devices.c:401
-msgid "Prefix"
-msgstr "Präfix"
-
-#: ../cli/src/devices.c:405
-msgid "Gateway"
-msgstr "Gateway"
-
-#: ../cli/src/devices.c:416
-msgid "DNS"
-msgstr "DNS"
+#: ../cli/src/devices.c:810
+#, c-format
+msgid "Error: 'dev status': %s; allowed fields: %s"
+msgstr "Fehler: »Gerätestatus«: %s; erlaubte Felder: %s"
-#: ../cli/src/devices.c:458
+#: ../cli/src/devices.c:817
msgid "Status of devices"
msgstr "Status der Geräte"
-#: ../cli/src/devices.c:487
+#: ../cli/src/devices.c:845
#, c-format
msgid "Error: '%s' argument is missing."
msgstr "Fehler: Argument »%s« fehlt."
-#: ../cli/src/devices.c:516 ../cli/src/devices.c:655 ../cli/src/devices.c:729
+#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1136
#, c-format
msgid "Error: Device '%s' not found."
msgstr "Fehler: Gerät »%s« wurde nicht gefunden."
-#: ../cli/src/devices.c:539
+#: ../cli/src/devices.c:897
#, c-format
msgid "Success: Device '%s' successfully disconnected."
msgstr "Erfolg: Gerät »%s« wurde erfolgreich getrennt."
-#: ../cli/src/devices.c:564
+#: ../cli/src/devices.c:922
#, c-format
msgid "Error: Device '%s' (%s) disconnecting failed: %s"
msgstr "Fehler: Trennung des Gerätes »%s« (%s) ist gescheitert: %s"
-#: ../cli/src/devices.c:572
+#: ../cli/src/devices.c:930
#, c-format
msgid "Device state: %d (%s)\n"
msgstr "Gerätezustand: %d (%s)\n"
-#: ../cli/src/devices.c:636
+#: ../cli/src/devices.c:994
#, c-format
msgid "Error: iface has to be specified."
msgstr "Fehler: Es muss eine Schnittstelle angegeben werden."
-#: ../cli/src/devices.c:736 ../cli/src/devices.c:746
-msgid "WiFi scan list"
-msgstr "Suchliste des WLAN"
-
-#: ../cli/src/devices.c:740
+#: ../cli/src/devices.c:1112
#, c-format
-msgid "Error: Device '%s' is not a WiFi device."
-msgstr "Fehler: Gerät »%s« ist kein WLAN-Gerät."
+msgid "Error: 'dev wifi': %s"
+msgstr "Fehler: »Geräte-WLAN«: %s"
-#: ../cli/src/devices.c:754
-msgid "Device:"
-msgstr "Gerät:"
-
-#: ../cli/src/devices.c:806
+#: ../cli/src/devices.c:1114
#, c-format
-msgid "Error: hwaddr has to be specified."
-msgstr "Fehler: Es muss eine Hardwareadresse angegeben werden."
+msgid "Error: 'dev wifi': %s; allowed fields: %s"
+msgstr "Fehler: »Geräte-WLAN«: %s; erlaubte Felder: %s"
-#: ../cli/src/devices.c:844
+#: ../cli/src/devices.c:1121
+msgid "WiFi scan list"
+msgstr "Suchliste des WLAN"
+
+#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
#, c-format
msgid "Error: Access point with hwaddr '%s' not found."
msgstr ""
"Fehler: Der Zugangspunkt mit der Hardware-Adresse »%s« wurde nicht gefunden."
-#: ../cli/src/devices.c:862
+#: ../cli/src/devices.c:1173
#, c-format
-msgid "%u MHz"
-msgstr "%u MHz"
+msgid "Error: Device '%s' is not a WiFi device."
+msgstr "Fehler: Gerät »%s« ist kein WLAN-Gerät."
-#: ../cli/src/devices.c:863
+#: ../cli/src/devices.c:1237
#, c-format
-msgid "%u MB/s"
-msgstr "%u MB/s"
-
-#: ../cli/src/devices.c:869 ../cli/src/devices.c:871
-msgid "AP parameters"
-msgstr "Parameter des Zugangspunkts"
-
-#: ../cli/src/devices.c:873
-msgid "SSID:"
-msgstr "SSID:"
-
-#: ../cli/src/devices.c:874
-msgid "BSSID:"
-msgstr "BSSID:"
-
-#: ../cli/src/devices.c:875
-msgid "Frequency:"
-msgstr "Frequenz:"
-
-#: ../cli/src/devices.c:876
-msgid "Mode:"
-msgstr "Modus:"
-
-#: ../cli/src/devices.c:876
-msgid "Ad-hoc"
-msgstr "Ad-hoc"
-
-#: ../cli/src/devices.c:876
-msgid "Infrastructure"
-msgstr "Infrastuktur"
-
-#: ../cli/src/devices.c:877
-msgid "Maximal bitrate:"
-msgstr "Maximale Übertragungsgeschwindigkeit:"
+msgid "Error: 'dev wifi' command '%s' is not valid."
+msgstr "Fehler: Der Befehl »%s« für »dev wifi« ist ungültig."
-#: ../cli/src/devices.c:878
-msgid "Strength:"
-msgstr "Stärke:"
+#: ../cli/src/devices.c:1284
+#, c-format
+msgid "Error: 'dev' command '%s' is not valid."
+msgstr "Fehler: Der Befehl »%s« für »dev« ist ungültig."
-#: ../cli/src/devices.c:879
-msgid "Flags:"
-msgstr "Flags:"
+#: ../cli/src/network-manager.c:35
+msgid "RUNNING"
+msgstr "LAUFEND"
-#: ../cli/src/devices.c:879
-msgid "privacy"
-msgstr "Vertraulichkeit"
+#. 1
+#: ../cli/src/network-manager.c:37
+msgid "NET-ENABLED"
+msgstr "NETZ-AKTIVIERT"
-#: ../cli/src/devices.c:880
-msgid "WPA flags:"
-msgstr "WPA-Flags:"
+#. 2
+#: ../cli/src/network-manager.c:38
+msgid "WIFI-HARDWARE"
+msgstr "WLAN-HARDWARE"
-#: ../cli/src/devices.c:881
-msgid "RSN flags:"
-msgstr "RSN-Flags:"
+#. 3
+#: ../cli/src/network-manager.c:39
+msgid "WIFI"
+msgstr "WLAN"
-#: ../cli/src/devices.c:907
-#, c-format
-msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "Fehler: Der Befehl »%s« für »dev wifi« ist ungültig."
+#. 4
+#: ../cli/src/network-manager.c:40
+msgid "WWAN-HARDWARE"
+msgstr "WWAN-HARDWARE"
-#: ../cli/src/devices.c:943
-#, c-format
-msgid "Error: 'dev' command '%s' is not valid."
-msgstr "Fehler: Der Befehl »%s« für »dev« ist ungültig."
+#. 5
+#: ../cli/src/network-manager.c:41
+msgid "WWAN"
+msgstr "WWAN"
-#: ../cli/src/network-manager.c:46
+#: ../cli/src/network-manager.c:64
#, c-format
msgid ""
"Usage: nmcli nm { COMMAND | help }\n"
"\n"
-" COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+" COMMAND := { status | enable | sleep | wifi | wwan }\n"
"\n"
" status\n"
-" sleep\n"
-" wakeup\n"
+" enable [true|false]\n"
+" sleep [true|false]\n"
" wifi [on|off]\n"
" wwan [on|off]\n"
"\n"
msgstr ""
"Aufruf: nmcli nm { BEFEHL | help }\n"
"\n"
-" BEFEHL := { status | sleep | wakeup | wifi | wwan }\n"
+" BEFEHL := { status | enable | sleep | wifi | wwan }\n"
"\n"
" status\n"
-" sleep\n"
-" wakeup\n"
+" enable [true|false]\n"
+" sleep [true|false]\n"
" wifi [on|off]\n"
" wwan [on|off]\n"
"\n"
-#: ../cli/src/network-manager.c:67
+#: ../cli/src/network-manager.c:85
msgid "asleep"
msgstr "schlafend"
-#: ../cli/src/network-manager.c:69
+#: ../cli/src/network-manager.c:87
msgid "connecting"
msgstr "wird verbunden"
-#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
-#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
-msgid "enabled"
-msgstr "aktiviert"
+#: ../cli/src/network-manager.c:128
+#, c-format
+msgid "Error: 'nm status': %s"
+msgstr "Fehler: »NM-Status«: %s"
-#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
-#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
-#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
-msgid "disabled"
-msgstr "deaktiviert"
+#: ../cli/src/network-manager.c:130
+#, c-format
+msgid "Error: 'nm status': %s; allowed fields: %s"
+msgstr "Fehler: »NM-Status«: %s; erlaubte Felder: %s"
-#: ../cli/src/network-manager.c:102
+#: ../cli/src/network-manager.c:137
msgid "NetworkManager status"
msgstr "Status von NetworkManager"
-#: ../cli/src/network-manager.c:104
-msgid "NM running:"
-msgstr "NM läuft:"
+#. Print header
+#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+msgid "enabled"
+msgstr "aktiviert"
+
+#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
+msgid "disabled"
+msgstr "deaktiviert"
-#: ../cli/src/network-manager.c:104
+#: ../cli/src/network-manager.c:152
msgid "running"
msgstr "wird ausgeführt"
-#: ../cli/src/network-manager.c:104
+#: ../cli/src/network-manager.c:152
msgid "not running"
msgstr "wird nicht ausgeführt"
-#: ../cli/src/network-manager.c:105
-msgid "NM state:"
-msgstr "Status von NM:"
+#: ../cli/src/network-manager.c:175
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "Fehler: Verbindung zum Systembus konnte nicht hergestellt werden: %s"
-#: ../cli/src/network-manager.c:106
-msgid "NM wireless hardware:"
-msgstr "NM Funknetzwerk-Hardware:"
+#: ../cli/src/network-manager.c:186
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "Fehler: D-Bus-Objektproxy konnte nicht erstellt werden."
-#. no argument, show current state
-#: ../cli/src/network-manager.c:107 ../cli/src/network-manager.c:143
-msgid "NM wireless:"
-msgstr "NM Funk:"
+#: ../cli/src/network-manager.c:192
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "Fehler beim schlafen gehen: %s"
-#: ../cli/src/network-manager.c:108
-msgid "NM WWAN hardware:"
-msgstr "NM WWAN-Hardware:"
+#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
+#: ../cli/src/network-manager.c:318
+#, c-format
+msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
+msgstr ""
+"Fehler: Der Wert »%s« für »--fields« ist hier nicht gültig; erlaubte Felder: %s"
-#. no argument, show current state
-#: ../cli/src/network-manager.c:109 ../cli/src/network-manager.c:160
-msgid "NM WWAN:"
-msgstr "NM WWAN:"
+#: ../cli/src/network-manager.c:245
+msgid "Networking enabled"
+msgstr "Netzwerk aktiviert"
-#: ../cli/src/network-manager.c:150
+#: ../cli/src/network-manager.c:256
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Fehler: Ungültiger »aktiviert«-Parameter: »%s«; Verwenden Sie »true« oder "
+"»false«."
+
+#: ../cli/src/network-manager.c:265
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr ""
+"Fehler: Der Schlafzustand-Status wurde von NetworkManager nicht exportiert."
+
+#: ../cli/src/network-manager.c:273
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr ""
+"Fehler: Ungültiger »schlafend«-Parameter: »%s«; Verwenden Sie »true« oder "
+"»false«."
+
+#: ../cli/src/network-manager.c:294
+msgid "WiFi enabled"
+msgstr "WLAN aktiviert"
+
+#: ../cli/src/network-manager.c:305
#, c-format
msgid "Error: invalid 'wifi' parameter: '%s'."
msgstr "Fehler: Ungültiger »wifi«-Parameter: »%s«."
-#: ../cli/src/network-manager.c:167
+#: ../cli/src/network-manager.c:326
+msgid "WWAN enabled"
+msgstr "WWAN aktiviert"
+
+#: ../cli/src/network-manager.c:337
#, c-format
msgid "Error: invalid 'wwan' parameter: '%s'."
msgstr "Fehler: Ungültiger »wwan«-Parameter: »%s«."
-#: ../cli/src/network-manager.c:178
+#: ../cli/src/network-manager.c:348
#, c-format
msgid "Error: 'nm' command '%s' is not valid."
msgstr "Fehler: Der Befehl »%s« für »nm« ist ungültig."
-#: ../cli/src/nmcli.c:65
+#: ../cli/src/nmcli.c:69
#, c-format
msgid ""
"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
"\n"
"OPTIONS\n"
-" -t[erse] terse output\n"
-" -p[retty] pretty output\n"
-" -v[ersion] show program version\n"
-" -h[elp] print this help\n"
+" -t[erse] terse output\n"
+" -p[retty] pretty output\n"
+" -m[ode] tabular|multiline output mode\n"
+" -f[ields] <field1,field2,...>|all|common specify fields to output\n"
+" -e[scape] yes|no escape columns separators in "
+"values\n"
+" -v[ersion] show program version\n"
+" -h[elp] print this help\n"
"\n"
"OBJECT\n"
" nm NetworkManager status\n"
@@ -833,7 +1054,11 @@ msgstr ""
"\n"
"OPTIONEN\n"
" -t[erse] kurze Ausgabe\n"
-" -p[retty] hübsche Ausgabe\n"
+" -p[retty] hübsche Ausgabe\n"
+" -m[ode] tabular|multiline Ausgabemodue\n"
+" -f[ields] <field1,field2,…>|all|common gibt Ausgabefelder an\n"
+" -e[scape] yes|no Escape-Spaltenseparator in "
+"Werten\n"
" -v[ersion] Programmversion anzeigen\n"
" -h[elp] diese Hilfe ausgeben\n"
"\n"
@@ -843,35 +1068,166 @@ msgstr ""
" dev von NetworkManager verwaltete Verbindungen\n"
"\n"
-#: ../cli/src/nmcli.c:106
+#: ../cli/src/nmcli.c:113
+#, c-format
+msgid "Error: Object '%s' is unknown, try 'nmcli help'."
+msgstr "Fehler: Objekt »%s« ist unbekannt, versuchen Sie »nmcli help«."
+
+#: ../cli/src/nmcli.c:143
+#, c-format
+msgid "Error: Option '--terse' is specified the second time."
+msgstr "Fehler: Option »---terse« wurde zweimal gesetzt."
+
+#: ../cli/src/nmcli.c:148
+#, c-format
+msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
+msgstr "Fehler: Option »--terse« schließt »--pretty« aus."
+
+#: ../cli/src/nmcli.c:156
+#, c-format
+msgid "Error: Option '--pretty' is specified the second time."
+msgstr "Fehler: Option »--pretty« wurde zweimal gesetzt."
+
+#: ../cli/src/nmcli.c:161
+#, c-format
+msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
+msgstr "Fehler: Option »--pretty« schließt »--terse« aus."
+
+#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
+#, c-format
+msgid "Error: missing argument for '%s' option."
+msgstr "Fehler: Fehlendes Argument für die Option »%s«."
+
+#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
#, c-format
-msgid "Object '%s' is unknown, try 'nmcli help'."
-msgstr "Objekt »%s« ist unbekannt, versuchen Sie »nmcli help«."
+msgid "Error: '%s' is not valid argument for '%s' option."
+msgstr "Fehler: »%s« ist kein gültiges Argument für die Option »%s«."
-#: ../cli/src/nmcli.c:139
+#: ../cli/src/nmcli.c:203
+#, c-format
+msgid "Error: fields for '%s' options are missing."
+msgstr "Fehler: Felder für die Option »%s« fehlen."
+
+#: ../cli/src/nmcli.c:209
#, c-format
msgid "nmcli tool, version %s\n"
msgstr "nmcli-Werkzeug, Version %s\n"
-#: ../cli/src/nmcli.c:145
+#: ../cli/src/nmcli.c:215
#, c-format
-msgid "Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Option »%s« ist unbekannt, versuchen Sie »nmcli -help«."
+msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
+msgstr "Fehler: Option »%s« ist unbekannt, versuchen Sie »nmcli -help«."
-#: ../cli/src/nmcli.c:164
+#: ../cli/src/nmcli.c:234
#, c-format
msgid "Caught signal %d, shutting down..."
msgstr "Signal %d wurde empfangen, wird beendet …"
-#: ../cli/src/nmcli.c:189
+#: ../cli/src/nmcli.c:259
#, c-format
msgid "Error: Could not connect to NetworkManager."
msgstr "Fehler: Verbindung mit NetworkManager konnte nicht hergestellt werden."
-#: ../cli/src/nmcli.c:205
+#: ../cli/src/nmcli.c:275
msgid "Success"
msgstr "Erfolg"
+#: ../cli/src/settings.c:411
+#, c-format
+msgid "%d (hex-ascii-key)"
+msgstr "%d (HEX-ASCII-Schlüssel)"
+
+#: ../cli/src/settings.c:413
+#, c-format
+msgid "%d (104/128-bit passphrase)"
+msgstr "%d (104/128-bit-Passphrase)"
+
+#: ../cli/src/settings.c:416
+#, c-format
+msgid "%d (unknown)"
+msgstr "%d (unbekannt)"
+
+#: ../cli/src/settings.c:442
+msgid "0 (unknown)"
+msgstr "0 (unbekannt)"
+
+#: ../cli/src/settings.c:448
+msgid "any, "
+msgstr "jede,"
+
+#: ../cli/src/settings.c:450
+msgid "900 MHz, "
+msgstr "900 MHz,"
+
+#: ../cli/src/settings.c:452
+msgid "1800 MHz, "
+msgstr "1800 MHz,"
+
+#: ../cli/src/settings.c:454
+msgid "1900 MHz, "
+msgstr "1900 MHz,"
+
+#: ../cli/src/settings.c:456
+msgid "850 MHz, "
+msgstr "850 MHz,"
+
+#: ../cli/src/settings.c:458
+msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 2100 MHz, "
+
+#: ../cli/src/settings.c:460
+msgid "WCDMA 3GPP UMTS 1800 MHz, "
+msgstr "WCDMA 3GPP UMTS 1800 MHz, "
+
+#: ../cli/src/settings.c:462
+msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
+
+#: ../cli/src/settings.c:464
+msgid "WCDMA 3GPP UMTS 800 MHz, "
+msgstr "WCDMA 3GPP UMTS 800 MHz, "
+
+#: ../cli/src/settings.c:466
+msgid "WCDMA 3GPP UMTS 850 MHz, "
+msgstr "WCDMA 3GPP UMTS 850 MHz, "
+
+#: ../cli/src/settings.c:468
+msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgstr "WCDMA 3GPP UMTS 900 MHz, "
+
+#: ../cli/src/settings.c:470
+msgid "WCDMA 3GPP UMTS 1700 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+
+#: ../cli/src/settings.c:554 ../cli/src/settings.c:721
+msgid "auto"
+msgstr "auto"
+
+#: ../cli/src/settings.c:716 ../cli/src/settings.c:719
+#: ../cli/src/settings.c:720 ../cli/src/utils.c:172
+msgid "not set"
+msgstr "nicht gesetzt"
+
+#: ../cli/src/utils.c:124
+#, c-format
+msgid "field '%s' has to be alone"
+msgstr "Feld »%s« muss allein stehen"
+
+#: ../cli/src/utils.c:127
+#, c-format
+msgid "invalid field '%s'"
+msgstr "ungültiges Feld »%s«"
+
+#: ../cli/src/utils.c:146
+#, c-format
+msgid "Option '--terse' requires specifying '--fields'"
+msgstr "Optione »--terse« benötigt die Angabe von »--fields«"
+
+#: ../cli/src/utils.c:150
+#, c-format
+msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
+msgstr "Option »--terse« benötigt bestimmte »--fields«-Werte, nicht »%s«"
+
#: ../libnm-util/crypto.c:120
#, c-format
msgid "PEM key file had no end tag '%s'."
@@ -1206,39 +1562,141 @@ msgstr "PKCS#12-Datei konnte nicht überprüft werden: %d"
msgid "Could not generate random data."
msgstr "Es konnten keine Zufallsdaten generiert werden."
-#: ../libnm-util/nm-utils.c:1924
+#: ../libnm-util/nm-utils.c:1975
#, c-format
msgid "Not enough memory to make encryption key."
msgstr ""
"Nicht genügend freier Speicher zur Erstellung des Verschlüsselungsschlüssels."
-#: ../libnm-util/nm-utils.c:2034
+#: ../libnm-util/nm-utils.c:2085
msgid "Could not allocate memory for PEM file creation."
msgstr ""
"Es konnte nicht genügend freier Speicher zur Erstellung der PEM-Datei "
"angefordert werden."
-#: ../libnm-util/nm-utils.c:2046
+#: ../libnm-util/nm-utils.c:2097
#, c-format
msgid "Could not allocate memory for writing IV to PEM file."
msgstr ""
"Es konnte nicht genügend freier Speicher zum Schreiben des IV in die PEM-"
"Datei angefordert werden."
-#: ../libnm-util/nm-utils.c:2058
+#: ../libnm-util/nm-utils.c:2109
#, c-format
msgid "Could not allocate memory for writing encrypted key to PEM file."
msgstr ""
"Es konnte nicht genügend freier Speicher zum Schreiben des verschlüsselten "
"Schlüssels in die PEM-Datei angefordert werden."
-#: ../libnm-util/nm-utils.c:2077
+#: ../libnm-util/nm-utils.c:2128
#, c-format
msgid "Could not allocate memory for PEM file data."
msgstr ""
"Es konnte nicht genügend freier Speicher für die PEM-Datei angefordert "
"werden."
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Verbindungsfreigabe über ein geschütztes WLAN-Netzwerk"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
+msgid "Connection sharing via an open WiFi network"
+msgstr "Verbindungsfreigabe über ein offenes WLAN-Netzwerk"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
+msgid "Modify persistent system hostname"
+msgstr "Den ständigen Rechnernamen des Systems bearbeiten"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
+msgid "Modify system connections"
+msgstr "Systemverbindungen bearbeiten"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
+msgid "System policy prevents modification of system settings"
+msgstr ""
+"Die Systemrichtlinien verhindern das Bearbeiten von Systemeinstellungen"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr ""
+"Die Systemrichtlinien verhindern das Bearbeiten des ständigen Rechnernamens "
+"des Systems"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr ""
+"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein geschütztes "
+"WLAN-Netzwerk"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr ""
+"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein offenes WLAN-"
+"Netzwerk"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "Die Kontrolle von Netzwerkverbindungen erlauben"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Allow use of user-specific connections"
+msgstr "Die Verwendung von benutzerspezifischen Verbindungen erlauben"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Enable or disable WiFi devices"
+msgstr "WLAN-Geräte aktivieren oder deaktivieren"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable mobile broadband devices"
+msgstr "Mobile Breitbandgeräte aktivieren oder deaktivieren"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable system networking"
+msgstr "System-Netzwerke aktivieren oder deaktivieren"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid ""
+"Put NetworkManager to sleep or wake it up (should only be used by system "
+"power management)"
+msgstr ""
+"NetworkManager in den Schlafzustand versetzen oder daraus aufwecken (Sollte "
+"nur von der System-Energieverwaltung verwendet werden)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "System policy prevents control of network connections"
+msgstr ""
+"Die Systemrichtlinien verhindern die Kontrolle von Netzwerkverbindungen"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr ""
+"Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung von WLAN-"
+"Geräten"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr ""
+"Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung mobiler "
+"Breitbandgeräte"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "System policy prevents enabling or disabling system networking"
+msgstr ""
+"Die Systemrichtlinien verhindern die Aktivierung oder Deaktivierung von "
+"System-Netzwerken"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr ""
+"Die Systemrichtlinien verhindern das in den Schlaf versetzen oder Aufwecken "
+"von NetworkManager"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents use of user-specific connections"
+msgstr ""
+"Die Systemrichtlinien verhindern die Verwendung von benutzerspezifischen "
+"Verbindungen"
+
#: ../src/nm-netlink-monitor.c:100 ../src/nm-netlink-monitor.c:231
#: ../src/nm-netlink-monitor.c:653
#, c-format
@@ -1287,25 +1745,25 @@ msgstr "Der netlink-Gruppe konnte nicht beigetreten werden: %s"
msgid "error updating link cache: %s"
msgstr "Die Aktualisierung des Verbindungszwischenspeichers schlug fehl: %s"
-#: ../src/main.c:502
+#: ../src/main.c:499
#, c-format
msgid "Invalid option. Please use --help to see a list of valid options.\n"
msgstr ""
"Ungültige Option. Verwenden Sie --help um eine Liste der verfügbaren "
"Optionen zu erhalten.\n"
-#: ../src/main.c:562
+#: ../src/main.c:570
#, c-format
msgid "%s. Please use --help to see a list of valid options.\n"
msgstr ""
"%s. Verwenden Sie --help, um eine Liste der verfügbaren Optionen zu "
"erhalten.\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:328
msgid "# Created by NetworkManager\n"
msgstr "# Erstellt von NetworkManager\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
#, c-format
msgid ""
"# Merged from %s\n"
@@ -1314,19 +1772,19 @@ msgstr ""
"# Zusammengeführt aus %s\n"
"\n"
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
msgid "no usable DHCP client could be found."
msgstr "Es konnte kein verwendbarer DHCP-Client gefunden werden."
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
msgid "'dhclient' could be found."
msgstr "»dhclient« konnte nicht gefunden werden."
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
msgid "'dhcpcd' could be found."
msgstr "»dhcpcd« konnte nicht gefunden werden."
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
#, c-format
msgid "unsupported DHCP client '%s'"
msgstr "Nicht unterstützter DHCP-Client »%s«"
@@ -1341,13 +1799,13 @@ msgstr "Unbekannte Protokollstufe »%s«"
msgid "Unknown log domain '%s'"
msgstr "Unbekannte Protokolldomäne »%s«"
-#: ../src/dns-manager/nm-dns-manager.c:343
+#: ../src/dns-manager/nm-dns-manager.c:384
msgid "NOTE: the libc resolver may not support more than 3 nameservers."
msgstr ""
"HINWEIS: Der libc-resolver unterstützt eventuell nicht mehr als drei "
"Nameserver."
-#: ../src/dns-manager/nm-dns-manager.c:345
+#: ../src/dns-manager/nm-dns-manager.c:386
msgid "The nameservers listed below may not be recognized."
msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
@@ -1356,48 +1814,165 @@ msgstr "Die nachfolgend gelisteten Nameserver werden eventuell nicht erkannt."
msgid "Auto %s"
msgstr "Auto %s"
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3254
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
+#: ../system-settings/plugins/ifnet/connection_parser.c:49
msgid "System"
msgstr "System"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Verbindungsfreigabe über ein geschütztes WLAN-Netzwerk"
+#~ msgid "Type"
+#~ msgstr "Typ"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Verbindungsfreigabe über ein offenes WLAN-Netzwerk"
+#~ msgid "Name"
+#~ msgstr "Name"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Den ständigen Rechnernamen des Systems bearbeiten"
+#~ msgid "User connections:\n"
+#~ msgstr "Benutzerverbindungen:\n"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-msgid "Modify system connections"
-msgstr "Systemverbindungen bearbeiten"
+#~ msgid "System-wide connections"
+#~ msgstr "Systemweite Verbindungen"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr ""
-"Die Systemrichtlinien verhindern das Bearbeiten von Systemeinstellungen"
+#~ msgid "Default"
+#~ msgstr "Vorgabe"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr ""
-"Die Systemrichtlinien verhindern das Bearbeiten des ständigen Rechnernamens "
-"des Systems"
+#~ msgid "Service"
+#~ msgstr "Dienst"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr ""
-"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein geschütztes "
-"WLAN-Netzwerk"
+#~ msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
+#~ msgstr "%s, %s, Frequenz %d MHz, Durchsatz %d Mb/s, Stärke %d"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr ""
-"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein offenes WLAN-"
-"Netzwerk"
+#~ msgid "Device"
+#~ msgstr "Gerät"
+
+#~ msgid "Driver"
+#~ msgstr "Treiber"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "HW Address"
+#~ msgstr "Hardwareadresse"
+
+#~ msgid ""
+#~ "\n"
+#~ " Capabilities:\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Fähigkeiten:\n"
+
+#~ msgid "Carrier Detect"
+#~ msgstr "Trägersignalkennung"
+
+#~ msgid "Speed"
+#~ msgstr "Geschwindigkeit"
+
+#~ msgid ""
+#~ "\n"
+#~ " Wireless Properties\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Eigenschaften der Funkverbindung\n"
+
+#~ msgid "WEP Encryption"
+#~ msgstr "WEP-Verschlüsselung"
+
+#~ msgid "WPA Encryption"
+#~ msgstr "WPA-Verschlüsselung"
+
+#~ msgid "WPA2 Encryption"
+#~ msgstr "WPA2-Verschlüsselung"
+
+#~ msgid "TKIP cipher"
+#~ msgstr "TKIP-Chiffre"
+
+#~ msgid "CCMP cipher"
+#~ msgstr "CCMP-Chiffre"
+
+#~ msgid ""
+#~ "\n"
+#~ " Wireless Access Points %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Funknetzwerk-Zugangspunkte %s\n"
+
+#~ msgid "(* = current AP)"
+#~ msgstr "(* = momentaner Zugangspunkt)"
+
+#~ msgid ""
+#~ "\n"
+#~ " Wired Properties\n"
+#~ msgstr ""
+#~ "\n"
+#~ " Eigenschaften der kabelgebundenen Verbindung\n"
+
+#~ msgid "Carrier"
+#~ msgstr "Trägersignal"
+
+#~ msgid ""
+#~ "\n"
+#~ " IPv4 Settings:\n"
+#~ msgstr ""
+#~ "\n"
+#~ " IPv4-Einstellungen:\n"
+
+#~ msgid "Address"
+#~ msgstr "Adresse"
+
+#~ msgid "Prefix"
+#~ msgstr "Präfix"
+
+#~ msgid "Gateway"
+#~ msgstr "Gateway"
+
+#~ msgid "Device:"
+#~ msgstr "Gerät:"
+
+#~ msgid "Error: hwaddr has to be specified."
+#~ msgstr "Fehler: Es muss eine Hardwareadresse angegeben werden."
+
+#~ msgid "AP parameters"
+#~ msgstr "Parameter des Zugangspunkts"
+
+#~ msgid "Frequency:"
+#~ msgstr "Frequenz:"
+
+#~ msgid "Mode:"
+#~ msgstr "Modus:"
+
+#~ msgid "Ad-hoc"
+#~ msgstr "Ad-hoc"
+
+#~ msgid "Maximal bitrate:"
+#~ msgstr "Maximale Übertragungsgeschwindigkeit:"
+
+#~ msgid "Strength:"
+#~ msgstr "Stärke:"
+
+#~ msgid "Flags:"
+#~ msgstr "Flags:"
+
+#~ msgid "privacy"
+#~ msgstr "Vertraulichkeit"
+
+#~ msgid "WPA flags:"
+#~ msgstr "WPA-Flags:"
+
+#~ msgid "RSN flags:"
+#~ msgstr "RSN-Flags:"
+
+#~ msgid "NM running:"
+#~ msgstr "NM läuft:"
+
+#~ msgid "NM state:"
+#~ msgstr "Status von NM:"
+
+#~ msgid "NM wireless hardware:"
+#~ msgstr "NM Funknetzwerk-Hardware:"
+
+#~ msgid "NM wireless:"
+#~ msgstr "NM Funk:"
+
+#~ msgid "NM WWAN hardware:"
+#~ msgstr "NM WWAN-Hardware:"
#~ msgid "unable to join netlink group for monitoring link status: %s"
#~ msgstr ""
diff --git a/po/es.po b/po/es.po
index 36b63833b0..d002f77513 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@ msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-08-10 03:25+0000\n"
-"PO-Revision-Date: 2010-08-16 21:27+0200\n"
+"POT-Creation-Date: 2010-09-17 15:25+0000\n"
+"PO-Revision-Date: 2010-09-18 11:01+0200\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -118,12 +118,12 @@ msgstr ""
#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
#, c-format
msgid "Error: 'con list': %s"
-msgstr "Error: 'con list': %s"
+msgstr "Error: «con list»: %s"
#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
#, c-format
msgid "Error: 'con list': %s; allowed fields: %s"
-msgstr "Error: 'con list': %s; campos permitidos: %s"
+msgstr "Error: «con list»: %s; campos permitidos: %s"
#: ../cli/src/connections.c:208
msgid "Connection details"
@@ -219,7 +219,7 @@ msgid "Error: no valid parameter specified."
msgstr "Error: no se especificó un parámetro válido."
#: ../cli/src/connections.c:544 ../cli/src/connections.c:1577
-#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:274
+#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359
#, c-format
msgid "Error: %s."
msgstr "Error: %s."
@@ -227,12 +227,12 @@ msgstr "Error: %s."
#: ../cli/src/connections.c:650
#, c-format
msgid "Error: 'con status': %s"
-msgstr "Error: 'con status': %s"
+msgstr "Error: «con status»: %s"
#: ../cli/src/connections.c:652
#, c-format
msgid "Error: 'con status': %s; allowed fields: %s"
-msgstr "Error: 'con status': %s; campos permitidos: %s"
+msgstr "Error: «con status»: %s; campos permitidos: %s"
#: ../cli/src/connections.c:659
msgid "Active connections"
@@ -241,22 +241,22 @@ msgstr "Conexiones activas"
#: ../cli/src/connections.c:1027
#, c-format
msgid "no active connection on device '%s'"
-msgstr "conexión no activa en dispositivo '%s'"
+msgstr "conexión no activa en el dispositivo «%s»"
#: ../cli/src/connections.c:1035
#, c-format
msgid "no active connection or device"
-msgstr "conexión o dispositivo no activos"
+msgstr "conexión o dispositivo no activo"
#: ../cli/src/connections.c:1085
#, c-format
msgid "device '%s' not compatible with connection '%s'"
-msgstr "dispositivo '%s' incompatible con conexión '%s'"
+msgstr "dispositivo «%s» incompatible con conexión «%s»"
#: ../cli/src/connections.c:1087
#, c-format
msgid "no device found for connection '%s'"
-msgstr "no se encontró dispositivo para conexión '%s'"
+msgstr "no se encontró dispositivo para conexión «%s»"
#: ../cli/src/connections.c:1098
msgid "activating"
@@ -268,8 +268,8 @@ msgstr "activada"
#: ../cli/src/connections.c:1103 ../cli/src/connections.c:1126
#: ../cli/src/connections.c:1159 ../cli/src/devices.c:246
-#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
+#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473
msgid "unknown"
msgstr "desconocido"
@@ -287,7 +287,7 @@ msgstr "Conectando VPN"
#: ../cli/src/connections.c:1118
msgid "VPN connecting (getting IP configuration)"
-msgstr "Conectando VPN (Obteniendo configuración IP)"
+msgstr "Conectando VPN (obteniendo configuración IP)"
#: ../cli/src/connections.c:1120
msgid "VPN connected"
@@ -295,7 +295,7 @@ msgstr "VPN conectada"
#: ../cli/src/connections.c:1122
msgid "VPN connection failed"
-msgstr "Conexión VPN falló"
+msgstr "Falló la conexión VPN"
#: ../cli/src/connections.c:1124
msgid "VPN disconnected"
@@ -315,19 +315,19 @@ msgstr "el usuario estaba desconectado"
#: ../cli/src/connections.c:1141
msgid "the base network connection was interrupted"
-msgstr "la conexión de red de base fue interrumpida"
+msgstr "se interrumpió la conexión de red de base"
#: ../cli/src/connections.c:1143
msgid "the VPN service stopped unexpectedly"
-msgstr "El servicio VPN se detuvo inesperadamente"
+msgstr "el servicio VPN se detuvo inesperadamente"
#: ../cli/src/connections.c:1145
msgid "the VPN service returned invalid configuration"
-msgstr "El servicio VPN retornó configuración inválida"
+msgstr "el servicio VPN retornó una configuración no válida"
#: ../cli/src/connections.c:1147
msgid "the connection attempt timed out"
-msgstr "El intento de conexión se agotó"
+msgstr "se agotaron los intentos de conexión"
#: ../cli/src/connections.c:1149
msgid "the VPN service did not start in time"
@@ -347,7 +347,7 @@ msgstr "secretos VPN válidos"
#: ../cli/src/connections.c:1157
msgid "the connection was removed"
-msgstr "la conexión fue eliminada"
+msgstr "se eliminó la conexión"
#: ../cli/src/connections.c:1171
#, c-format
@@ -362,7 +362,7 @@ msgstr "Conexión activada\n"
#: ../cli/src/connections.c:1177
#, c-format
msgid "Error: Connection activation failed."
-msgstr "Error: Activación de conexión falló."
+msgstr "Error: falló la activación de la conexión."
#: ../cli/src/connections.c:1196
#, c-format
@@ -372,72 +372,72 @@ msgstr "estado: %s (%d)\n"
#: ../cli/src/connections.c:1206
#, c-format
msgid "Error: Connection activation failed: %s."
-msgstr "Error: Activación de conexión falló: %s."
+msgstr "Error: falló la activación de la conexión: %s."
#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
#, c-format
msgid "Error: Timeout %d sec expired."
-msgstr "Error: Pausa de %d segundos expiró."
+msgstr "Error: expiró la pausa de %d segundos."
#: ../cli/src/connections.c:1266
#, c-format
msgid "Error: Connection activation failed: %s"
-msgstr "Error: Activación de conexión falló: %s"
+msgstr "Error: falló la activación de la conexión: %s"
#: ../cli/src/connections.c:1280
#, c-format
msgid "Error: Obtaining active connection for '%s' failed."
-msgstr "Error: Obtención de conexión activa para '%s' falló."
+msgstr "Error: falló la obtención de conexión activa para «%s»."
#: ../cli/src/connections.c:1289
#, c-format
msgid "Active connection state: %s\n"
-msgstr "Estado de conexión activa: %s\n"
+msgstr "Estado de la conexión activa: %s\n"
#: ../cli/src/connections.c:1290
#, c-format
msgid "Active connection path: %s\n"
-msgstr "Ruta de conexión activa: %s\n"
+msgstr "Ruta de la conexión activa: %s\n"
#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
#, c-format
msgid "Error: Unknown connection: %s."
-msgstr "Error: Conexión desconocida: %s."
+msgstr "Error: conexión desconocida: %s."
#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
#, c-format
msgid "Error: timeout value '%s' is not valid."
-msgstr "Error: valor de pausa '%s' inválido."
+msgstr "Error: valor de pausa «%s» inválido."
#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
#, c-format
msgid "Error: id or uuid has to be specified."
-msgstr "Error: id o uuid ha sido especificado."
+msgstr "Error: se debe especificar un id o uuid."
#: ../cli/src/connections.c:1412
#, c-format
msgid "Error: No suitable device found: %s."
-msgstr "Error: Dispositivo inapropiado: %s."
+msgstr "Error: no se encontró un dispositivo apropiado: %s."
#: ../cli/src/connections.c:1414
#, c-format
msgid "Error: No suitable device found."
-msgstr "Error: Dispositivo no apropiado."
+msgstr "Error: no se encontró un dispositivo apropiado."
#: ../cli/src/connections.c:1509
#, c-format
msgid "Warning: Connection not active\n"
-msgstr "Advertencia: Conexión inactiva\n"
+msgstr "Advertencia: conexión inactiva\n"
#: ../cli/src/connections.c:1566
#, c-format
msgid "Error: 'con' command '%s' is not valid."
-msgstr "Error: comando 'con' '%s' es inválido."
+msgstr "Error: comando «con» «%s» no es válido."
#: ../cli/src/connections.c:1602
#, c-format
msgid "Error: could not connect to D-Bus."
-msgstr "Error: no se pudo conectar a D-Bus."
+msgstr "Error: no se pudo conectar con D-Bus."
#: ../cli/src/connections.c:1609
#, c-format
@@ -453,7 +453,7 @@ msgstr "Error: No se pudo obtener configuración de usuario."
#, c-format
msgid "Error: Can't obtain connections: settings services are not running."
msgstr ""
-"Error: No se pudieron obtener conexiones: servicios de configuración no se "
+"Error: no se pudieron obtener conexiones: servicios de configuración no se "
"están ejecutando."
#. 0
@@ -506,13 +506,11 @@ msgstr "DNS IP4"
#. 6
#: ../cli/src/devices.c:79
-#| msgid "IP4-SETTINGS"
msgid "IP6-SETTINGS"
msgstr "CONFIGURACIONES IP6"
#. 7
#: ../cli/src/devices.c:80
-#| msgid "IP4-DNS"
msgid "IP6-DNS"
msgstr "DNS IP6"
@@ -667,7 +665,7 @@ msgstr "sin gestión"
msgid "unavailable"
msgstr "no disponible"
-#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
msgid "disconnected"
msgstr "desconectado"
@@ -687,7 +685,7 @@ msgstr "conectando (necesita autenticación)"
msgid "connecting (getting IP configuration)"
msgstr "conectando (obteniendo configuración IP)"
-#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:87
+#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
msgid "connected"
msgstr "conectado"
@@ -749,16 +747,16 @@ msgstr "Infraestructura"
#: ../cli/src/devices.c:486
#, c-format
msgid "Error: 'dev list': %s"
-msgstr "Error: 'dev list': %s"
+msgstr "Error: «dev list»: %s"
#: ../cli/src/devices.c:488
#, c-format
msgid "Error: 'dev list': %s; allowed fields: %s"
-msgstr "Error: 'dev list': %s; campos permitidos: %s"
+msgstr "Error: «dev list»: %s; campos permitidos: %s"
#: ../cli/src/devices.c:497
msgid "Device details"
-msgstr "Detalles de dispositivos"
+msgstr "Detalles de los dispositivos"
#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
msgid "(unknown)"
@@ -786,81 +784,81 @@ msgstr "apagado"
#: ../cli/src/devices.c:808
#, c-format
msgid "Error: 'dev status': %s"
-msgstr "Error: 'dev status': %s"
+msgstr "Error: «dev status»: %s"
#: ../cli/src/devices.c:810
#, c-format
msgid "Error: 'dev status': %s; allowed fields: %s"
-msgstr "Error: 'dev status': %s; campos permitidos: %s"
+msgstr "Error: «dev status»: %s; campos permitidos: %s"
#: ../cli/src/devices.c:817
msgid "Status of devices"
-msgstr "Estado de dispositivos"
+msgstr "Estado de los dispositivos"
#: ../cli/src/devices.c:845
#, c-format
msgid "Error: '%s' argument is missing."
-msgstr "Error: '%s' falta argumento."
+msgstr "Error: falta el argumento «%s»."
#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
#: ../cli/src/devices.c:1136
#, c-format
msgid "Error: Device '%s' not found."
-msgstr "Error: Dispositivo '%s' no encontrado."
+msgstr "Error: no se encontró el dispositivo «%s»."
#: ../cli/src/devices.c:897
#, c-format
msgid "Success: Device '%s' successfully disconnected."
-msgstr "Éxito: Dispositivo '%s' desconectado correctamente."
+msgstr "Éxito: dispositivo «%s» desconectado correctamente."
#: ../cli/src/devices.c:922
#, c-format
msgid "Error: Device '%s' (%s) disconnecting failed: %s"
-msgstr "Error: Desconexión de dispositivo '%s' (%s) falló: %s"
+msgstr "Error: falló la desconexión del dispositivo «%s» (%s): %s"
#: ../cli/src/devices.c:930
#, c-format
msgid "Device state: %d (%s)\n"
-msgstr "Estado de dispositivo: %d (%s)\n"
+msgstr "Estado del dispositivo: %d (%s)\n"
#: ../cli/src/devices.c:994
#, c-format
msgid "Error: iface has to be specified."
-msgstr "Error: iface tiene que especificarse."
+msgstr "Error: se debe especificar iface."
#: ../cli/src/devices.c:1112
#, c-format
msgid "Error: 'dev wifi': %s"
-msgstr "Error: 'dev wifi' '%s'"
+msgstr "Error: «dev wifi» «%s»"
#: ../cli/src/devices.c:1114
#, c-format
msgid "Error: 'dev wifi': %s; allowed fields: %s"
-msgstr "Error: 'dev wifi': %s; campos permitidos: %s"
+msgstr "Error: «dev wifi»: %s; campos permitidos: %s"
#: ../cli/src/devices.c:1121
msgid "WiFi scan list"
-msgstr "lista de scan WiFi"
+msgstr "lista de análisis WiFi"
#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
#, c-format
msgid "Error: Access point with hwaddr '%s' not found."
-msgstr "Error: Punto de acceso con hwaddr '%s' no se encontró."
+msgstr "Error: no se encontró el punto de acceso con hwaddr «%s»."
#: ../cli/src/devices.c:1173
#, c-format
msgid "Error: Device '%s' is not a WiFi device."
-msgstr "Error: Dispositivo '%s' no es un dispositivo WiFi."
+msgstr "Error: el dispositivo «%s» no es un dispositivo WiFi."
#: ../cli/src/devices.c:1237
#, c-format
msgid "Error: 'dev wifi' command '%s' is not valid."
-msgstr "Error: comando 'dev wifi' '%s' inválido."
+msgstr "Error: comando «dev wifi» «%s» inválido."
#: ../cli/src/devices.c:1284
#, c-format
msgid "Error: 'dev' command '%s' is not valid."
-msgstr "Error: comando 'dev' '%s' inválido."
+msgstr "Error: comando «dev» «%s» no válido."
#: ../cli/src/network-manager.c:35
msgid "RUNNING"
@@ -868,119 +866,180 @@ msgstr "EJECUTANDO"
#. 1
#: ../cli/src/network-manager.c:37
-msgid "WIFI-HARDWARE"
-msgstr "HARDWARE-WIFI"
+msgid "NET-ENABLED"
+msgstr "RED-ACTIVADA"
#. 2
#: ../cli/src/network-manager.c:38
-msgid "WIFI"
-msgstr "WIFI"
+msgid "WIFI-HARDWARE"
+msgstr "HARDWARE-WIFI"
#. 3
#: ../cli/src/network-manager.c:39
-msgid "WWAN-HARDWARE"
-msgstr "HARDWARE-WWAN"
+msgid "WIFI"
+msgstr "WIFI"
#. 4
#: ../cli/src/network-manager.c:40
+msgid "WWAN-HARDWARE"
+msgstr "HARDWARE-WWAN"
+
+#. 5
+#: ../cli/src/network-manager.c:41
msgid "WWAN"
msgstr "WWAN"
-#: ../cli/src/network-manager.c:62
-#, c-format
+#: ../cli/src/network-manager.c:64
+#, c-format
+#| msgid ""
+#| "Usage: nmcli nm { COMMAND | help }\n"
+#| "\n"
+#| " COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+#| "\n"
+#| " status\n"
+#| " sleep\n"
+#| " wakeup\n"
+#| " wifi [on|off]\n"
+#| " wwan [on|off]\n"
+#| "\n"
msgid ""
"Usage: nmcli nm { COMMAND | help }\n"
"\n"
-" COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+" COMMAND := { status | enable | sleep | wifi | wwan }\n"
"\n"
" status\n"
-" sleep\n"
-" wakeup\n"
+" enable [true|false]\n"
+" sleep [true|false]\n"
" wifi [on|off]\n"
" wwan [on|off]\n"
"\n"
msgstr ""
"Uso: nmcli nm { COMANDO | ayuda }\n"
"\n"
-" COMANDO := { status | sleep | wakeup | wifi | wwan }\n"
+" COMANDO := { status | enable | sleep | wakeup | wifi | wwan }\n"
"\n"
-" estatus\n"
+" estado\n"
+" activar [cierto|falso]\n"
" dormir\n"
" despertar\n"
" wifi [encendido|apagado]\n"
" wwan [encendido|apagado]\n"
"\n"
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:85
msgid "asleep"
msgstr "dormido"
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:87
msgid "connecting"
msgstr "conectando"
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:128
#, c-format
msgid "Error: 'nm status': %s"
-msgstr "Error: 'nm status': %s"
+msgstr "Error: «nm status»: %s"
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:130
#, c-format
msgid "Error: 'nm status': %s; allowed fields: %s"
-msgstr "Error: 'nm status': %s; campos permitidos: %s"
+msgstr "Error: «nm status»: %s; campos permitidos: %s"
-#: ../cli/src/network-manager.c:134
+#: ../cli/src/network-manager.c:137
msgid "NetworkManager status"
msgstr "Estado de NetworkManager"
#. Print header
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
msgid "enabled"
-msgstr "habilitado"
+msgstr "activado"
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
msgid "disabled"
-msgstr "inhabilitado"
+msgstr "desactivado"
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:152
msgid "running"
msgstr "ejecutando"
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:152
msgid "not running"
msgstr "no ejecutando"
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:175
+#, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "Error: no se pudo conectar con el bus del sistema: %s"
+
+#: ../cli/src/network-manager.c:186
+#, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "Error: no se pudo crear un objeto proxy en D-Bus."
+
+#: ../cli/src/network-manager.c:192
+#, c-format
+#| msgid "Error: 'con list': %s"
+msgid "Error in sleep: %s"
+msgstr "Error al dormir: %s"
+
+#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
+#: ../cli/src/network-manager.c:318
#, c-format
msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
-msgstr "Error: '--fields' valor '%s' no es válido aquí; campos permitidos: %s"
+msgstr "Error: «--fields» valor «%s» no es válido aquí; campos permitidos: %s"
+
+#: ../cli/src/network-manager.c:245
+#| msgid "WiFi enabled"
+msgid "Networking enabled"
+msgstr "Red activada"
+
+#: ../cli/src/network-manager.c:256
+#, c-format
+#| msgid "Error: invalid 'wwan' parameter: '%s'."
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "Error: parámetro «enable» inválido: «%s»; use «true» o «false»."
+
+#: ../cli/src/network-manager.c:265
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "Error: NetworkManager no exporta el estado para dormir."
+
+#: ../cli/src/network-manager.c:273
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "Error: parámetro «wifi» inválido: «%s»."
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:294
msgid "WiFi enabled"
-msgstr "WiFi habilitado"
+msgstr "WiFi activado"
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:305
#, c-format
msgid "Error: invalid 'wifi' parameter: '%s'."
-msgstr "Error: parámetro 'wifi' inválido: '%s'."
+msgstr "Error: parámetro «wifi» inválido: «%s»."
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:326
msgid "WWAN enabled"
-msgstr "WWAN habilitado"
+msgstr "WWAN activado"
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:337
#, c-format
msgid "Error: invalid 'wwan' parameter: '%s'."
-msgstr "Error: parámetro 'wwan' inválido: '%s'."
+msgstr "Error: parámetro «wwan» inválido: «%s»."
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:348
#, c-format
msgid "Error: 'nm' command '%s' is not valid."
-msgstr "Error: comando 'nm' command '%s' inválido."
+msgstr "Error: comando «nm» command «%s» inválido."
#: ../cli/src/nmcli.c:69
#, c-format
@@ -1020,42 +1079,42 @@ msgstr ""
#: ../cli/src/nmcli.c:113
#, c-format
msgid "Error: Object '%s' is unknown, try 'nmcli help'."
-msgstr "Error: Objeto '%s' desconocido, intente 'nmcli help'."
+msgstr "Error: el objeto «%s» desconocido, intente «nmcli help»."
#: ../cli/src/nmcli.c:143
#, c-format
msgid "Error: Option '--terse' is specified the second time."
-msgstr "Error: Opción '--terse' se especifica la segunda vez."
+msgstr "Error: la opción «--terse» se especifica la segunda vez."
#: ../cli/src/nmcli.c:148
#, c-format
msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
-msgstr "Error: Opción '--terse' es mutuamente exclusiva con '--pretty'."
+msgstr "Error: la opción «--terse» es mutuamente exclusiva con «--pretty»."
#: ../cli/src/nmcli.c:156
#, c-format
msgid "Error: Option '--pretty' is specified the second time."
-msgstr "Error: Opción '--pretty' se especifica la segunda vez."
+msgstr "Error: la opción «--pretty» se especifica la segunda vez."
#: ../cli/src/nmcli.c:161
#, c-format
msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
-msgstr "Error: Opción '--pretty' es mutuamente exclusiva con '--terse'."
+msgstr "Error: la opción «--pretty» es mutuamente exclusiva con «--terse»."
#: ../cli/src/nmcli.c:171 ../cli/src/nmcli.c:187
#, c-format
msgid "Error: missing argument for '%s' option."
-msgstr "Error: falta argumento para opción '%s'."
+msgstr "Error: falta argumento para opción «%s»."
#: ../cli/src/nmcli.c:180 ../cli/src/nmcli.c:196
#, c-format
msgid "Error: '%s' is not valid argument for '%s' option."
-msgstr "Error: '%s' no es válido argumento para opción '%s'."
+msgstr "Error: «%s» no es válido argumento para opción «%s»."
#: ../cli/src/nmcli.c:203
#, c-format
msgid "Error: fields for '%s' options are missing."
-msgstr "Error: faltan campos para opciones '%s'."
+msgstr "Error: faltan campos para opciones «%s»."
#: ../cli/src/nmcli.c:209
#, c-format
@@ -1065,7 +1124,7 @@ msgstr "herramienta nmcli, versión %s\n"
#: ../cli/src/nmcli.c:215
#, c-format
msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
-msgstr "Error: Opción '%s' desconocida, intente 'nmcli -help'."
+msgstr "Error: opción «%s» desconocida, intente «nmcli -help»."
#: ../cli/src/nmcli.c:234
#, c-format
@@ -1075,7 +1134,7 @@ msgstr "Señal capturada %d, apagando..."
#: ../cli/src/nmcli.c:259
#, c-format
msgid "Error: Could not connect to NetworkManager."
-msgstr "Error: No se pudo conectar al NetworkManager."
+msgstr "Error: no se pudo conectar con NetworkManager."
#: ../cli/src/nmcli.c:275
msgid "Success"
@@ -1160,22 +1219,22 @@ msgstr "no establecido"
#: ../cli/src/utils.c:124
#, c-format
msgid "field '%s' has to be alone"
-msgstr "campo '%s' tiene que estar solo"
+msgstr "el campo «%s» tiene que estar solo"
#: ../cli/src/utils.c:127
#, c-format
msgid "invalid field '%s'"
-msgstr "campo inválido '%s'"
+msgstr "campo inválido «%s»"
#: ../cli/src/utils.c:146
#, c-format
msgid "Option '--terse' requires specifying '--fields'"
-msgstr "Opción '--terse' requiere especificar '--fields'"
+msgstr "Opción «--terse» requiere especificar «--fields»"
#: ../cli/src/utils.c:150
#, c-format
msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
-msgstr "Opción '--terse' requiere valores de '--fields' específicos, no '%s'"
+msgstr "Opción «--terse» requiere valores de «--fields» específicos, no «%s»"
#: ../libnm-util/crypto.c:120
#, c-format
@@ -1635,7 +1694,7 @@ msgstr ""
#: ../src/nm-netlink-monitor.c:265
#, c-format
msgid "unable to enable netlink handle credential passing: %s"
-msgstr "no se puede habilitar el manejador netlink para pasar credenciales: %s"
+msgstr "no se puede activar el manejador netlink para pasar credenciales: %s"
#: ../src/nm-netlink-monitor.c:291 ../src/nm-netlink-monitor.c:353
#, c-format
@@ -1661,22 +1720,22 @@ msgstr "no pudo unirse al grupo netlink: %s"
msgid "error updating link cache: %s"
msgstr "error al actualizar el enlace caché: %s"
-#: ../src/main.c:502
+#: ../src/main.c:499
#, c-format
msgid "Invalid option. Please use --help to see a list of valid options.\n"
msgstr ""
"Opción no válida. Use --help para ver una lista de las opciones válidas.\n"
-#: ../src/main.c:573
+#: ../src/main.c:570
#, c-format
msgid "%s. Please use --help to see a list of valid options.\n"
-msgstr "%s. Por favor use --help para ver la lista de opciones válidas.\n"
+msgstr "%s. Usar --help para ver la lista de opciones válidas.\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:324
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:328
msgid "# Created by NetworkManager\n"
msgstr "# Creado por NetworkManager\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:340
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
#, c-format
msgid ""
"# Merged from %s\n"
@@ -1691,31 +1750,31 @@ msgstr "cliente DHCP inútil pudo ser hallado."
#: ../src/dhcp-manager/nm-dhcp-manager.c:293
msgid "'dhclient' could be found."
-msgstr "'dhclient' pudo ser hallado."
+msgstr "se pudo encontrar «dhclient»."
#: ../src/dhcp-manager/nm-dhcp-manager.c:303
msgid "'dhcpcd' could be found."
-msgstr "'dhcpcd' pudo ser hallado."
+msgstr "se pudo encontrar «dhcpcd»."
#: ../src/dhcp-manager/nm-dhcp-manager.c:311
#, c-format
msgid "unsupported DHCP client '%s'"
-msgstr "'%s' Cliente DHCP sin soporte "
+msgstr "«%s» cliente DHCP sin soporte "
#: ../src/logging/nm-logging.c:146
#, c-format
msgid "Unknown log level '%s'"
-msgstr "Nivel de registro desconocido '%s'"
+msgstr "Nivel de registro desconocido «%s»"
#: ../src/logging/nm-logging.c:171
#, c-format
msgid "Unknown log domain '%s'"
-msgstr "Dominio de registro desconocido '%s'"
+msgstr "Dominio de registro desconocido «%s»"
#: ../src/dns-manager/nm-dns-manager.c:384
msgid "NOTE: the libc resolver may not support more than 3 nameservers."
msgstr ""
-"NOTA: el 'resolver' de nombres de libc puede que no soporte más de 3 "
+"NOTA: el resolutor de nombres de libc puede que no soporte más de 3 "
"servidores de nombres."
#: ../src/dns-manager/nm-dns-manager.c:386
@@ -1725,8 +1784,9 @@ msgstr "Puede que los servidores de nombres listados abajo no se reconozcan."
#: ../src/system-settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
-msgstr "Auto %ss"
+msgstr "Auto %s"
#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
+#: ../system-settings/plugins/ifnet/connection_parser.c:49
msgid "System"
msgstr "Sistema"
diff --git a/po/pa.po b/po/pa.po
index 4894383b15..cf3777a70b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: NetworkManager.HEAD\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
"cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2010-06-28 08:52+0000\n"
-"PO-Revision-Date: 2010-08-01 17:05+0530\n"
+"POT-Creation-Date: 2010-09-18 03:25+0000\n"
+"PO-Revision-Date: 2010-09-19 08:09+0530\n"
"Last-Translator: A S Alam <aalam@users.sf.net>\n"
"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
"MIME-Version: 1.0\n"
@@ -22,76 +22,76 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"\n"
-#: ../cli/src/connections.c:59 ../cli/src/connections.c:74
-#: ../cli/src/devices.c:85 ../cli/src/devices.c:98 ../cli/src/devices.c:108
-#: ../cli/src/devices.c:118 ../cli/src/devices.c:131 ../cli/src/devices.c:142
-#: ../cli/src/devices.c:152
+#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/devices.c:88 ../cli/src/devices.c:101 ../cli/src/devices.c:111
+#: ../cli/src/devices.c:121 ../cli/src/devices.c:134 ../cli/src/devices.c:145
+#: ../cli/src/devices.c:156 ../cli/src/devices.c:165 ../cli/src/devices.c:174
msgid "NAME"
msgstr "NAME"
#. 0
-#: ../cli/src/connections.c:60 ../cli/src/connections.c:75
+#: ../cli/src/connections.c:61 ../cli/src/connections.c:76
msgid "UUID"
msgstr "UUID"
#. 1
-#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:62
msgid "DEVICES"
msgstr "DEVICES"
#. 2
-#: ../cli/src/connections.c:62 ../cli/src/connections.c:77
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:78
msgid "SCOPE"
msgstr "SCOPE"
#. 3
-#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:64
msgid "DEFAULT"
msgstr "DEFAULT"
#. 4
-#: ../cli/src/connections.c:64
+#: ../cli/src/connections.c:65
msgid "DBUS-SERVICE"
msgstr "DBUS-SERVICE"
#. 5
-#: ../cli/src/connections.c:65
+#: ../cli/src/connections.c:66
msgid "SPEC-OBJECT"
msgstr "SPEC-OBJECT"
#. 6
-#: ../cli/src/connections.c:66
+#: ../cli/src/connections.c:67
msgid "VPN"
msgstr "VPN"
#. 1
#. 0
#. 1
-#: ../cli/src/connections.c:76 ../cli/src/devices.c:61 ../cli/src/devices.c:87
+#: ../cli/src/connections.c:77 ../cli/src/devices.c:62 ../cli/src/devices.c:90
msgid "TYPE"
msgstr "TYPE"
#. 3
-#: ../cli/src/connections.c:78
+#: ../cli/src/connections.c:79
msgid "TIMESTAMP"
msgstr "TIMESTAMP"
#. 4
-#: ../cli/src/connections.c:79
+#: ../cli/src/connections.c:80
msgid "TIMESTAMP-REAL"
msgstr "TIMESTAMP-REAL"
#. 5
-#: ../cli/src/connections.c:80
+#: ../cli/src/connections.c:81
msgid "AUTOCONNECT"
msgstr "AUTOCONNECT"
#. 6
-#: ../cli/src/connections.c:81
+#: ../cli/src/connections.c:82
msgid "READONLY"
msgstr "READONLY"
-#: ../cli/src/connections.c:157
+#: ../cli/src/connections.c:158
#, c-format
msgid ""
"Usage: nmcli con { COMMAND | help }\n"
@@ -112,40 +112,40 @@ msgstr ""
"<timeout>]\n"
" down id <id> | uuid <id>\n"
-#: ../cli/src/connections.c:197 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:198 ../cli/src/connections.c:537
#, c-format
msgid "Error: 'con list': %s"
msgstr "Error: 'con list': %s"
-#: ../cli/src/connections.c:199 ../cli/src/connections.c:538
+#: ../cli/src/connections.c:200 ../cli/src/connections.c:539
#, c-format
msgid "Error: 'con list': %s; allowed fields: %s"
msgstr "Error: 'con list': %s; allowed fields: %s"
-#: ../cli/src/connections.c:207
+#: ../cli/src/connections.c:208
msgid "Connection details"
msgstr "ਕੁਨੈਕਸ਼ਨ ਵੇਰਵਾ"
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
msgid "system"
msgstr "ਸਿਸਟਮ"
-#: ../cli/src/connections.c:381 ../cli/src/connections.c:601
+#: ../cli/src/connections.c:382 ../cli/src/connections.c:602
msgid "user"
msgstr "ਯੂਜ਼ਰ"
-#: ../cli/src/connections.c:383
+#: ../cli/src/connections.c:384
msgid "never"
msgstr "ਕਦੇ ਨਹੀਂ"
#. "CAPABILITIES"
#. Print header
#. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
#: ../cli/src/settings.c:551 ../cli/src/settings.c:652
#: ../cli/src/settings.c:926 ../cli/src/settings.c:927
#: ../cli/src/settings.c:929 ../cli/src/settings.c:931
@@ -161,11 +161,11 @@ msgstr "ਕਦੇ ਨਹੀਂ"
msgid "yes"
msgstr "ਹਾਂ"
-#: ../cli/src/connections.c:384 ../cli/src/connections.c:385
-#: ../cli/src/connections.c:602 ../cli/src/connections.c:605
-#: ../cli/src/devices.c:388 ../cli/src/devices.c:513 ../cli/src/devices.c:539
-#: ../cli/src/devices.c:540 ../cli/src/devices.c:541 ../cli/src/devices.c:542
-#: ../cli/src/devices.c:543 ../cli/src/settings.c:508
+#: ../cli/src/connections.c:385 ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603 ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432 ../cli/src/devices.c:557 ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584 ../cli/src/devices.c:585 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587 ../cli/src/settings.c:508
#: ../cli/src/settings.c:510 ../cli/src/settings.c:551
#: ../cli/src/settings.c:652 ../cli/src/settings.c:926
#: ../cli/src/settings.c:927 ../cli/src/settings.c:929
@@ -181,445 +181,455 @@ msgstr "ਹਾਂ"
msgid "no"
msgstr "ਨਹੀਂ"
-#: ../cli/src/connections.c:457 ../cli/src/connections.c:500
+#: ../cli/src/connections.c:458 ../cli/src/connections.c:501
msgid "System connections"
msgstr "ਸਿਸਟਮ ਕੁਨੈਕਸ਼ਨ"
-#: ../cli/src/connections.c:462 ../cli/src/connections.c:513
+#: ../cli/src/connections.c:463 ../cli/src/connections.c:514
msgid "User connections"
msgstr "ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨ"
-#: ../cli/src/connections.c:474 ../cli/src/connections.c:1334
-#: ../cli/src/connections.c:1350 ../cli/src/connections.c:1359
-#: ../cli/src/connections.c:1370 ../cli/src/connections.c:1452
-#: ../cli/src/devices.c:864 ../cli/src/devices.c:874 ../cli/src/devices.c:973
-#: ../cli/src/devices.c:980
+#: ../cli/src/connections.c:475 ../cli/src/connections.c:1335
+#: ../cli/src/connections.c:1351 ../cli/src/connections.c:1360
+#: ../cli/src/connections.c:1371 ../cli/src/connections.c:1456
+#: ../cli/src/devices.c:962 ../cli/src/devices.c:972 ../cli/src/devices.c:1074
+#: ../cli/src/devices.c:1081
#, c-format
msgid "Error: %s argument is missing."
msgstr "ਗਲਤੀ: %s ਆਰਗੂਮੈਂਟ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
-#: ../cli/src/connections.c:487
+#: ../cli/src/connections.c:488
#, c-format
msgid "Error: %s - no such connection."
msgstr "ਗਲਤੀ: %s - ਇੰਝ ਦਾ ਕੋਈ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ"
-#: ../cli/src/connections.c:519 ../cli/src/connections.c:1383
-#: ../cli/src/connections.c:1470 ../cli/src/devices.c:687
-#: ../cli/src/devices.c:754 ../cli/src/devices.c:888 ../cli/src/devices.c:986
+#: ../cli/src/connections.c:520 ../cli/src/connections.c:1384
+#: ../cli/src/connections.c:1474 ../cli/src/devices.c:785
+#: ../cli/src/devices.c:852 ../cli/src/devices.c:986 ../cli/src/devices.c:1087
#, c-format
msgid "Unknown parameter: %s\n"
msgstr "ਅਣਜਾਣ ਪੈਰਾਮੀਟਰ: %s\n"
-#: ../cli/src/connections.c:528
+#: ../cli/src/connections.c:529
#, c-format
msgid "Error: no valid parameter specified."
msgstr "ਗਲਤੀ: ਕੋਈ ਢੁੱਕਵਾਂ ਪੈਰਾਮੀਟਰ ਨਹੀਂ ਦਿੱਤਾ।"
-#: ../cli/src/connections.c:543 ../cli/src/connections.c:1572
-#: ../cli/src/devices.c:1192 ../cli/src/network-manager.c:274
+#: ../cli/src/connections.c:544 ../cli/src/connections.c:1577
+#: ../cli/src/devices.c:1293 ../cli/src/network-manager.c:359
#, c-format
msgid "Error: %s."
msgstr "ਗਲਤੀ: %s"
-#: ../cli/src/connections.c:649
+#: ../cli/src/connections.c:650
#, c-format
msgid "Error: 'con status': %s"
msgstr "ਗਲਤੀ: 'con status': %s"
-#: ../cli/src/connections.c:651
+#: ../cli/src/connections.c:652
#, c-format
msgid "Error: 'con status': %s; allowed fields: %s"
msgstr "ਗਲਤੀ: 'con status': %s; allowed fields: %s"
-#: ../cli/src/connections.c:658
+#: ../cli/src/connections.c:659
msgid "Active connections"
msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ"
-#: ../cli/src/connections.c:1026
+#: ../cli/src/connections.c:1027
#, c-format
msgid "no active connection on device '%s'"
msgstr "ਜੰਤਰ '%s' ਉੱਤੇ ਕੋਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ"
-#: ../cli/src/connections.c:1034
+#: ../cli/src/connections.c:1035
#, c-format
msgid "no active connection or device"
msgstr "ਕੋਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਜਾਂ ਜੰਤਰ ਨਹੀਂ ਹੈ"
-#: ../cli/src/connections.c:1084
+#: ../cli/src/connections.c:1085
#, c-format
msgid "device '%s' not compatible with connection '%s'"
msgstr "ਜੰਤਰ '%s' ਕੁਨੈਕਸ਼ਨ '%s' ਨਾਲ ਅਨੁਕੂਲ ਨਹੀਂ ਹੈ"
-#: ../cli/src/connections.c:1086
+#: ../cli/src/connections.c:1087
#, c-format
msgid "no device found for connection '%s'"
msgstr "ਕੁਨੈਕਸ਼ਨ '%s' ਲਈ ਕੋਈ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ"
-#: ../cli/src/connections.c:1097
+#: ../cli/src/connections.c:1098
msgid "activating"
msgstr "ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../cli/src/connections.c:1099
+#: ../cli/src/connections.c:1100
msgid "activated"
msgstr "ਚਾਲੂ ਕੀਤਾ"
-#: ../cli/src/connections.c:1102 ../cli/src/connections.c:1125
-#: ../cli/src/connections.c:1158 ../cli/src/devices.c:224
-#: ../cli/src/devices.c:514 ../cli/src/network-manager.c:92
-#: ../cli/src/network-manager.c:145 ../cli/src/settings.c:473
+#: ../cli/src/connections.c:1103 ../cli/src/connections.c:1126
+#: ../cli/src/connections.c:1159 ../cli/src/devices.c:246
+#: ../cli/src/devices.c:558 ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:149 ../cli/src/settings.c:473
msgid "unknown"
msgstr "ਅਣਜਾਣ"
-#: ../cli/src/connections.c:1111
+#: ../cli/src/connections.c:1112
msgid "VPN connecting (prepare)"
msgstr "VPN ਕੁਨੈਕਸ਼ਨ (ਤਿਆਰੀ)"
-#: ../cli/src/connections.c:1113
+#: ../cli/src/connections.c:1114
msgid "VPN connecting (need authentication)"
msgstr "VPN ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ)"
-#: ../cli/src/connections.c:1115
+#: ../cli/src/connections.c:1116
msgid "VPN connecting"
msgstr "VPN ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../cli/src/connections.c:1117
+#: ../cli/src/connections.c:1118
msgid "VPN connecting (getting IP configuration)"
msgstr "VPN ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (IP ਸੰਰਚਨਾ ਲਈ ਜਾ ਰਹੀ ਹੈ)"
-#: ../cli/src/connections.c:1119
+#: ../cli/src/connections.c:1120
msgid "VPN connected"
msgstr "VPN ਕੁਨੈਕਟ ਹੈ"
-#: ../cli/src/connections.c:1121
+#: ../cli/src/connections.c:1122
msgid "VPN connection failed"
msgstr "VPN ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੋਇਆ"
-#: ../cli/src/connections.c:1123
+#: ../cli/src/connections.c:1124
msgid "VPN disconnected"
msgstr "VPN ਡਿਸ-ਕੁਨੈਕਟ"
-#: ../cli/src/connections.c:1134
+#: ../cli/src/connections.c:1135
msgid "unknown reason"
msgstr "ਅਣਜਾਣ ਕਾਰਨ"
-#: ../cli/src/connections.c:1136
+#: ../cli/src/connections.c:1137
msgid "none"
msgstr "ਕੋਈ ਨਹੀਂ"
-#: ../cli/src/connections.c:1138
+#: ../cli/src/connections.c:1139
msgid "the user was disconnected"
msgstr "ਯੂਜ਼ਰ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ"
-#: ../cli/src/connections.c:1140
+#: ../cli/src/connections.c:1141
msgid "the base network connection was interrupted"
msgstr "ਬੇਸ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ 'ਚ ਰੁਕਾਵਟ"
-#: ../cli/src/connections.c:1142
+#: ../cli/src/connections.c:1143
msgid "the VPN service stopped unexpectedly"
msgstr "VPN ਸਰਵਿਸ ਅਚਾਨਕ ਰੁਕ ਗਈ"
-#: ../cli/src/connections.c:1144
+#: ../cli/src/connections.c:1145
msgid "the VPN service returned invalid configuration"
msgstr "VPN ਸਰਵਿਸ ਨੇ ਅਢੁੱਕਵੀਂ ਸੰਰਚਨਾ ਵਾਪਸ ਕੀਤੀ"
-#: ../cli/src/connections.c:1146
+#: ../cli/src/connections.c:1147
msgid "the connection attempt timed out"
msgstr "ਕੁਨੈਕਸ਼ਨ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਸਮਾਂ ਸਮਾਪਤ ਹੋ ਗਿਆ"
-#: ../cli/src/connections.c:1148
+#: ../cli/src/connections.c:1149
msgid "the VPN service did not start in time"
msgstr "VPN ਸਰਵਿਸ ਸਮੇਂ 'ਚ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਈ"
-#: ../cli/src/connections.c:1150
+#: ../cli/src/connections.c:1151
msgid "the VPN service failed to start"
msgstr "VPN ਸਰਵਿਸ ਸ਼ੁਰੂ ਹੋਣ ਲਈ ਫੇਲ੍ਹ ਹੋਈ"
-#: ../cli/src/connections.c:1152
+#: ../cli/src/connections.c:1153
msgid "no valid VPN secrets"
msgstr "ਕੋਈ ਢੁੱਕਵਾਂ VPN ਭੇਦ ਨਹੀਂ"
-#: ../cli/src/connections.c:1154
+#: ../cli/src/connections.c:1155
msgid "invalid VPN secrets"
msgstr "ਅਢੁੱਕਵਾਂ VPN ਭੇਦ"
-#: ../cli/src/connections.c:1156
+#: ../cli/src/connections.c:1157
msgid "the connection was removed"
msgstr "ਕੁਨੈਕਸ਼ਨ ਹਟਾਇਆ ਗਿਆ"
-#: ../cli/src/connections.c:1170
+#: ../cli/src/connections.c:1171
#, c-format
msgid "state: %s\n"
msgstr "ਹਾਲਤ: %s\n"
-#: ../cli/src/connections.c:1173 ../cli/src/connections.c:1199
+#: ../cli/src/connections.c:1174 ../cli/src/connections.c:1200
#, c-format
msgid "Connection activated\n"
msgstr "ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕੀਤਾ\n"
-#: ../cli/src/connections.c:1176
+#: ../cli/src/connections.c:1177
#, c-format
msgid "Error: Connection activation failed."
msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-#: ../cli/src/connections.c:1195
+#: ../cli/src/connections.c:1196
#, c-format
msgid "state: %s (%d)\n"
msgstr "ਹਾਲਤ: %s (%d)\n"
-#: ../cli/src/connections.c:1205
+#: ../cli/src/connections.c:1206
#, c-format
msgid "Error: Connection activation failed: %s."
msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s।"
-#: ../cli/src/connections.c:1222 ../cli/src/devices.c:811
+#: ../cli/src/connections.c:1223 ../cli/src/devices.c:909
#, c-format
msgid "Error: Timeout %d sec expired."
msgstr "ਗਲਤੀ: ਸਮਾਂ-ਸਮਾਪਤੀ %d ਸਕਿੰਟ ਖਤਮ ਹੋਏ।"
-#: ../cli/src/connections.c:1265
+#: ../cli/src/connections.c:1266
#, c-format
msgid "Error: Connection activation failed: %s"
msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰਨ ਲਈ ਫੇਲ੍ਹ: %s"
-#: ../cli/src/connections.c:1279
+#: ../cli/src/connections.c:1280
#, c-format
msgid "Error: Obtaining active connection for '%s' failed."
msgstr "ਗਲਤੀ: '%s' ਲਈ ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-#: ../cli/src/connections.c:1288
+#: ../cli/src/connections.c:1289
#, c-format
msgid "Active connection state: %s\n"
msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਹਾਲਤ: %s\n"
-#: ../cli/src/connections.c:1289
+#: ../cli/src/connections.c:1290
#, c-format
msgid "Active connection path: %s\n"
msgstr "ਚਾਲੂ ਕੁਨੈਕਸ਼ਨ ਪਾਥ: %s\n"
-#: ../cli/src/connections.c:1343 ../cli/src/connections.c:1461
+#: ../cli/src/connections.c:1344 ../cli/src/connections.c:1465
#, c-format
msgid "Error: Unknown connection: %s."
msgstr "ਗਲਤੀ: ਅਣਜਾਣ ਕੁਨੈਕਸ਼ਨ: %s।"
-#: ../cli/src/connections.c:1378 ../cli/src/devices.c:882
+#: ../cli/src/connections.c:1379 ../cli/src/devices.c:980
#, c-format
msgid "Error: timeout value '%s' is not valid."
msgstr "ਗਲਤੀ: ਸਮਾਂ-ਸਮਾਪਤੀ ਮੁੱਲ '%s' ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ।"
-#: ../cli/src/connections.c:1391 ../cli/src/connections.c:1478
+#: ../cli/src/connections.c:1392 ../cli/src/connections.c:1482
#, c-format
msgid "Error: id or uuid has to be specified."
msgstr "ਗਲਤੀ: id ਜਾਂ uuid ਨਹੀਂ ਦਿੱਤਾ।"
-#: ../cli/src/connections.c:1411
+#: ../cli/src/connections.c:1412
#, c-format
msgid "Error: No suitable device found: %s."
msgstr "ਗਲਤੀ: ਕੋਈ ਢੁੱਕਵਾਂ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ: %s।"
-#: ../cli/src/connections.c:1413
+#: ../cli/src/connections.c:1414
#, c-format
msgid "Error: No suitable device found."
msgstr "ਗਲਤੀ: ਕੋਈ ਢੁੱਕਵਾਂ ਜੰਤਰ ਨਹੀਂ ਮਿਲਿਆ।"
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1509
#, c-format
msgid "Warning: Connection not active\n"
msgstr "ਚੇਤਾਵਨੀ: ਕੁਨੈਕਸ਼ਨ ਚਾਲੂ ਨਹੀਂ ਹੈ\n"
-#: ../cli/src/connections.c:1561
+#: ../cli/src/connections.c:1566
#, c-format
msgid "Error: 'con' command '%s' is not valid."
msgstr "ਗਲਤੀ: 'con' ਕਮਾਂਡ '%s' ਢੁੱਕਵਾਂ ਨਹੀਂ।"
-#: ../cli/src/connections.c:1597
+#: ../cli/src/connections.c:1602
#, c-format
msgid "Error: could not connect to D-Bus."
msgstr "ਗਲਤੀ: ਡੀ-ਬੱਸ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
-#: ../cli/src/connections.c:1604
+#: ../cli/src/connections.c:1609
#, c-format
msgid "Error: Could not get system settings."
msgstr "ਗਲਤੀ: ਸਿਸਟਮ ਸੈਟਿੰਗ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ।"
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:1617
#, c-format
msgid "Error: Could not get user settings."
msgstr "ਗਲਤੀ: ਯੂਜ਼ਰ ਸੈਟਿੰਗ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ।"
-#: ../cli/src/connections.c:1622
+#: ../cli/src/connections.c:1627
#, c-format
msgid "Error: Can't obtain connections: settings services are not running."
msgstr "ਗਲਤੀ: ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਲਿਆ ਜਾ ਸਕਦਾ: ਸਿਸਟਮ ਸਰਵਿਸ ਨਹੀਂ ਚੱਲ ਰਹੀ ਹੈ।"
#. 0
#. 9
-#: ../cli/src/devices.c:60 ../cli/src/devices.c:86 ../cli/src/devices.c:162
+#: ../cli/src/devices.c:61 ../cli/src/devices.c:89 ../cli/src/devices.c:184
msgid "DEVICE"
msgstr "ਜੰਤਰ"
#. 1
#. 4
#. 0
-#: ../cli/src/devices.c:62 ../cli/src/devices.c:90
+#: ../cli/src/devices.c:63 ../cli/src/devices.c:93
#: ../cli/src/network-manager.c:36
msgid "STATE"
msgstr "ਹਾਲਤ"
-#: ../cli/src/devices.c:71
+#: ../cli/src/devices.c:72
msgid "GENERAL"
msgstr "ਆਮ"
#. 0
-#: ../cli/src/devices.c:72
+#: ../cli/src/devices.c:73
msgid "CAPABILITIES"
msgstr "ਸਮਰੱਥਾ"
#. 1
-#: ../cli/src/devices.c:73
+#: ../cli/src/devices.c:74
msgid "WIFI-PROPERTIES"
msgstr "ਵਾਈਫਾਈ-ਵਿਸ਼ੇਸ਼ਤਾ"
#. 2
-#: ../cli/src/devices.c:74
+#: ../cli/src/devices.c:75
msgid "AP"
msgstr "AP"
#. 3
-#: ../cli/src/devices.c:75
+#: ../cli/src/devices.c:76
msgid "WIRED-PROPERTIES"
msgstr "ਤਾਰ-ਵਿਸ਼ੇਸ਼ਤਾ"
#. 4
-#: ../cli/src/devices.c:76
+#: ../cli/src/devices.c:77
msgid "IP4-SETTINGS"
msgstr "IP4-ਸੈਟਿੰਗ"
#. 5
-#: ../cli/src/devices.c:77
+#: ../cli/src/devices.c:78
msgid "IP4-DNS"
msgstr "IP4-DNS"
+#. 6
+#: ../cli/src/devices.c:79
+msgid "IP6-SETTINGS"
+msgstr "IP6-ਸੈਟਿੰਗ"
+
+#. 7
+#: ../cli/src/devices.c:80
+msgid "IP6-DNS"
+msgstr "IP6-DNS"
+
#. 2
-#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:91
msgid "DRIVER"
msgstr "ਡਰਾਇਵਰ"
#. 3
-#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:92
msgid "HWADDR"
msgstr "HWADDR"
#. 0
-#: ../cli/src/devices.c:99
+#: ../cli/src/devices.c:102
msgid "CARRIER-DETECT"
msgstr "ਕੈਰੀਅਰ-ਖੋਜ"
#. 1
-#: ../cli/src/devices.c:100
+#: ../cli/src/devices.c:103
msgid "SPEED"
msgstr "ਸਪੀਡ"
#. 0
-#: ../cli/src/devices.c:109
+#: ../cli/src/devices.c:112
msgid "CARRIER"
msgstr "ਕੈਰੀਅਰ"
#. 0
-#: ../cli/src/devices.c:119
+#: ../cli/src/devices.c:122
msgid "WEP"
msgstr "WEP"
#. 1
-#: ../cli/src/devices.c:120
+#: ../cli/src/devices.c:123
msgid "WPA"
msgstr "WPA"
#. 2
-#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:124
msgid "WPA2"
msgstr "WPA2"
#. 3
-#: ../cli/src/devices.c:122
+#: ../cli/src/devices.c:125
msgid "TKIP"
msgstr "TKIP"
#. 4
-#: ../cli/src/devices.c:123
+#: ../cli/src/devices.c:126
msgid "CCMP"
msgstr "CCMP"
#. 0
-#: ../cli/src/devices.c:132
+#: ../cli/src/devices.c:135 ../cli/src/devices.c:146
msgid "ADDRESS"
msgstr "ਐਡਰੈੱਸ"
#. 1
-#: ../cli/src/devices.c:133
+#: ../cli/src/devices.c:136 ../cli/src/devices.c:147
msgid "PREFIX"
msgstr "ਪ੍ਰੀ-ਫਿਕਸ"
#. 2
-#: ../cli/src/devices.c:134
+#: ../cli/src/devices.c:137 ../cli/src/devices.c:148
msgid "GATEWAY"
msgstr "ਗੇਟਵੇ"
#. 0
-#: ../cli/src/devices.c:143
+#: ../cli/src/devices.c:157 ../cli/src/devices.c:166
msgid "DNS"
msgstr "DNS"
#. 0
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:175
msgid "SSID"
msgstr "SSID"
#. 1
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:176
msgid "BSSID"
msgstr "BSSID"
#. 2
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:177
msgid "MODE"
msgstr "ਮੋਡ"
#. 3
-#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:178
msgid "FREQ"
msgstr "ਫਰੀਕਿਊਂਸੀ"
#. 4
-#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:179
msgid "RATE"
msgstr "ਰੇਟ"
#. 5
-#: ../cli/src/devices.c:158
+#: ../cli/src/devices.c:180
msgid "SIGNAL"
msgstr "ਸਿਗਨਲ"
#. 6
-#: ../cli/src/devices.c:159
+#: ../cli/src/devices.c:181
msgid "SECURITY"
msgstr "ਸੁਰੱਖਿਆ"
#. 7
-#: ../cli/src/devices.c:160
+#: ../cli/src/devices.c:182
msgid "WPA-FLAGS"
msgstr "WPA-FLAGS"
#. 8
-#: ../cli/src/devices.c:161
+#: ../cli/src/devices.c:183
msgid "RSN-FLAGS"
msgstr "RSN-FLAGS"
#. 10
-#: ../cli/src/devices.c:163
+#: ../cli/src/devices.c:185
msgid "ACTIVE"
msgstr "ਚਾਲੂ"
-#: ../cli/src/devices.c:186
+#: ../cli/src/devices.c:208
#, c-format
msgid ""
"Usage: nmcli dev { COMMAND | help }\n"
@@ -642,204 +652,205 @@ msgstr ""
" wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
"\n"
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:228
msgid "unmanaged"
msgstr "ਬਿਨ-ਪਰਬੰਧ"
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:230
msgid "unavailable"
msgstr "ਨਾ-ਉਪਲੱਬਧ"
-#: ../cli/src/devices.c:210 ../cli/src/network-manager.c:89
+#: ../cli/src/devices.c:232 ../cli/src/network-manager.c:91
msgid "disconnected"
msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਕੀਤਾ"
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:234
msgid "connecting (prepare)"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਤਿਆਰੀ)"
-#: ../cli/src/devices.c:214
+#: ../cli/src/devices.c:236
msgid "connecting (configuring)"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਸੰਰਚਨਾ ਜਾਰੀ)"
-#: ../cli/src/devices.c:216
+#: ../cli/src/devices.c:238
msgid "connecting (need authentication)"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ)"
-#: ../cli/src/devices.c:218
+#: ../cli/src/devices.c:240
msgid "connecting (getting IP configuration)"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ (IP ਸੰਰਚਨਾ ਲਈ ਜਾ ਰਹੀ ਹੈ)"
-#: ../cli/src/devices.c:220 ../cli/src/network-manager.c:87
+#: ../cli/src/devices.c:242 ../cli/src/network-manager.c:89
msgid "connected"
msgstr "ਕੁਨੈਕਟ ਹੋਇਆ"
-#: ../cli/src/devices.c:222
+#: ../cli/src/devices.c:244
msgid "connection failed"
msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
-#: ../cli/src/devices.c:245 ../cli/src/devices.c:380
+#: ../cli/src/devices.c:267 ../cli/src/devices.c:424
msgid "Unknown"
msgstr "ਅਣਜਾਣ"
-#: ../cli/src/devices.c:277
+#: ../cli/src/devices.c:299
msgid "(none)"
msgstr "(ਕੋਈ ਨਹੀਂ)"
-#: ../cli/src/devices.c:302
+#: ../cli/src/devices.c:324
#, c-format
msgid "%s: error converting IP4 address 0x%X"
msgstr "%s: IP4 ਐਡਰੈੱਸ 0x%X ਬਦਲਣ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../cli/src/devices.c:349
+#: ../cli/src/devices.c:393
#, c-format
msgid "%u MHz"
msgstr "%u MHz"
-#: ../cli/src/devices.c:350
+#: ../cli/src/devices.c:394
#, c-format
msgid "%u MB/s"
msgstr "%u MB/s"
-#: ../cli/src/devices.c:359
+#: ../cli/src/devices.c:403
msgid "Encrypted: "
msgstr "ਇੰਕ੍ਰਿਪਟ ਕੀਤਾ: "
-#: ../cli/src/devices.c:364
+#: ../cli/src/devices.c:408
msgid "WEP "
msgstr "WEP "
-#: ../cli/src/devices.c:366
+#: ../cli/src/devices.c:410
msgid "WPA "
msgstr "WPA "
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:412
msgid "WPA2 "
msgstr "WPA2 "
-#: ../cli/src/devices.c:371
+#: ../cli/src/devices.c:415
msgid "Enterprise "
msgstr "ਇੰਟਰਪ੍ਰਾਈਜ਼ "
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:424
msgid "Ad-Hoc"
msgstr "ਐਡ-ਹਾਕ"
-#: ../cli/src/devices.c:380
+#: ../cli/src/devices.c:424
msgid "Infrastructure"
msgstr "ਇੰਫਰਾਸਟੱਕਚਰ"
-#: ../cli/src/devices.c:442
+#: ../cli/src/devices.c:486
#, c-format
msgid "Error: 'dev list': %s"
msgstr "ਗਲਤੀ: 'dev list': %s"
-#: ../cli/src/devices.c:444
+#: ../cli/src/devices.c:488
#, c-format
msgid "Error: 'dev list': %s; allowed fields: %s"
msgstr "ਗਲਤੀ: 'dev list': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
-#: ../cli/src/devices.c:453
+#: ../cli/src/devices.c:497
msgid "Device details"
msgstr "ਜੰਤਰ ਵੇਰਵਾ"
-#: ../cli/src/devices.c:483 ../cli/src/devices.c:827
+#: ../cli/src/devices.c:527 ../cli/src/devices.c:925
msgid "(unknown)"
msgstr "(ਅਣਜਾਣ)"
-#: ../cli/src/devices.c:484
+#: ../cli/src/devices.c:528
msgid "unknown)"
msgstr "ਅਣਜਾਣ)"
-#: ../cli/src/devices.c:510
+#: ../cli/src/devices.c:554
#, c-format
msgid "%u Mb/s"
msgstr "%u Mb/s"
#. Print header
#. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:627
msgid "on"
msgstr "ਚਾਲੂ"
-#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:627
msgid "off"
msgstr "ਬੰਦ"
-#: ../cli/src/devices.c:710
+#: ../cli/src/devices.c:808
#, c-format
msgid "Error: 'dev status': %s"
msgstr "ਗਲਤੀ: 'dev status': %s"
-#: ../cli/src/devices.c:712
+#: ../cli/src/devices.c:810
#, c-format
msgid "Error: 'dev status': %s; allowed fields: %s"
msgstr "ਗਲਤੀ: 'dev status': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
-#: ../cli/src/devices.c:719
+#: ../cli/src/devices.c:817
msgid "Status of devices"
msgstr "ਜੰਤਰਾਂ ਦੀ ਹਾਲਤ"
-#: ../cli/src/devices.c:747
+#: ../cli/src/devices.c:845
#, c-format
msgid "Error: '%s' argument is missing."
msgstr "ਗਲਤੀ: '%s' ਆਰਗੂਮੈਂਟ ਗੁੰਮ ਹੈ।"
-#: ../cli/src/devices.c:776 ../cli/src/devices.c:915 ../cli/src/devices.c:1035
+#: ../cli/src/devices.c:874 ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1136
#, c-format
msgid "Error: Device '%s' not found."
msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' ਨਹੀਂ ਲੱਭਿਆ।"
-#: ../cli/src/devices.c:799
+#: ../cli/src/devices.c:897
#, c-format
msgid "Success: Device '%s' successfully disconnected."
msgstr "ਸਫ਼ਲ: ਜੰਤਰ '%s' ਠੀਕ ਤਰ੍ਹਾਂ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ।"
-#: ../cli/src/devices.c:824
+#: ../cli/src/devices.c:922
#, c-format
msgid "Error: Device '%s' (%s) disconnecting failed: %s"
msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' (%s) ਡਿਸ-ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ: %s"
-#: ../cli/src/devices.c:832
+#: ../cli/src/devices.c:930
#, c-format
msgid "Device state: %d (%s)\n"
msgstr "ਜੰਤਰ ਹਾਲਤ: %d (%s)\n"
-#: ../cli/src/devices.c:896
+#: ../cli/src/devices.c:994
#, c-format
msgid "Error: iface has to be specified."
msgstr "ਗਲਤੀ: iface ਦੇਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-#: ../cli/src/devices.c:1011
+#: ../cli/src/devices.c:1112
#, c-format
msgid "Error: 'dev wifi': %s"
msgstr "ਗਲਤੀ: 'dev wifi': %s"
-#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1114
#, c-format
msgid "Error: 'dev wifi': %s; allowed fields: %s"
msgstr "ਗਲਤੀ: 'dev wifi': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
-#: ../cli/src/devices.c:1020
+#: ../cli/src/devices.c:1121
msgid "WiFi scan list"
msgstr "ਵਾਈਫਾਈ ਸਕੈਨ ਲਿਸਟ"
-#: ../cli/src/devices.c:1055 ../cli/src/devices.c:1109
+#: ../cli/src/devices.c:1156 ../cli/src/devices.c:1210
#, c-format
msgid "Error: Access point with hwaddr '%s' not found."
msgstr "ਗਲਤੀ: hwaddr '%s' ਵਾਲਾ ਅਸੈੱਸ ਪੁਆਇੰਟ ਨਹੀਂ ਲੱਭਿਆ।"
-#: ../cli/src/devices.c:1072
+#: ../cli/src/devices.c:1173
#, c-format
msgid "Error: Device '%s' is not a WiFi device."
msgstr "ਗਲਤੀ: ਜੰਤਰ '%s' ਵਾਈ-ਫਾਈ ਜੰਤਰ ਨਹੀਂ ਹੈ।"
-#: ../cli/src/devices.c:1136
+#: ../cli/src/devices.c:1237
#, c-format
msgid "Error: 'dev wifi' command '%s' is not valid."
msgstr "ਗਲਤੀ: 'dev wifi' ਕਮਾਂਡ '%s' ਢੁੱਕਵੀਂ ਨਹੀਂ ਹੈ।"
-#: ../cli/src/devices.c:1183
+#: ../cli/src/devices.c:1284
#, c-format
msgid "Error: 'dev' command '%s' is not valid."
msgstr "ਗਲਤੀ: 'dev' ਕਮਾਂਡ '%s' ਢੁੱਕਵੀਂ ਨਹੀਂ ਹੈ।"
@@ -850,116 +861,176 @@ msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
#. 1
#: ../cli/src/network-manager.c:37
-msgid "WIFI-HARDWARE"
-msgstr "ਵਾਈਫਾਈ ਹਾਰਡਵੇਅਰ"
+msgid "NET-ENABLED"
+msgstr "NET-ENABLED"
#. 2
#: ../cli/src/network-manager.c:38
-msgid "WIFI"
-msgstr "ਵਾਈਫਾਈ"
+msgid "WIFI-HARDWARE"
+msgstr "ਵਾਈਫਾਈ ਹਾਰਡਵੇਅਰ"
#. 3
#: ../cli/src/network-manager.c:39
-msgid "WWAN-HARDWARE"
-msgstr "WWAN-ਹਾਰਡਵੇਅਰ"
+msgid "WIFI"
+msgstr "ਵਾਈਫਾਈ"
#. 4
#: ../cli/src/network-manager.c:40
+msgid "WWAN-HARDWARE"
+msgstr "WWAN-ਹਾਰਡਵੇਅਰ"
+
+#. 5
+#: ../cli/src/network-manager.c:41
msgid "WWAN"
msgstr "WWAN"
-#: ../cli/src/network-manager.c:62
-#, c-format
+#: ../cli/src/network-manager.c:64
+#, c-format
+#| msgid ""
+#| "Usage: nmcli nm { COMMAND | help }\n"
+#| "\n"
+#| " COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+#| "\n"
+#| " status\n"
+#| " sleep\n"
+#| " wakeup\n"
+#| " wifi [on|off]\n"
+#| " wwan [on|off]\n"
+#| "\n"
msgid ""
"Usage: nmcli nm { COMMAND | help }\n"
"\n"
-" COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+" COMMAND := { status | enable | sleep | wifi | wwan }\n"
"\n"
" status\n"
-" sleep\n"
-" wakeup\n"
+" enable [true|false]\n"
+" sleep [true|false]\n"
" wifi [on|off]\n"
" wwan [on|off]\n"
"\n"
msgstr ""
"ਵਰਤੋਂ: nmcli nm { COMMAND | help }\n"
"\n"
-" COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+" COMMAND := { status | enable | sleep | wifi | wwan }\n"
"\n"
" status\n"
-" sleep\n"
-" wakeup\n"
+" enable [true|false]\n"
+" sleep [true|false]\n"
" wifi [on|off]\n"
" wwan [on|off]\n"
"\n"
-#: ../cli/src/network-manager.c:83
+#: ../cli/src/network-manager.c:85
msgid "asleep"
msgstr "asleep"
-#: ../cli/src/network-manager.c:85
+#: ../cli/src/network-manager.c:87
msgid "connecting"
msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../cli/src/network-manager.c:125
+#: ../cli/src/network-manager.c:128
#, c-format
msgid "Error: 'nm status': %s"
msgstr "ਗਲਤੀ: 'nm status': %s"
-#: ../cli/src/network-manager.c:127
+#: ../cli/src/network-manager.c:130
#, c-format
msgid "Error: 'nm status': %s; allowed fields: %s"
msgstr "ਗਲਤੀ: 'nm status': %s; ਮਨਜ਼ੂਰ ਖੇਤਰ: %s"
-#: ../cli/src/network-manager.c:134
+#: ../cli/src/network-manager.c:137
msgid "NetworkManager status"
msgstr "ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਹਾਲਤ"
#. Print header
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
msgid "enabled"
msgstr "ਚਾਲੂ ਹੈ"
-#: ../cli/src/network-manager.c:140 ../cli/src/network-manager.c:141
-#: ../cli/src/network-manager.c:142 ../cli/src/network-manager.c:143
-#: ../cli/src/network-manager.c:211 ../cli/src/network-manager.c:243
+#: ../cli/src/network-manager.c:144 ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146 ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154 ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296 ../cli/src/network-manager.c:328
msgid "disabled"
msgstr "ਬੰਦ ਹੈ"
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:152
msgid "running"
msgstr "ਚੱਲ ਰਿਹਾ ਹੈ"
-#: ../cli/src/network-manager.c:148
+#: ../cli/src/network-manager.c:152
msgid "not running"
msgstr "ਨਹੀਂ ਚੱਲ ਰਿਹਾ ਹੈ"
-#: ../cli/src/network-manager.c:201 ../cli/src/network-manager.c:233
+#: ../cli/src/network-manager.c:175
+#, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "ਗਲਤੀ: ਡੀ-ਬੱਸ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+
+#: ../cli/src/network-manager.c:186
+#, c-format
+#| msgid "Error: could not connect to D-Bus."
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "ਗਲਤੀ: ਡੀ-ਬੱਸ ਆਬਜੈਕਟ ਪਰਾਕਸੀ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ।"
+
+#: ../cli/src/network-manager.c:192
+#, c-format
+#| msgid "Error: 'con list': %s"
+msgid "Error in sleep: %s"
+msgstr "ਸਲੀਪ 'ਚ ਗਲਤੀ: %s"
+
+#: ../cli/src/network-manager.c:237 ../cli/src/network-manager.c:286
+#: ../cli/src/network-manager.c:318
#, c-format
msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
msgstr "ਗਲਤੀ: '--fields' value '%s' is not valid here; allowed fields: %s"
-#: ../cli/src/network-manager.c:209
+#: ../cli/src/network-manager.c:245
+#| msgid "WiFi enabled"
+msgid "Networking enabled"
+msgstr "ਨੈਟਵਰਕਿੰਗ ਚਾਲੂ ਹੈ"
+
+#: ../cli/src/network-manager.c:256
+#, c-format
+#| msgid "Error: invalid 'wwan' parameter: '%s'."
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "ਗਲਤ: ਗਲਤ 'enable' ਪੈਰਾਮੀਟਰ: '%s'; 'true' ਜਾਂ 'false' ਵਰਤੋਂ।"
+
+#: ../cli/src/network-manager.c:265
+#, c-format
+#| msgid "Error: Could not connect to NetworkManager."
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "ਗਲਤੀ: ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਵਲੋਂ ਸਲੀਪ (sleep) ਹਾਲਤ ਐਕਸਪੋਰਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ।"
+
+#: ../cli/src/network-manager.c:273
+#, c-format
+#| msgid "Error: invalid 'wifi' parameter: '%s'."
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "ਗਲਤੀ: ਗਲਤ 'sleep' ਪੈਰਾਮੀਟਰ: '%s'; 'true' ਜਾਂ 'false' ਵਰਤੋਂ।"
+
+#: ../cli/src/network-manager.c:294
msgid "WiFi enabled"
msgstr "ਵਾਈਫਾਈ ਚਾਲੂ ਹੈ"
-#: ../cli/src/network-manager.c:220
+#: ../cli/src/network-manager.c:305
#, c-format
msgid "Error: invalid 'wifi' parameter: '%s'."
msgstr "ਗਲਤੀ: ਅਢੁੱਕਵਾਂ 'wifi' ਪੈਰਾਮੀਟਰ: '%s'."
-#: ../cli/src/network-manager.c:241
+#: ../cli/src/network-manager.c:326
msgid "WWAN enabled"
msgstr "WWAN ਚਾਲੂ ਹੈ"
-#: ../cli/src/network-manager.c:252
+#: ../cli/src/network-manager.c:337
#, c-format
msgid "Error: invalid 'wwan' parameter: '%s'."
msgstr "ਗਲਤੀ: ਅਢੁੱਕਵਾਂ 'wwan' ਪੈਰਾਮੀਟਰ: '%s'."
-#: ../cli/src/network-manager.c:263
+#: ../cli/src/network-manager.c:348
#, c-format
msgid "Error: 'nm' command '%s' is not valid."
msgstr "ਗਲਤੀ: 'nm' ਕਮਾਂਡ '%s' ਢੁੱਕਵੀਂ ਨਹੀਂ ਹੈ।"
@@ -1478,26 +1549,26 @@ msgstr "PKCS#12 ਫਾਇਲ ਜਾਂਚੀ ਨਹੀਂ ਜਾ ਸਕੀ: %d"
msgid "Could not generate random data."
msgstr "ਰਲਵਾਂ ਡਾਟਾ ਤਿਆਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"
-#: ../libnm-util/nm-utils.c:1925
+#: ../libnm-util/nm-utils.c:1975
#, c-format
msgid "Not enough memory to make encryption key."
msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ ਬਣਾਉਣ ਲਈ ਲੋੜੀਦੀ ਮੈਮੋਰੀ ਨਹੀਂ ਹੈ।"
-#: ../libnm-util/nm-utils.c:2035
+#: ../libnm-util/nm-utils.c:2085
msgid "Could not allocate memory for PEM file creation."
msgstr "PEM ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਮੈਮੋਰੀ ਜਾਰੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
-#: ../libnm-util/nm-utils.c:2047
+#: ../libnm-util/nm-utils.c:2097
#, c-format
msgid "Could not allocate memory for writing IV to PEM file."
msgstr "PEM ਫਾਇਲ ਵਾਸਤੇ IV ਲਿਖਣ ਲਈ ਮੈਮੋਰੀ ਦਿੱਤੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
-#: ../libnm-util/nm-utils.c:2059
+#: ../libnm-util/nm-utils.c:2109
#, c-format
msgid "Could not allocate memory for writing encrypted key to PEM file."
msgstr "PEM ਫਾਇਲ ਵਾਸਤੇ ਇੰਕ੍ਰਿਪਟ ਕੀਤੀ ਕੁੰਜੀ ਲਿਖਣ ਲਈ ਮੈਮੋਰੀ ਦਿੱਤੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
-#: ../libnm-util/nm-utils.c:2078
+#: ../libnm-util/nm-utils.c:2128
#, c-format
msgid "Could not allocate memory for PEM file data."
msgstr "PEM ਫਾਇਲ ਡਾਟੇ ਲਈ ਮੈਮੋਰੀ ਜਾਰੀ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
@@ -1559,16 +1630,14 @@ msgid ""
"Put NetworkManager to sleep or wake it up (should only be used by system "
"power management)"
msgstr ""
-"ਨੈੱਟਵਰਕਮੈਨਜੇਰ ਨੂੰ ਸਲੀਪ ਕਰੋ ਜਾਂ ਵੇਕ ਅੱਪ ਕਰੋ (ਕੇਵਲ ਸਿਸਟਮ ਪਾਵਰ ਮੈਨਜੇਮੈਂਟ ਰਾਹੀਂ ਵਰਤਿਆ "
-"ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ)"
+"ਨੈੱਟਵਰਕਮੈਨਜੇਰ ਨੂੰ ਸਲੀਪ ਕਰੋ ਜਾਂ ਵੇਕ ਅੱਪ ਕਰੋ (ਕੇਵਲ ਸਿਸਟਮ ਪਾਵਰ ਮੈਨਜੇਮੈਂਟ ਰਾਹੀਂ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ "
+"ਹੈ)"
#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
-#| msgid "System policy prevents modification of system settings"
msgid "System policy prevents control of network connections"
msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਕੰਟਰੋਲ ਕਰਨ ਤੋਂ ਸੋਧ ਤੋਂ ਰੋਕਦੀ ਹੈ"
#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
-#| msgid "System policy prevents sharing connections via an open WiFi network"
msgid "System policy prevents enabling or disabling WiFi devices"
msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਵਾਈ-ਫਾਈ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨੋਂ ਰੋਕਦੀ ਹੈ"
@@ -1577,7 +1646,6 @@ msgid "System policy prevents enabling or disabling mobile broadband devices"
msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਮੋਬਾਇਲ ਬਰਾਡਬੈਂਡ ਜੰਤਰ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
-#| msgid "System policy prevents modification of system settings"
msgid "System policy prevents enabling or disabling system networking"
msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਸਿਸਟਮ ਨੈੱਟਵਰਕਿੰਗ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
@@ -1586,7 +1654,6 @@ msgid "System policy prevents putting NetworkManager to sleep or waking it up"
msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਨੈੱਟਵਰਕਮੈਨੇਜਰ ਨੂੰ ਸਲੀਪ ਜਾਂ ਵੇਕਅੱਪ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ"
#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
-#| msgid "System policy prevents modification of system settings"
msgid "System policy prevents use of user-specific connections"
msgstr "ਸਿਸਟਮ ਪਾਲਸੀ ਖਾਸ-ਯੂਜ਼ਰ ਕੁਨੈਕਸ਼ਨ ਵਰਤੋਂ ਤੋਂ ਰੋਕਦੀ ਹੈ"
@@ -1630,21 +1697,21 @@ msgstr "netlink ਗਰੁੱਪ ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਅਸਮਰ
msgid "error updating link cache: %s"
msgstr "ਲਿੰਕ ਕੈਸ਼ ਅੱਪਡੇਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
-#: ../src/main.c:502
+#: ../src/main.c:499
#, c-format
msgid "Invalid option. Please use --help to see a list of valid options.\n"
msgstr "ਗਲਤ ਚੋਣ। ਢੁੱਕਵੀਆਂ ਚੋਣਾਂ ਵੇਖਣ ਲਈ --help ਵਰਤੋਂ ਜੀ।\n"
-#: ../src/main.c:568
+#: ../src/main.c:570
#, c-format
msgid "%s. Please use --help to see a list of valid options.\n"
msgstr "%s। ਢੁੱਕਵੀਆਂ ਚੋਣਾਂ ਦੀ ਲਿਸਟ ਵੇਖਣ ਲਈ --help ਵਰਤੋਂ ਜੀ।\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:325
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:328
msgid "# Created by NetworkManager\n"
msgstr "#ਨੈੱਟਵਰਕ ਮੈਨੇਜਰ ਵਲੋਂ ਬਣਾਈ\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:341
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
#, c-format
msgid ""
"# Merged from %s\n"
@@ -1653,19 +1720,19 @@ msgstr ""
"#%s ਤੋਂ ਮਿਲਾਇਆ\n"
"\n"
-#: ../src/dhcp-manager/nm-dhcp-manager.c:279
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
msgid "no usable DHCP client could be found."
msgstr "ਕੋਈ ਵਰਤੋਂਯੋਗ DHCP ਕਲਾਇਟ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
-#: ../src/dhcp-manager/nm-dhcp-manager.c:288
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
msgid "'dhclient' could be found."
msgstr "'dhclient' ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
-#: ../src/dhcp-manager/nm-dhcp-manager.c:298
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
msgid "'dhcpcd' could be found."
msgstr "'dhcpcd' ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
-#: ../src/dhcp-manager/nm-dhcp-manager.c:306
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
#, c-format
msgid "unsupported DHCP client '%s'"
msgstr "ਗੈਰਸਹਾਇਕ DHCP ਕਲਾਇਟ '%s'"
@@ -1680,11 +1747,11 @@ msgstr "ਅਣਜਾਣ ਲਾਗ ਲੈਵਲ '%s'"
msgid "Unknown log domain '%s'"
msgstr "ਅਣਜਾਣ ਲਾਗ ਡੋਮੇਨ '%s'"
-#: ../src/dns-manager/nm-dns-manager.c:350
+#: ../src/dns-manager/nm-dns-manager.c:384
msgid "NOTE: the libc resolver may not support more than 3 nameservers."
msgstr "ਨੋਟ: libc ਰਿਜ਼ੋਲਵਰ ੩ ਤੋਂ ਵੱਧ ਨੇਮ-ਸਰਵਰ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"
-#: ../src/dns-manager/nm-dns-manager.c:352
+#: ../src/dns-manager/nm-dns-manager.c:386
msgid "The nameservers listed below may not be recognized."
msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ ਨਹੀਂ ਜਾ ਸਕਦੇ।"
@@ -1693,7 +1760,8 @@ msgstr "ਹੇਠਾਂ ਦਿੱਤੇ ਨੇਮ-ਸਰਵਰ ਪਛਾਣੇ
msgid "Auto %s"
msgstr "ਆਟੋ %s"
-#: ../system-settings/plugins/ifcfg-rh/reader.c:3275
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
+#: ../system-settings/plugins/ifnet/connection_parser.c:49
msgid "System"
msgstr "ਸਿਸਟਮ।"
diff --git a/po/sl.po b/po/sl.po
index 4f9809182c..cb37ee828a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,16 +1,18 @@
-# Slovenian translation of NetworkManager.
+# -*- mode:po; coding:utf-8; -*- Slovenian message catalogue for NetworkManager.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the NetworkManager package.
+#
# Matic Žgur <mr.zgur@gmail.com>, 2007.
-# Andrej Žnidaršič <andrej.znidarsic@gmail.com>, 2009.
+# Andrej Žnidaršič <andrej.znidarsic@gmail.com>, 2009 - 2010.
+# Matej Urbančič <matej.urban@gmail.com>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: NetworkManager\n"
+"Project-Id-Version: NetworkManager master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n"
-"POT-Creation-Date: 2009-09-29 03:25+0000\n"
-"PO-Revision-Date: 2009-12-17 07:10+0100\n"
-"Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n"
+"POT-Creation-Date: 2010-09-18 15:24+0000\n"
+"PO-Revision-Date: 2010-09-18 20:27+0100\n"
+"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +22,1306 @@ msgstr ""
"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: utf-8\n"
+#: ../cli/src/connections.c:60
+#: ../cli/src/connections.c:75
+#: ../cli/src/devices.c:88
+#: ../cli/src/devices.c:101
+#: ../cli/src/devices.c:111
+#: ../cli/src/devices.c:121
+#: ../cli/src/devices.c:134
+#: ../cli/src/devices.c:145
+#: ../cli/src/devices.c:156
+#: ../cli/src/devices.c:165
+#: ../cli/src/devices.c:174
+msgid "NAME"
+msgstr "IME"
+
+#. 0
+#: ../cli/src/connections.c:61
+#: ../cli/src/connections.c:76
+msgid "UUID"
+msgstr "UUID"
+
+#. 1
+#: ../cli/src/connections.c:62
+msgid "DEVICES"
+msgstr "NAPRAVE"
+
+#. 2
+#: ../cli/src/connections.c:63
+#: ../cli/src/connections.c:78
+msgid "SCOPE"
+msgstr "OBSEG"
+
+#. 3
+#: ../cli/src/connections.c:64
+msgid "DEFAULT"
+msgstr "PRIVZETO"
+
+#. 4
+#: ../cli/src/connections.c:65
+msgid "DBUS-SERVICE"
+msgstr "STORITEV-DBUS"
+
+#. 5
+#: ../cli/src/connections.c:66
+msgid "SPEC-OBJECT"
+msgstr "SPEC-PREDMET"
+
+#. 6
+#: ../cli/src/connections.c:67
+msgid "VPN"
+msgstr "VPN"
+
+#. 1
+#. 0
+#. 1
+#: ../cli/src/connections.c:77
+#: ../cli/src/devices.c:62
+#: ../cli/src/devices.c:90
+msgid "TYPE"
+msgstr "VRSTA"
+
+#. 3
+#: ../cli/src/connections.c:79
+msgid "TIMESTAMP"
+msgstr "ČASOVNI ŽIG"
+
+#. 4
+#: ../cli/src/connections.c:80
+msgid "TIMESTAMP-REAL"
+msgstr "REAL-ČASOVNI ŽIG"
+
+#. 5
+#: ../cli/src/connections.c:81
+msgid "AUTOCONNECT"
+msgstr "SAMODEJNO POVEŽI"
+
+#. 6
+#: ../cli/src/connections.c:82
+msgid "READONLY"
+msgstr "SAMO ZA BRANJE"
+
+#: ../cli/src/connections.c:158
+#, c-format
+msgid ""
+"Usage: nmcli con { COMMAND | help }\n"
+" COMMAND := { list | status | up | down }\n"
+"\n"
+" list [id <id> | uuid <id> | system | user]\n"
+" status\n"
+" up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout <timeout>]\n"
+" down id <id> | uuid <id>\n"
+msgstr ""
+"Uporaba: nmcli con { UKAZ | help }\n"
+" UKAZ := { list | status | up | down }\n"
+"\n"
+" list [id <id> | uuid <id> | system | user]\n"
+" status\n"
+" up id <id> | uuid <id> [iface <vmesnik>] [ap <strojni-naslov>] [--nowait] [--timeout <zakasnitev>]\n"
+" down id <id> | uuid <id>\n"
+
+#: ../cli/src/connections.c:198
+#: ../cli/src/connections.c:537
+#, c-format
+msgid "Error: 'con list': %s"
+msgstr "Napaka: 'con list': %s"
+
+#: ../cli/src/connections.c:200
+#: ../cli/src/connections.c:539
+#, c-format
+msgid "Error: 'con list': %s; allowed fields: %s"
+msgstr "Napaka: 'con list': %s; dovoljena so polja: %s"
+
+#: ../cli/src/connections.c:208
+msgid "Connection details"
+msgstr "Podatki o povezavi"
+
+#: ../cli/src/connections.c:382
+#: ../cli/src/connections.c:602
+msgid "system"
+msgstr "sistem"
+
+#: ../cli/src/connections.c:382
+#: ../cli/src/connections.c:602
+msgid "user"
+msgstr "uporabnik"
+
+#: ../cli/src/connections.c:384
+msgid "never"
+msgstr "nikoli"
+
+#. "CAPABILITIES"
+#. Print header
+#. "WIFI-PROPERTIES"
+#: ../cli/src/connections.c:385
+#: ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603
+#: ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432
+#: ../cli/src/devices.c:557
+#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584
+#: ../cli/src/devices.c:585
+#: ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587
+#: ../cli/src/settings.c:508
+#: ../cli/src/settings.c:551
+#: ../cli/src/settings.c:652
+#: ../cli/src/settings.c:926
+#: ../cli/src/settings.c:927
+#: ../cli/src/settings.c:929
+#: ../cli/src/settings.c:931
+#: ../cli/src/settings.c:1056
+#: ../cli/src/settings.c:1057
+#: ../cli/src/settings.c:1058
+#: ../cli/src/settings.c:1137
+#: ../cli/src/settings.c:1138
+#: ../cli/src/settings.c:1139
+#: ../cli/src/settings.c:1140
+#: ../cli/src/settings.c:1141
+#: ../cli/src/settings.c:1142
+#: ../cli/src/settings.c:1143
+#: ../cli/src/settings.c:1144
+#: ../cli/src/settings.c:1145
+#: ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1224
+msgid "yes"
+msgstr "da"
+
+#: ../cli/src/connections.c:385
+#: ../cli/src/connections.c:386
+#: ../cli/src/connections.c:603
+#: ../cli/src/connections.c:606
+#: ../cli/src/devices.c:432
+#: ../cli/src/devices.c:557
+#: ../cli/src/devices.c:583
+#: ../cli/src/devices.c:584
+#: ../cli/src/devices.c:585
+#: ../cli/src/devices.c:586
+#: ../cli/src/devices.c:587
+#: ../cli/src/settings.c:508
+#: ../cli/src/settings.c:510
+#: ../cli/src/settings.c:551
+#: ../cli/src/settings.c:652
+#: ../cli/src/settings.c:926
+#: ../cli/src/settings.c:927
+#: ../cli/src/settings.c:929
+#: ../cli/src/settings.c:931
+#: ../cli/src/settings.c:1056
+#: ../cli/src/settings.c:1057
+#: ../cli/src/settings.c:1058
+#: ../cli/src/settings.c:1137
+#: ../cli/src/settings.c:1138
+#: ../cli/src/settings.c:1139
+#: ../cli/src/settings.c:1140
+#: ../cli/src/settings.c:1141
+#: ../cli/src/settings.c:1142
+#: ../cli/src/settings.c:1143
+#: ../cli/src/settings.c:1144
+#: ../cli/src/settings.c:1145
+#: ../cli/src/settings.c:1146
+#: ../cli/src/settings.c:1147
+#: ../cli/src/settings.c:1148
+#: ../cli/src/settings.c:1149
+#: ../cli/src/settings.c:1224
+msgid "no"
+msgstr "ne"
+
+#: ../cli/src/connections.c:458
+#: ../cli/src/connections.c:501
+msgid "System connections"
+msgstr "Sistemske povezave"
+
+#: ../cli/src/connections.c:463
+#: ../cli/src/connections.c:514
+msgid "User connections"
+msgstr "Uporabniške povezave"
+
+#: ../cli/src/connections.c:475
+#: ../cli/src/connections.c:1335
+#: ../cli/src/connections.c:1351
+#: ../cli/src/connections.c:1360
+#: ../cli/src/connections.c:1371
+#: ../cli/src/connections.c:1456
+#: ../cli/src/devices.c:962
+#: ../cli/src/devices.c:972
+#: ../cli/src/devices.c:1074
+#: ../cli/src/devices.c:1081
+#, c-format
+msgid "Error: %s argument is missing."
+msgstr "Napaka: manjka argument %s."
+
+#: ../cli/src/connections.c:488
+#, c-format
+msgid "Error: %s - no such connection."
+msgstr "Napaka: %s - povezava ne obstaja."
+
+#: ../cli/src/connections.c:520
+#: ../cli/src/connections.c:1384
+#: ../cli/src/connections.c:1474
+#: ../cli/src/devices.c:785
+#: ../cli/src/devices.c:852
+#: ../cli/src/devices.c:986
+#: ../cli/src/devices.c:1087
+#, c-format
+msgid "Unknown parameter: %s\n"
+msgstr "Neznan parameter: %s\n"
+
+#: ../cli/src/connections.c:529
+#, c-format
+msgid "Error: no valid parameter specified."
+msgstr "Napaka: ni podanega veljavnega parametra."
+
+#: ../cli/src/connections.c:544
+#: ../cli/src/connections.c:1577
+#: ../cli/src/devices.c:1293
+#: ../cli/src/network-manager.c:359
+#, c-format
+msgid "Error: %s."
+msgstr "Napaka: %s."
+
+#: ../cli/src/connections.c:650
+#, c-format
+msgid "Error: 'con status': %s"
+msgstr "Napaka: 'con status': %s"
+
+#: ../cli/src/connections.c:652
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
+msgstr "Napaka: 'con status': %s; dovoljena polja: %s"
+
+#: ../cli/src/connections.c:659
+msgid "Active connections"
+msgstr "Dejavne povezave"
+
+#: ../cli/src/connections.c:1027
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "ni dejavnih povezav na napravi '%s'"
+
+#: ../cli/src/connections.c:1035
+#, c-format
+msgid "no active connection or device"
+msgstr "ni dejavne povezave ali naprave"
+
+#: ../cli/src/connections.c:1085
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
+msgstr "naprava '%s' ni združljiva s povezavo '%s'"
+
+#: ../cli/src/connections.c:1087
+#, c-format
+msgid "no device found for connection '%s'"
+msgstr "ni naprave za povezavo '%s'"
+
+#: ../cli/src/connections.c:1098
+msgid "activating"
+msgstr "začenjanje"
+
+#: ../cli/src/connections.c:1100
+msgid "activated"
+msgstr "začeto"
+
+#: ../cli/src/connections.c:1103
+#: ../cli/src/connections.c:1126
+#: ../cli/src/connections.c:1159
+#: ../cli/src/devices.c:246
+#: ../cli/src/devices.c:558
+#: ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:149
+#: ../cli/src/settings.c:473
+msgid "unknown"
+msgstr "neznano"
+
+#: ../cli/src/connections.c:1112
+msgid "VPN connecting (prepare)"
+msgstr "VPN povezovanje (priprava)"
+
+#: ../cli/src/connections.c:1114
+msgid "VPN connecting (need authentication)"
+msgstr "VPN povezovanje (zahtevana je overitev)"
+
+#: ../cli/src/connections.c:1116
+msgid "VPN connecting"
+msgstr "VPN povezovanje"
+
+#: ../cli/src/connections.c:1118
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN povezovanje (pridobivanje nastavitev IP)"
+
+#: ../cli/src/connections.c:1120
+msgid "VPN connected"
+msgstr "Povezan v VPN"
+
+#: ../cli/src/connections.c:1122
+msgid "VPN connection failed"
+msgstr "Povezava z VPN je spodletela"
+
+#: ../cli/src/connections.c:1124
+msgid "VPN disconnected"
+msgstr "Povezava z VPN je prekinjena"
+
+#: ../cli/src/connections.c:1135
+msgid "unknown reason"
+msgstr "neznan vzrok"
+
+#: ../cli/src/connections.c:1137
+msgid "none"
+msgstr "brez"
+
+#: ../cli/src/connections.c:1139
+msgid "the user was disconnected"
+msgstr "povezava z uporabnikom je prekinjena"
+
+#: ../cli/src/connections.c:1141
+msgid "the base network connection was interrupted"
+msgstr "osnovna omrežna povezava je bila prekinjena"
+
+#: ../cli/src/connections.c:1143
+msgid "the VPN service stopped unexpectedly"
+msgstr "storitev VPN je nepričakovano zaustavljena"
+
+#: ../cli/src/connections.c:1145
+msgid "the VPN service returned invalid configuration"
+msgstr "storitev VPN je vrnila neveljavne nastavitve"
+
+#: ../cli/src/connections.c:1147
+msgid "the connection attempt timed out"
+msgstr "poskus povezave je časovno potekel"
+
+#: ../cli/src/connections.c:1149
+msgid "the VPN service did not start in time"
+msgstr "storitev VPN se ni pravočasno začela"
+
+#: ../cli/src/connections.c:1151
+msgid "the VPN service failed to start"
+msgstr "storitev VPN ni uspešno začeta"
+
+#: ../cli/src/connections.c:1153
+msgid "no valid VPN secrets"
+msgstr "ni veljavnih VPN skrivnosti"
+
+#: ../cli/src/connections.c:1155
+msgid "invalid VPN secrets"
+msgstr "neveljavne VPN skrivnosti"
+
+#: ../cli/src/connections.c:1157
+msgid "the connection was removed"
+msgstr "povezava je odstranjena"
+
+#: ../cli/src/connections.c:1171
+#, c-format
+msgid "state: %s\n"
+msgstr "stanje: %s\n"
+
+#: ../cli/src/connections.c:1174
+#: ../cli/src/connections.c:1200
+#, c-format
+msgid "Connection activated\n"
+msgstr "Povezava je omogočena\n"
+
+#: ../cli/src/connections.c:1177
+#, c-format
+msgid "Error: Connection activation failed."
+msgstr "Napaka: začenjanje povezave ni uspelo."
+
+#: ../cli/src/connections.c:1196
+#, c-format
+msgid "state: %s (%d)\n"
+msgstr "stanje: %s (%d)\n"
+
+#: ../cli/src/connections.c:1206
+#, c-format
+msgid "Error: Connection activation failed: %s."
+msgstr "Napaka: začenjanje povezave ni uspelo: %s."
+
+#: ../cli/src/connections.c:1223
+#: ../cli/src/devices.c:909
+#, c-format
+msgid "Error: Timeout %d sec expired."
+msgstr "Napaka: časovna omejitev %d sekund je potekla."
+
+#: ../cli/src/connections.c:1266
+#, c-format
+msgid "Error: Connection activation failed: %s"
+msgstr "Napaka: začenjanje povezave ni uspelo: %s."
+
+#: ../cli/src/connections.c:1280
+#, c-format
+msgid "Error: Obtaining active connection for '%s' failed."
+msgstr "Napaka: pridobivanje dejavne povezave '%s' je spodletelo."
+
+#: ../cli/src/connections.c:1289
+#, c-format
+msgid "Active connection state: %s\n"
+msgstr "Stanje dejavne povezave: %s\n"
+
+#: ../cli/src/connections.c:1290
+#, c-format
+msgid "Active connection path: %s\n"
+msgstr "Pot dejavne povezave: %s\n"
+
+#: ../cli/src/connections.c:1344
+#: ../cli/src/connections.c:1465
+#, c-format
+msgid "Error: Unknown connection: %s."
+msgstr "Napaka: neznana povezava: %s."
+
+#: ../cli/src/connections.c:1379
+#: ../cli/src/devices.c:980
+#, c-format
+msgid "Error: timeout value '%s' is not valid."
+msgstr "Napaka: vrednost časovne omejitve '%s' ni veljavna."
+
+#: ../cli/src/connections.c:1392
+#: ../cli/src/connections.c:1482
+#, c-format
+msgid "Error: id or uuid has to be specified."
+msgstr "Napaka: podatek id ali uuid ni naveden."
+
+#: ../cli/src/connections.c:1412
+#, c-format
+msgid "Error: No suitable device found: %s."
+msgstr "Napaka: ni mogoče najti ustrezne naprave: %s."
+
+#: ../cli/src/connections.c:1414
+#, c-format
+msgid "Error: No suitable device found."
+msgstr "Napaka: ni mogoče najti ustrezne naprave."
+
+#: ../cli/src/connections.c:1509
+#, c-format
+msgid "Warning: Connection not active\n"
+msgstr "Opozorilo: povezava ni dejavna\n"
+
+#: ../cli/src/connections.c:1566
+#, c-format
+msgid "Error: 'con' command '%s' is not valid."
+msgstr "Napaka: ukaz 'con' '%s' ni veljaven."
+
+#: ../cli/src/connections.c:1602
+#, c-format
+msgid "Error: could not connect to D-Bus."
+msgstr "Napaka: povezava z D-Bus ni mogoča."
+
+#: ../cli/src/connections.c:1609
+#, c-format
+msgid "Error: Could not get system settings."
+msgstr "Napaka: ni mogoče pridobiti sistemskih nastavitev."
+
+#: ../cli/src/connections.c:1617
+#, c-format
+msgid "Error: Could not get user settings."
+msgstr "Napaka: ni mogoče pridobiti uporabniških nastavitev."
+
+#: ../cli/src/connections.c:1627
+#, c-format
+msgid "Error: Can't obtain connections: settings services are not running."
+msgstr "Napaka: ni mogoče pridobiti povezave: storitve nastavitev niso zagnane."
+
+#. 0
+#. 9
+#: ../cli/src/devices.c:61
+#: ../cli/src/devices.c:89
+#: ../cli/src/devices.c:184
+msgid "DEVICE"
+msgstr "NAPRAVA"
+
+#. 1
+#. 4
+#. 0
+#: ../cli/src/devices.c:63
+#: ../cli/src/devices.c:93
+#: ../cli/src/network-manager.c:36
+msgid "STATE"
+msgstr "STANJE"
+
+#: ../cli/src/devices.c:72
+msgid "GENERAL"
+msgstr "SPLOŠNO"
+
+#. 0
+#: ../cli/src/devices.c:73
+msgid "CAPABILITIES"
+msgstr "ZMOŽNOSTI"
+
+#. 1
+#: ../cli/src/devices.c:74
+msgid "WIFI-PROPERTIES"
+msgstr "WIFI-LASTNOSTI"
+
+#. 2
+#: ../cli/src/devices.c:75
+msgid "AP"
+msgstr "AP"
+
+#. 3
+#: ../cli/src/devices.c:76
+msgid "WIRED-PROPERTIES"
+msgstr "LASTNOSTI ŽIČNE POVEZAVE"
+
+#. 4
+#: ../cli/src/devices.c:77
+msgid "IP4-SETTINGS"
+msgstr "IP4-NASTAVITVE"
+
+#. 5
+#: ../cli/src/devices.c:78
+msgid "IP4-DNS"
+msgstr "IP4-DNS"
+
+#. 6
+#: ../cli/src/devices.c:79
+msgid "IP6-SETTINGS"
+msgstr "IP6-NASTAVITVE"
+
+#. 7
+#: ../cli/src/devices.c:80
+msgid "IP6-DNS"
+msgstr "IP6-DNS"
+
+#. 2
+#: ../cli/src/devices.c:91
+msgid "DRIVER"
+msgstr "GONILNIK"
+
+#. 3
+#: ../cli/src/devices.c:92
+msgid "HWADDR"
+msgstr "HWADDR"
+
+#. 0
+#: ../cli/src/devices.c:102
+msgid "CARRIER-DETECT"
+msgstr "ZAZNAVA-OPERATERJA"
+
+#. 1
+#: ../cli/src/devices.c:103
+msgid "SPEED"
+msgstr "HITROST"
+
+#. 0
+#: ../cli/src/devices.c:112
+msgid "CARRIER"
+msgstr "OPERATER"
+
+#. 0
+#: ../cli/src/devices.c:122
+msgid "WEP"
+msgstr "WEP"
+
+#. 1
+#: ../cli/src/devices.c:123
+msgid "WPA"
+msgstr "WPA"
+
+#. 2
+#: ../cli/src/devices.c:124
+msgid "WPA2"
+msgstr "WPA2"
+
+#. 3
+#: ../cli/src/devices.c:125
+msgid "TKIP"
+msgstr "TKIP"
+
+#. 4
+#: ../cli/src/devices.c:126
+msgid "CCMP"
+msgstr "CCMP"
+
+#. 0
+#: ../cli/src/devices.c:135
+#: ../cli/src/devices.c:146
+msgid "ADDRESS"
+msgstr "NASLOV"
+
+#. 1
+#: ../cli/src/devices.c:136
+#: ../cli/src/devices.c:147
+msgid "PREFIX"
+msgstr "PREDPONA"
+
+#. 2
+#: ../cli/src/devices.c:137
+#: ../cli/src/devices.c:148
+msgid "GATEWAY"
+msgstr "PREHOD"
+
+#. 0
+#: ../cli/src/devices.c:157
+#: ../cli/src/devices.c:166
+msgid "DNS"
+msgstr "DNS"
+
+#. 0
+#: ../cli/src/devices.c:175
+msgid "SSID"
+msgstr "SSID"
+
+#. 1
+#: ../cli/src/devices.c:176
+msgid "BSSID"
+msgstr "BSSID"
+
+#. 2
+#: ../cli/src/devices.c:177
+msgid "MODE"
+msgstr "NAČIN"
+
+#. 3
+#: ../cli/src/devices.c:178
+msgid "FREQ"
+msgstr "FREKVENCA"
+
+#. 4
+#: ../cli/src/devices.c:179
+msgid "RATE"
+msgstr "HITROST"
+
+#. 5
+#: ../cli/src/devices.c:180
+msgid "SIGNAL"
+msgstr "SIGNAL"
+
+#. 6
+#: ../cli/src/devices.c:181
+msgid "SECURITY"
+msgstr "VARNOST"
+
+#. 7
+#: ../cli/src/devices.c:182
+msgid "WPA-FLAGS"
+msgstr "WPA-ZASTAVICE"
+
+#. 8
+#: ../cli/src/devices.c:183
+msgid "RSN-FLAGS"
+msgstr "RSN-ZASTAVICE"
+
+#. 10
+#: ../cli/src/devices.c:185
+msgid "ACTIVE"
+msgstr "DEJAVNO"
+
+#: ../cli/src/devices.c:208
+#, c-format
+msgid ""
+"Usage: nmcli dev { COMMAND | help }\n"
+"\n"
+" COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+" status\n"
+" list [iface <iface>]\n"
+" disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+" wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"\n"
+msgstr ""
+"Uporaba: nmcli dev { UKAZ | help }\n"
+"\n"
+"UKAZ := { status | list | disconnect | wifi }\n"
+"\n"
+"status\n"
+"list [iface <iface>]\n"
+"disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+"wifi [list [iface <iface>] [hwaddr <hwaddr>]]\n"
+"\n"
+
+#: ../cli/src/devices.c:228
+msgid "unmanaged"
+msgstr "neupravljano"
+
+#: ../cli/src/devices.c:230
+msgid "unavailable"
+msgstr "ni razpoložljivo"
+
+#: ../cli/src/devices.c:232
+#: ../cli/src/network-manager.c:91
+msgid "disconnected"
+msgstr "povezava je prekinjena"
+
+#: ../cli/src/devices.c:234
+msgid "connecting (prepare)"
+msgstr "povezovanje (priprava)"
+
+#: ../cli/src/devices.c:236
+msgid "connecting (configuring)"
+msgstr "povezovanje (nastavljanje)"
+
+#: ../cli/src/devices.c:238
+msgid "connecting (need authentication)"
+msgstr "povezovanje (zahteva overitev)"
+
+#: ../cli/src/devices.c:240
+msgid "connecting (getting IP configuration)"
+msgstr "povezovanje (pridobivanje nastavitev IP)"
+
+#: ../cli/src/devices.c:242
+#: ../cli/src/network-manager.c:89
+msgid "connected"
+msgstr "povezano"
+
+#: ../cli/src/devices.c:244
+msgid "connection failed"
+msgstr "povezava je spodletela"
+
+#: ../cli/src/devices.c:267
+#: ../cli/src/devices.c:424
+msgid "Unknown"
+msgstr "Neznano"
+
+#: ../cli/src/devices.c:299
+msgid "(none)"
+msgstr "(brez)"
+
+#: ../cli/src/devices.c:324
+#, c-format
+msgid "%s: error converting IP4 address 0x%X"
+msgstr "%s: napaka med pretvarjanjem naslova IP4 0x%X"
+
+#: ../cli/src/devices.c:393
+#, c-format
+msgid "%u MHz"
+msgstr "%u MHz"
+
+#: ../cli/src/devices.c:394
+#, c-format
+msgid "%u MB/s"
+msgstr "%u MB/s"
+
+#: ../cli/src/devices.c:403
+msgid "Encrypted: "
+msgstr "Šifrirano: "
+
+#: ../cli/src/devices.c:408
+msgid "WEP "
+msgstr "WEP "
+
+#: ../cli/src/devices.c:410
+msgid "WPA "
+msgstr "WPA "
+
+#: ../cli/src/devices.c:412
+msgid "WPA2 "
+msgstr "WPA2 "
+
+#: ../cli/src/devices.c:415
+msgid "Enterprise "
+msgstr "Podjetniški "
+
+#: ../cli/src/devices.c:424
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+#: ../cli/src/devices.c:424
+msgid "Infrastructure"
+msgstr "infrastruktura"
+
+#: ../cli/src/devices.c:486
+#, c-format
+msgid "Error: 'dev list': %s"
+msgstr "Napaka: 'dev list': %s"
+
+#: ../cli/src/devices.c:488
+#, c-format
+msgid "Error: 'dev list': %s; allowed fields: %s"
+msgstr "Napaka: 'dev list': %s; dovoljena polja: %s"
+
+#: ../cli/src/devices.c:497
+msgid "Device details"
+msgstr "Podrobnosti naprave"
+
+#: ../cli/src/devices.c:527
+#: ../cli/src/devices.c:925
+msgid "(unknown)"
+msgstr "(neznano)"
+
+#: ../cli/src/devices.c:528
+msgid "unknown)"
+msgstr "neznano)"
+
+#: ../cli/src/devices.c:554
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#. Print header
+#. "WIRED-PROPERTIES"
+#: ../cli/src/devices.c:627
+msgid "on"
+msgstr "omogočeno"
+
+#: ../cli/src/devices.c:627
+msgid "off"
+msgstr "onemogočeno"
+
+#: ../cli/src/devices.c:808
+#, c-format
+msgid "Error: 'dev status': %s"
+msgstr "Napaka: 'dev status': %s"
+
+#: ../cli/src/devices.c:810
+#, c-format
+msgid "Error: 'dev status': %s; allowed fields: %s"
+msgstr "Napaka: 'dev status': %s; dovoljena polja: %s"
+
+#: ../cli/src/devices.c:817
+msgid "Status of devices"
+msgstr "Stanje naprav"
+
+#: ../cli/src/devices.c:845
+#, c-format
+msgid "Error: '%s' argument is missing."
+msgstr "Napaka: manjka argument '%s'"
+
+#: ../cli/src/devices.c:874
+#: ../cli/src/devices.c:1013
+#: ../cli/src/devices.c:1136
+#, c-format
+msgid "Error: Device '%s' not found."
+msgstr "Napaka: naprave '%s' ni mogoče najti"
+
+#: ../cli/src/devices.c:897
+#, c-format
+msgid "Success: Device '%s' successfully disconnected."
+msgstr "Obvestilo: povezava naprave '%s' je uspešno prekinjena."
+
+#: ../cli/src/devices.c:922
+#, c-format
+msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+msgstr "Napaka: prišlo je do napake med prekinjanjem naprave '%s' (%s): %s"
+
+#: ../cli/src/devices.c:930
+#, c-format
+msgid "Device state: %d (%s)\n"
+msgstr "Stanje naprave: %d (%s)\n"
+
+#: ../cli/src/devices.c:994
+#, c-format
+msgid "Error: iface has to be specified."
+msgstr "Napaka: iface nastavitev mora določena."
+
+#: ../cli/src/devices.c:1112
+#, c-format
+msgid "Error: 'dev wifi': %s"
+msgstr "Napaka: 'dev wifi': %s"
+
+#: ../cli/src/devices.c:1114
+#, c-format
+msgid "Error: 'dev wifi': %s; allowed fields: %s"
+msgstr "Napaka: 'dev wifi': %s; dovoljena polja: %s"
+
+#: ../cli/src/devices.c:1121
+msgid "WiFi scan list"
+msgstr "WiFi seznam preiskovanja"
+
+#: ../cli/src/devices.c:1156
+#: ../cli/src/devices.c:1210
+#, c-format
+msgid "Error: Access point with hwaddr '%s' not found."
+msgstr "Napaka: dostopne točke s strojnim naslovom '%s' ni mogoče najti."
+
+#: ../cli/src/devices.c:1173
+#, c-format
+msgid "Error: Device '%s' is not a WiFi device."
+msgstr "Napaka: naprava '%s' ni veljavna WiFi naprava."
+
+#: ../cli/src/devices.c:1237
+#, c-format
+msgid "Error: 'dev wifi' command '%s' is not valid."
+msgstr "Napaka: 'dev wifi' ukaz '%s' ni veljaven."
+
+#: ../cli/src/devices.c:1284
+#, c-format
+msgid "Error: 'dev' command '%s' is not valid."
+msgstr "Napaka: 'dev' ukaz '%s' ni veljaven."
+
+#: ../cli/src/network-manager.c:35
+msgid "RUNNING"
+msgstr "V TEKU"
+
+#. 1
+#: ../cli/src/network-manager.c:37
+msgid "NET-ENABLED"
+msgstr "NET-OMOGOČENO"
+
+#. 2
+#: ../cli/src/network-manager.c:38
+msgid "WIFI-HARDWARE"
+msgstr "WIFI-STROJNA OPREMA"
+
+#. 3
+#: ../cli/src/network-manager.c:39
+msgid "WIFI"
+msgstr "WIFI"
+
+#. 4
+#: ../cli/src/network-manager.c:40
+msgid "WWAN-HARDWARE"
+msgstr "WWAN-STROJNA OPREMA"
+
+#. 5
+#: ../cli/src/network-manager.c:41
+msgid "WWAN"
+msgstr "WWAN"
+
+#: ../cli/src/network-manager.c:64
+#, c-format
+msgid ""
+"Usage: nmcli nm { COMMAND | help }\n"
+"\n"
+" COMMAND := { status | enable | sleep | wifi | wwan }\n"
+"\n"
+" status\n"
+" enable [true|false]\n"
+" sleep [true|false]\n"
+" wifi [on|off]\n"
+" wwan [on|off]\n"
+"\n"
+msgstr ""
+"Uporaba: nmcli nm { UKAZ | help }\n"
+"\n"
+" UKAZ := { status | enable | sleep | wifi | wwan }\n"
+"\n"
+" status\n"
+" enable [true|false]\n"
+" sleep [true|false]\n"
+" wifi [on|off]\n"
+" wwan [on|off]\n"
+"\n"
+
+#: ../cli/src/network-manager.c:85
+msgid "asleep"
+msgstr "v mirovanju"
+
+#: ../cli/src/network-manager.c:87
+msgid "connecting"
+msgstr "povezovanje"
+
+#: ../cli/src/network-manager.c:128
+#, c-format
+msgid "Error: 'nm status': %s"
+msgstr "Napaka: 'nm status': %s"
+
+#: ../cli/src/network-manager.c:130
+#, c-format
+msgid "Error: 'nm status': %s; allowed fields: %s"
+msgstr "Napaka: 'nm status': %s; dovoljena polja: %s"
+
+#: ../cli/src/network-manager.c:137
+msgid "NetworkManager status"
+msgstr "Stanje NetworkManager"
+
+#. Print header
+#: ../cli/src/network-manager.c:144
+#: ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146
+#: ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154
+#: ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:328
+msgid "enabled"
+msgstr "omogočeno"
+
+#: ../cli/src/network-manager.c:144
+#: ../cli/src/network-manager.c:145
+#: ../cli/src/network-manager.c:146
+#: ../cli/src/network-manager.c:147
+#: ../cli/src/network-manager.c:154
+#: ../cli/src/network-manager.c:247
+#: ../cli/src/network-manager.c:296
+#: ../cli/src/network-manager.c:328
+msgid "disabled"
+msgstr "onemogočeno"
+
+#: ../cli/src/network-manager.c:152
+msgid "running"
+msgstr "v teku"
+
+#: ../cli/src/network-manager.c:152
+msgid "not running"
+msgstr "ni v teku"
+
+#: ../cli/src/network-manager.c:175
+#, c-format
+msgid "Error: Couldn't connect to system bus: %s"
+msgstr "Napaka: ni se mogoče povezati s sistemskim vodilom: %s"
+
+#: ../cli/src/network-manager.c:186
+#, c-format
+msgid "Error: Couldn't create D-Bus object proxy."
+msgstr "Napaka: ni mogoče ustvariti posredniškega predmeta vodila D-Bus."
+
+#: ../cli/src/network-manager.c:192
+#, c-format
+msgid "Error in sleep: %s"
+msgstr "Napaka v mirovanju: %s"
+
+#: ../cli/src/network-manager.c:237
+#: ../cli/src/network-manager.c:286
+#: ../cli/src/network-manager.c:318
+#, c-format
+msgid "Error: '--fields' value '%s' is not valid here; allowed fields: %s"
+msgstr "Napaka: vrednost '--fields' '%s' ni veljavna, dovoljena polja: %s"
+
+#: ../cli/src/network-manager.c:245
+msgid "Networking enabled"
+msgstr "Omrežje je omogočeno"
+
+#: ../cli/src/network-manager.c:256
+#, c-format
+msgid "Error: invalid 'enable' parameter: '%s'; use 'true' or 'false'."
+msgstr "Napaka: neveljaven parameter 'enable': '%s'; uporabite 'true' ali 'false'."
+
+#: ../cli/src/network-manager.c:265
+#, c-format
+msgid "Error: Sleeping status is not exported by NetworkManager."
+msgstr "Napaka: stanje v mirovanju ni izvoženo s programom NetworkManager."
+
+#: ../cli/src/network-manager.c:273
+#, c-format
+msgid "Error: invalid 'sleep' parameter: '%s'; use 'true' or 'false'."
+msgstr "Napaka: neveljaven parameter 'sleep': '%s'; uporabite 'true' ali 'false'."
+
+#: ../cli/src/network-manager.c:294
+msgid "WiFi enabled"
+msgstr "WiFi je omogočen"
+
+#: ../cli/src/network-manager.c:305
+#, c-format
+msgid "Error: invalid 'wifi' parameter: '%s'."
+msgstr "Napaka: neveljaven 'wifi' parameter: '%s'."
+
+#: ../cli/src/network-manager.c:326
+msgid "WWAN enabled"
+msgstr "WWAN je omogočen"
+
+#: ../cli/src/network-manager.c:337
+#, c-format
+msgid "Error: invalid 'wwan' parameter: '%s'."
+msgstr "Napaka: neveljaven 'wwan' parameter: '%s'."
+
+#: ../cli/src/network-manager.c:348
+#, c-format
+msgid "Error: 'nm' command '%s' is not valid."
+msgstr "Napaka: ukaz 'nm' '%s' ni veljaven"
+
+#: ../cli/src/nmcli.c:69
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"\n"
+"OPTIONS\n"
+" -t[erse] terse output\n"
+" -p[retty] pretty output\n"
+" -m[ode] tabular|multiline output mode\n"
+" -f[ields] <field1,field2,...>|all|common specify fields to output\n"
+" -e[scape] yes|no escape columns separators in values\n"
+" -v[ersion] show program version\n"
+" -h[elp] print this help\n"
+"\n"
+"OBJECT\n"
+" nm NetworkManager status\n"
+" con NetworkManager connections\n"
+" dev devices managed by NetworkManager\n"
+"\n"
+msgstr ""
+"Uporaba: %s [MOŽNOSTI] PREDMET { UKAZ| help }\n"
+"\n"
+"MOŽNOSTI\n"
+"-t[erse] zgoščen odvod\n"
+"-p[retty] olepšan odvod\n"
+"-m[ode] tabular|multiline način odvoda\n"
+"-f[ields] <polje1,polje2,...>|all|common določilo polj odvoda\n"
+"-e[scape] yes|no izpuščanje ločilnikov vrednosti\n"
+"-v[ersion] pokaži različico programa\n"
+"-h[elp] natisni pomoč\n"
+"\n"
+"PREDMET\n"
+"nm stanje programa NetworkManager\n"
+"con povezave programa NetworkManager\n"
+"dev naprave upravljane s programom NetworkManager\n"
+"\n"
+
+#: ../cli/src/nmcli.c:113
+#, c-format
+msgid "Error: Object '%s' is unknown, try 'nmcli help'."
+msgstr "Napaka: predmeta '%s' ni mogoče prepoznati, poskusite: 'nmcli help'."
+
+#: ../cli/src/nmcli.c:143
+#, c-format
+msgid "Error: Option '--terse' is specified the second time."
+msgstr "Napaka: možnost '--terse' je podana dvakrat."
+
+#: ../cli/src/nmcli.c:148
+#, c-format
+msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
+msgstr "Napaka: možnosti \"--terse\" in \"--pretty\" se med seboj izključujeta."
+
+#: ../cli/src/nmcli.c:156
+#, c-format
+msgid "Error: Option '--pretty' is specified the second time."
+msgstr "Napaka: možnost '--pretty' je podana dvakrat."
+
+#: ../cli/src/nmcli.c:161
+#, c-format
+msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
+msgstr "Napaka: možnosti \"--pretty\" in \"--tearse\" se med seboj izključujeta."
+
+#: ../cli/src/nmcli.c:171
+#: ../cli/src/nmcli.c:187
+#, c-format
+msgid "Error: missing argument for '%s' option."
+msgstr "Napaka: manjka argument za možnost '%s'."
+
+#: ../cli/src/nmcli.c:180
+#: ../cli/src/nmcli.c:196
+#, c-format
+msgid "Error: '%s' is not valid argument for '%s' option."
+msgstr "Napaka: '%s' ni veljaven argument za možnost '%s'."
+
+#: ../cli/src/nmcli.c:203
+#, c-format
+msgid "Error: fields for '%s' options are missing."
+msgstr "Napaka: polja za možnosti '%s' manjkajo."
+
+#: ../cli/src/nmcli.c:209
+#, c-format
+msgid "nmcli tool, version %s\n"
+msgstr "nmcli orodje, različica %s\n"
+
+#: ../cli/src/nmcli.c:215
+#, c-format
+msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
+msgstr "Napaka: možnost '%s' ni prepoznana, poskusite 'nmcli -help'."
+
+#: ../cli/src/nmcli.c:234
+#, c-format
+msgid "Caught signal %d, shutting down..."
+msgstr "Ujet signal %d, povezava bo izklopljena ..."
+
+#: ../cli/src/nmcli.c:259
+#, c-format
+msgid "Error: Could not connect to NetworkManager."
+msgstr "Napaka: ni se mogoče povezati s programom NetworkManager."
+
+#: ../cli/src/nmcli.c:275
+msgid "Success"
+msgstr "Uspešno zaključeno"
+
+#: ../cli/src/settings.c:411
+#, c-format
+msgid "%d (hex-ascii-key)"
+msgstr "%d (šestnajstiški-ascii-ključ)"
+
+#: ../cli/src/settings.c:413
+#, c-format
+msgid "%d (104/128-bit passphrase)"
+msgstr "%d (104/128-bitno šifrirno geslo)"
+
+#: ../cli/src/settings.c:416
+#, c-format
+msgid "%d (unknown)"
+msgstr "%d (neznano)"
+
+#: ../cli/src/settings.c:442
+msgid "0 (unknown)"
+msgstr "0 (neznano)"
+
+#: ../cli/src/settings.c:448
+msgid "any, "
+msgstr "karkoli, "
+
+#: ../cli/src/settings.c:450
+msgid "900 MHz, "
+msgstr "900 MHz, "
+
+#: ../cli/src/settings.c:452
+msgid "1800 MHz, "
+msgstr "1800 MHz, "
+
+#: ../cli/src/settings.c:454
+msgid "1900 MHz, "
+msgstr "1900 MHz, "
+
+#: ../cli/src/settings.c:456
+msgid "850 MHz, "
+msgstr "850 MHz, "
+
+#: ../cli/src/settings.c:458
+msgid "WCDMA 3GPP UMTS 2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 2100 MHz, "
+
+#: ../cli/src/settings.c:460
+msgid "WCDMA 3GPP UMTS 1800 MHz, "
+msgstr "WCDMA 3GPP UMTS 1800 MHz, "
+
+#: ../cli/src/settings.c:462
+msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700/2100 MHz, "
+
+#: ../cli/src/settings.c:464
+msgid "WCDMA 3GPP UMTS 800 MHz, "
+msgstr "WCDMA 3GPP UMTS 800 MHz, "
+
+#: ../cli/src/settings.c:466
+msgid "WCDMA 3GPP UMTS 850 MHz, "
+msgstr "WCDMA 3GPP UMTS 850 MHz, "
+
+#: ../cli/src/settings.c:468
+msgid "WCDMA 3GPP UMTS 900 MHz, "
+msgstr "WCDMA 3GPP UMTS 900 MHz, "
+
+#: ../cli/src/settings.c:470
+msgid "WCDMA 3GPP UMTS 1700 MHz, "
+msgstr "WCDMA 3GPP UMTS 1700 MHz, "
+
+#: ../cli/src/settings.c:554
+#: ../cli/src/settings.c:721
+msgid "auto"
+msgstr "samodejno"
+
+#: ../cli/src/settings.c:716
+#: ../cli/src/settings.c:719
+#: ../cli/src/settings.c:720
+#: ../cli/src/utils.c:172
+msgid "not set"
+msgstr "ni nastavljeno"
+
+#: ../cli/src/utils.c:124
+#, c-format
+msgid "field '%s' has to be alone"
+msgstr "polje '%s' mora biti samostojno."
+
+#: ../cli/src/utils.c:127
+#, c-format
+msgid "invalid field '%s'"
+msgstr "neveljavno polje '%s'"
+
+#: ../cli/src/utils.c:146
+#, c-format
+msgid "Option '--terse' requires specifying '--fields'"
+msgstr "Možnost '--terse' zahteva podan argument '--fields'"
+
+#: ../cli/src/utils.c:150
+#, c-format
+msgid "Option '--terse' requires specific '--fields' option values , not '%s'"
+msgstr "Možnost '--terse' zahteva posebne vrednosti '--polja' in ne '%s'"
+
#: ../libnm-util/crypto.c:120
#, c-format
msgid "PEM key file had no end tag '%s'."
-msgstr "Ključna datoteka PEM nima končne oznake '%s'."
+msgstr "Datoteka ključa PEM nima končne oznake '%s'."
#: ../libnm-util/crypto.c:130
#, c-format
msgid "Doesn't look like a PEM private key file."
-msgstr "Ni videti kot PEM zasebna ključna datoteka."
+msgstr "Datoteka ni videti kot PEM datoteka zasebnega ključa."
#: ../libnm-util/crypto.c:138
#, c-format
@@ -68,7 +1361,7 @@ msgstr "Slabo oblikovana datoteka PEM: neznana cifra zasebnega ključa '%s'."
#: ../libnm-util/crypto.c:222
#, c-format
msgid "Could not decode private key."
-msgstr "Zasebnega ključa ni mogoče dekodirati."
+msgstr "Zasebnega ključa ni mogoče odkodirati."
#: ../libnm-util/crypto.c:267
#, c-format
@@ -78,7 +1371,7 @@ msgstr "PEM potrdilo '%s' nima končne oznake '%s'."
#: ../libnm-util/crypto.c:277
#, c-format
msgid "Failed to decode certificate."
-msgstr "Dekodiranje potrdila je spodletelo."
+msgstr "Odkodiranje potrdila je spodletelo."
#: ../libnm-util/crypto.c:286
#, c-format
@@ -109,7 +1402,7 @@ msgstr "IV vsebuje ne-šestnajstiške številke."
#: ../libnm-util/crypto_gnutls.c:148
#: ../libnm-util/crypto_gnutls.c:266
#: ../libnm-util/crypto_nss.c:171
-#: ../libnm-util/crypto_nss.c:335
+#: ../libnm-util/crypto_nss.c:336
#, c-format
msgid "Private key cipher '%s' was unknown."
msgstr "Cifra zasebnega ključa '%s' je neznana."
@@ -127,16 +1420,16 @@ msgstr "Ni mogoče določiti vrste zasebnega ključa."
#: ../libnm-util/crypto.c:530
#, c-format
msgid "Not enough memory to store decrypted private key."
-msgstr "Ni dovolj pomnilnika za shranjevanje dešifriranega zasebnega ključa."
+msgstr "Ni dovolj pomnilnika za shranjevanje odšifriranega zasebnega ključa."
#: ../libnm-util/crypto_gnutls.c:49
msgid "Failed to initialize the crypto engine."
-msgstr "Zagon motorja šifriranja je spodletel."
+msgstr "Začenjanje programnika šifriranja je spodletelo."
#: ../libnm-util/crypto_gnutls.c:93
#, c-format
msgid "Failed to initialize the MD5 engine: %s / %s."
-msgstr "Zagon motorja MD5 je spodletel: %s / %s."
+msgstr "Začenjanje programnika MD5 je spodletelo: %s / %s."
#: ../libnm-util/crypto_gnutls.c:156
#, c-format
@@ -147,50 +1440,50 @@ msgstr "Neveljavna dolžina IV (mora biti vsaj %zd)"
#: ../libnm-util/crypto_nss.c:188
#, c-format
msgid "Not enough memory for decrypted key buffer."
-msgstr "Ni dovolj pomnilnika za medpomnilnik ključa dešifriranja."
+msgstr "Ni dovolj pomnilnika za medpomnilnik odšifriranega ključa."
#: ../libnm-util/crypto_gnutls.c:173
#, c-format
msgid "Failed to initialize the decryption cipher context: %s / %s."
-msgstr "Zagon vsebine cifre dešifriranje je spodletel: %s / %s."
+msgstr "Začenjanje vsebine odšifrirne cifre je spodletelo: %s / %s."
#: ../libnm-util/crypto_gnutls.c:182
#, c-format
msgid "Failed to set symmetric key for decryption: %s / %s."
-msgstr "Nastavljanje simetričnega ključa za dešifriranje je spodletelo: %s / %s. "
+msgstr "Nastavljanje simetričnega ključa za odšifriranje je spodletelo: %s / %s."
#: ../libnm-util/crypto_gnutls.c:191
#, c-format
msgid "Failed to set IV for decryption: %s / %s."
-msgstr "Nastavljanje IV za dešifriranje je spodletelo: %s / %s."
+msgstr "Nastavljanje IV za odšifriranje je spodletelo: %s / %s."
#: ../libnm-util/crypto_gnutls.c:200
#, c-format
msgid "Failed to decrypt the private key: %s / %s."
-msgstr "Dešifriranje zasebnega ključa je spodletelo: %s / %s."
+msgstr "Odšifriranje zasebnega ključa je spodletelo: %s / %s."
#: ../libnm-util/crypto_gnutls.c:210
-#: ../libnm-util/crypto_nss.c:266
+#: ../libnm-util/crypto_nss.c:267
#, c-format
msgid "Failed to decrypt the private key: unexpected padding length."
-msgstr "Dešifriranje zasebnega ključa je spodletelo: nepričakovana dolžina blazinjenja."
+msgstr "Odšifriranje zasebnega ključa je spodletelo: nepričakovana dolžina blazinjenja."
#: ../libnm-util/crypto_gnutls.c:221
-#: ../libnm-util/crypto_nss.c:277
+#: ../libnm-util/crypto_nss.c:278
#, c-format
msgid "Failed to decrypt the private key."
-msgstr "Dešifriranje zasebnega ključa je spodletelo."
+msgstr "Odšifriranje zasebnega ključa je spodletelo."
#: ../libnm-util/crypto_gnutls.c:286
-#: ../libnm-util/crypto_nss.c:355
+#: ../libnm-util/crypto_nss.c:356
#, c-format
msgid "Could not allocate memory for encrypting."
-msgstr "Pomnilnika za šifriranje ni mogoče dodeliti."
+msgstr "Ni mogoče dodeliti pomnilnika za šifriranje."
#: ../libnm-util/crypto_gnutls.c:294
#, c-format
msgid "Failed to initialize the encryption cipher context: %s / %s."
-msgstr "Zagon vsebine šifrirne cifre je spodletel: %s / %s. "
+msgstr "Začenjanje vsebine šifrirne cifre je spodletelo: %s / %s."
#: ../libnm-util/crypto_gnutls.c:303
#, c-format
@@ -215,32 +1508,32 @@ msgstr "Napaka med zaganjanjem podatkov potrdila: %s"
#: ../libnm-util/crypto_gnutls.c:384
#, c-format
msgid "Couldn't decode certificate: %s"
-msgstr "Potrdila ni mogoča dekodirati: %s"
+msgstr "Potrdila ni mogoča odkodirati: %s"
#: ../libnm-util/crypto_gnutls.c:408
#, c-format
msgid "Couldn't initialize PKCS#12 decoder: %s"
-msgstr "Dekodirnika PKCS#12 ni mogoče zagnati: %s"
+msgstr "Odkodirnika PKCS#12 ni mogoče začeti: %s"
#: ../libnm-util/crypto_gnutls.c:421
#, c-format
msgid "Couldn't decode PKCS#12 file: %s"
-msgstr "Datoteke PKCS#12 ni mogoče dekodirati: %s"
+msgstr "Datoteke PKCS#12 ni mogoče odkodirati: %s"
#: ../libnm-util/crypto_gnutls.c:433
#, c-format
msgid "Couldn't verify PKCS#12 file: %s"
msgstr "Datoteke PKCS#12 ni mogoče preveriti: %s"
-#: ../libnm-util/crypto_nss.c:57
+#: ../libnm-util/crypto_nss.c:56
#, c-format
msgid "Failed to initialize the crypto engine: %d."
-msgstr "Zagon motorja šifriranja je spodletel: %d."
+msgstr "Začenjanje programnika šifriranja je spodletelo: %d."
#: ../libnm-util/crypto_nss.c:111
#, c-format
msgid "Failed to initialize the MD5 context: %d."
-msgstr "Zagon vsebine MD5 je spodletel: %d."
+msgstr "Začenjanje vsebine MD5 je spodletelo: %d."
#: ../libnm-util/crypto_nss.c:179
#, c-format
@@ -250,7 +1543,7 @@ msgstr "Neveljavna dolžina IV (mora biti vsaj %d)."
#: ../libnm-util/crypto_nss.c:196
#, c-format
msgid "Failed to initialize the decryption cipher slot."
-msgstr "Zagon polja cifre dešifriranja je spodletel."
+msgstr "Začenjanje polja cifre odšifriranja je spodletelo."
#: ../libnm-util/crypto_nss.c:206
#, c-format
@@ -260,169 +1553,249 @@ msgstr "Nastavljanje simetričnega ključa za opis je spodletelo."
#: ../libnm-util/crypto_nss.c:216
#, c-format
msgid "Failed to set IV for decryption."
-msgstr "Nastavljanje IV za dešifriranje je spodletelo."
+msgstr "Nastavljanje IV za odšifriranje je spodletelo."
#: ../libnm-util/crypto_nss.c:224
#, c-format
msgid "Failed to initialize the decryption context."
-msgstr "Zagon vsebine dešifriranja je spodletel."
+msgstr "Začenjanje vsebine odšifriranja je spodletelo."
#: ../libnm-util/crypto_nss.c:237
#, c-format
msgid "Failed to decrypt the private key: %d."
-msgstr "Dešifriranje zasebnega ključa je spodletelo: %d."
+msgstr "Odšifriranje zasebnega ključa je spodletelo: %d."
#: ../libnm-util/crypto_nss.c:245
#, c-format
msgid "Failed to decrypt the private key: decrypted data too large."
-msgstr "Dešifriranje zasebnega ključa je spodletelo: dešifrirani podatki so preveliki."
+msgstr "Odšifriranje zasebnega ključa je spodletelo: odšifrirani podatki so preveliki."
#: ../libnm-util/crypto_nss.c:256
#, c-format
msgid "Failed to finalize decryption of the private key: %d."
-msgstr "Končanje dešifriranja zasebnega ključa je spodletelo: %d."
+msgstr "Končanje odšifriranja zasebnega ključa je spodletelo: %d."
-#: ../libnm-util/crypto_nss.c:363
+#: ../libnm-util/crypto_nss.c:364
#, c-format
msgid "Failed to initialize the encryption cipher slot."
-msgstr "Zagon polja cifre šifriranja je spodletel."
+msgstr "Začenjanje polja cifre šifriranja je spodletelo."
-#: ../libnm-util/crypto_nss.c:371
+#: ../libnm-util/crypto_nss.c:372
#, c-format
msgid "Failed to set symmetric key for encryption."
msgstr "Nastavljanje simetričnega ključa za šifriranje je spodletelo."
-#: ../libnm-util/crypto_nss.c:379
+#: ../libnm-util/crypto_nss.c:380
#, c-format
msgid "Failed to set IV for encryption."
msgstr "Nastavljanje IV za šifriranje je spodletelo."
-#: ../libnm-util/crypto_nss.c:387
+#: ../libnm-util/crypto_nss.c:388
#, c-format
msgid "Failed to initialize the encryption context."
-msgstr "Zaganjanje vsebine šifriranja je spodletelo."
+msgstr "Začenjanje vsebine šifriranja je spodletelo."
-#: ../libnm-util/crypto_nss.c:395
+#: ../libnm-util/crypto_nss.c:396
#, c-format
msgid "Failed to encrypt: %d."
msgstr "Šifriranje je spodletelo: %d."
-#: ../libnm-util/crypto_nss.c:403
+#: ../libnm-util/crypto_nss.c:404
#, c-format
msgid "Unexpected amount of data after encrypting."
msgstr "Nepričakovana količina podatkov po šifriranju."
-#: ../libnm-util/crypto_nss.c:446
+#: ../libnm-util/crypto_nss.c:447
#, c-format
msgid "Couldn't decode certificate: %d"
-msgstr "Potrdila ni mogoče dekodirati: %d"
+msgstr "Potrdila ni mogoče odkodirati: %d"
-#: ../libnm-util/crypto_nss.c:481
+#: ../libnm-util/crypto_nss.c:482
#, c-format
msgid "Couldn't convert password to UCS2: %d"
msgstr "Gesla ni mogoče pretvoriti v UCS2: %d"
-#: ../libnm-util/crypto_nss.c:509
+#: ../libnm-util/crypto_nss.c:510
#, c-format
msgid "Couldn't initialize PKCS#12 decoder: %d"
-msgstr "Dekodirnika PKCS#12 ni mogoče zagnati: %d"
+msgstr "Dekodirnika PKCS#12 ni mogoče začeti: %d"
-#: ../libnm-util/crypto_nss.c:518
+#: ../libnm-util/crypto_nss.c:519
#, c-format
msgid "Couldn't decode PKCS#12 file: %d"
-msgstr "Datoteke PCKS#12 ni mogoče dekodirati: %d"
+msgstr "Datoteke PCKS#12 ni mogoče odkodirati: %d"
-#: ../libnm-util/crypto_nss.c:527
+#: ../libnm-util/crypto_nss.c:528
#, c-format
msgid "Couldn't verify PKCS#12 file: %d"
msgstr "Datoteke PCKS#12 ni mogoče preveriti: %d"
-#: ../libnm-util/crypto_nss.c:556
+#: ../libnm-util/crypto_nss.c:557
msgid "Could not generate random data."
msgstr "Naključnih podatkov ni mogoče ustvariti."
-#: ../libnm-util/nm-utils.c:1522
+#: ../libnm-util/nm-utils.c:1975
#, c-format
msgid "Not enough memory to make encryption key."
msgstr "Ni dovolj pomnilnika za ustvarjanje šifrirnega ključa."
-#: ../libnm-util/nm-utils.c:1633
+#: ../libnm-util/nm-utils.c:2085
msgid "Could not allocate memory for PEM file creation."
msgstr "Ni mogoče dodeliti pomnilnika za ustvarjanje datoteke PEM."
-#: ../libnm-util/nm-utils.c:1645
+#: ../libnm-util/nm-utils.c:2097
#, c-format
msgid "Could not allocate memory for writing IV to PEM file."
msgstr "Ni mogoče dodeliti pomnilnika za zapis IV v datoteko PEM."
-#: ../libnm-util/nm-utils.c:1657
+#: ../libnm-util/nm-utils.c:2109
#, c-format
msgid "Could not allocate memory for writing encrypted key to PEM file."
msgstr "Ni mogoče dodeliti pomnilnika za zapis šifriranega ključa v datoteko PEM."
-#: ../libnm-util/nm-utils.c:1676
+#: ../libnm-util/nm-utils.c:2128
#, c-format
msgid "Could not allocate memory for PEM file data."
msgstr "Ni mogoče dodeliti pomnilnika za podatke datoteke PEM."
-#: ../src/nm-netlink-monitor.c:194
-#: ../src/nm-netlink-monitor.c:464
-#: ../src/nm-netlink-monitor.c:569
-#: ../src/ip6-manager/nm-netlink-listener.c:352
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
+msgid "Connection sharing via a protected WiFi network"
+msgstr "Souporaba povezave preko zaščitenega WiFi omrežja"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
+msgid "Connection sharing via an open WiFi network"
+msgstr "Souporaba povezave preko odprtega WiFi omrežja"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
+msgid "Modify persistent system hostname"
+msgstr "Spremeni trajno sistemsko ime gostitelja"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
+msgid "Modify system connections"
+msgstr "Spremeni sistemske povezave"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
+msgid "System policy prevents modification of system settings"
+msgstr "Sistemska določila onemogočajo spreminjanje sistemskih nastavitev"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
+msgid "System policy prevents modification of the persistent system hostname"
+msgstr "Sistemska pravila preprečujejo spremembo imena gostitelja trajnega sistema"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
+msgid "System policy prevents sharing connections via a protected WiFi network"
+msgstr "Sistemska pravila preprečujejo souporabo povezav preko zaščitenega WiFi omrežja"
+
+#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
+msgid "System policy prevents sharing connections via an open WiFi network"
+msgstr "Sistemska pravila preprečujejo souporabo povezav preko odprtega WiFi omrežja"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:1
+msgid "Allow control of network connections"
+msgstr "Dovoli nadzor omrežnih povezav"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:2
+msgid "Allow use of user-specific connections"
+msgstr "Dovoli uporabo posebnih uporabniških povezav."
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:3
+msgid "Enable or disable WiFi devices"
+msgstr "Omogoči ali onemogoči naprave WiFi"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:4
+msgid "Enable or disable mobile broadband devices"
+msgstr "Omogoči ali onemogoči naprave mobilnih širokopasovnih storitev"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:5
+msgid "Enable or disable system networking"
+msgstr "Omogoči ali onemogoči sistemske omrežne povezave"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:6
+msgid "Put NetworkManager to sleep or wake it up (should only be used by system power management)"
+msgstr "Postavi program NetworkManager v mirovanje ali iz njega (možnost je namenjena upravljanju napajanja)"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:7
+msgid "System policy prevents control of network connections"
+msgstr "Sistemska določila preprečujejo nadzor omrežnih povezav"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:8
+msgid "System policy prevents enabling or disabling WiFi devices"
+msgstr "Sistemska določila preprečujejo omogočanja ali onemogočanje WiFi naprav"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:9
+msgid "System policy prevents enabling or disabling mobile broadband devices"
+msgstr "Sistemska določila preprečuje omogočanja ali onemogočanje mobilne širokopasovne naprave"
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:10
+msgid "System policy prevents enabling or disabling system networking"
+msgstr "Sistemska določila preprečujejo omogočanje ali onemogočanje omrežnih povezav."
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:11
+msgid "System policy prevents putting NetworkManager to sleep or waking it up"
+msgstr "Sistemska določila preprečujejo postavitev programa NetworkManager v mirovanje ali iz njega."
+
+#: ../policy/org.freedesktop.NetworkManager.policy.in.h:12
+msgid "System policy prevents use of user-specific connections"
+msgstr "Sistemska določila preprečujejo uporabo uporabniških povezav."
+
+#: ../src/nm-netlink-monitor.c:100
+#: ../src/nm-netlink-monitor.c:231
+#: ../src/nm-netlink-monitor.c:653
#, c-format
msgid "error processing netlink message: %s"
msgstr "napaka med obdelovanjem sporočila netlink: %s"
-#: ../src/nm-netlink-monitor.c:260
-#, c-format
-#| msgid ""
-#| "unable to create netlink socket for monitoring wired ethernet devices - %s"
-msgid "unable to allocate netlink handle for monitoring link status: %s"
-msgstr "ni mogoče dodeliti ročice netlink za nadziranje stanja povezave: %s"
+#: ../src/nm-netlink-monitor.c:214
+msgid "error occurred while waiting for data on socket"
+msgstr "med čakanjem na podatke na vtiču je prišlo do napake"
-#: ../src/nm-netlink-monitor.c:270
+#: ../src/nm-netlink-monitor.c:254
#, c-format
-#| msgid ""
-#| "unable to bind to netlink socket for monitoring wired ethernet devices - %"
-#| "s"
msgid "unable to connect to netlink for monitoring link status: %s"
msgstr "ni se mogoče povezati z netlink za nadziranje stanja povezave: %s"
-#: ../src/nm-netlink-monitor.c:278
+#: ../src/nm-netlink-monitor.c:265
#, c-format
-#| msgid ""
-#| "unable to bind to netlink socket for monitoring wired ethernet devices - %"
-#| "s"
-msgid "unable to join netlink group for monitoring link status: %s"
-msgstr "ni se mogoče povezati s skupino netlink za nadziranje stanja povezave: %s"
+msgid "unable to enable netlink handle credential passing: %s"
+msgstr "ni mogoče omogočiti ročnika netlink overjanje:% s"
-#: ../src/nm-netlink-monitor.c:286
+#: ../src/nm-netlink-monitor.c:291
+#: ../src/nm-netlink-monitor.c:353
+#, c-format
+msgid "unable to allocate netlink handle for monitoring link status: %s"
+msgstr "ni mogoče dodeliti ročice netlink za nadziranje stanja povezave: %s"
+
+#: ../src/nm-netlink-monitor.c:376
#, c-format
-#| msgid ""
-#| "unable to create netlink socket for monitoring wired ethernet devices - %s"
msgid "unable to allocate netlink link cache for monitoring link status: %s"
msgstr "ni mogoče dodeliti predpomnilnika netlink povezav za nadziranje stanja povezave: %s"
-#: ../src/nm-netlink-monitor.c:494
-#: ../src/ip6-manager/nm-netlink-listener.c:382
-msgid "error occurred while waiting for data on socket"
-msgstr "med čakanjem na podatke na vtiču je prišlo do napake"
+#: ../src/nm-netlink-monitor.c:502
+#, c-format
+msgid "unable to join netlink group: %s"
+msgstr "skupini netlink se ni mogoče pridružiti: %s"
-#: ../src/nm-netlink-monitor.c:558
+#: ../src/nm-netlink-monitor.c:629
+#: ../src/nm-netlink-monitor.c:642
#, c-format
msgid "error updating link cache: %s"
msgstr "napaka med posodabljanjem predpomnilnika povezave: %s"
-#: ../src/NetworkManager.c:330
+#: ../src/main.c:499
#, c-format
msgid "Invalid option. Please use --help to see a list of valid options.\n"
msgstr "Neveljavna možnost. Uporabite --help za seznam veljavnih možnosti.\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:304
+#: ../src/main.c:570
+#, c-format
+msgid "%s. Please use --help to see a list of valid options.\n"
+msgstr "%s. Uporabite --help za prikaz seznam veljavnih možnosti.\n"
+
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:328
msgid "# Created by NetworkManager\n"
-msgstr "#Ustvaril upravljalnik omrežij\n"
+msgstr "#Ustvarjeno z upravljalnikom omrežij\n"
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:310
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:344
#, c-format
msgid ""
"# Merged from %s\n"
@@ -431,562 +1804,48 @@ msgstr ""
"# Združeno iz %s\n"
"\n"
-#: ../src/ip6-manager/nm-netlink-listener.c:200
+#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+msgid "no usable DHCP client could be found."
+msgstr "ni mogoče najti uporabnega odjemalca DHCP."
+
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+msgid "'dhclient' could be found."
+msgstr "'dhclient' je najden."
+
+#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+msgid "'dhcpcd' could be found."
+msgstr "'dhcpcd' ni mogoče najti."
+
+#: ../src/dhcp-manager/nm-dhcp-manager.c:311
#, c-format
-msgid "unable to allocate netlink handle: %s"
-msgstr "Ročnika netlink ni mogoče dodeliti: %s"
+msgid "unsupported DHCP client '%s'"
+msgstr "nepodprt odjemalec DHCP '%s'"
-#: ../src/ip6-manager/nm-netlink-listener.c:210
+#: ../src/logging/nm-logging.c:146
#, c-format
-msgid "unable to connect to netlink: %s"
-msgstr "z netlink se ni mogoče povezati: %s"
+msgid "Unknown log level '%s'"
+msgstr "Neznana raven beleženja '%s'"
-#: ../src/ip6-manager/nm-netlink-listener.c:307
+#: ../src/logging/nm-logging.c:171
#, c-format
-msgid "unable to join netlink group: %s"
-msgstr "skupini netlink se ni mogoče pridružiti: %s"
+msgid "Unknown log domain '%s'"
+msgstr "Neznana domena beleženja '%s'"
-#: ../src/dns-manager/nm-dns-manager.c:315
+#: ../src/dns-manager/nm-dns-manager.c:384
msgid "NOTE: the libc resolver may not support more than 3 nameservers."
-msgstr "OPOMBA: libc razreševalnik morda ne podpira več kot 3 imenske strežnike."
+msgstr "OPOMBA: razreševalnik libc morda ne podpira več kot 3 imenskih strežnikov."
-#: ../src/dns-manager/nm-dns-manager.c:317
+#: ../src/dns-manager/nm-dns-manager.c:386
msgid "The nameservers listed below may not be recognized."
-msgstr "Imenski strežniki našteti spodaj morda ne bodo prepoznani."
+msgstr "Navedeni imenski strežniki morda ne bodo prepoznani."
-#: ../src/system-settings/nm-default-wired-connection.c:194
+#: ../src/system-settings/nm-default-wired-connection.c:157
#, c-format
msgid "Auto %s"
msgstr "Samodejno %s"
-#: ../system-settings/plugins/ifcfg-rh/reader.c:2406
-#| msgid "Open System"
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3412
+#: ../system-settings/plugins/ifnet/connection_parser.c:49
msgid "System"
msgstr "Sistem"
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1
-msgid "Connection sharing via a protected WiFi network"
-msgstr "Deljene povezave preko zaščitenega WiFi omrežja"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2
-msgid "Connection sharing via an open WiFi network"
-msgstr "Deljene povezave preko odprtega WiFi omrežja"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3
-msgid "Modify persistent system hostname"
-msgstr "Spremeni trajno sistemsko ime gostitelja"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4
-#| msgid "No active connections!"
-msgid "Modify system connections"
-msgstr "Spremeni sistemske povezave"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5
-msgid "System policy prevents modification of system settings"
-msgstr "Sistemska določila onemogočajo spreminjanje sistemskih nastavitev"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6
-msgid "System policy prevents modification of the persistent system hostname"
-msgstr "Sistemska pravila preprečujejo spremembo imena gostitelja trajnega sistema"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7
-msgid "System policy prevents sharing connections via a protected WiFi network"
-msgstr "Sistemska pravila preprečujejo deljenje povezav preko zaščitenega WiFi omrežja"
-
-#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8
-msgid "System policy prevents sharing connections via an open WiFi network"
-msgstr "Sistemska pravila preprečujejo deljenje povezav preko odprtega WiFi omrežja"
-
-#~ msgid "Passphrase for wireless network %s"
-#~ msgstr "Šifrirna fraza za brezžično omrežje %s"
-#~ msgid "Connection to the wireless network '%s' failed."
-#~ msgstr "Povezava z brezžičnim omrežjem %s ni uspela"
-#~ msgid "Connection to the wired network failed."
-#~ msgstr "Povezava z žičnim omrežjem ni uspela."
-#~ msgid "Error displaying connection information:"
-#~ msgstr "Napaka pri prikazovanju informacij o povezavi:"
-#~ msgid "Could not find some required resources (the glade file)!"
-#~ msgstr "Ni mogoče najti nekaterih zahtevanih virov (datoteke glade)!"
-#~ msgid "%d Mb/s"
-#~ msgstr "%d Mb/s"
-#~ msgid "Wired Ethernet (%s)"
-#~ msgstr "Žični eternet (%s)"
-#~ msgid "Wireless Ethernet (%s)"
-#~ msgstr "Brezžični eternet (%s)"
-#~ msgid "Unknown"
-#~ msgstr "Neznano"
-#~ msgid "NetworkManager Applet"
-#~ msgstr "Programček NetworkManager"
-#~ msgid ""
-#~ "Copyright © 2004-2006 Red Hat, Inc.\n"
-#~ "Copyright © 2005-2006 Novell, Inc."
-#~ msgstr ""
-#~ "Copyright © 2004-2006 Red Hat, Inc.\n"
-#~ "Copyright © 2005-2006 Novell, Inc."
-#~ msgid ""
-#~ "Notification area applet for managing your network devices and "
-#~ "connections."
-#~ msgstr ""
-#~ "Programček za območje obvestil za upravljanje vaših mrežnih naprav in "
-#~ "povezav."
-#~ msgid "translator-credits"
-#~ msgstr "Matic Žgur <mr.zgur@gmail.com>"
-#~ msgid ""
-#~ "Copyright © 2004-2005 Red Hat, Inc.\n"
-#~ "Copyright © 2005-2006 Novell, Inc."
-#~ msgstr ""
-#~ "Copyright © 2004-2005 Red Hat, Inc.\n"
-#~ "Copyright © 2005-2006 Novell, Inc."
-#~ msgid "VPN Login Failure"
-#~ msgstr "Neuspela prijava VPN"
-#~ msgid "Could not start the VPN connection '%s' due to a login failure."
-#~ msgstr "Ni mogoče začeti povezave VPN '%s' zaradi neuspele prijave."
-#~ msgid "VPN Start Failure"
-#~ msgstr "Neuspel zagon VPN"
-#~ msgid ""
-#~ "Could not start the VPN connection '%s' due to a failure launching the "
-#~ "VPN program."
-#~ msgstr ""
-#~ "Ni mogoče začeti povezave VPN '%s' zaradi neuspelega zagona programa VPN."
-#~ msgid "VPN Connect Failure"
-#~ msgstr "Neuspela povezava VPN"
-#~ msgid "Could not start the VPN connection '%s' due to a connection error."
-#~ msgstr "Ni mogoče začeti povezave VPN '%s' zaradi napake pri povezavi."
-#~ msgid "VPN Configuration Error"
-#~ msgstr "Napaka nastavitev VPN"
-#~ msgid "The VPN connection '%s' was not correctly configured."
-#~ msgstr "Povezava VPN '%s' ni pravilno nastavljena."
-#~ msgid ""
-#~ "Could not start the VPN connection '%s' because the VPN server did not "
-#~ "return an adequate network configuration."
-#~ msgstr ""
-#~ "Ni mogoče začeti povezave VPN '%s', ker strežnik VPN ni vrnil ustreznih "
-#~ "nastavitev."
-#~ msgid "VPN Login Message"
-#~ msgstr "Prijavno sporočilo VPN"
-#~ msgid ""
-#~ "The NetworkManager Applet could not find some required resources (the "
-#~ "glade file was not found)."
-#~ msgstr ""
-#~ "Programček NetworkManager ne more najti nekaterih zahtevanih virov "
-#~ "(datoteka glade ni bila najdena)."
-#~ msgid "The network device \"%s (%s)\" does not support wireless scanning."
-#~ msgstr ""
-#~ "Omrežna naprava \"%s (%s)\" ne podpira skeniranja brezžičnih omrežij."
-#~ msgid "The network device \"%s (%s)\" does not support link detection."
-#~ msgstr "Omrežna naprava \"%s (%s)\" ne podpira odkrivanja povezav."
-#~ msgid "(unknown)"
-#~ msgstr "(neznano)"
-#~ msgid "Preparing device %s for the wired network..."
-#~ msgstr "Pripravljanje naprave %s na žično omrežje ..."
-#~ msgid "Preparing device %s for the wireless network '%s'..."
-#~ msgstr "Pripravljanje naprave %s na rezžično omrežje '%s' ..."
-#~ msgid "Configuring device %s for the wired network..."
-#~ msgstr "Nastavljanje naprave %s za žično omrežje ..."
-#~ msgid "Attempting to join the wireless network '%s'..."
-#~ msgstr "Poskus pridruževanja brezžičnemu omrežju '%s' ..."
-#~ msgid "Waiting for Network Key for the wireless network '%s'..."
-#~ msgstr "Čakanje na omrežni ključ za brezžično omrežje '%s' ..."
-#~ msgid "Requesting a network address from the wired network..."
-#~ msgstr "Zahtevanje omrežnega naslova iz žičnega omrežja ..."
-#~ msgid "Requesting a network address from the wireless network '%s'..."
-#~ msgstr "Zahtevanje omrežnega naslova iz brezžičnega omrežja '%s' ..."
-#~ msgid "Finishing connection to the wired network..."
-#~ msgstr "Zaključevanje povezave v žično omrežje ..."
-#~ msgid "Finishing connection to the wireless network '%s'..."
-#~ msgstr "Zaključevanje povezave v brezžično omrežje '%s' ..."
-#~ msgid "NetworkManager is not running"
-#~ msgstr "NetworkManager ni zagnan"
-#~ msgid "Networking disabled"
-#~ msgstr "Omrežje onemogočeno"
-#~ msgid "No network connection"
-#~ msgstr "Nobene omrežne povezave"
-#~ msgid "Wired network connection"
-#~ msgstr "Žična omrežna povezava"
-#~ msgid "Connected to an Ad-Hoc wireless network"
-#~ msgstr "Povezan v ad-hoc brezžično omrežje"
-#~ msgid "Wireless network connection to '%s' (%d%%)"
-#~ msgstr "Brezžična omrežna povezava z '%s' (%d%%)"
-#~ msgid "VPN connection to '%s'"
-#~ msgstr "Povezave VPN z '%s'"
-#~ msgid "VPN connecting to '%s'"
-#~ msgstr "Povezovanje VPN z '%s'"
-#~ msgid "_Connect to Other Wireless Network..."
-#~ msgstr "Po_veži se v drugo brezžično omrežje ..."
-#~ msgid "Create _New Wireless Network..."
-#~ msgstr "_Ustvari novo brezžično omrežje ..."
-#~ msgid "_VPN Connections"
-#~ msgstr "_Povezave VPN"
-#~ msgid "_Configure VPN..."
-#~ msgstr "_Nastavi VPN ..."
-#~ msgid "_Disconnect VPN..."
-#~ msgstr "_Prekini povezavo z VPN ..."
-#~ msgid "_Dial Up Connections"
-#~ msgstr "_Klicna povezava"
-#~ msgid "Connect to %s..."
-#~ msgstr "Poveži se v %s ..."
-#~ msgid "Disconnect from %s..."
-#~ msgstr "Prekini povezavo z %s ..."
-#~ msgid "No network devices have been found"
-#~ msgstr "Najdena ni bila nobena omrežna naprava"
-#~ msgid "NetworkManager is not running..."
-#~ msgstr "NetworkManager ni zagnan ..."
-#~ msgid "Enable _Networking"
-#~ msgstr "Omogoči _omrežje"
-#~ msgid "Enable _Wireless"
-#~ msgstr "Omogoči _brezžično omrežje"
-#~ msgid "Connection _Information"
-#~ msgstr "_Informacije o povezavi"
-#~ msgid "_Help"
-#~ msgstr "_Pomoč"
-#~ msgid "_About"
-#~ msgstr "_O Programu"
-#~ msgid ""
-#~ "The NetworkManager applet could not find some required resources. It "
-#~ "cannot continue.\n"
-#~ msgstr ""
-#~ "Programček NetworkManager ne more najti nekaterih zahtevanih virov. Ni "
-#~ "mogoče nadaljevati.\n"
-#~ msgid "Shared Key"
-#~ msgstr "Deljeni ključ"
-#~ msgid "Automatic (Default)"
-#~ msgstr "Samodejno (privzeto)"
-#~ msgid "AES-CCMP"
-#~ msgstr "AES-CCMP"
-#~ msgid "TKIP"
-#~ msgstr "TKIP"
-#~ msgid "Dynamic WEP"
-#~ msgstr "Dinamični WEP"
-#~ msgid "None"
-#~ msgstr "Brez"
-#~ msgid "WEP 64/128-bit ASCII"
-#~ msgstr "WEP 64/128-bit ASCII"
-#~ msgid "WEP 64/128-bit Hex"
-#~ msgstr "WEP 64/128-bit Hex"
-#~ msgid "WEP 128-bit Passphrase"
-#~ msgstr "WEP 128-bit šifrirna fraza"
-#~ msgid "PEAP"
-#~ msgstr "PEAP"
-#~ msgid "TLS"
-#~ msgstr "TLS"
-#~ msgid "TTLS"
-#~ msgstr "TTLS"
-#~ msgid "WPA2 Enterprise"
-#~ msgstr "Podjetniški WPA2"
-#~ msgid "WPA Enterprise"
-#~ msgstr "Podjetniški WPA"
-#~ msgid "WPA2 Personal"
-#~ msgstr "Osebni WPA2"
-#~ msgid "WPA Personal"
-#~ msgstr "Osebni WPA"
-#~ msgid "Orientation"
-#~ msgstr "Usmerjenost"
-#~ msgid "The orientation of the tray."
-#~ msgstr "Usmeritev pladnja."
-#~ msgid "Wired Network (%s)"
-#~ msgstr "Žično omrežje (%s)"
-#~ msgid "_Wired Network"
-#~ msgstr "Ž_ično omrežje"
-#~ msgid "Wireless Network (%s)"
-#~ msgid_plural "Wireless Networks (%s)"
-#~ msgstr[0] "Brezžično omrežje (%s)"
-#~ msgstr[1] "Brezžični omrežji (%s)"
-#~ msgstr[2] "Brezžična omrežja (%s)"
-#~ msgstr[3] "Brezžična omrežja (%s)"
-#~ msgid "Wireless Network"
-#~ msgid_plural "Wireless Networks"
-#~ msgstr[0] "Brezžično omrežje"
-#~ msgstr[1] "Brezžični omrežji"
-#~ msgstr[2] "Brezžična omrežja"
-#~ msgstr[3] "Brezžična omrežja"
-#~ msgid " (invalid Unicode)"
-#~ msgstr " (neveljaven Unicode)"
-#~ msgid ""
-#~ "By default, the wireless network's name is set to your computer's name, %"
-#~ "s, with no encryption enabled"
-#~ msgstr ""
-#~ "Privzeto je ime brezžičnega omrežja nastavljeno na ime vašega "
-#~ "računalnika, %s, brez omogočenega šifriranja"
-#~ msgid "Create new wireless network"
-#~ msgstr "Ustvari novo brezžično omrežje"
-#~ msgid ""
-#~ "Enter the name and security settings of the wireless network you wish to "
-#~ "create."
-#~ msgstr ""
-#~ "Vnesite ime in varnostne nastavitve brezžičnega omrežja, ki ga želite "
-#~ "ustvariti."
-#~ msgid "Create New Wireless Network"
-#~ msgstr "Ustvari novo brezžično omrežje"
-#~ msgid "Existing wireless network"
-#~ msgstr "Obstoječe brezžično omrežje"
-#~ msgid "Enter the name of the wireless network to which you wish to connect."
-#~ msgstr "Vnesite ime brezžičnega omrežja, v katerega se želite povezati."
-#~ msgid "Connect to Other Wireless Network"
-#~ msgstr "Poveži se v drugo brezžično omrežje"
-#~ msgid "Error connecting to wireless network"
-#~ msgstr "Napaka pri povezovanju z brezžičnim omrežjem"
-#~ msgid ""
-#~ "The requested wireless network requires security capabilities unsupported "
-#~ "by your hardware."
-#~ msgstr ""
-#~ "Zahtevano brezžično omrežje zahteva varnostne zmožnosti, ki so nepodprte "
-#~ "z vašo strojno opremo."
-#~ msgid "Cannot start VPN connection '%s'"
-#~ msgstr "Ni mogoče začeti povezave VPN '%s'"
-#~ msgid ""
-#~ "Could not find the authentication dialog for VPN connection type '%s'. "
-#~ "Contact your system administrator."
-#~ msgstr ""
-#~ "Ni mogoče najti pogovornega okna za overitev za povezavo VPN vrste '%s'. "
-#~ "Kontaktirajte sistemskega administratorja."
-#~ msgid ""
-#~ "There was a problem launching the authentication dialog for VPN "
-#~ "connection type '%s'. Contact your system administrator."
-#~ msgstr ""
-#~ "Pri zagonu pogovornega okna za overovitev za povezavo VPN vrste '%s' je "
-#~ "prišlo do problema. Kontaktirajte sistemskega administratorja."
-#~ msgid " "
-#~ msgstr " "
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Active Connection Information</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Informacije o aktivni povezavi</"
-#~ "span>"
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Passphrase Required by Wireless "
-#~ "Network</span>\n"
-#~ "\n"
-#~ "A passphrase or encryption key is required to access the wireless network "
-#~ "'%s'."
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Šifrirna fraza, ki jo zahteva "
-#~ "brezžično omrežje</span>\n"
-#~ "\n"
-#~ "Za dostop do brezžičnega omrežja '%s' je zahtevana šifrirna fraza ali "
-#~ "šifrirni ključ."
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Reduced Network Functionality</"
-#~ "span>\n"
-#~ "\n"
-#~ "%s It will not be completely functional."
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Zmanjšana uporabnost omrežja</"
-#~ "span>\n"
-#~ "\n"
-#~ "%s ne bo popolnoma uporaben."
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Wireless Network Login "
-#~ "Confirmation</span>\n"
-#~ "\n"
-#~ "You have chosen to log in to the wireless network '%s'. If you are sure "
-#~ "that this wireless network is secure, click the checkbox below and "
-#~ "NetworkManager will not require confirmation on subsequent log ins."
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Potrditev prijave v brezžično "
-#~ "omrežje</span>\n"
-#~ "\n"
-#~ "Izbrali ste prijavo v brezžično omrežje '%s'. Če ste prepričani, da je to "
-#~ "brezžično omrežje varno, kliknite potrditveno polje spodaj in "
-#~ "NetworkManager ne bo več zahteval potrditve za nadaljnje prijave."
-#~ msgid "Anonymous Identity:"
-#~ msgstr "Anonimna identiteta:"
-#~ msgid "Authentication:"
-#~ msgstr "Overovitev:"
-#~ msgid "Broadcast Address:"
-#~ msgstr "Naslov za razpršeno oddajanje:"
-#~ msgid "CA Certificate File:"
-#~ msgstr "Datoteka overiteljevega (CA) certifikata:"
-#~ msgid "C_onnect"
-#~ msgstr "Po_veži se"
-#~ msgid "Client Certificate File:"
-#~ msgstr "Datoteka odjemalčevega certifikata:"
-#~ msgid "Connection Information"
-#~ msgstr "Informacije o povezavi"
-#~ msgid "Default Route:"
-#~ msgstr "Privzeta smer:"
-#~ msgid "Destination Address:"
-#~ msgstr "Ciljni naslov:"
-#~ msgid "Driver:"
-#~ msgstr "Gonilnik:"
-#~ msgid "EAP Method:"
-#~ msgstr "Metoda EAP:"
-#~ msgid "Hardware Address:"
-#~ msgstr "Naslov strojne opreme:"
-#~ msgid "IP Address:"
-#~ msgstr "IP naslov:"
-#~ msgid "Identity:"
-#~ msgstr "Identiteta:"
-#~ msgid "Interface:"
-#~ msgstr "Vmesnik:"
-#~ msgid "Key Type:"
-#~ msgstr "Vrsta ključa:"
-#~ msgid "Key management:"
-#~ msgstr "Upravljanje s ključi:"
-#~ msgid "Key:"
-#~ msgstr "Ključ:"
-#~ msgid ""
-#~ "None\n"
-#~ "WEP 128-bit Passphrase\n"
-#~ "WEP 64/128-bit Hex\n"
-#~ "WEP 64/128-bit ASCII\n"
-#~ msgstr ""
-#~ "Brez\n"
-#~ "WEP 128-bit šifrirna fraza\n"
-#~ "WEP 64/128-bit Hex\n"
-#~ "WEP 64/128-bit ASCII\n"
-#~ msgid ""
-#~ "Open System\n"
-#~ "Shared Key"
-#~ msgstr ""
-#~ "Odprti sistem\n"
-#~ "Deljeni ključ"
-#~ msgid "Other Wireless Network..."
-#~ msgstr "Drugo brezžično omrežje ..."
-#~ msgid "Passphrase:"
-#~ msgstr "Šifrirna fraza:"
-#~ msgid "Password:"
-#~ msgstr "Geslo:"
-#~ msgid "Primary DNS:"
-#~ msgstr "Primarni DNS;"
-#~ msgid "Private Key File:"
-#~ msgstr "Datoteka zasebnega ključa:"
-#~ msgid "Private Key Password:"
-#~ msgstr "Geslo zasebnega ključa:"
-#~ msgid "Secondary DNS:"
-#~ msgstr "Sekundarni DNS:"
-#~ msgid "Select the CA Certificate File"
-#~ msgstr "Izberite datoteko overiteljevega (CA) certifikata"
-#~ msgid "Select the Client Certificate File"
-#~ msgstr "Izberite datoteko odjemalčevega certifikata"
-#~ msgid "Select the Private Key File"
-#~ msgstr "Izberite datoteko zasebnega ključa"
-#~ msgid "Show key"
-#~ msgstr "Pokaži ključ"
-#~ msgid "Show passphrase"
-#~ msgstr "Pokaži šifrirno frazo"
-#~ msgid "Show password"
-#~ msgstr "Pokaži geslo"
-#~ msgid "Show passwords"
-#~ msgstr "Pokaži gesla"
-#~ msgid "Speed:"
-#~ msgstr "Hitrost:"
-#~ msgid "Subnet Mask:"
-#~ msgstr "Maska podomrežja:"
-#~ msgid "Type:"
-#~ msgstr "Vrsta:"
-#~ msgid "User Name:"
-#~ msgstr "Uporabniško ime:"
-#~ msgid "Wireless Network Key Required"
-#~ msgstr "Zahtevan ključ brezžičnega omrežja"
-#~ msgid "Wireless _adapter:"
-#~ msgstr "Brezžični _vmesnik:"
-#~ msgid "_Always Trust this Wireless Network"
-#~ msgstr "Vedno _zaupaj temu brezžičnemu omrežju"
-#~ msgid "_Don't remind me again"
-#~ msgstr "_Ne spomni me več"
-#~ msgid "_Login to Network"
-#~ msgstr "_Prijava v omrežje"
-#~ msgid "_Network Name:"
-#~ msgstr "_Ime omrežja:"
-#~ msgid "_Wireless Security:"
-#~ msgstr "_Zaščita omrežja:"
-#~ msgid "Cannot add VPN connection"
-#~ msgstr "Ni mogoče dodati povezave VPN"
-#~ msgid ""
-#~ "No suitable VPN software was found on your system. Contact your system "
-#~ "administrator."
-#~ msgstr ""
-#~ "Ustrezna programska oprema za VPN ni bila najdena na vašem sistemu. "
-#~ "Kontaktirajte vašega sistemskega administratorja."
-#~ msgid "Cannot import VPN connection"
-#~ msgstr "Ni mogoče uvoziti povezave VPN"
-#~ msgid ""
-#~ "Cannot find suitable software for VPN connection type '%s' to import the "
-#~ "file '%s'. Contact your system administrator."
-#~ msgstr ""
-#~ "Ni mogoče najti ustrezne programske opreme za povezavo VPN vrste '%s' za "
-#~ "uvoz datoteke '%s'. Kontaktirajte vašega sistemskega administratorja."
-#~ msgid "Error retrieving VPN connection '%s'"
-#~ msgstr "Napaka pri pridobivanju povezave VPN '%s'"
-#~ msgid ""
-#~ "Could not find the UI files for VPN connection type '%s'. Contact your "
-#~ "system administrator."
-#~ msgstr ""
-#~ "Ni mogoče najti datotek uporabniškega vmesnika za povezavo VPN vrste \"%s"
-#~ "\". Kontaktirajte vašega sistemskega administratorja."
-#~ msgid "Delete VPN connection \"%s\"?"
-#~ msgstr "Ali želite izbrisati povezavo VPN \"%s\"?"
-#~ msgid ""
-#~ "All information about the VPN connection \"%s\" will be lost and you may "
-#~ "need your system administrator to provide information to create a new "
-#~ "connection."
-#~ msgstr ""
-#~ "Vse informacije o povezavi VPN \"%s\" bodo izgubljene in mogoče boste "
-#~ "potrebovali vašega sistemskega administratorja, da vam priskrbi "
-#~ "informacije za ustvarjanje nove povezave."
-#~ msgid "Unable to load"
-#~ msgstr "Ni mogoče naložiti"
-#~ msgid "Cannot find some needed resources (the glade file)!"
-#~ msgstr "Ni mogoče najti nekaterih potrebnih virov (datoteke glade)!"
-#~ msgid "Create VPN Connection"
-#~ msgstr "Ustvari povezavo VPN"
-#~ msgid "Edit VPN Connection"
-#~ msgstr "Uredi povezavo VPN"
-#~ msgid "Add a new VPN connection"
-#~ msgstr "Dodaj novo povezavo VPN"
-#~ msgid "Delete the selected VPN connection"
-#~ msgstr "Izbriši izbrano povezavo VPN"
-#~ msgid "E_xport"
-#~ msgstr "I_zvozi"
-#~ msgid "Edit the selected VPN connection"
-#~ msgstr "Uredi izbrano povezavo VPN"
-#~ msgid "Export the VPN settings to a file"
-#~ msgstr "Izvozi nastavitve VPN v datoteko"
-#~ msgid "Export the selected VPN connection to a file"
-#~ msgstr "Izvozi izbrano povezavo VPN v datoteko"
-#~ msgid "Manage Virtual Private Network Connections"
-#~ msgstr "Upravljanje povezav navideznega zasebnega omrežja (VPN)"
-#~ msgid "VPN Connections"
-#~ msgstr "Povezave VPN"
-#~ msgid "40-bit WEP"
-#~ msgstr "40-bitni WEP"
-#~ msgid "104-bit WEP"
-#~ msgstr "104-bitni WEP"
-#~ msgid "WPA TKIP"
-#~ msgstr "WPA TKIP"
-#~ msgid "WPA CCMP"
-#~ msgstr "WPA CCMP"
-#~ msgid "WPA Automatic"
-#~ msgstr "Samodejni WPA"
-#~ msgid "WPA2 TKIP"
-#~ msgstr "WPA2 TKIP"
-#~ msgid "WPA2 CCMP"
-#~ msgstr "WPA2 CCMP"
-#~ msgid "WPA2 Automatic"
-#~ msgstr "Samodejni WPA2"
-#~ msgid "none"
-#~ msgstr "brez"
-#~ msgid "operation took too long"
-#~ msgstr "operacija je trajala predolgo"
-#~ msgid "received data from wrong type of sender"
-#~ msgstr "prejeti podatki od pošiljatelja napačne vrste"
-#~ msgid "received data from unexpected sender"
-#~ msgstr "prejeti podatki od nepričakovanega pošiljatelja"
-#~ msgid "too much data was sent over socket and some of it was lost"
-#~ msgstr ""
-#~ "preveč podatkov je bilo poslano preko vtiča in nekaj se jih je izgubilo"
-#~ msgid "You are now connected to the Ad-Hoc wireless network '%s'."
-#~ msgstr "Zdaj ste povezani v ad-hoc brezžično omrežje '%s'."
-#~ msgid "You are now connected to the wireless network '%s'."
-#~ msgstr "Zdaj ste povezani z brezžičnim omrežjem '%s'."
-#~ msgid "You are now connected to the wired network."
-#~ msgstr "Zdaj ste povezani z žičnim omrežjem."
-#~ msgid "Connection Established"
-#~ msgstr "Povezava vzpostavljena"
-#~ msgid "Disconnected"
-#~ msgstr "Prekinjena povezava"
-#~ msgid "The network connection has been disconnected."
-#~ msgstr "Omrežna povezava je bila prekinjena."
-#~ msgid "LEAP"
-#~ msgstr "LEAP"
-
diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c
index fe027c4ff5..59849d3bd5 100644
--- a/src/bluez-manager/nm-bluez-manager.c
+++ b/src/bluez-manager/nm-bluez-manager.c
@@ -251,11 +251,13 @@ name_owner_changed_cb (NMDBusManager *dbus_mgr,
gboolean old_owner_good = (old_owner && strlen (old_owner));
gboolean new_owner_good = (new_owner && strlen (new_owner));
- /* Can't handle the signal if its not from the supplicant service */
+ /* Can't handle the signal if its not from the Bluez */
if (strcmp (BLUEZ_SERVICE, name))
return;
- if (old_owner_good && !new_owner_good)
+ if (!old_owner_good && new_owner_good)
+ query_default_adapter (self);
+ else if (old_owner_good && !new_owner_good)
remove_all_devices (self, TRUE);
}
diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c
index a9bae14b1e..7f6a640e72 100644
--- a/src/system-settings/nm-sysconfig-settings.c
+++ b/src/system-settings/nm-sysconfig-settings.c
@@ -414,7 +414,7 @@ load_plugins (NMSysconfigSettings *self, const char *plugins, GError **error)
for (iter = plist; *iter; iter++) {
GModule *plugin;
char *full_name, *path;
- const char *pname = *iter;
+ const char *pname = g_strstrip (*iter);
GObject *obj;
GObject * (*factory_func) (void);
diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am
index ca4d3cd3f3..1c1fd4a7de 100644
--- a/system-settings/plugins/keyfile/Makefile.am
+++ b/system-settings/plugins/keyfile/Makefile.am
@@ -1,35 +1,49 @@
-SUBDIRS=io tests
+SUBDIRS=. tests
INCLUDES = \
-I$(top_srcdir)/src/system-settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
- -I$(top_srcdir)/libnm-glib \
- -I$(top_srcdir)/system-settings/plugins/keyfile/io
+ -I$(top_srcdir)/libnm-glib
pkglib_LTLIBRARIES = libnm-settings-plugin-keyfile.la
+noinst_LTLIBRARIES = libkeyfile-io.la
+
+libkeyfile_io_la_SOURCES = \
+ reader.c \
+ reader.h \
+ writer.c \
+ writer.h \
+ errors.c \
+ common.h
+
+libkeyfile_io_la_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DG_DISABLE_DEPRECATED
+
+libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
+
libnm_settings_plugin_keyfile_la_SOURCES = \
nm-keyfile-connection.c \
nm-keyfile-connection.h \
plugin.c \
plugin.h
-keyfiledir=$(sysconfdir)/NetworkManager/system-connections
-
libnm_settings_plugin_keyfile_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -DG_DISABLE_DEPRECATED \
- -DKEYFILE_DIR=\""$(keyfiledir)"\"
+ -DG_DISABLE_DEPRECATED
libnm_settings_plugin_keyfile_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_keyfile_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \
+ libkeyfile-io.la \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
$(DBUS_LIBS) \
diff --git a/system-settings/plugins/keyfile/common.h b/system-settings/plugins/keyfile/common.h
new file mode 100644
index 0000000000..7d94a7053e
--- /dev/null
+++ b/system-settings/plugins/keyfile/common.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager system settings service
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2008 - 2010 Red Hat, Inc.
+ */
+
+#ifndef __COMMON_H__
+#define __COMMON_H__
+
+#include <glib.h>
+
+#define KEYFILE_PLUGIN_NAME "keyfile"
+#define KEYFILE_PLUGIN_INFO "(c) 2007 - 2010 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
+
+#define KEYFILE_DIR SYSCONFDIR "/NetworkManager/system-connections"
+
+#define VPN_SECRETS_GROUP "vpn-secrets"
+
+#define KEYFILE_PLUGIN_ERROR (keyfile_plugin_error_quark ())
+GQuark keyfile_plugin_error_quark (void);
+
+#endif /* __COMMON_H__ */
+
diff --git a/system-settings/plugins/keyfile/errors.c b/system-settings/plugins/keyfile/errors.c
new file mode 100644
index 0000000000..e2e97690f1
--- /dev/null
+++ b/system-settings/plugins/keyfile/errors.c
@@ -0,0 +1,35 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* NetworkManager system settings service
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2008 - 2010 Red Hat, Inc.
+ */
+
+#include <glib.h>
+#include "common.h"
+
+GQuark
+keyfile_plugin_error_quark (void)
+{
+ static GQuark error_quark = 0;
+
+ if (G_UNLIKELY (error_quark == 0))
+ error_quark = g_quark_from_static_string ("keyfile-plugin-error-quark");
+
+ return error_quark;
+}
+
+
diff --git a/system-settings/plugins/keyfile/io/Makefile.am b/system-settings/plugins/keyfile/io/Makefile.am
deleted file mode 100644
index 9333c50976..0000000000
--- a/system-settings/plugins/keyfile/io/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-INCLUDES = \
- -I$(top_srcdir)/system-settings/src \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/libnm-util \
- -I$(top_srcdir)/libnm-glib
-
-noinst_LTLIBRARIES = libkeyfile-io.la
-
-libkeyfile_io_la_SOURCES = \
- reader.h \
- reader.c \
- writer.h \
- writer.c
-
-libkeyfile_io_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
-
-libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
-
diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.c b/system-settings/plugins/keyfile/nm-keyfile-connection.c
index 1c90961bef..3c27a54c79 100644
--- a/system-settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/system-settings/plugins/keyfile/nm-keyfile-connection.c
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2008 - 2010 Red Hat, Inc.
*/
#include <string.h>
@@ -26,10 +26,12 @@
#include <nm-utils.h>
#include <nm-settings-connection-interface.h>
+#include "nm-system-config-interface.h"
#include "nm-dbus-glib-types.h"
#include "nm-keyfile-connection.h"
#include "reader.h"
#include "writer.h"
+#include "common.h"
static NMSettingsConnectionInterface *parent_settings_connection_iface;
@@ -53,13 +55,55 @@ enum {
};
NMKeyfileConnection *
-nm_keyfile_connection_new (const char *filename)
+nm_keyfile_connection_new (const char *filename, GError **error)
{
+ GObject *object;
+ NMKeyfileConnectionPrivate *priv;
+ NMSettingConnection *s_con;
+ NMConnection *tmp;
+
g_return_val_if_fail (filename != NULL, NULL);
- return (NMKeyfileConnection *) g_object_new (NM_TYPE_KEYFILE_CONNECTION,
- NM_KEYFILE_CONNECTION_FILENAME, filename,
- NULL);
+ tmp = connection_from_file (filename, error);
+ if (!tmp)
+ return NULL;
+
+ object = (GObject *) g_object_new (NM_TYPE_KEYFILE_CONNECTION,
+ NM_KEYFILE_CONNECTION_FILENAME, filename,
+ NULL);
+ if (!object) {
+ g_object_unref (tmp);
+ return NULL;
+ }
+
+ priv = NM_KEYFILE_CONNECTION_GET_PRIVATE (object);
+ g_assert (priv->filename);
+
+ /* Update our settings with what was read from the file */
+ nm_sysconfig_connection_update (NM_SYSCONFIG_CONNECTION (object), tmp, FALSE, NULL);
+ g_object_unref (tmp);
+
+ /* if for some reason the connection didn't have a UUID, add one */
+ s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (object), NM_TYPE_SETTING_CONNECTION);
+ if (s_con && !nm_setting_connection_get_uuid (s_con)) {
+ GError *write_error = NULL;
+ char *uuid;
+
+ uuid = nm_utils_uuid_generate ();
+ g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL);
+ g_free (uuid);
+
+ if (!write_connection (NM_CONNECTION (object), KEYFILE_DIR, 0, 0, NULL, &write_error)) {
+ PLUGIN_WARN (KEYFILE_PLUGIN_NAME,
+ "Couldn't update connection %s with a UUID: (%d) %s",
+ nm_setting_connection_get_id (s_con),
+ write_error ? write_error->code : -1,
+ (write_error && write_error->message) ? write_error->message : "(unknown)");
+ g_propagate_error (error, write_error);
+ }
+ }
+
+ return NM_KEYFILE_CONNECTION (object);
}
const char *
@@ -122,56 +166,6 @@ nm_keyfile_connection_init (NMKeyfileConnection *connection)
{
}
-static GObject *
-constructor (GType type,
- guint n_construct_params,
- GObjectConstructParam *construct_params)
-{
- GObject *object;
- NMKeyfileConnectionPrivate *priv;
- NMSettingConnection *s_con;
- NMConnection *tmp;
-
- object = G_OBJECT_CLASS (nm_keyfile_connection_parent_class)->constructor (type, n_construct_params, construct_params);
-
- if (!object)
- return NULL;
-
- priv = NM_KEYFILE_CONNECTION_GET_PRIVATE (object);
-
- g_assert (priv->filename);
-
- tmp = connection_from_file (priv->filename);
- if (!tmp) {
- g_object_unref (object);
- return NULL;
- }
-
- nm_sysconfig_connection_update (NM_SYSCONFIG_CONNECTION (object), tmp, FALSE, NULL);
- g_object_unref (tmp);
-
- /* if for some reason the connection didn't have a UUID, add one */
- s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (object), NM_TYPE_SETTING_CONNECTION);
- if (s_con && !nm_setting_connection_get_uuid (s_con)) {
- GError *error = NULL;
- char *uuid;
-
- uuid = nm_utils_uuid_generate ();
- g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL);
- g_free (uuid);
-
- if (!write_connection (NM_CONNECTION (object), KEYFILE_DIR, 0, 0, NULL, &error)) {
- g_warning ("Couldn't update connection %s with a UUID: (%d) %s",
- nm_setting_connection_get_id (s_con),
- error ? error->code : 0,
- (error && error->message) ? error->message : "unknown");
- g_error_free (error);
- }
- }
-
- return object;
-}
-
static void
finalize (GObject *object)
{
@@ -225,7 +219,6 @@ nm_keyfile_connection_class_init (NMKeyfileConnectionClass *keyfile_connection_c
g_type_class_add_private (keyfile_connection_class, sizeof (NMKeyfileConnectionPrivate));
/* Virtual methods */
- object_class->constructor = constructor;
object_class->set_property = set_property;
object_class->get_property = get_property;
object_class->finalize = finalize;
diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.h b/system-settings/plugins/keyfile/nm-keyfile-connection.h
index 3b4e050c2f..68e795a6ce 100644
--- a/system-settings/plugins/keyfile/nm-keyfile-connection.h
+++ b/system-settings/plugins/keyfile/nm-keyfile-connection.h
@@ -45,7 +45,7 @@ typedef struct {
GType nm_keyfile_connection_get_type (void);
-NMKeyfileConnection *nm_keyfile_connection_new (const char *filename);
+NMKeyfileConnection *nm_keyfile_connection_new (const char *filename, GError **error);
const char *nm_keyfile_connection_get_filename (NMKeyfileConnection *self);
diff --git a/system-settings/plugins/keyfile/plugin.c b/system-settings/plugins/keyfile/plugin.c
index 36f47ccdc5..27ae0a06f6 100644
--- a/system-settings/plugins/keyfile/plugin.c
+++ b/system-settings/plugins/keyfile/plugin.c
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2008 Novell, Inc.
- * Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2008 - 2010 Red Hat, Inc.
*/
#include <config.h>
@@ -38,9 +38,7 @@
#include "nm-system-config-interface.h"
#include "nm-keyfile-connection.h"
#include "writer.h"
-
-#define KEYFILE_PLUGIN_NAME "keyfile"
-#define KEYFILE_PLUGIN_INFO "(c) 2007 - 2008 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
+#include "common.h"
#define CONF_FILE SYSCONFDIR "/NetworkManager/NetworkManager.conf"
#define OLD_CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf"
@@ -74,31 +72,49 @@ read_connections (NMSystemConfigInterface *config)
{
SCPluginKeyfilePrivate *priv = SC_PLUGIN_KEYFILE_GET_PRIVATE (config);
GDir *dir;
- GError *err = NULL;
+ GError *error = NULL;
+ const char *item;
+
+ dir = g_dir_open (KEYFILE_DIR, 0, &error);
+ if (!dir) {
+ PLUGIN_WARN (KEYFILE_PLUGIN_NAME, "Cannot read directory '%s': (%d) %s",
+ KEYFILE_DIR,
+ error ? error->code : -1,
+ error && error->message ? error->message : "(unknown)");
+ g_clear_error (&error);
+ return;
+ }
- dir = g_dir_open (KEYFILE_DIR, 0, &err);
- if (dir) {
- const char *item;
+ while ((item = g_dir_read_name (dir))) {
+ NMKeyfileConnection *connection;
+ char *full_path;
- while ((item = g_dir_read_name (dir))) {
- NMKeyfileConnection *connection;
- char *full_path;
+ full_path = g_build_filename (KEYFILE_DIR, item, NULL);
+ PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "parsing %s ... ", item);
+ connection = nm_keyfile_connection_new (full_path, &error);
+ if (connection) {
+ NMSettingConnection *s_con;
+ const char *cid;
- full_path = g_build_filename (KEYFILE_DIR, item, NULL);
- connection = nm_keyfile_connection_new (full_path);
- if (connection) {
- g_hash_table_insert (priv->hash,
- (gpointer) nm_keyfile_connection_get_filename (connection),
- connection);
- }
- g_free (full_path);
- }
+ s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION);
+ g_assert (s_con);
- g_dir_close (dir);
- } else {
- g_warning ("Can not read directory '%s': %s", KEYFILE_DIR, err->message);
- g_error_free (err);
+ cid = nm_setting_connection_get_id (s_con);
+ g_assert (cid);
+
+ g_hash_table_insert (priv->hash,
+ (gpointer) nm_keyfile_connection_get_filename (connection),
+ connection);
+
+ PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, " read connection '%s'", cid);
+ } else {
+ PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, " error: %s",
+ (error && error->message) ? error->message : "(unknown)");
+ g_clear_error (&error);
+ }
+ g_free (full_path);
}
+ g_dir_close (dir);
}
typedef struct {
@@ -148,16 +164,32 @@ update_connection_settings (NMKeyfileConnection *orig,
/* Monitoring */
static void
+remove_connection (SCPluginKeyfile *self,
+ NMKeyfileConnection *connection,
+ const char *name)
+{
+ g_return_if_fail (connection != NULL);
+ g_return_if_fail (name != NULL);
+
+ /* Removing from the hash table should drop the last reference */
+ g_object_ref (connection);
+ g_hash_table_remove (SC_PLUGIN_KEYFILE_GET_PRIVATE (self)->hash, name);
+ g_signal_emit_by_name (connection, "removed");
+ g_object_unref (connection);
+}
+
+static void
dir_changed (GFileMonitor *monitor,
- GFile *file,
- GFile *other_file,
- GFileMonitorEvent event_type,
- gpointer user_data)
+ GFile *file,
+ GFile *other_file,
+ GFileMonitorEvent event_type,
+ gpointer user_data)
{
NMSystemConfigInterface *config = NM_SYSTEM_CONFIG_INTERFACE (user_data);
SCPluginKeyfilePrivate *priv = SC_PLUGIN_KEYFILE_GET_PRIVATE (config);
char *name;
NMKeyfileConnection *connection;
+ GError *error = NULL;
name = g_file_get_path (file);
connection = g_hash_table_lookup (priv->hash, name);
@@ -165,27 +197,32 @@ dir_changed (GFileMonitor *monitor,
switch (event_type) {
case G_FILE_MONITOR_EVENT_DELETED:
if (connection) {
- /* Removing from the hash table should drop the last reference */
- g_object_ref (connection);
- g_hash_table_remove (priv->hash, name);
- g_signal_emit_by_name (connection, "removed");
- g_object_unref (connection);
+ PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "removed %s.", name);
+ remove_connection (SC_PLUGIN_KEYFILE (config), connection, name);
}
break;
case G_FILE_MONITOR_EVENT_CREATED:
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+ PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "updating %s", name);
+
if (connection) {
/* Update */
NMKeyfileConnection *tmp;
- tmp = (NMKeyfileConnection *) nm_keyfile_connection_new (name);
+ tmp = nm_keyfile_connection_new (name, &error);
if (tmp) {
update_connection_settings (connection, tmp);
g_object_unref (tmp);
+ } else {
+ /* Error; remove the connection */
+ PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, " error: %s",
+ (error && error->message) ? error->message : "(unknown)");
+ g_clear_error (&error);
+ remove_connection (SC_PLUGIN_KEYFILE (config), connection, name);
}
} else {
/* New */
- connection = nm_keyfile_connection_new (name);
+ connection = nm_keyfile_connection_new (name, &error);
if (connection) {
NMSettingConnection *s_con;
const char *connection_uuid;
@@ -234,6 +271,10 @@ dir_changed (GFileMonitor *monitor,
connection);
g_signal_emit_by_name (config, NM_SYSTEM_CONFIG_INTERFACE_CONNECTION_ADDED, connection);
}
+ } else {
+ PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, " error: %s",
+ (error && error->message) ? error->message : "(unknown)");
+ g_clear_error (&error);
}
}
break;
diff --git a/system-settings/plugins/keyfile/io/reader.c b/system-settings/plugins/keyfile/reader.c
index 50c3efe850..a5b4219c4a 100644
--- a/system-settings/plugins/keyfile/io/reader.c
+++ b/system-settings/plugins/keyfile/reader.c
@@ -40,9 +40,11 @@
#include <arpa/inet.h>
#include <netinet/ether.h>
#include <string.h>
+#include <ctype.h>
#include "nm-dbus-glib-types.h"
#include "reader.h"
+#include "common.h"
static gboolean
read_array_of_uint (GKeyFile *file,
@@ -730,6 +732,68 @@ read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key)
g_strfreev (keys);
}
+static void
+ssid_parser (NMSetting *setting, const char *key, GKeyFile *keyfile)
+{
+ const char *setting_name = nm_setting_get_name (setting);
+ GByteArray *array = NULL;
+ char *p, *tmp_string;
+ gint *tmp_list;
+ gsize length;
+ int i;
+
+ /* New format: just a string. We try parsing the new format if there are
+ * no ';' in the string or it's not just numbers.
+ */
+ p = tmp_string = g_key_file_get_string (keyfile, setting_name, key, NULL);
+ if (tmp_string) {
+ gboolean new_format = FALSE;
+
+ if (strchr (p, ';') == NULL)
+ new_format = TRUE;
+ else {
+ new_format = TRUE;
+ while (p && *p) {
+ if (!isdigit (*p++)) {
+ new_format = FALSE;
+ break;
+ }
+ }
+ }
+
+ if (new_format) {
+ array = g_byte_array_sized_new (strlen (tmp_string));
+ g_byte_array_append (array, (guint8 *) tmp_string, strlen (tmp_string));
+ goto done;
+ }
+ }
+ g_free (tmp_string);
+
+ /* Old format; list of ints */
+ tmp_list = g_key_file_get_integer_list (keyfile, setting_name, key, &length, NULL);
+ array = g_byte_array_sized_new (length);
+ for (i = 0; i < length; i++) {
+ int val = tmp_list[i];
+ unsigned char v = (unsigned char) (val & 0xFF);
+
+ if (val < 0 || val > 255) {
+ g_warning ("%s: %s / %s ignoring invalid byte element '%d' (not "
+ " between 0 and 255 inclusive)", __func__, setting_name,
+ key, val);
+ } else
+ g_byte_array_append (array, (const unsigned char *) &v, sizeof (v));
+ }
+ g_free (tmp_list);
+
+done:
+ if (array->len)
+ g_object_set (setting, key, array, NULL);
+ else {
+ g_warning ("%s: ignoring invalid SSID for %s / %s",
+ __func__, setting_name, key);
+ }
+ g_byte_array_free (array, TRUE);
+}
typedef struct {
const char *setting_name;
@@ -793,6 +857,10 @@ static KeyParser key_parsers[] = {
NM_SETTING_BLUETOOTH_BDADDR,
TRUE,
mac_address_parser },
+ { NM_SETTING_WIRELESS_SETTING_NAME,
+ NM_SETTING_WIRELESS_SSID,
+ TRUE,
+ ssid_parser },
{ NULL, NULL, FALSE }
};
@@ -986,108 +1054,120 @@ read_vpn_secrets (GKeyFile *file, NMSettingVPN *s_vpn)
}
NMConnection *
-connection_from_file (const char *filename)
+connection_from_file (const char *filename, GError **error)
{
GKeyFile *key_file;
struct stat statbuf;
gboolean bad_owner, bad_permissions;
NMConnection *connection = NULL;
- GError *err = NULL;
+ NMSettingConnection *s_con;
+ NMSettingBluetooth *s_bt;
+ NMSetting *setting;
+ gchar **groups;
+ gsize length;
+ int i;
+ gboolean vpn_secrets = FALSE;
+ const char *ctype, *tmp;
+ GError *verify_error = NULL;
- if (stat (filename, &statbuf) != 0 || !S_ISREG (statbuf.st_mode))
+ if (stat (filename, &statbuf) != 0 || !S_ISREG (statbuf.st_mode)) {
+ g_set_error_literal (error, KEYFILE_PLUGIN_ERROR, 0,
+ "File did not exist or was not a regular file");
return NULL;
+ }
bad_owner = getuid () != statbuf.st_uid;
bad_permissions = statbuf.st_mode & 0077;
if (bad_owner || bad_permissions) {
- g_warning ("Ignoring insecure configuration file '%s'", filename);
+ g_set_error (error, KEYFILE_PLUGIN_ERROR, 0,
+ "File permissions (%o) or owner (%d) were insecure",
+ statbuf.st_mode, statbuf.st_uid);
return NULL;
}
key_file = g_key_file_new ();
- if (g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, &err)) {
- NMSettingConnection *s_con;
- NMSettingBluetooth *s_bt;
- NMSetting *setting;
- gchar **groups;
- gsize length;
- int i;
- gboolean vpn_secrets = FALSE;
- const char *ctype, *tmp;
-
- connection = nm_connection_new ();
+ if (!g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, error))
+ goto out;
- groups = g_key_file_get_groups (key_file, &length);
- for (i = 0; i < length; i++) {
- /* Only read out secrets when needed */
- if (!strcmp (groups[i], VPN_SECRETS_GROUP)) {
- vpn_secrets = TRUE;
- continue;
- }
+ connection = nm_connection_new ();
- setting = read_setting (key_file, groups[i]);
- if (setting)
- nm_connection_add_setting (connection, setting);
+ groups = g_key_file_get_groups (key_file, &length);
+ for (i = 0; i < length; i++) {
+ /* Only read out secrets when needed */
+ if (!strcmp (groups[i], VPN_SECRETS_GROUP)) {
+ vpn_secrets = TRUE;
+ continue;
}
- /* Make sure that we have the base device type setting even if
- * the keyfile didn't include it, which can happen when the base
- * device type setting is all default values (like ethernet).
- */
- s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
- if (s_con) {
- ctype = nm_setting_connection_get_connection_type (s_con);
- setting = nm_connection_get_setting_by_name (connection, ctype);
- if (ctype) {
- gboolean add_serial = FALSE;
- NMSetting *new_setting = NULL;
-
- if (!setting && !strcmp (ctype, NM_SETTING_WIRED_SETTING_NAME))
- new_setting = nm_setting_wired_new ();
- else if (!strcmp (ctype, NM_SETTING_BLUETOOTH_SETTING_NAME)) {
- s_bt = (NMSettingBluetooth *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BLUETOOTH);
- if (s_bt) {
- tmp = nm_setting_bluetooth_get_connection_type (s_bt);
- if (tmp && !strcmp (tmp, NM_SETTING_BLUETOOTH_TYPE_DUN))
- add_serial = TRUE;
- }
- } else if (!strcmp (ctype, NM_SETTING_GSM_SETTING_NAME))
- add_serial = TRUE;
- else if (!strcmp (ctype, NM_SETTING_CDMA_SETTING_NAME))
- add_serial = TRUE;
-
- /* Bluetooth DUN, GSM, and CDMA connections require a serial setting */
- if (add_serial && !nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL))
- new_setting = nm_setting_serial_new ();
-
- if (new_setting)
- nm_connection_add_setting (connection, new_setting);
- }
- }
+ setting = read_setting (key_file, groups[i]);
+ if (setting)
+ nm_connection_add_setting (connection, setting);
+ }
- /* Serial connections require a PPP setting too */
- if (nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL)) {
- if (!nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP))
- nm_connection_add_setting (connection, nm_setting_ppp_new ());
- }
+ /* Make sure that we have the base device type setting even if
+ * the keyfile didn't include it, which can happen when the base
+ * device type setting is all default values (like ethernet).
+ */
+ s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
+ if (s_con) {
+ ctype = nm_setting_connection_get_connection_type (s_con);
+ setting = nm_connection_get_setting_by_name (connection, ctype);
+ if (ctype) {
+ gboolean add_serial = FALSE;
+ NMSetting *new_setting = NULL;
+
+ if (!setting && !strcmp (ctype, NM_SETTING_WIRED_SETTING_NAME))
+ new_setting = nm_setting_wired_new ();
+ else if (!strcmp (ctype, NM_SETTING_BLUETOOTH_SETTING_NAME)) {
+ s_bt = (NMSettingBluetooth *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BLUETOOTH);
+ if (s_bt) {
+ tmp = nm_setting_bluetooth_get_connection_type (s_bt);
+ if (tmp && !strcmp (tmp, NM_SETTING_BLUETOOTH_TYPE_DUN))
+ add_serial = TRUE;
+ }
+ } else if (!strcmp (ctype, NM_SETTING_GSM_SETTING_NAME))
+ add_serial = TRUE;
+ else if (!strcmp (ctype, NM_SETTING_CDMA_SETTING_NAME))
+ add_serial = TRUE;
- /* Handle vpn secrets after the 'vpn' setting was read */
- if (vpn_secrets) {
- NMSettingVPN *s_vpn;
+ /* Bluetooth DUN, GSM, and CDMA connections require a serial setting */
+ if (add_serial && !nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL))
+ new_setting = nm_setting_serial_new ();
- s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
- if (s_vpn)
- read_vpn_secrets (key_file, s_vpn);
+ if (new_setting)
+ nm_connection_add_setting (connection, new_setting);
}
+ }
- g_strfreev (groups);
- } else {
- g_warning ("Error parsing file '%s': %s", filename, err->message);
- g_error_free (err);
+ /* Serial connections require a PPP setting too */
+ if (nm_connection_get_setting (connection, NM_TYPE_SETTING_SERIAL)) {
+ if (!nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP))
+ nm_connection_add_setting (connection, nm_setting_ppp_new ());
}
- g_key_file_free (key_file);
+ /* Handle vpn secrets after the 'vpn' setting was read */
+ if (vpn_secrets) {
+ NMSettingVPN *s_vpn;
+
+ s_vpn = (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
+ if (s_vpn)
+ read_vpn_secrets (key_file, s_vpn);
+ }
+ g_strfreev (groups);
+
+ /* Verify the connection */
+ if (!nm_connection_verify (connection, &verify_error)) {
+ g_set_error (error, KEYFILE_PLUGIN_ERROR, 0,
+ "invalid or missing connection property '%s'",
+ (verify_error && verify_error->message) ? verify_error->message : "(unknown)");
+ g_clear_error (&verify_error);
+ g_object_unref (connection);
+ connection = NULL;
+ }
+
+out:
+ g_key_file_free (key_file);
return connection;
}
diff --git a/system-settings/plugins/keyfile/io/reader.h b/system-settings/plugins/keyfile/reader.h
index beac866a25..3572715495 100644
--- a/system-settings/plugins/keyfile/io/reader.h
+++ b/system-settings/plugins/keyfile/reader.h
@@ -22,11 +22,9 @@
#ifndef _KEYFILE_PLUGIN_READER_H
#define _KEYFILE_PLUGIN_READER_H
-#define VPN_SECRETS_GROUP "vpn-secrets"
-
#include <glib.h>
#include <nm-connection.h>
-NMConnection *connection_from_file (const char *filename);
+NMConnection *connection_from_file (const char *filename, GError **error);
#endif /* _KEYFILE_PLUGIN_READER_H */
diff --git a/system-settings/plugins/keyfile/tests/Makefile.am b/system-settings/plugins/keyfile/tests/Makefile.am
index a0af14b269..af76667867 100644
--- a/system-settings/plugins/keyfile/tests/Makefile.am
+++ b/system-settings/plugins/keyfile/tests/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_srcdir)/libnm-glib \
- -I$(top_srcdir)/system-settings/plugins/keyfile/io
+ -I$(top_srcdir)/system-settings/plugins/keyfile
noinst_PROGRAMS = test-keyfile
@@ -18,7 +18,7 @@ test_keyfile_CPPFLAGS = \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
test_keyfile_LDADD = \
- $(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \
+ $(top_builddir)/system-settings/plugins/keyfile/libkeyfile-io.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS)
diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am
index 52252f9a61..d6ee018340 100644
--- a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am
+++ b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am
@@ -5,7 +5,8 @@ EXTRA_DIST = \
Test_Wired_Connection_MAC_Case \
Test_Wired_Connection_IP6 \
ATT_Data_Connect_BT \
- ATT_Data_Connect_Plain
+ ATT_Data_Connect_Plain \
+ Test_String_SSID
check-local:
@for f in $(EXTRA_DIST); do \
diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_String_SSID b/system-settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
new file mode 100644
index 0000000000..4a3b56d24f
--- /dev/null
+++ b/system-settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
@@ -0,0 +1,11 @@
+[connection]
+id=Test
+uuid=2f962388-e5f3-45af-a62c-ac220b8f7baa
+type=802-11-wireless
+
+[802-11-wireless]
+ssid=blah blah ssid 1234
+
+[ipv4]
+method=auto
+
diff --git a/system-settings/plugins/keyfile/tests/test-keyfile.c b/system-settings/plugins/keyfile/tests/test-keyfile.c
index 81e17440c9..7bf63ef539 100644
--- a/system-settings/plugins/keyfile/tests/test-keyfile.c
+++ b/system-settings/plugins/keyfile/tests/test-keyfile.c
@@ -85,7 +85,7 @@ test_read_valid_wired_connection (void)
NMIP6Address *ip6_addr;
NMIP6Route *ip6_route;
- connection = connection_from_file (TEST_WIRED_FILE);
+ connection = connection_from_file (TEST_WIRED_FILE, NULL);
ASSERT (connection != NULL,
"connection-read", "failed to read %s", TEST_WIRED_FILE);
@@ -587,7 +587,7 @@ test_write_wired_connection (void)
const char *address2_gw = "1.2.1.1";
const char *route1 = "10.10.10.2";
const char *route1_nh = "10.10.10.1";
- const char *route2 = "0.0.0.0";
+ const char *route2 = "1.1.1.1";
const char *route2_nh = "1.2.1.1";
const char *dns6_1 = "1::cafe";
const char *dns6_2 = "2::cafe";
@@ -595,7 +595,7 @@ test_write_wired_connection (void)
const char *address6_2 = "dcba::beef";
const char *route6_1 = "1:2:3:4:5:6:7:8";
const char *route6_1_nh = "8:7:6:5:4:3:2:1";
- const char *route6_2 = "::";
+ const char *route6_2 = "2001::1000";
const char *route6_2_nh = "2001::1111";
guint64 timestamp = 0x12345678L;
@@ -704,7 +704,7 @@ test_write_wired_connection (void)
"connection-write", "didn't get keyfile name back after writing connection");
/* Read the connection back in and compare it to the one we just wrote out */
- reread = connection_from_file (testfile);
+ reread = connection_from_file (testfile, NULL);
ASSERT (reread != NULL, "connection-write", "failed to re-read test connection");
ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
@@ -737,7 +737,7 @@ test_read_ip6_wired_connection (void)
const char *expected6_gw1 = "abcd:1234:ffff::cdd1";
NMIP6Address *ip6_addr;
- connection = connection_from_file (TEST_WIRED_IP6_FILE);
+ connection = connection_from_file (TEST_WIRED_IP6_FILE, NULL);
ASSERT (connection != NULL,
"connection-read", "failed to read %s", TEST_WIRED_IP6_FILE);
@@ -964,7 +964,7 @@ test_write_ip6_wired_connection (void)
"connection-write", "didn't get keyfile name back after writing connection");
/* Read the connection back in and compare it to the one we just wrote out */
- reread = connection_from_file (testfile);
+ reread = connection_from_file (testfile, NULL);
ASSERT (reread != NULL, "connection-write", "failed to re-read test connection");
ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
@@ -993,7 +993,7 @@ test_read_wired_mac_case (void)
const char *expected_id = "Test Wired Connection MAC Case";
const char *expected_uuid = "4e80a56d-c99f-4aad-a6dd-b449bc398c57";
- connection = connection_from_file (TEST_WIRED_MAC_CASE_FILE);
+ connection = connection_from_file (TEST_WIRED_MAC_CASE_FILE, NULL);
ASSERT (connection != NULL,
"connection-read", "failed to read %s", TEST_WIRED_MAC_CASE_FILE);
@@ -1079,7 +1079,7 @@ test_read_valid_wireless_connection (void)
const guint64 expected_timestamp = 1226604314;
guint64 timestamp;
- connection = connection_from_file (TEST_WIRELESS_FILE);
+ connection = connection_from_file (TEST_WIRELESS_FILE, NULL);
ASSERT (connection != NULL,
"connection-read", "failed to read %s", TEST_WIRELESS_FILE);
@@ -1282,7 +1282,150 @@ test_write_wireless_connection (void)
"connection-write", "didn't get keyfile name back after writing connection");
/* Read the connection back in and compare it to the one we just wrote out */
- reread = connection_from_file (testfile);
+ reread = connection_from_file (testfile, NULL);
+ ASSERT (reread != NULL, "connection-write", "failed to re-read test connection");
+
+ ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
+ "connection-write", "written and re-read connection weren't the same");
+
+ g_clear_error (&error);
+ unlink (testfile);
+ g_free (testfile);
+
+ g_object_unref (reread);
+ g_object_unref (connection);
+}
+
+#define TEST_STRING_SSID_FILE TEST_KEYFILES_DIR"/Test_String_SSID"
+
+static void
+test_read_string_ssid (void)
+{
+ NMConnection *connection;
+ NMSettingWireless *s_wireless;
+ GError *error = NULL;
+ const GByteArray *array;
+ const char *expected_ssid = "blah blah ssid 1234";
+
+ connection = connection_from_file (TEST_STRING_SSID_FILE, NULL);
+ ASSERT (connection != NULL,
+ "connection-read", "failed to read %s", TEST_STRING_SSID_FILE);
+
+ ASSERT (nm_connection_verify (connection, &error),
+ "connection-verify", "failed to verify %s: %s", TEST_STRING_SSID_FILE, error->message);
+
+ /* ===== WIRELESS SETTING ===== */
+
+ s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS));
+ ASSERT (s_wireless != NULL,
+ "connection-verify-wireless", "failed to verify %s: missing %s setting",
+ TEST_STRING_SSID_FILE,
+ NM_SETTING_WIRELESS_SETTING_NAME);
+
+ /* SSID */
+ array = nm_setting_wireless_get_ssid (s_wireless);
+ ASSERT (array != NULL,
+ "connection-verify-wireless", "failed to verify %s: missing %s / %s key",
+ TEST_STRING_SSID_FILE,
+ NM_SETTING_WIRELESS_SETTING_NAME,
+ NM_SETTING_WIRELESS_SSID);
+ ASSERT (memcmp (array->data, expected_ssid, sizeof (expected_ssid)) == 0,
+ "connection-verify-wireless", "failed to verify %s: unexpected %s / %s key value",
+ TEST_STRING_SSID_FILE,
+ NM_SETTING_WIRELESS_SETTING_NAME,
+ NM_SETTING_WIRELESS_SSID);
+
+ g_object_unref (connection);
+}
+
+static void
+test_write_string_ssid (void)
+{
+ NMConnection *connection;
+ NMSettingConnection *s_con;
+ NMSettingWireless *s_wireless;
+ NMSettingIP4Config *s_ip4;
+ char *uuid, *testfile = NULL, *tmp;
+ GByteArray *ssid;
+ unsigned char tmpssid[] = { 65, 49, 50, 51, 32, 46, 92, 46, 36, 37, 126, 93 };
+ gboolean success;
+ NMConnection *reread;
+ GError *error = NULL;
+ pid_t owner_grp;
+ uid_t owner_uid;
+ GKeyFile *keyfile;
+
+ connection = nm_connection_new ();
+ ASSERT (connection != NULL,
+ "connection-write", "failed to allocate new connection");
+
+ /* Connection setting */
+
+ s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
+ ASSERT (s_con != NULL,
+ "connection-write", "failed to allocate new %s setting",
+ NM_SETTING_CONNECTION_SETTING_NAME);
+ nm_connection_add_setting (connection, NM_SETTING (s_con));
+
+ uuid = nm_utils_uuid_generate ();
+ g_object_set (s_con,
+ NM_SETTING_CONNECTION_ID, "String SSID Test",
+ NM_SETTING_CONNECTION_UUID, uuid,
+ NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRELESS_SETTING_NAME,
+ NULL);
+ g_free (uuid);
+
+ /* Wireless setting */
+
+ s_wireless = NM_SETTING_WIRELESS (nm_setting_wireless_new ());
+ ASSERT (s_wireless != NULL,
+ "connection-write", "failed to allocate new %s setting",
+ NM_SETTING_WIRELESS_SETTING_NAME);
+ nm_connection_add_setting (connection, NM_SETTING (s_wireless));
+
+ ssid = g_byte_array_sized_new (sizeof (tmpssid));
+ g_byte_array_append (ssid, &tmpssid[0], sizeof (tmpssid));
+ g_object_set (s_wireless, NM_SETTING_WIRELESS_SSID, ssid, NULL);
+ g_byte_array_free (ssid, TRUE);
+
+ /* IP4 setting */
+
+ s_ip4 = NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
+ ASSERT (s_ip4 != NULL,
+ "connection-write", "failed to allocate new %s setting",
+ NM_SETTING_IP4_CONFIG_SETTING_NAME);
+ nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+
+ g_object_set (s_ip4,
+ NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+ NULL);
+
+ /* Write out the connection */
+ owner_uid = geteuid ();
+ owner_grp = getegid ();
+ success = write_connection (connection, TEST_SCRATCH_DIR, owner_uid, owner_grp, &testfile, &error);
+ ASSERT (success == TRUE,
+ "connection-write", "failed to allocate write keyfile: %s",
+ error ? error->message : "(none)");
+
+ ASSERT (testfile != NULL,
+ "connection-write", "didn't get keyfile name back after writing connection");
+
+ /* Ensure the SSID was written out as a string */
+ keyfile = g_key_file_new ();
+ ASSERT (g_key_file_load_from_file (keyfile, testfile, 0, NULL) == TRUE,
+ "string-ssid-verify", "failed to load keyfile to verify");
+ tmp = g_key_file_get_string (keyfile, NM_SETTING_WIRELESS_SETTING_NAME, NM_SETTING_WIRELESS_SSID, NULL);
+ ASSERT (tmp, "string-ssid-verify", "failed to load 'ssid' key from file");
+ ASSERT (strlen (tmp) == sizeof (tmpssid),
+ "string-ssid-verify", "reread SSID and expected were different sizes");
+ ASSERT (memcmp (tmp, tmpssid, sizeof (tmpssid)) == 0,
+ "string-ssid-verify", "reread SSID and expected were different");
+ g_free (tmp);
+ g_key_file_free (keyfile);
+
+ /* Read the connection back in and compare it to the one we just wrote out */
+ reread = connection_from_file (testfile, NULL);
ASSERT (reread != NULL, "connection-write", "failed to re-read test connection");
ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
@@ -1317,7 +1460,7 @@ test_read_bt_dun_connection (void)
const char *expected_username = "ISP@CINGULARGPRS.COM";
const char *expected_password = "CINGULAR1";
- connection = connection_from_file (TEST_BT_DUN_FILE);
+ connection = connection_from_file (TEST_BT_DUN_FILE, NULL);
ASSERT (connection != NULL,
"connection-read", "failed to read %s", TEST_BT_DUN_FILE);
@@ -1567,7 +1710,7 @@ test_write_bt_dun_connection (void)
"connection-write", "didn't get keyfile name back after writing connection");
/* Read the connection back in and compare it to the one we just wrote out */
- reread = connection_from_file (testfile);
+ reread = connection_from_file (testfile, NULL);
ASSERT (reread != NULL, "connection-write", "failed to re-read test connection");
ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
@@ -1601,7 +1744,7 @@ test_read_gsm_connection (void)
const char *expected_network_id = "24005";
const char *expected_pin = "2345";
- connection = connection_from_file (TEST_GSM_FILE);
+ connection = connection_from_file (TEST_GSM_FILE, NULL);
ASSERT (connection != NULL,
"connection-read", "failed to read %s", TEST_GSM_FILE);
@@ -1829,7 +1972,7 @@ test_write_gsm_connection (void)
"connection-write", "didn't get keyfile name back after writing connection");
/* Read the connection back in and compare it to the one we just wrote out */
- reread = connection_from_file (testfile);
+ reread = connection_from_file (testfile, NULL);
ASSERT (reread != NULL, "connection-write", "failed to re-read test connection");
ASSERT (nm_connection_compare (connection, reread, NM_SETTING_COMPARE_FLAG_EXACT) == TRUE,
@@ -1867,6 +2010,9 @@ int main (int argc, char **argv)
test_read_valid_wireless_connection ();
test_write_wireless_connection ();
+ test_read_string_ssid ();
+ test_write_string_ssid ();
+
test_read_bt_dun_connection ();
test_write_bt_dun_connection ();
diff --git a/system-settings/plugins/keyfile/io/writer.c b/system-settings/plugins/keyfile/writer.c
index 7bba71e685..fdba70c969 100644
--- a/system-settings/plugins/keyfile/io/writer.c
+++ b/system-settings/plugins/keyfile/writer.c
@@ -36,11 +36,11 @@
#include <string.h>
#include <arpa/inet.h>
#include <netinet/ether.h>
-#include <nm-settings-interface.h>
+#include <ctype.h>
#include "nm-dbus-glib-types.h"
#include "writer.h"
-#include "reader.h"
+#include "common.h"
static gboolean
write_array_of_uint (GKeyFile *file,
@@ -454,6 +454,49 @@ write_hash_of_string (GKeyFile *file,
g_hash_table_foreach (hash, write_hash_of_string_helper, &info);
}
+static void
+ssid_writer (GKeyFile *file,
+ NMSetting *setting,
+ const char *key,
+ const GValue *value)
+{
+ GByteArray *array;
+ const char *setting_name = nm_setting_get_name (setting);
+ gboolean new_format = TRUE;
+ int i, *tmp_array;
+ char *ssid;
+
+ g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_UCHAR_ARRAY));
+
+ array = (GByteArray *) g_value_get_boxed (value);
+ if (!array || !array->len)
+ return;
+
+ /* Check whether each byte is printable. If not, we have to use an
+ * integer list, otherwise we can just use a string.
+ */
+ for (i = 0; i < array->len; i++) {
+ char c = array->data[i] & 0xFF;
+ if (!isprint (c)) {
+ new_format = FALSE;
+ break;
+ }
+ }
+
+ if (new_format) {
+ ssid = g_malloc0 (array->len + 1);
+ memcpy (ssid, array->data, array->len);
+ g_key_file_set_string (file, setting_name, key, ssid);
+ g_free (ssid);
+ } else {
+ tmp_array = g_new (gint, array->len);
+ for (i = 0; i < array->len; i++)
+ tmp_array[i] = (int) array->data[i];
+ g_key_file_set_integer_list (file, setting_name, key, tmp_array, array->len);
+ g_free (tmp_array);
+ }
+}
+
typedef struct {
const char *setting_name;
const char *key;
@@ -503,6 +546,9 @@ static KeyWriter key_writers[] = {
{ NM_SETTING_BLUETOOTH_SETTING_NAME,
NM_SETTING_BLUETOOTH_BDADDR,
mac_address_writer },
+ { NM_SETTING_WIRELESS_SETTING_NAME,
+ NM_SETTING_WIRELESS_SSID,
+ ssid_writer },
{ NULL, NULL, NULL }
};
@@ -667,18 +713,14 @@ write_connection (NMConnection *connection,
g_file_set_contents (path, data, len, error);
if (chown (path, owner_uid, owner_grp) < 0) {
- g_set_error (error,
- NM_SETTINGS_INTERFACE_ERROR,
- NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
+ g_set_error (error, KEYFILE_PLUGIN_ERROR, 0,
"%s.%d: error chowning '%s': %d", __FILE__, __LINE__,
path, errno);
unlink (path);
} else {
err = chmod (path, S_IRUSR | S_IWUSR);
if (err) {
- g_set_error (error,
- NM_SETTINGS_INTERFACE_ERROR,
- NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
+ g_set_error (error, KEYFILE_PLUGIN_ERROR, 0,
"%s.%d: error setting permissions on '%s': %d", __FILE__,
__LINE__, path, errno);
unlink (path);
diff --git a/system-settings/plugins/keyfile/io/writer.h b/system-settings/plugins/keyfile/writer.h
index fa04deef98..fa04deef98 100644
--- a/system-settings/plugins/keyfile/io/writer.h
+++ b/system-settings/plugins/keyfile/writer.h