From 78c3b8801ecf4975e5da1af3b10ae20dd2d876de Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 20 Apr 2016 21:11:10 +0200 Subject: Imported Upstream version 1.2.0 --- configure | 28 +- configure.ac | 4 +- ...org.freedesktop.NetworkManager.AccessPoint.html | 8 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 2 +- ...eedesktop.NetworkManager.Connection.Active.html | 2 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 2 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +- ...freedesktop.NetworkManager.Device.Wireless.html | 4 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 16 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 2 +- ....freedesktop.NetworkManager.VPN.Connection.html | 6 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 6 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 12 +- docs/api/html/index.html | 2 +- docs/api/version.xml | 2 +- docs/libnm-glib/html/NMAccessPoint.html | 24 +- docs/libnm-glib/html/NMActiveConnection.html | 28 +- docs/libnm-glib/html/NMClient.html | 26 +- docs/libnm-glib/html/NMDevice.html | 36 +- docs/libnm-glib/html/NMDeviceBt.html | 8 +- docs/libnm-glib/html/NMDeviceModem.html | 8 +- docs/libnm-glib/html/NMDeviceWifi.html | 8 +- docs/libnm-glib/html/NMIP4Config.html | 6 +- docs/libnm-glib/html/NMIP6Config.html | 8 +- docs/libnm-glib/html/NMRemoteConnection.html | 8 +- docs/libnm-glib/html/NMRemoteSettings.html | 32 +- docs/libnm-glib/html/NMSecretAgent.html | 34 +- docs/libnm-glib/html/NMVPNConnection.html | 4 +- docs/libnm-glib/html/NMWimaxNsp.html | 8 +- docs/libnm-glib/html/index.html | 4 +- docs/libnm-glib/html/index.sgml | 1 - docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 8 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 16 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 4 +- docs/libnm-glib/html/object-tree.html | 2 +- docs/libnm-glib/libnm-glib-docs.xml | 2 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/NMConnection.html | 2 +- docs/libnm-util/html/index.html | 4 +- docs/libnm-util/html/index.sgml | 1 - .../libnm-util/html/libnm-util-NetworkManager.html | 2 +- docs/libnm-util/libnm-util-docs.sgml | 2 +- docs/libnm-util/version.xml | 2 +- docs/libnm/html/NMAccessPoint.html | 8 +- docs/libnm/html/NMActiveConnection.html | 12 +- docs/libnm/html/NMClient.html | 16 +- docs/libnm/html/NMDevice.html | 34 +- docs/libnm/html/NMRemoteConnection.html | 4 +- docs/libnm/html/NMSecretAgentOld.html | 18 +- docs/libnm/html/NMSetting.html | 10 +- docs/libnm/html/NMSettingConnection.html | 6 +- docs/libnm/html/NMSettingGeneric.html | 2 +- docs/libnm/html/NMSimpleConnection.html | 24 +- docs/libnm/html/NMVpnEditorPlugin.html | 44 +- docs/libnm/html/NMWimaxNsp.html | 8 +- docs/libnm/html/api-index-full.html | 6 +- docs/libnm/html/index.html | 4 +- docs/libnm/html/index.sgml | 1 - docs/libnm/html/libnm-NMConnection.html | 276 ++--- docs/libnm/html/libnm-nm-errors.html | 20 +- docs/libnm/html/libnm-nm-utils.html | 2 +- docs/libnm/libnm-docs.xml | 2 +- docs/libnm/version.xml | 2 +- examples/C/glib/add-connection-libnm.c | 2 +- libnm-core/Makefile.am | 1 + libnm-core/Makefile.in | 1 + libnm-core/crypto.c | 3 + libnm-core/nm-core-internal.h | 1 + libnm-core/nm-vpn-editor-plugin.c | 144 ++- libnm-core/nm-vpn-editor-plugin.h | 2 +- libnm-core/nm-vpn-plugin-info.c | 18 +- libnm-util/crypto.c | 3 + libnm/nm-vpn-service-plugin.c | 26 +- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 6 +- man/nm-online.1 | 6 +- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 6 +- man/nm-settings.xml | 2 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- po/fr.po | 2 +- po/pl.po | 109 +- po/sv.po | 1148 +++++++++++--------- po/te.po | 2 +- shared/nm-shared-utils.c | 34 + shared/nm-shared-utils.h | 3 + shared/nm-version-macros.h | 4 +- src/devices/nm-device-factory.c | 5 +- src/devices/nm-device-infiniband.c | 67 +- src/devices/nm-device-macvlan.c | 9 +- src/devices/nm-device-vlan.c | 57 +- src/devices/nm-device.c | 76 +- src/devices/nm-device.h | 10 +- src/devices/wwan/nm-modem.c | 3 +- src/nm-config.c | 2 +- src/nm-core-utils.c | 34 - src/nm-core-utils.h | 5 - src/nm-manager.c | 16 +- src/platform/nm-fake-platform.c | 14 + src/platform/nm-linux-platform.c | 38 +- src/platform/nm-platform.c | 50 +- src/platform/nm-platform.h | 4 + src/vpn-manager/nm-vpn-connection.c | 19 +- 108 files changed, 1586 insertions(+), 1275 deletions(-) diff --git a/configure b/configure index 2788d1f1..fd20c533 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.1.94. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.2.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.1.94' -PACKAGE_STRING='NetworkManager 1.1.94' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='NetworkManager 1.2.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1685,7 +1685,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 1.1.94 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1755,7 +1755,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.1.94:";; + short | recursive ) echo "Configuration of NetworkManager 1.2.0:";; esac cat <<\_ACEOF @@ -2062,7 +2062,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.1.94 +NetworkManager configure 1.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2789,7 +2789,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.1.94, which was +It was created by NetworkManager $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3659,7 +3659,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.1.94' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -17539,10 +17539,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 -NM_MINOR_VERSION=1 -NM_MICRO_VERSION=94 -NM_VERSION=1.1.94 -NM_GIT_SHA=304f676e6e355ac581eca20f4d987c627ec2458b +NM_MINOR_VERSION=2 +NM_MICRO_VERSION=0 +NM_VERSION=1.2.0 +NM_GIT_SHA=d3d648f9ef1086fdba8f5c320b380ff962f674db @@ -27298,7 +27298,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 1.1.94, which was +This file was extended by NetworkManager $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27364,7 +27364,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.1.94 +NetworkManager config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3ef50261..ab2993a5 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [1]) -m4_define([nm_micro_version], [94]) +m4_define([nm_minor_version], [2]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) m4_define([nm_git_sha], [m4_esyscmd([ ( [ -d ./.git/ ] && [ "$(readlink -f ./.git/)" = "$(readlink -f "$(git rev-parse --git-dir 2>/dev/null)" 2>/dev/null)" ] && git rev-parse --verify -q HEAD 2>/dev/null ) || true ])]) diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html index ccf36e84..8669fdc9 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -87,7 +87,7 @@ Flags readable u

Flags describing the capabilities of the access point.

-

Returns: NM80211ApFlags +

Returns: NM80211ApFlags

@@ -99,7 +99,7 @@ WpaFlags readable u

Flags describing the access point's capabilities according to WPA (Wifi Protected Access).

-

Returns: NM80211ApSecurityFlags +

Returns: NM80211ApSecurityFlags

@@ -111,7 +111,7 @@ RsnFlags readable u

Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.

-

Returns: NM80211ApSecurityFlags +

Returns: NM80211ApSecurityFlags

@@ -149,7 +149,7 @@ Mode readable u

Describes the operating mode of the access point.

-

Returns: NM80211Mode +

Returns: NM80211Mode

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html index b32df401..91c82cd9 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -86,7 +86,7 @@ RegisterWithCapabilities (IN s identifier,

IN u capabilities:

-

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.

+

(NMSecretAgentCapabilities) Indicates various agent capabilities to NetworkManager.

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html index 394b34fb..5078108b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -166,7 +166,7 @@ State readable u

The state of this active connection.

-

Returns: NMActiveConnectionState +

Returns: NMActiveConnectionState

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html index bf8d3abd..96d7124e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -98,7 +98,7 @@ BtCapabilities readable u

Bluetooth capabilities of the device (either DUN or NAP).

-

Returns: NMBluetoothCapabilities +

Returns: NMBluetoothCapabilities

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html index cc18c40f..d375b528 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -82,7 +82,7 @@ ModemCapabilities readable u firmware reload or other reinitialization to switch between eg CDMA/EVDO and GSM/UMTS.

-

Returns: NMDeviceModemCapabilities +

Returns: NMDeviceModemCapabilities

@@ -94,7 +94,7 @@ CurrentCapabilities readable u

The generic family of access technologies the modem currently supports without a firmware reload or reinitialization.

-

Returns: NMDeviceModemCapabilities +

Returns: NMDeviceModemCapabilities

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html index b13c244c..afe7fec5 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -214,7 +214,7 @@ Mode readable u

The operating mode of the wireless device.

-

Returns: NM80211Mode +

Returns: NM80211Mode

@@ -253,7 +253,7 @@ WirelessCapabilities readable u

The capabilities of the wireless device.

-

Returns: NMDeviceWifiCapabilities +

Returns: NMDeviceWifiCapabilities

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html index 3acd8a78..4bcc0ccb 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -217,15 +217,15 @@ StateChanged (u new_state,

u new_state:

-

(NMDeviceState) The new state of the device.

+

(NMDeviceState) The new state of the device.

u old_state:

-

(NMDeviceState) The previous state of the device.

+

(NMDeviceState) The previous state of the device.

u reason:

-

(NMDeviceStateReason) A reason for the state transition.

+

(NMDeviceStateReason) A reason for the state transition.

@@ -307,7 +307,7 @@ Capabilities readable u

Flags describing the capabilities of the device.

-

Returns: NMDeviceCapabilities +

Returns: NMDeviceCapabilities

@@ -328,7 +328,7 @@ State readable u

The current state of the device.

-

Returns: NMDeviceState +

Returns: NMDeviceState

@@ -339,7 +339,7 @@ StateReason readable (uu)

The current state and reason for changing to that state.

-

Returns: A tuple of NMDeviceState and NMDeviceStateReason. +

Returns: A tuple of NMDeviceState and NMDeviceStateReason.

@@ -451,7 +451,7 @@ DeviceType readable u

The general type of the network device; ie Ethernet, WiFi, etc.

-

Returns: NMDeviceType +

Returns: NMDeviceType

@@ -494,7 +494,7 @@ Metered readable u

Whether the amount of traffic flowing through the device is subject to limitations, for example set by service providers.

-

Returns: NMMetered +

Returns: NMMetered

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html index 6022ef16..23201a1f 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -105,7 +105,7 @@ GetSecrets (IN a{sa{sv}} connection,

IN u flags:

-

(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

+

(NMSecretAgentGetSecretsFlags) Flags which modify the behavior of the secrets request. If true, new secrets are assumed to be invalid or incorrect, and the agent should ask the user for new secrets. If false, existing secrets should be retrieved from storage and returned without interrupting the user.

OUT a{sa{sv}} secrets:

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html index ebaad8d8..4bb08ff8 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -89,11 +89,11 @@ VpnStateChanged (u state,

u state:

-

(NMVpnConnectionState) The new state of the VPN connection.

+

(NMVpnConnectionState) The new state of the VPN connection.

u reason:

-

(NMVpnConnectionStateReason) Reason code describing the change to the new state.

+

(NMVpnConnectionStateReason) Reason code describing the change to the new state.

@@ -108,7 +108,7 @@ VpnState readable u

The VPN-specific state of the connection.

-

Returns: NMVpnConnectionState +

Returns: NMVpnConnectionState

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html index a5dc49ec..87db2178 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -272,7 +272,7 @@ StateChanged (u state);

u state:

-

(NMVpnServiceState) The new state of the plugin.

+

(NMVpnServiceState) The new state of the plugin.

@@ -395,7 +395,7 @@ Failure (u reason);

u reason:

-

(NMVpnPluginFailure) Reason code for the failure.

+

(NMVpnPluginFailure) Reason code for the failure.

@@ -409,7 +409,7 @@ State readable u

The state of the plugin.

-

Returns: NMVpnServiceState +

Returns: NMVpnServiceState

diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index 4fd2675c..a3468b7e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -398,7 +398,7 @@ CheckConnectivity (OUT u connectivity);

OUT u connectivity:

-

(NMConnectivityState) The current connectivity state.

+

(NMConnectivityState) The current connectivity state.

@@ -418,7 +418,7 @@ state (OUT u state);

OUT u state:

-

NMState

+

NMState

@@ -449,7 +449,7 @@ StateChanged (u state);

u state:

-

(NMState) The new state of NetworkManager.

+

(NMState) The new state of NetworkManager.

@@ -643,7 +643,7 @@ Metered readable u

Indicates whether the connectivity is metered. This is equivalent to the metered property of the device associated with the primary connection.

-

Returns: NMMetered +

Returns: NMMetered

@@ -685,7 +685,7 @@ State readable u

The overall state of the NetworkManager daemon.

-

Returns: NMState +

Returns: NMState

@@ -696,7 +696,7 @@ Connectivity readable u

The network connectivity state.

-

Returns: NMConnectivityState +

Returns: NMConnectivityState

diff --git a/docs/api/html/index.html b/docs/api/html/index.html index c3c1b2dc..e31a7500 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -14,7 +14,7 @@
-

Version 1.1.94 +

Version 1.2.0

Copyright © 2012, 2013, 2014, 2015, 2016 The NetworkManager Authors

diff --git a/docs/api/version.xml b/docs/api/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index a178775a..9b26174f 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -51,7 +51,7 @@ -NM80211ApFlags +NM80211ApFlags nm_access_point_get_flags () @@ -59,7 +59,7 @@ -NM80211ApSecurityFlags +NM80211ApSecurityFlags nm_access_point_get_wpa_flags () @@ -67,7 +67,7 @@ -NM80211ApSecurityFlags +NM80211ApSecurityFlags nm_access_point_get_rsn_flags () @@ -97,7 +97,7 @@ -NM80211Mode +NM80211Mode nm_access_point_get_mode () @@ -327,7 +327,7 @@ nm_access_point_new (

nm_access_point_get_flags ()

-
NM80211ApFlags
+
NM80211ApFlags
 nm_access_point_get_flags (NMAccessPoint *ap);

 
Gets the flags of the access point.

 

@@ -353,7 +353,7 @@ nm_access_point_get_flags (
 
nm_access_point_get_wpa_flags ()

-
NM80211ApSecurityFlags
+
NM80211ApSecurityFlags
 nm_access_point_get_wpa_flags (NMAccessPoint *ap);

 
Gets the WPA (version 1) flags of the access point.

 

@@ -379,7 +379,7 @@ nm_access_point_get_wpa_flags (
 

 
nm_access_point_get_rsn_flags ()

-
NM80211ApSecurityFlags
+
NM80211ApSecurityFlags
 nm_access_point_get_rsn_flags (NMAccessPoint *ap);

 
Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
 point.

@@ -486,7 +486,7 @@ nm_access_point_get_frequency (
 

 
nm_access_point_get_mode ()

-
NM80211Mode
+
NM80211Mode
 nm_access_point_get_mode (NMAccessPoint *ap);

 
Gets the mode of the access point.

 

@@ -622,7 +622,7 @@ filter that list with this function.

 
 
connections

 
 a list of
-NMConnection objects to filter. 

+NMConnection objects to filter. 

 [element-type NMConnection]
 
 
@@ -631,7 +631,7 @@ filter that list with this function.

 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given ap
+list of NMConnection objects that could be activated with the given ap
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -644,7 +644,7 @@ be freed with g_slist_free() when it is no longer
 
nm_access_point_connection_valid ()

 
gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);

+                                  NMConnection *connection);

 
Validates a given connection against a given Wi-Fi access point to ensure that
 the connection may be activated with that AP.  The connection must match the
 ap
@@ -667,7 +667,7 @@ against

 
 
 
connection

-
an NMConnection to validate against ap
+
an NMConnection to validate against ap
 

  
 
diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html
index 51037dca..895f4e7b 100644
--- a/docs/libnm-glib/html/NMActiveConnection.html
+++ b/docs/libnm-glib/html/NMActiveConnection.html
@@ -93,7 +93,7 @@
 
 
 
-NMActiveConnectionState
+NMActiveConnectionState
 
 
 nm_active_connection_get_state ()
@@ -386,7 +386,7 @@ nm_active_connection_new (
nm_active_connection_get_connection ()

 
const char *
 nm_active_connection_get_connection (NMActiveConnection *connection);

-
Gets the NMConnection's DBus object path.  This is often used with
+
Gets the NMConnection's DBus object path.  This is often used with
 nm_remote_settings_get_connection_by_path() to retrieve the
 NMRemoteConnection object that describes the connection.

 

@@ -406,7 +406,7 @@ nm_active_connection_get_connection (
 

 
Returns

-
 the object path of the NMConnection which this NMActiveConnection
+
 the object path of the NMConnection which this NMActiveConnection
 is an active instance of.  This is the internal string used by the
 connection, and must not be modified.

 

@@ -416,7 +416,7 @@ connection, and must not be modified.

 
nm_active_connection_get_id ()

 
const char *
 nm_active_connection_get_id (NMActiveConnection *connection);

-
Gets the NMConnection's ID.

+
Gets the NMConnection's ID.

 

 
Parameters

 

@@ -434,7 +434,7 @@ nm_active_connection_get_id (
 
Returns

-
 the ID of the NMConnection that backs the NMActiveConnection.
+
 the ID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

 
 
Since: 0.9.10

@@ -444,7 +444,7 @@ This is the internal string used by the connection, and must not be modified.
nm_active_connection_get_uuid ()

 
const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);

-
Gets the NMConnection's UUID.

+
Gets the NMConnection's UUID.

 

 
Parameters

 

@@ -462,7 +462,7 @@ nm_active_connection_get_uuid (
 

 
Returns

-
 the UUID of the NMConnection that backs the NMActiveConnection.
+
 the UUID of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

 

 
@@ -472,7 +472,7 @@ This is the internal string used by the connection, and must not be modified.
const char *
 nm_active_connection_get_connection_type
                                (NMActiveConnection *connection);
-
Gets the NMConnection's type.

+
Gets the NMConnection's type.

 

 
Parameters

 

@@ -490,7 +490,7 @@ nm_active_connection_get_connection_type
 
 

 
Returns

-
 the type of the NMConnection that backs the NMActiveConnection.
+
 the type of the NMConnection that backs the NMActiveConnection.
 This is the internal string used by the connection, and must not be modified.

 

 
Since: 0.9.10

@@ -554,7 +554,7 @@ This is the internal copy used by the connection, and must not be modified. 

 

 

 
nm_active_connection_get_state ()

-
NMActiveConnectionState
+
NMActiveConnectionState
 nm_active_connection_get_state (NMActiveConnection *connection);

 
Gets the active connection's state.

 

@@ -655,7 +655,7 @@ nm_active_connection_get_ip4_config (
 
Returns

 
 the NMIP4Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 

 
[transfer none]

 

@@ -687,7 +687,7 @@ nm_active_connection_get_dhcp4_config (
Returns

 
 the NMDHCP4Config, or NULL if the
 connection does not use DHCP, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

 
[transfer none]

 

 
Since: 0.9.10

@@ -743,7 +743,7 @@ nm_active_connection_get_ip6_config (
 
Returns

 
 the NMIP6Config, or NULL if the
-connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
+connection is not in the NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 state. 

 
[transfer none]

 
@@ -775,7 +775,7 @@ nm_active_connection_get_dhcp6_config (
Returns

 
 the NMDHCP6Config, or NULL if the
 connection does not use DHCPv6, or is not in the
-NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

+NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. 

 
[transfer none]

 
 
Since: 0.9.10

diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html
index 865c607a..3d92860f 100644
--- a/docs/libnm-glib/html/NMClient.html
+++ b/docs/libnm-glib/html/NMClient.html
@@ -241,7 +241,7 @@
 
 
-
+
@@ -948,7 +948,7 @@ details of the newly added connection. 

 
nm_client_add_and_activate_connection ()

 
void
 nm_client_add_and_activate_connection (NMClient *client,
-                                       NMConnection *partial,
+                                       NMConnection *partial,
                                        NMDevice *device,
                                        const char *specific_object,
                                        NMClientAddActivateFn callback,
@@ -977,7 +977,7 @@ track the activation to its completion.

 

-
-
+
@@ -1725,7 +1725,7 @@ incompatible with the device. To get the full list of connections see
 
 
-
+
@@ -1734,7 +1734,7 @@ incompatible with the device. To get the full list of connections see
 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given device
+list of NMConnection objects that could be activated with the given device
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -1747,7 +1747,7 @@ be freed with g_slist_free() when it is no longer
 
nm_device_connection_valid ()

 
gboolean
 nm_device_connection_valid (NMDevice *device,
-                            NMConnection *connection);

+                            NMConnection *connection);
 
Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
 device
@@ -1773,7 +1773,7 @@ against

 
 

-
@@ -1791,7 +1791,7 @@ if is incompatible with the device's capabilities and characteristics.

 
nm_device_connection_compatible ()

 
gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

 
Validates a given connection for a given NMDevice object and returns
 whether the connection may be activated with the device. For example if
@@ -1821,7 +1821,7 @@ against

 
 
-
@@ -1844,7 +1844,7 @@ if is incompatible with the device's capabilities and characteristics.

 
nm_device_get_setting_type ()

 
GType
 nm_device_get_setting_type (NMDevice *device);

-
Gets the (primary) NMSetting subtype associated with connections
+
Gets the (primary) NMSetting subtype associated with connections
 that can be used on device
 .

 

@@ -1865,7 +1865,7 @@ that can be used on device
 

 
Returns

 
 device
-'s associated NMSetting type

+'s associated NMSetting type

 

 
Since: 0.9.10

 

diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html
index 8a0df6b0..75e07531 100644
--- a/docs/libnm-glib/html/NMDeviceBt.html
+++ b/docs/libnm-glib/html/NMDeviceBt.html
@@ -73,7 +73,7 @@
 
 
-
+
@@ -716,7 +716,7 @@ invisible to the current user.

 
-
+
@@ -748,7 +748,7 @@ still visible to the user.

 
-
+
diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html
index ebc67526..0e1a4139 100644
--- a/docs/libnm-glib/html/NMRemoteSettings.html
+++ b/docs/libnm-glib/html/NMRemoteSettings.html
@@ -284,13 +284,13 @@
 which stores network configuration and allows authenticated clients to
 add, delete, and modify that configuration.  The data required to connect
 to a specific network is called a "connection" and encapsulated by the
-NMConnection object.  Once a connection is known to NetworkManager, having
+NMConnection object.  Once a connection is known to NetworkManager, having
 either been added by a user or read from on-disk storage, the
 NMRemoteSettings object creates a NMRemoteConnection object which
 represents this stored connection.  Use the NMRemoteConnection object to
 perform any operations like modification or deletion.

 
To add a new network connection to the NetworkManager settings service, first
-build up a template NMConnection object.  Since this connection is not yet
+build up a template NMConnection object.  Since this connection is not yet
 added to NetworkManager, it is known only to your program and is not yet
 an NMRemoteConnection.  Then ask NMRemoteSettings to add your connection.
 When the connection is added successfully, the supplied callback is called
@@ -368,7 +368,7 @@ the stored object known to NetworkManager.

    if (error)
        g_print ("Error adding connection: %s", error->message);
    else {
-       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
+       g_print ("Added: %s\n", nm_connection_get_path (NM_CONNECTION (remote)));
        /* Use 'remote' with nm_remote_connection_commit_changes() to save
         * changes and nm_remote_connection_delete() to delete the connection */
    }
@@ -383,28 +383,28 @@ the stored object known to NetworkManager.

    char *uuid;
    gboolean success;
 
-   connection = nm_connection_new ();
+   connection = nm_connection_new ();
 
    /* Build up the 'connection' setting */
-   s_con = (NMSettingConnection *) nm_setting_connection_new ();
-   uuid = nm_utils_uuid_generate ();
+   s_con = (NMSettingConnection *) nm_setting_connection_new ();
+   uuid = nm_utils_uuid_generate ();
    g_object_set (G_OBJECT (s_con),
-                 NM_SETTING_CONNECTION_UUID, uuid,
-                 NM_SETTING_CONNECTION_ID, human_name,
-                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
+                 NM_SETTING_CONNECTION_UUID, uuid,
+                 NM_SETTING_CONNECTION_ID, human_name,
+                 NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
                  NULL);
    g_free (uuid);
-   nm_connection_add_setting (connection, NM_SETTING (s_con));
+   nm_connection_add_setting (connection, NM_SETTING (s_con));
 
    /* Add the required 'wired' setting as this is a wired connection */
-   nm_connection_add_setting (connection, nm_setting_wired_new ());
+   nm_connection_add_setting (connection, nm_setting_wired_new ());
 
    /* Add an 'ipv4' setting using AUTO configuration (eg DHCP) */
-   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
+   s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new ();
    g_object_set (G_OBJECT (s_ip4),
-                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
+                 NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
                  NULL);
-   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
+   nm_connection_add_setting (connection, NM_SETTING (s_ip4));
 
    /* Ask NetworkManager to store the connection */
    success = nm_remote_settings_add_connection (settings, connection, added_cb, loop);
@@ -725,7 +725,7 @@ not known. 

 
nm_remote_settings_add_connection ()

 
gboolean
 nm_remote_settings_add_connection (NMRemoteSettings *settings,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    NMRemoteSettingsAddConnectionFunc callback,
                                    gpointer user_data);

 
Requests that the remote settings service add the given settings to a new
@@ -785,7 +785,7 @@ added, not the object itself

 
gboolean
 nm_remote_settings_add_connection_unsaved
                                (NMRemoteSettings *settings,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMRemoteSettingsAddConnectionFunc callback,
                                 gpointer user_data);

 
Requests that the remote settings service add the given settings to a new
diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html
index 8acd02c1..ebb7e858 100644
--- a/docs/libnm-glib/html/NMSecretAgent.html
+++ b/docs/libnm-glib/html/NMSecretAgent.html
@@ -247,7 +247,7 @@ nm_secret_agent_error_quark (void
 
NMSecretAgentGetSecretsFunc ()

 
void
 (*NMSecretAgentGetSecretsFunc) (NMSecretAgent *agent,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GHashTable *secrets,
                                 GError *error,
                                 gpointer user_data);

@@ -283,13 +283,13 @@ something like this:

 NMSettingWirelessSecurity *s_wsec;
 GHashTable *secrets_hash;
 
-secrets = nm_connection_new ();
-s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
+secrets = nm_connection_new ();
+s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
 g_object_set (G_OBJECT (s_wsec),
-              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
+              NM_SETTING_WIRELESS_SECURITY_PSK, "my really cool PSK",
               NULL);
-nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
-secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
+nm_connection_add_setting (secrets, NM_SETTING (s_wsec));
+secrets_hash = nm_connection_to_hash (secrets, NM_SETTING_HASH_FLAG_ALL);
 
 (call the NMSecretAgentGetSecretsFunc with secrets_hash)
 
@@ -326,9 +326,9 @@ has returned. 

 
@@ -353,7 +353,7 @@ is the secret. 

 
NMSecretAgentSaveSecretsFunc ()

 
void
 (*NMSecretAgentSaveSecretsFunc) (NMSecretAgent *agent,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError *error,
                                  gpointer user_data);

 
Called as a result of a request by NM to save secrets.  When the
@@ -400,7 +400,7 @@ has returned. 

 
NMSecretAgentDeleteSecretsFunc ()

 
void
 (*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GError *error,
                                    gpointer user_data);

 
Called as a result of a request by NM to delete secrets.  When the
@@ -532,7 +532,7 @@ nm_secret_agent_get_registered (
nm_secret_agent_get_secrets ()

 
void
 nm_secret_agent_get_secrets (NMSecretAgent *self,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              const char *setting_name,
                              const char **hints,
                              NMSecretAgentGetSecretsFlags flags,
@@ -563,7 +563,7 @@ secrets from the user.

 

-
+
@@ -601,7 +601,7 @@ secrets from the user.

 
nm_secret_agent_save_secrets ()

 
void
 nm_secret_agent_save_secrets (NMSecretAgent *self,
-                              NMConnection *connection,
+                              NMConnection *connection,
                               NMSecretAgentSaveSecretsFunc callback,
                               gpointer user_data);

 
Asyncronously ensure that all secrets inside connection
@@ -624,7 +624,7 @@ are stored to disk.

 
-
+
@@ -647,7 +647,7 @@ are stored to disk.

 
nm_secret_agent_delete_secrets ()

 
void
 nm_secret_agent_delete_secrets (NMSecretAgent *self,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 NMSecretAgentDeleteSecretsFunc callback,
                                 gpointer user_data);

 
Asynchronously ask the agent to delete all saved secrets belonging to
@@ -670,7 +670,7 @@ nm_secret_agent_delete_secrets (
 

-
+
diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html
index 7562a519..8be2954c 100644
--- a/docs/libnm-glib/html/NMVPNConnection.html
+++ b/docs/libnm-glib/html/NMVPNConnection.html
@@ -52,7 +52,7 @@
 
+NMConnection objects to filter. 

 
@@ -306,7 +306,7 @@ returned connections will match the nsp
 

 
Returns

 
 a
-list of NMConnection objects that could be activated with the given nsp
+list of NMConnection objects that could be activated with the given nsp
 .
 The elements of the list are owned by their creator and should not be freed
 by the caller, but the returned list itself is owned by the caller and should
@@ -319,7 +319,7 @@ be freed with g_slist_free() when it is no longer
 
nm_wimax_nsp_connection_valid ()

 
gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);

+                               NMConnection *connection);
 
Validates a given connection against a given WiMAX NSP to ensure that the
 connection may be activated with that NSP.  The connection must match the
 nsp
@@ -341,7 +341,7 @@ against

 
 

-
diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html
index 5df1127b..33e38b22 100644
--- a/docs/libnm-glib/html/index.html
+++ b/docs/libnm-glib/html/index.html
@@ -15,10 +15,10 @@
 

 

 
-NMState
+NMState
 
 
 nm_client_get_state ()
@@ -304,7 +304,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_get_connectivity ()
@@ -312,7 +312,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity ()
@@ -328,7 +328,7 @@
 

 

 
-NMConnectivityState
+NMConnectivityState
 
 
 nm_client_check_connectivity_finish ()
@@ -861,7 +861,7 @@ or NULL if none is found. 

 
nm_client_activate_connection ()

 
void
 nm_client_activate_connection (NMClient *client,
-                               NMConnection *connection,
+                               NMConnection *connection,
                                NMDevice *device,
                                const char *specific_object,
                                NMClientActivateFn callback,
@@ -899,7 +899,7 @@ track the activation to its completion.

 

 

 
connection
 an NMConnection. 
 an NMConnection. 

 [allow-none]
 

 

 

 
partial
 an NMConnection to add; the connection may be
+
 an NMConnection to add; the connection may be
 partially filled (or even NULL) and will be completed by NetworkManager
 using the given device
 and specific_object
@@ -1379,7 +1379,7 @@ nm_client_get_version (
 
nm_client_get_state ()

-
NMState
+
NMState
 nm_client_get_state (NMClient *client);

 
Gets the current daemon state.

 

@@ -1399,7 +1399,7 @@ nm_client_get_state (
 
Returns

-
 the current NMState

+
 the current NMState

 

 
 

@@ -1649,7 +1649,7 @@ domains separated by ",". (NULL or an empty string
 

 

 
nm_client_get_connectivity ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_get_connectivity (NMClient *client);

 
Gets the current network connectivity state. Contrast
 nm_client_check_connectivity() and
@@ -1679,7 +1679,7 @@ connectivity state first before returning any information.

 

 

 
nm_client_check_connectivity ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_check_connectivity (NMClient *client,
                               GCancellable *cancellable,
                               GError **error);

@@ -1772,7 +1772,7 @@ re-checking, and 
 
nm_client_check_connectivity_finish ()

-
NMConnectivityState
+
NMConnectivityState
 nm_client_check_connectivity_finish (NMClient *client,
                                      GAsyncResult *result,
                                      GError **error);

diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html
index 7506b557..f92c1585 100644
--- a/docs/libnm-glib/html/NMDevice.html
+++ b/docs/libnm-glib/html/NMDevice.html
@@ -74,7 +74,7 @@
 

 

 
-NMDeviceType
+NMDeviceType
 
 
 nm_device_get_device_type ()
@@ -124,7 +124,7 @@
 

 

 
-NMDeviceCapabilities
+NMDeviceCapabilities
 
 
 nm_device_get_capabilities ()
@@ -204,7 +204,7 @@
 

 

 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state ()
@@ -212,7 +212,7 @@
 

 

 
-NMDeviceState
+NMDeviceState
 
 
 nm_device_get_state_reason ()
@@ -766,7 +766,7 @@ used by the device, and must not be modified.

 

 

 
nm_device_get_device_type ()

-
NMDeviceType
+
NMDeviceType
 nm_device_get_device_type (NMDevice *device);

 
Returns the numeric type of the NMDevice, ie Ethernet, Wi-Fi, etc.

 

@@ -960,7 +960,7 @@ This is the internal string used by the device, and must not be modified.

 

 

 
nm_device_get_capabilities ()

-
NMDeviceCapabilities
+
NMDeviceCapabilities
 nm_device_get_capabilities (NMDevice *device);

 
Gets the device' capabilities.

 

@@ -1249,7 +1249,7 @@ using DHCP. 

 

 

 
nm_device_get_state ()

-
NMDeviceState
+
NMDeviceState
 nm_device_get_state (NMDevice *device);

 
Gets the current NMDevice state.

 

@@ -1275,9 +1275,9 @@ nm_device_get_state (
 
nm_device_get_state_reason ()

-
NMDeviceState
+
NMDeviceState
 nm_device_get_state_reason (NMDevice *device,
-                            NMDeviceStateReason *reason);

+                            NMDeviceStateReason *reason);

 
Gets the current NMDevice state (return value) and the reason for entering
 the state (reason
  argument).

@@ -1297,7 +1297,7 @@ the state (reason
 

 

 
reason
 location to store reason (NMDeviceStateReason), or NULL. 
 location to store reason (NMDeviceStateReason), or NULL. 

 [out][allow-none]
 

 

 
connections
 a list of NMConnection objects to filter. 
 a list of NMConnection objects to filter. 

 [element-type NMConnection]
 

 

 
connection
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 

 
connection
an NMConnection to validate against device
+
an NMConnection to validate against device
 

  
 

 
-NMBluetoothCapabilities
+NMBluetoothCapabilities
 
 
 nm_device_bt_get_capabilities ()
@@ -256,7 +256,7 @@ nm_device_bt_get_name (
 
nm_device_bt_get_capabilities ()

-
NMBluetoothCapabilities
+
NMBluetoothCapabilities
 nm_device_bt_get_capabilities (NMDeviceBt *device);

 
Returns the Bluetooth device's usable capabilities.

 

@@ -276,7 +276,7 @@ nm_device_bt_get_capabilities (
 

 
Returns

-
 a combination of NMBluetoothCapabilities

+
 a combination of NMBluetoothCapabilities

 

 

 
@@ -369,7 +369,7 @@ nm_device_bt_get_capabilities (
 
The “bt-capabilities” property

 
  “bt-capabilities”          guint

-
The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.

+
The device's bluetooth capabilities, a combination of NMBluetoothCapabilities.

 
Flags: Read

 
Default value: 0

 
diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html
index 15fe2aa1..2c05df00 100644
--- a/docs/libnm-glib/html/NMDeviceModem.html
+++ b/docs/libnm-glib/html/NMDeviceModem.html
@@ -51,7 +51,7 @@
 

 

 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_modem_capabilities ()
@@ -59,7 +59,7 @@
 

 

 
-NMDeviceModemCapabilities
+NMDeviceModemCapabilities
 
 
 nm_device_modem_get_current_capabilities ()
@@ -143,7 +143,7 @@ nm_device_modem_error_quark (void
 

 

 
nm_device_modem_get_modem_capabilities ()

-
NMDeviceModemCapabilities
+
NMDeviceModemCapabilities
 nm_device_modem_get_modem_capabilities
                                (NMDeviceModem *self);

 
Returns a bitfield of the generic access technology families the modem
@@ -172,7 +172,7 @@ may require a firmware reload or reinitialization.

 

 

 
nm_device_modem_get_current_capabilities ()

-
NMDeviceModemCapabilities
+
NMDeviceModemCapabilities
 nm_device_modem_get_current_capabilities
                                (NMDeviceModem *self);

 
Returns a bitfield of the generic access technology families the modem
diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html
index d739d92a..1c0223aa 100644
--- a/docs/libnm-glib/html/NMDeviceWifi.html
+++ b/docs/libnm-glib/html/NMDeviceWifi.html
@@ -74,7 +74,7 @@
 

 

 
-NM80211Mode
+NM80211Mode
 
 
 nm_device_wifi_get_mode ()
@@ -90,7 +90,7 @@
 

 

 
-NMDeviceWifiCapabilities
+NMDeviceWifiCapabilities
 
 
 nm_device_wifi_get_capabilities ()
@@ -374,7 +374,7 @@ device, and must not be modified.

 

 

 
nm_device_wifi_get_mode ()

-
NM80211Mode
+
NM80211Mode
 nm_device_wifi_get_mode (NMDeviceWifi *device);

 
Gets the NMDeviceWifi mode.

 

@@ -426,7 +426,7 @@ nm_device_wifi_get_bitrate (
 
nm_device_wifi_get_capabilities ()

-
NMDeviceWifiCapabilities
+
NMDeviceWifiCapabilities
 nm_device_wifi_get_capabilities (NMDeviceWifi *device);

 
Gets the Wi-Fi capabilities of the NMDeviceWifi.

 

diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html
index b7b318e1..edc746b6 100644
--- a/docs/libnm-glib/html/NMIP4Config.html
+++ b/docs/libnm-glib/html/NMIP4Config.html
@@ -288,7 +288,7 @@ nm_ip4_config_get_addresses (
 
Returns

-
 the GSList containing NMIP4Addresses.
+
 the GSList containing NMIP4Addresses.
 This is the internal copy used by the configuration and must not be modified. 

 
[element-type NMIP4Address]

 

@@ -317,7 +317,7 @@ nm_ip4_config_get_routes (
 
Returns

 
 the GSList containing
-NMIP4Routes. This is the internal copy used by the configuration,
+NMIP4Routes. This is the internal copy used by the configuration,
 and must not be modified. 

 
[element-type NMIP4Route]

 

@@ -487,7 +487,7 @@ modified. 

 

 
The “addresses” property

 
  “addresses”                gpointer

-
The GPtrArray containing NMIP4Addresses of the configuration.

+
The GPtrArray containing NMIP4Addresses of the configuration.

 
Flags: Read

 

 

diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html
index ed97f3e5..53718105 100644
--- a/docs/libnm-glib/html/NMIP6Config.html
+++ b/docs/libnm-glib/html/NMIP6Config.html
@@ -289,7 +289,7 @@ nm_ip6_config_get_addresses (
 
Returns

 
 the GSList containing
-NMIP6Addresses. This is the internal copy used by the configuration
+NMIP6Addresses. This is the internal copy used by the configuration
 and must not be modified. 

 
[element-type NMIP6Address]

 

@@ -318,7 +318,7 @@ nm_ip6_config_get_routes (
 
Returns

 
 the GSList containing
-NMIP6Routes. This is the internal copy used by the configuration,
+NMIP6Routes. This is the internal copy used by the configuration,
 and must not be modified. 

 
[element-type NMIP6Route]

 
@@ -519,7 +519,7 @@ This is the internal copy used by the configuration, and must not be modified. <
 
The “addresses” property

 
  “addresses”                NMIP6AddressObjectArray *

 
The GPtrArray containing the IPv6 addresses;  use
-nm_utils_ip6_addresses_from_gvalue() to return a GSList of
+nm_utils_ip6_addresses_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.

 
Flags: Read

 
@@ -552,7 +552,7 @@ contain the addresses of nameservers of the configuration.

 
The “routes” property

 
  “routes”                   NMIP6RouteObjectArray *

 
The GPtrArray containing the IPv6 routes;  use
-nm_utils_ip6_routes_from_gvalue() to return a GSList of
+nm_utils_ip6_routes_from_gvalue() to return a GSList of
 NMSettingIP6Address objects that is more usable than the raw data.

 
Flags: Read

 
diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html
index c099c3df..ee5bfa0c 100644
--- a/docs/libnm-glib/html/NMRemoteConnection.html
+++ b/docs/libnm-glib/html/NMRemoteConnection.html
@@ -229,7 +229,7 @@
 

 
Object Hierarchy

 
    GObject
-    ╰── NMConnection
+    ╰── NMConnection
         ╰── NMRemoteConnection
 

 

@@ -554,7 +554,7 @@ nm_remote_connection_get_secrets (
 

 
setting_name
the NMSetting object name to get secrets for
the NMSetting object name to get secrets for

  
 

 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 
secrets

 
 the GHashTable containing
-the requested secrets in the same format as an NMConnection hash (as
-created by nm_connection_to_hash() for example).  Each key in secrets
-should be the name of a NMSetting object (like "802-11-wireless-security")
+the requested secrets in the same format as an NMConnection hash (as
+created by nm_connection_to_hash() for example).  Each key in secrets
+should be the name of a NMSetting object (like "802-11-wireless-security")
 and each value should be a GHashTable.  The sub-hashes map string:GValue
 where the string is the setting property name (like "psk") and the value
 is the secret. 

 

 
connection
the NMConnection for which we're asked secrets
the NMConnection for which we're asked secrets

  
 

 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 
connection
a NMConnection
a NMConnection

  
 

 

 

 
-NMVPNConnectionState
+NMVPNConnectionState
 
 
 nm_vpn_connection_get_vpn_state ()
@@ -175,7 +175,7 @@ nm_vpn_connection_new (
 
nm_vpn_connection_get_vpn_state ()

-
NMVPNConnectionState
+
NMVPNConnectionState
 nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn);

 
Gets the current NMVPNConnection state.

 

diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html
index 91cdbfee..d473ec6c 100644
--- a/docs/libnm-glib/html/NMWimaxNsp.html
+++ b/docs/libnm-glib/html/NMWimaxNsp.html
@@ -297,7 +297,7 @@ returned connections will match the nsp
 

 
connections

 
 a list of
-NMConnection objects to filter. 
[element-type NMConnection]
 

 

 
connection
an NMConnection to validate against nsp
+
an NMConnection to validate against nsp
 

  
 

 

-      for libnm-glib 1.1.94
+      for libnm-glib 1.2.0
 
       The latest version of this documentation can be found on-line at
-      https://developer.gnome.org/libnm-glib/0.9/.
+      https://developer.gnome.org/libnm-glib/stable/.
     

 
Copyright © 2012-2013 The NetworkManager Authors

 

diff --git a/docs/libnm-glib/html/index.sgml b/docs/libnm-glib/html/index.sgml
index 5d95d5cb..984704d5 100644
--- a/docs/libnm-glib/html/index.sgml
+++ b/docs/libnm-glib/html/index.sgml
@@ -1,4 +1,3 @@
-
 
 
 
diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
index e0523b6f..a3f3fadc 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html
@@ -57,7 +57,7 @@
 
 
 
-NMVPNServiceState
+NMVPNServiceState
 
 
 nm_vpn_plugin_get_state ()
@@ -172,7 +172,7 @@ nm_vpn_plugin_get_connection (NMV
 

 

 
nm_vpn_plugin_get_state ()

-
NMVPNServiceState
+
NMVPNServiceState
 nm_vpn_plugin_get_state (NMVPNPlugin *plugin);

 

 

@@ -180,7 +180,7 @@ nm_vpn_plugin_get_state (NMVPNPlu
 
nm_vpn_plugin_set_state ()

 
void
 nm_vpn_plugin_set_state (NMVPNPlugin *plugin,
-                         NMVPNServiceState state);

+                         NMVPNServiceState state);

 

 

 

@@ -235,7 +235,7 @@ nm_vpn_plugin_set_login_banner (N
 
nm_vpn_plugin_failure ()

 
void
 nm_vpn_plugin_failure (NMVPNPlugin *plugin,
-                       NMVPNPluginFailure reason);

+                       NMVPNPluginFailure reason);

 

 

 

diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
index a4343675..cd633c5d 100644
--- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
+++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html
@@ -73,7 +73,7 @@
 
 
 
-NMConnection *
+NMConnection *
 
 
 nm_vpn_plugin_ui_interface_import ()
@@ -262,7 +262,7 @@ nm_vpn_plugin_ui_factory (GError<
 
nm_vpn_plugin_ui_interface_ui_factory ()

 
NMVpnPluginUiWidgetInterface *
 nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
-                                       NMConnection *connection,
+                                       NMConnection *connection,
                                        GError **error);

 

 

@@ -275,7 +275,7 @@ nm_vpn_plugin_ui_interface_get_capabilities
 

 

 
nm_vpn_plugin_ui_interface_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
                                    const char *path,
                                    GError **error);

@@ -286,7 +286,7 @@ nm_vpn_plugin_ui_interface_import (gboolean
 nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
                                    const char *path,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GError **error);

 

 

@@ -295,7 +295,7 @@ nm_vpn_plugin_ui_interface_export (char *
 nm_vpn_plugin_ui_interface_get_suggested_name
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection);
+ NMConnection *connection);
@@ -303,7 +303,7 @@ nm_vpn_plugin_ui_interface_get_suggested_name 
gboolean
 nm_vpn_plugin_ui_interface_delete_connection
                                (NMVpnPluginUiInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);

nm_vpn_plugin_ui_interface_delete_connection is deprecated and should not be used in newly-written code.

@@ -320,7 +320,7 @@ nm_vpn_plugin_ui_widget_interface_get_widget 
gboolean
 nm_vpn_plugin_ui_widget_interface_update_connection
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);
@@ -329,7 +329,7 @@ nm_vpn_plugin_ui_widget_interface_update_connection 
gboolean
 nm_vpn_plugin_ui_widget_interface_save_secrets
                                (NMVpnPluginUiWidgetInterface *iface,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 GError **error);

nm_vpn_plugin_ui_widget_interface_save_secrets is deprecated and should not be used in newly-written code.

diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html index b03e5987..83f198f6 100644 --- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html +++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html @@ -111,11 +111,11 @@ an applet when the applet calls the authentication dialog of the VPN plugin.

gboolean
 nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
                                       const char *secret_name,
-                                      NMSettingSecretFlags *out_flags);
+ NMSettingSecretFlags *out_flags);

Given a VPN secret key name, attempts to find the corresponding flags data item in data . If found, converts the flags data item to -NMSettingSecretFlags and returns it.

+NMSettingSecretFlags and returns it.

Parameters

diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html index c6ea9297..acd89edf 100644 --- a/docs/libnm-glib/html/object-tree.html +++ b/docs/libnm-glib/html/object-tree.html @@ -49,7 +49,7 @@ │├──NMDHCP4Config│╰──NMDHCP6Config├──NMRemoteSettings - ├──NMConnection + ├──NMConnection│╰──NMRemoteConnection╰──NMSecretAgent diff --git a/docs/libnm-glib/libnm-glib-docs.xml b/docs/libnm-glib/libnm-glib-docs.xml index 76119246..798ea5f8 100644 --- a/docs/libnm-glib/libnm-glib-docs.xml +++ b/docs/libnm-glib/libnm-glib-docs.xml @@ -10,7 +10,7 @@ for libnm-glib &version; The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-glib/0.9/. + https://developer.gnome.org/libnm-glib/stable/. diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 85c39759..7572c017 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -1730,7 +1730,7 @@ nm_connection_get_connection_type (char * nm_connection_get_virtual_device_description (NMConnection *connection); -

Returns the name that nm_device_disambiguate_names() would +

Returns the name that nm_device_disambiguate_names() would return for the virtual device that would be created for connection . Eg, "VLAN (eth1.1)".

diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index b50fbdbd..974ce75b 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -15,10 +15,10 @@

- for libnm-util 1.1.94 + for libnm-util 1.2.0 The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-util/0.9/. + https://developer.gnome.org/libnm-util/stable/.

Copyright © 2012 The NetworkManager Authors

diff --git a/docs/libnm-util/html/index.sgml b/docs/libnm-util/html/index.sgml index d1e0be2d..c95acf87 100644 --- a/docs/libnm-util/html/index.sgml +++ b/docs/libnm-util/html/index.sgml @@ -1,4 +1,3 @@ - diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html index b525e187..aaaadc84 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManager.html +++ b/docs/libnm-util/html/libnm-util-NetworkManager.html @@ -644,7 +644,7 @@

enum NMDeviceType

NMDeviceType values indicate the type of hardware represented by -an NMDevice.

+an NMDevice.

Members

diff --git a/docs/libnm-util/libnm-util-docs.sgml b/docs/libnm-util/libnm-util-docs.sgml index 14139181..9ec760eb 100644 --- a/docs/libnm-util/libnm-util-docs.sgml +++ b/docs/libnm-util/libnm-util-docs.sgml @@ -11,7 +11,7 @@ for libnm-util &version; The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm-util/0.9/. + https://developer.gnome.org/libnm-util/stable/. diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html index b1469048..2fbd6507 100644 --- a/docs/libnm/html/NMAccessPoint.html +++ b/docs/libnm/html/NMAccessPoint.html @@ -573,7 +573,7 @@ with this function.

 - @@ -583,7 +583,7 @@ filter.

Returns

an array of -NMConnections that could be activated with the given ap +NMConnections that could be activated with the given ap . The array should be freed with g_ptr_array_unref() when it is no longer required.

[transfer container][element-type NMConnection]

@@ -594,7 +594,7 @@ be freed with g_ptr_array_unref() when it is no lo

nm_access_point_connection_valid ()

gboolean
 nm_access_point_connection_valid (NMAccessPoint *ap,
-                                  NMConnection *connection);
+ NMConnection *connection);

Validates a given connection against a given Wi-Fi access point to ensure that the connection may be activated with that AP. The connection must match the ap @@ -617,7 +617,7 @@ against

- diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html index bcd2410d..55266de2 100644 --- a/docs/libnm/html/NMActiveConnection.html +++ b/docs/libnm/html/NMActiveConnection.html @@ -374,7 +374,7 @@ nm_active_connection_get_connection (

nm_active_connection_get_id ()

const char *
 nm_active_connection_get_id (NMActiveConnection *connection);
-

Gets the NMConnection's ID.

+

Gets the NMConnection's ID.

Parameters

connections

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection]

connection

an NMConnection to validate against ap +

an NMConnection to validate against ap

 
@@ -392,7 +392,7 @@ nm_active_connection_get_id (

Returns

-

the ID of the NMConnection that backs the NMActiveConnection. +

the ID of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

@@ -401,7 +401,7 @@ This is the internal string used by the connection, and must not be modified.

nm_active_connection_get_uuid ()

const char *
 nm_active_connection_get_uuid (NMActiveConnection *connection);
-

Gets the NMConnection's UUID.

+

Gets the NMConnection's UUID.

Parameters

@@ -419,7 +419,7 @@ nm_active_connection_get_uuid (

Returns

-

the UUID of the NMConnection that backs the NMActiveConnection. +

the UUID of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

@@ -429,7 +429,7 @@ This is the internal string used by the connection, and must not be modified.

const char * nm_active_connection_get_connection_type (NMActiveConnection *connection); -

Gets the NMConnection's type.

+

Gets the NMConnection's type.

Parameters

@@ -447,7 +447,7 @@ nm_active_connection_get_connection_type

Returns

-

the type of the NMConnection that backs the NMActiveConnection. +

the type of the NMConnection that backs the NMActiveConnection. This is the internal string used by the connection, and must not be modified.

diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index 1e51c552..a990346a 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -2018,7 +2018,7 @@ any.

nm_client_activate_connection_async ()

void
 nm_client_activate_connection_async (NMClient *client,
-                                     NMConnection *connection,
+                                     NMConnection *connection,
                                      NMDevice *device,
                                      const char *specific_object,
                                      GCancellable *cancellable,
@@ -2058,7 +2058,7 @@ track the activation to its completion.
- + @@ -2147,7 +2147,7 @@ will be set. 

void
 nm_client_add_and_activate_connection_async
                                (NMClient *client,
-                                NMConnection *partial,
+                                NMConnection *partial,
                                 NMDevice *device,
                                 const char *specific_object,
                                 GCancellable *cancellable,
@@ -2178,7 +2178,7 @@ track the activation to its completion.
- - @@ -259,7 +259,7 @@ filter.

Returns

an array of -NMConnections that could be activated with the given nsp +NMConnections that could be activated with the given nsp . The array should be freed with g_ptr_array_unref() when it is no longer required.

[transfer container][element-type NMConnection]

@@ -270,7 +270,7 @@ be freed with g_ptr_array_unref() when it is no lo

nm_wimax_nsp_connection_valid ()

gboolean
 nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp,
-                               NMConnection *connection);
+ NMConnection *connection);

Validates a given connection against a given WiMAX NSP to ensure that the connection may be activated with that NSP. The connection must match the nsp @@ -292,7 +292,7 @@ against

 - diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index fe6ccbeb..8e4f01ca 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -8214,7 +8214,7 @@
-NMVpnEditorInterface, struct in NMVpnEditor +NMVpnEditorInterface, struct in NMVpnEditor
@@ -8282,7 +8282,7 @@
-nm_vpn_editor_get_widget, function in NMVpnEditor +nm_vpn_editor_get_widget, function in NMVpnEditor
@@ -8326,7 +8326,7 @@
-nm_vpn_editor_update_connection, function in NMVpnEditor +nm_vpn_editor_update_connection, function in NMVpnEditor
diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 1267d387..eec37428 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,10 +15,10 @@

connection

an NMConnection.

an NMConnection.

[allow-none]

partial

an NMConnection to add; the connection may be +

an NMConnection to add; the connection may be partially filled (or even NULL) and will be completed by NetworkManager using the given device and specific_object @@ -2232,7 +2232,7 @@ nm_client_add_and_activate_connection_finish GError **error);

Gets the result of a call to nm_client_add_and_activate_connection_async().

You can call nm_active_connection_get_connection() on the returned -NMActiveConnection to find the path of the created NMConnection.

+NMActiveConnection to find the path of the created NMConnection.

Parameters

@@ -2556,7 +2556,7 @@ to

nm_client_add_connection_async ()

void
 nm_client_add_connection_async (NMClient *client,
-                                NMConnection *connection,
+                                NMConnection *connection,
                                 gboolean save_to_disk,
                                 GCancellable *cancellable,
                                 GAsyncReadyCallback callback,
@@ -3609,7 +3609,7 @@ regular devices and placeholder devices.

 user_function (NMClient           *client,
                NMRemoteConnection *connection,
                gpointer            user_data)
-

Notifies that a NMConnection has been added.

+

Notifies that a NMConnection has been added.

Parameters

@@ -3646,7 +3646,7 @@ user_function (NMClient *client, NMRemoteConnection *connection, gpointer user_data) -

Notifies that a NMConnection has been removed.

+

Notifies that a NMConnection has been removed.

Parameters

diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index 67f70037..6dd8dd36 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -327,7 +327,7 @@ - + @@ -1844,7 +1844,7 @@ will be set.

nm_device_reapply_async ()

void
 nm_device_reapply_async (NMDevice *device,
-                         NMConnection *connection,
+                         NMConnection *connection,
                          guint64 version_id,
                          guint32 flags,
                          GCancellable *cancellable,
@@ -1868,7 +1868,7 @@ currently active connection made since it was last applied.
- + @@ -1949,7 +1949,7 @@ will be set.

nm_device_get_applied_connection ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection (NMDevice *device,
                                   guint32 flags,
                                   guint64 *version_id,
@@ -1996,7 +1996,7 @@ the applied connection.

Returns

-

a NMConnection with the currently applied settings +

a NMConnection with the currently applied settings or NULL on error.

The connection is as received from D-Bus and might not validate according to nm_connection_verify().

@@ -2058,7 +2058,7 @@ nm_device_get_applied_connection_async

nm_device_get_applied_connection_finish ()

-
NMConnection *
+
NMConnection *
 nm_device_get_applied_connection_finish
                                (NMDevice *device,
                                 GAsyncResult *result,
@@ -2100,7 +2100,7 @@ connection.

Returns

-

a currently applied NMConnection or NULL in case +

a currently applied NMConnection or NULL in case of error.

The connection is as received from D-Bus and might not validate according to nm_connection_verify().

@@ -2395,7 +2395,7 @@ incompatible with the device. To get the full list of connections see
- + @@ -2404,7 +2404,7 @@ incompatible with the device. To get the full list of connections see

Returns

an array of -NMConnections that could be activated with the given device +NMConnections that could be activated with the given device . The array should be freed with g_ptr_array_unref() when it is no longer required.

[transfer container][element-type NMConnection]

@@ -2415,7 +2415,7 @@ should be freed with g_ptr_array_unref() when it i

nm_device_connection_valid ()

gboolean
 nm_device_connection_valid (NMDevice *device,
-                            NMConnection *connection);
+ NMConnection *connection);

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if device @@ -2441,7 +2441,7 @@ against

- @@ -2459,7 +2459,7 @@ if is incompatible with the device's capabilities and characteristics.

nm_device_connection_compatible ()

gboolean
 nm_device_connection_compatible (NMDevice *device,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

Validates a given connection for a given NMDevice object and returns whether the connection may be activated with the device. For example if @@ -2489,7 +2489,7 @@ against

- @@ -3022,7 +3022,7 @@ operations like addressing and routing.

The “ip4-config” property

  “ip4-config”               NMIPConfig *
-

The NMIP4Config of the device.

+

The NMIP4Config of the device.

Flags: Read

diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html index dac135b3..48fc088c 100644 --- a/docs/libnm/html/NMRemoteConnection.html +++ b/docs/libnm/html/NMRemoteConnection.html @@ -795,7 +795,7 @@ nm_remote_connection_get_visible (nm_remote_connection_save() and nm_remote_connection_delete() will -always fail. (NMRemoteSettings will not normally return +always fail. (NMRemoteSettings will not normally return non-visible connections to callers, but it is possible for a connection's visibility to change after you already have a reference to it.)

@@ -865,7 +865,7 @@ to disk, FALSE if the connection is the same as its not. If the connection is not visible then it is essentially useless; it will not contain any settings, and operations such as nm_remote_connection_save() and nm_remote_connection_delete() will always -fail. (NMRemoteSettings will not normally return non-visible connections +fail. (NMRemoteSettings will not normally return non-visible connections to callers, but it is possible for a connection's visibility to change after you already have a reference to it.)

Flags: Read

diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html index c95971c3..3fb7ca3a 100644 --- a/docs/libnm/html/NMSecretAgentOld.html +++ b/docs/libnm/html/NMSecretAgentOld.html @@ -223,7 +223,7 @@

NMSecretAgentOldGetSecretsFunc ()

void
 (*NMSecretAgentOldGetSecretsFunc) (NMSecretAgentOld *agent,
-                                   NMConnection *connection,
+                                   NMConnection *connection,
                                    GVariant *secrets,
                                    GError *error,
                                    gpointer user_data);
@@ -328,7 +328,7 @@ and the value is the secret

NMSecretAgentOldSaveSecretsFunc ()

void
 (*NMSecretAgentOldSaveSecretsFunc) (NMSecretAgentOld *agent,
-                                    NMConnection *connection,
+                                    NMConnection *connection,
                                     GError *error,
                                     gpointer user_data);

Called as a result of a request by NM to save secrets. When the @@ -375,7 +375,7 @@ has returned.

NMSecretAgentOldDeleteSecretsFunc ()

void
 (*NMSecretAgentOldDeleteSecretsFunc) (NMSecretAgentOld *agent,
-                                      NMConnection *connection,
+                                      NMConnection *connection,
                                       GError *error,
                                       gpointer user_data);

Called as a result of a request by NM to delete secrets. When the @@ -705,7 +705,7 @@ nm_secret_agent_old_get_registered (

nm_secret_agent_old_get_secrets ()

void
 nm_secret_agent_old_get_secrets (NMSecretAgentOld *self,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  const char *setting_name,
                                  const char **hints,
                                  NMSecretAgentGetSecretsFlags flags,
@@ -736,7 +736,7 @@ secrets from the user.
- + @@ -774,7 +774,7 @@ secrets from the user.

nm_secret_agent_old_save_secrets ()

void
 nm_secret_agent_old_save_secrets (NMSecretAgentOld *self,
-                                  NMConnection *connection,
+                                  NMConnection *connection,
                                   NMSecretAgentOldSaveSecretsFunc callback,
                                   gpointer user_data);

Asynchronously ensures that all secrets inside connection @@ -797,7 +797,7 @@ disk.

 - + @@ -820,7 +820,7 @@ disk.

nm_secret_agent_old_delete_secrets ()

void
 nm_secret_agent_old_delete_secrets (NMSecretAgentOld *self,
-                                    NMConnection *connection,
+                                    NMConnection *connection,
                                     NMSecretAgentOldDeleteSecretsFunc callback,
                                     gpointer user_data);

Asynchronously asks the agent to delete all saved secrets belonging to @@ -843,7 +843,7 @@ nm_secret_agent_old_delete_secrets (

- + diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html index 65b56b96..1a8a870f 100644 --- a/docs/libnm/html/NMSetting.html +++ b/docs/libnm/html/NMSetting.html @@ -263,7 +263,7 @@

Each NMSetting contains properties that describe configuration that applies to a specific network layer (like IPv4 or IPv6 configuration) or device type (like Ethernet, or Wi-Fi). A collection of individual settings together -make up an NMConnection. Each property is strongly typed and usually has +make up an NMConnection. Each property is strongly typed and usually has a number of allowed values. See each NMSetting subclass for a description of properties and allowed values.

@@ -467,7 +467,7 @@ like 'ppp' or 'wireless' or 'wired'.

nm_setting_verify ()

gboolean
 nm_setting_verify (NMSetting *setting,
-                   NMConnection *connection,
+                   NMConnection *connection,
                    GError **error);

Validates the setting. Each setting's properties have allowed values, and some are dependent on other values (hence the need for connection @@ -490,7 +490,7 @@ failed validation, and in what way that property failed validation.

 - @@ -514,7 +514,7 @@ is being verified in isolation.

nm_setting_verify_secrets ()

gboolean
 nm_setting_verify_secrets (NMSetting *setting,
-                           NMConnection *connection,
+                           NMConnection *connection,
                            GError **error);

Verifies the secrets in the setting. The returned GError contains information about which secret of the setting @@ -537,7 +537,7 @@ in some cases connection failure is not desired just for the secrets.

 - diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 8c845502..0cb7806e 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -484,8 +484,8 @@

Description

The NMSettingConnection object is a NMSetting subclass that describes -properties that apply to all NMConnection objects, regardless of what type -of network connection they describe. Each NMConnection object must contain +properties that apply to all NMConnection objects, regardless of what type +of network connection they describe. Each NMConnection object must contain a NMSettingConnection setting.

@@ -1757,7 +1757,7 @@ provider, or nm_utils_uuid_generate() or -nm_utils_uuid_generate_from_string().

+nm_utils_uuid_generate_from_string().

Flags: Read / Write

Default value: NULL

diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html index f1975597..81cb154a 100644 --- a/docs/libnm/html/NMSettingGeneric.html +++ b/docs/libnm/html/NMSettingGeneric.html @@ -75,7 +75,7 @@ optional properties that apply to "generic" devices (ie, devices that NetworkManager does not specifically recognize).

There are currently no properties on this object; it exists only to be -the "connection type" setting on NMConnections for generic devices.

+the "connection type" setting on NMConnections for generic devices.

Functions

diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html index d596d39d..d6bf39e4 100644 --- a/docs/libnm/html/NMSimpleConnection.html +++ b/docs/libnm/html/NMSimpleConnection.html @@ -42,7 +42,7 @@
- + @@ -270,7 +270,7 @@ nm_vpn_editor_plugin_get_capabilities (

nm_vpn_editor_plugin_import ()

-
NMConnection *
+
NMConnection *
 nm_vpn_editor_plugin_import (NMVpnEditorPlugin *plugin,
                              const char *path,
                              GError **error);

@@ -290,7 +290,7 @@ nm_vpn_editor_plugin_import (
path

-
 + @@ -303,7 +303,7 @@ nm_vpn_editor_plugin_import (

Returns

-

a new NMConnection imported from path +

a new NMConnection imported from path , or NULL on error or if the file at path was not recognized by this plugin.

@@ -316,7 +316,7 @@ was not recognized by this plugin. 

gboolean
 nm_vpn_editor_plugin_export (NMVpnEditorPlugin *plugin,
                              const char *path,
-                             NMConnection *connection,
+                             NMConnection *connection,
                              GError **error);
@@ -325,24 +325,29 @@ nm_vpn_editor_plugin_export (char * nm_vpn_editor_plugin_get_suggested_filename (NMVpnEditorPlugin *plugin, - NMConnection *connection); + NMConnection *connection);

nm_vpn_editor_plugin_load_from_file ()

NMVpnEditorPlugin *
-nm_vpn_editor_plugin_load_from_file (const char *plugin_filename,
+nm_vpn_editor_plugin_load_from_file (const char *plugin_name,
                                      const char *check_service,
                                      int check_owner,
                                      NMUtilsCheckFilePredicate check_file,
                                      gpointer user_data,
                                      GError **error);
-

Load the shared libary plugin_filename +

Load the shared libary plugin_name and create a new NMVpnEditorPlugin instace via the NMVpnEditorPluginFactory function.

+

If plugin_name + is not an absolute path name, it assumes the file +is in the plugin directory of NetworkManager. In any case, the call +will do certain checks on the file before passing it to dlopen. +A consequence for that is, that you cannot omit the ".so" suffix.

-

Parameters

+

Parameters

-NMConnection * +NMConnection * nm_device_get_applied_connection () @@ -343,7 +343,7 @@
-NMConnection * +NMConnection * nm_device_get_applied_connection_finish () @@ -1781,7 +1781,7 @@ devices in devices

nm_device_reapply ()

gboolean
 nm_device_reapply (NMDevice *device,
-                   NMConnection *connection,
+                   NMConnection *connection,
                    guint64 version_id,
                    guint32 flags,
                    GCancellable *cancellable,
@@ -1804,7 +1804,7 @@ made since it was last applied.

connection

the NMConnection to replace the applied settings with or NULL to reuse existing

the NMConnection to replace the applied settings with or NULL to reuse existing

  

connection

the NMConnection to replace the applied settings with or NULL to reuse existing

the NMConnection to replace the applied settings with or NULL to reuse existing

  

connections

an array of NMConnections to filter.

an array of NMConnections to filter.

[element-type NMConnection]

connection

an NMConnection to validate against device +

an NMConnection to validate against device

 

connection

an NMConnection to validate against device +

an NMConnection to validate against device

 

connection

the NMConnection for which we're asked secrets

the NMConnection for which we're asked secrets

  

connection

a NMConnection

a NMConnection

  

connection

a NMConnection

a NMConnection

  

connection

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

connection

the NMConnection that setting +

the NMConnection that setting came from, or NULL if setting is being verified in isolation.

-NMConnection * +NMConnection * nm_simple_connection_new () @@ -50,7 +50,7 @@
-NMConnection * +NMConnection * nm_simple_connection_new_from_dbus () @@ -58,7 +58,7 @@
-NMConnection * +NMConnection * nm_simple_connection_new_clone () @@ -80,21 +80,21 @@

Functions

nm_simple_connection_new ()

-
NMConnection *
+
NMConnection *
 nm_simple_connection_new (void);

 
Creates a new NMSimpleConnection object with no NMSetting objects. An
 NMSimpleConnection does not directly represent a D-Bus-exported connection,
 but might be used in the process of creating a new one.

 

 
Returns

-
 the new empty NMConnection object. 

+
 the new empty NMConnection object. 

 
[transfer full]

nm_simple_connection_new_from_dbus ()

-
NMConnection *
+
NMConnection *
 nm_simple_connection_new_from_dbus (GVariant *dict,
                                     GError **error);

 
Creates a new NMSimpleConnection from a hash table describing the
@@ -133,9 +133,9 @@ connection failed to normalize. 

 

 

 
nm_simple_connection_new_clone ()

-
NMConnection *
-nm_simple_connection_new_clone (NMConnection *connection);

-
Clones an NMConnection as an NMSimpleConnection.

+
NMConnection *
+nm_simple_connection_new_clone (NMConnection *connection);

+
Clones an NMConnection as an NMSimpleConnection.

 

 
Parameters

 

@@ -146,15 +146,15 @@ nm_simple_connection_new_clone (
connection

-
+
the NMConnection to clone
the NMConnection to clone

  
 

 

 

 

 
Returns

-
 a new NMConnection containing the same settings
-and properties as the source NMConnection. 

+
 a new NMConnection containing the same settings
+and properties as the source NMConnection. 

 
[transfer full]

 

 

diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 13cc3db2..ad04d23d 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -77,7 +77,7 @@
-NMConnection * +NMConnection * nm_vpn_editor_plugin_import () @@ -226,7 +226,7 @@ nm_vpn_editor_plugin_factory (GEr

nm_vpn_editor_plugin_get_editor ()

NMVpnEditor *
 nm_vpn_editor_plugin_get_editor (NMVpnEditorPlugin *plugin,
-                                 NMConnection *connection,
+                                 NMConnection *connection,
                                  GError **error);

Parameters

@@ -244,7 +244,7 @@ nm_vpn_editor_plugin_get_editor (

connection

the NMConnection to be edited

the NMConnection to be edited

  

full path to the file to attempt to read into a new NMConnection

full path to the file to attempt to read into a new NMConnection

  
@@ -351,14 +356,11 @@ function.

 - - + + @@ -396,7 +398,7 @@ loading the shared library.

plugin_filename

The path to the share library to load. -Apply some common heuristics to find the library, such as -appending "so" file ending. -If the path is not an absolute path or no matching module -can be found, lookup inside a directory defined at compile time. -Due to this, check_file -might be called for two different paths.

plugin_name

The path or name of the shared library to load. +The path must either be an absolute filename to an existing file. +Alternatively, it can be the name (without path) of a library in the +plugin directory of NetworkManager.

  
-

Returns

+

Returns

a new plugin instance or NULL on error.

[transfer full]

@@ -520,7 +522,7 @@ if non-NULL.

import_from_file ()

Try to import a connection from the specified path. On -success, return a partial NMConnection object. On error, return NULL and +success, return a partial NMConnection object. On error, return NULL and set error with additional information. Note that error can be NULL, in diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html index ecaae0aa..6e343d65 100644 --- a/docs/libnm/html/NMWimaxNsp.html +++ b/docs/libnm/html/NMWimaxNsp.html @@ -249,7 +249,7 @@ connections will match the nsp

connections

an array of NMConnections to +

an array of NMConnections to filter.

[element-type NMConnection]

connection

an NMConnection to validate against nsp +

an NMConnection to validate against nsp

 

- for libnm 1.1.94 + for libnm 1.2.0 The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm/1.0/. + https://developer.gnome.org/libnm/stable/.

Copyright © 2012-2014 The NetworkManager Authors

diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml index f0c50d66..9aa08657 100644 --- a/docs/libnm/html/index.sgml +++ b/docs/libnm/html/index.sgml @@ -1,4 +1,3 @@ - diff --git a/docs/libnm/html/libnm-NMConnection.html b/docs/libnm/html/libnm-NMConnection.html index 852c8876..5166dcf6 100644 --- a/docs/libnm/html/libnm-NMConnection.html +++ b/docs/libnm/html/libnm-NMConnection.html @@ -548,12 +548,12 @@

Description

-

An NMConnection describes all the settings and configuration values that +

An NMConnection describes all the settings and configuration values that are necessary to configure network devices for operation on a specific network. Connections are the fundamental operating object for -NetworkManager; no device is connected without a NMConnection, or -disconnected without having been connected with a NMConnection.

-

Each NMConnection contains a list of NMSetting objects usually referenced +NetworkManager; no device is connected without a NMConnection, or +disconnected without having been connected with a NMConnection.

+

Each NMConnection contains a list of NMSetting objects usually referenced by name (using nm_connection_get_setting_by_name()) or by type (with nm_connection_get_setting()). The settings describe the actual parameters with which the network devices are configured, including device-specific @@ -565,10 +565,10 @@ parameters (MTU, SSID, APN, channel, rate, etc) and IP-level parameters

nm_connection_add_setting ()

void
-nm_connection_add_setting (NMConnection *connection,
+nm_connection_add_setting (NMConnection *connection,
                            NMSetting *setting);

Adds a NMSetting to the connection, replacing any previous NMSetting of the -same name which has previously been added to the NMConnection. The +same name which has previously been added to the NMConnection. The connection takes ownership of the NMSetting object and does not increase the setting object's reference count.

@@ -582,7 +582,7 @@ the setting object's reference count.

connection

-

a NMConnection

+

a NMConnection

  @@ -598,9 +598,9 @@ the setting object's reference count.

nm_connection_remove_setting ()

void
-nm_connection_remove_setting (NMConnection *connection,
+nm_connection_remove_setting (NMConnection *connection,
                               GType setting_type);
-

Removes the NMSetting with the given GType from the NMConnection. This +

Removes the NMSetting with the given GType from the NMConnection. This operation dereferences the NMSetting object.

Parameters

@@ -613,7 +613,7 @@ operation dereferences the

connection

-

a NMConnection

+

a NMConnection

  @@ -629,10 +629,10 @@ operation dereferences the

nm_connection_get_setting ()

NMSetting *
-nm_connection_get_setting (NMConnection *connection,
+nm_connection_get_setting (NMConnection *connection,
                            GType setting_type);

Gets the NMSetting with the given GType, if one has been previously added -to the NMConnection.

+to the NMConnection.

Parameters

@@ -644,7 +644,7 @@ to the - + @@ -658,7 +658,7 @@ to the

Returns

the NMSetting, or NULL if no setting of that type was previously -added to the NMConnection.

+added to the NMConnection.

[transfer none]

@@ -666,10 +666,10 @@ added to the

nm_connection_get_setting_by_name ()

NMSetting *
-nm_connection_get_setting_by_name (NMConnection *connection,
+nm_connection_get_setting_by_name (NMConnection *connection,
                                    const char *name);

Gets the NMSetting with the given name, if one has been previously added -the NMConnection.

+the NMConnection.

Parameters

connection

a NMConnection

a NMConnection

  
@@ -681,7 +681,7 @@ the - + @@ -695,7 +695,7 @@ the

Returns

the NMSetting, or NULL if no setting with that name was previously -added to the NMConnection.

+added to the NMConnection.

[transfer none]

@@ -703,9 +703,9 @@ added to the

nm_connection_to_dbus ()

GVariant *
-nm_connection_to_dbus (NMConnection *connection,
+nm_connection_to_dbus (NMConnection *connection,
                        NMConnectionSerializationFlags flags);
-

Converts the NMConnection into a GVariant of type +

Converts the NMConnection into a GVariant of type NM_VARIANT_TYPE_CONNECTION describing the connection, suitable for marshalling over D-Bus or otherwise serializing.

@@ -719,7 +719,7 @@ marshalling over D-Bus or otherwise serializing.

 - + @@ -741,7 +741,7 @@ its settings, and each setting's properties.

nm_connection_replace_settings ()

gboolean
-nm_connection_replace_settings (NMConnection *connection,
+nm_connection_replace_settings (NMConnection *connection,
                                 GVariant *new_settings,
                                 GError **error);

Replaces connection @@ -760,7 +760,7 @@ need to result in a connection that passes

connection

-
 + @@ -789,8 +789,8 @@ will be unchanged).

nm_connection_replace_settings_from_connection ()

void
 nm_connection_replace_settings_from_connection
-                               (NMConnection *connection,
-                                NMConnection *new_connection);
+ (NMConnection *connection, + NMConnection *new_connection);

Deep-copies the settings of new_connection and replaces the settings of connection @@ -806,12 +806,12 @@ with the copied settings.

 - + - @@ -823,7 +823,7 @@ with

nm_connection_clear_settings ()

void
-nm_connection_clear_settings (NMConnection *connection);
+nm_connection_clear_settings (NMConnection *connection);

Deletes all of connection 's settings.

@@ -836,7 +836,7 @@ nm_connection_clear_settings (

connection

-
 +

connection

a NMConnection

a NMConnection

  

connection

the NMConnection

the NMConnection

  

a NMConnection

a NMConnection

  

connection

a NMConnection

a NMConnection

  

new_connection

a NMConnection to replace the settings of connection +

a NMConnection to replace the settings of connection with

  

a NMConnection

a NMConnection

  
@@ -846,10 +846,10 @@ nm_connection_clear_settings (

nm_connection_compare ()

gboolean
-nm_connection_compare (NMConnection *a,
-                       NMConnection *b,
+nm_connection_compare (NMConnection *a,
+                       NMConnection *b,
                        NMSettingCompareFlags flags);
-

Compares two NMConnection objects for similarity, with comparison behavior +

Compares two NMConnection objects for similarity, with comparison behavior modified by a set of flags. See nm_setting_compare() for a description of each flag's behavior.

@@ -863,12 +863,12 @@ each flag's behavior.

a

-

a NMConnection

+

a NMConnection

 

b

-

a second NMConnection to compare with the first

+

a second NMConnection to compare with the first

  @@ -888,11 +888,11 @@ each flag's behavior.

nm_connection_diff ()

gboolean
-nm_connection_diff (NMConnection *a,
-                    NMConnection *b,
+nm_connection_diff (NMConnection *a,
+                    NMConnection *b,
                     NMSettingCompareFlags flags,
                     GHashTable **out_settings);
-

Compares two NMConnection objects for similarity, with comparison behavior +

Compares two NMConnection objects for similarity, with comparison behavior modified by a set of flags. See nm_setting_compare() for a description of each flag's behavior. If the connections differ, settings and keys within each setting that differ are added to the returned out_settings @@ -909,12 +909,12 @@ No values are returned, only key names.

a

-

a NMConnection

+

a NMConnection

 

b

-

a second NMConnection to compare with the first

+

a second NMConnection to compare with the first

  @@ -943,7 +943,7 @@ not

nm_connection_verify ()

gboolean
-nm_connection_verify (NMConnection *connection,
+nm_connection_verify (NMConnection *connection,
                       GError **error);

Validates the connection and all its settings. Each setting's properties have allowed values, and some values are dependent on other values. For @@ -965,7 +965,7 @@ setting and which property failed validation, and how it failed validation.

connection

-

the NMConnection to verify

+

the NMConnection to verify

  @@ -985,7 +985,7 @@ setting and which property failed validation, and how it failed validation.

nm_connection_verify_secrets ()

gboolean
-nm_connection_verify_secrets (NMConnection *connection,
+nm_connection_verify_secrets (NMConnection *connection,
                               GError **error);

Verifies the secrets in the connection.

@@ -999,7 +999,7 @@ nm_connection_verify_secrets (

connection

-

the NMConnection to verify in

+

the NMConnection to verify in

  @@ -1020,7 +1020,7 @@ nm_connection_verify_secrets (

nm_connection_normalize ()

gboolean
-nm_connection_normalize (NMConnection *connection,
+nm_connection_normalize (NMConnection *connection,
                          GHashTable *parameters,
                          gboolean *modified,
                          GError **error);
@@ -1043,7 +1043,7 @@ cannot be normalized, the connection will not be modified.

connection

-

the NMConnection to normalize

+

the NMConnection to normalize

  @@ -1078,7 +1078,7 @@ why the connection is invalid, if the function returns an error.

nm_connection_need_secrets ()

const char *
-nm_connection_need_secrets (NMConnection *connection,
+nm_connection_need_secrets (NMConnection *connection,
                             GPtrArray **hints);

Returns the name of the first setting object in the connection which would need secrets to make a successful connection. The returned hints are only @@ -1096,7 +1096,7 @@ secrets are needed.

connection

-

the NMConnection

+

the NMConnection

  @@ -1121,7 +1121,7 @@ missing secrets

nm_connection_clear_secrets ()

void
-nm_connection_clear_secrets (NMConnection *connection);
+nm_connection_clear_secrets (NMConnection *connection);

Clears and frees any secrets that may be stored in the connection, to avoid keeping secret data in memory when not needed.

@@ -1134,7 +1134,7 @@ keeping secret data in memory when not needed.

connection

-

the NMConnection

+

the NMConnection

 
@@ -1145,7 +1145,7 @@ keeping secret data in memory when not needed.

nm_connection_clear_secrets_with_flags ()

void
 nm_connection_clear_secrets_with_flags
-                               (NMConnection *connection,
+                               (NMConnection *connection,
                                 NMSettingClearSecretsWithFlagsFn func,
                                 gpointer user_data);

Clears and frees secrets determined by func @@ -1161,7 +1161,7 @@ nm_connection_clear_secrets_with_flags

connection

-

the NMConnection

+

the NMConnection

  @@ -1184,7 +1184,7 @@ specific secret should be cleared or not.

nm_connection_update_secrets ()

gboolean
-nm_connection_update_secrets (NMConnection *connection,
+nm_connection_update_secrets (NMConnection *connection,
                               const char *setting_name,
                               GVariant *secrets,
                               GError **error);
@@ -1192,7 +1192,7 @@ nm_connection_update_secrets (setting_name - is NULL, expects a fully serialized NMConnection as + is NULL, expects a fully serialized NMConnection as returned by nm_connection_to_dbus() and will update all secrets from all settings contained in secrets .

@@ -1207,7 +1207,7 @@ settings contained in secrets

connection

-

the NMConnection

+

the NMConnection

  @@ -1239,10 +1239,10 @@ failed (tried to update secrets for a setting that doesn't exist, etc)

nm_connection_set_path ()

void
-nm_connection_set_path (NMConnection *connection,
+nm_connection_set_path (NMConnection *connection,
                         const char *path);

Sets the D-Bus path of the connection. This property is not serialized, and -is only for the reference of the caller. Sets the “path” +is only for the reference of the caller. Sets the “path” property.

Parameters

@@ -1255,7 +1255,7 @@ property.

connection

-

the NMConnection

+

the NMConnection

  @@ -1272,7 +1272,7 @@ which provides the connection

nm_connection_get_path ()

const char *
-nm_connection_get_path (NMConnection *connection);
+nm_connection_get_path (NMConnection *connection);

Returns the connection's D-Bus path.

Parameters

@@ -1284,7 +1284,7 @@ nm_connection_get_path (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1299,7 +1299,7 @@ nm_connection_get_path (

nm_connection_get_interface_name ()

const char *
-nm_connection_get_interface_name (NMConnection *connection);
+nm_connection_get_interface_name (NMConnection *connection);

Returns the interface name as stored in NMSettingConnection:interface_name. If the connection contains no NMSettingConnection, it will return NULL.

For hardware devices and software devices created outside of NetworkManager, @@ -1315,7 +1315,7 @@ NetworkManager, this is the name of the created interface.

connection

-

The NMConnection

+

The NMConnection

 
@@ -1329,7 +1329,7 @@ NetworkManager, this is the name of the created interface.

nm_connection_is_type ()

gboolean
-nm_connection_is_type (NMConnection *connection,
+nm_connection_is_type (NMConnection *connection,
                        const char *type);

A convenience function to check if the given connection is a particular @@ -1347,7 +1347,7 @@ property of the connection and matches that against

connection

-

the NMConnection

+

the NMConnection

  @@ -1369,10 +1369,10 @@ property of the connection and matches that against

nm_connection_for_each_setting_value ()

void
-nm_connection_for_each_setting_value (NMConnection *connection,
+nm_connection_for_each_setting_value (NMConnection *connection,
                                       NMSettingValueIterFn func,
                                       gpointer user_data);
-

Iterates over the properties of each NMSetting object in the NMConnection, +

Iterates over the properties of each NMSetting object in the NMConnection, calling the supplied user function for each property.

Parameters

@@ -1385,7 +1385,7 @@ calling the supplied user function for each property.

connection

-

the NMConnection

+

the NMConnection

  @@ -1407,7 +1407,7 @@ at each invocation

nm_connection_dump ()

void
-nm_connection_dump (NMConnection *connection);
+nm_connection_dump (NMConnection *connection);

Print the connection to stdout. For debugging purposes ONLY, should NOT be used for serialization of the connection or machine-parsed in any way. The output format is not guaranteed to be stable and may change at any time.

@@ -1421,7 +1421,7 @@ output format is not guaranteed to be stable and may change at any time.

connection

-

the NMConnection

+

the NMConnection

 
@@ -1431,7 +1431,7 @@ output format is not guaranteed to be stable and may change at any time.

nm_connection_get_uuid ()

const char *
-nm_connection_get_uuid (NMConnection *connection);
+nm_connection_get_uuid (NMConnection *connection);

A shortcut to return the UUID from the connection's NMSettingConnection.

Parameters

@@ -1443,7 +1443,7 @@ nm_connection_get_uuid (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1457,7 +1457,7 @@ nm_connection_get_uuid (

nm_connection_get_id ()

const char *
-nm_connection_get_id (NMConnection *connection);
+nm_connection_get_id (NMConnection *connection);

A shortcut to return the ID from the connection's NMSettingConnection.

Parameters

@@ -1469,7 +1469,7 @@ nm_connection_get_id (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1483,7 +1483,7 @@ nm_connection_get_id (

nm_connection_get_connection_type ()

const char *
-nm_connection_get_connection_type (NMConnection *connection);
+nm_connection_get_connection_type (NMConnection *connection);

A shortcut to return the type from the connection's NMSettingConnection.

Parameters

@@ -1495,7 +1495,7 @@ nm_connection_get_connection_type (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1509,7 +1509,7 @@ nm_connection_get_connection_type (

nm_connection_is_virtual ()

gboolean
-nm_connection_is_virtual (NMConnection *connection);
+nm_connection_is_virtual (NMConnection *connection);

Checks if connection refers to a virtual device (and thus can potentially be activated even if the device it refers to doesn't exist).

@@ -1523,7 +1523,7 @@ activated even if the device it refers to doesn't exist).

connection

-

an NMConnection

+

an NMConnection

 
@@ -1539,7 +1539,7 @@ refers to a virtual device

nm_connection_get_virtual_device_description ()

char *
 nm_connection_get_virtual_device_description
-                               (NMConnection *connection);
+ (NMConnection *connection);

Returns the name that nm_device_disambiguate_names() would return for the virtual device that would be created for connection . @@ -1554,7 +1554,7 @@ Eg, "VLAN (eth1.1)".

connection

-

an NMConnection for a virtual device type

+

an NMConnection for a virtual device type

 
@@ -1572,7 +1572,7 @@ is not a virtual connection type.

nm_connection_get_setting_802_1x ()

NMSetting8021x *
-nm_connection_get_setting_802_1x (NMConnection *connection);
+nm_connection_get_setting_802_1x (NMConnection *connection);

A shortcut to return any NMSetting8021x the connection might contain.

Parameters

@@ -1584,7 +1584,7 @@ nm_connection_get_setting_802_1x (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1599,7 +1599,7 @@ nm_connection_get_setting_802_1x (

nm_connection_get_setting_bluetooth ()

NMSettingBluetooth *
-nm_connection_get_setting_bluetooth (NMConnection *connection);
+nm_connection_get_setting_bluetooth (NMConnection *connection);

A shortcut to return any NMSettingBluetooth the connection might contain.

Parameters

@@ -1611,7 +1611,7 @@ nm_connection_get_setting_bluetooth (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1626,7 +1626,7 @@ nm_connection_get_setting_bluetooth (

nm_connection_get_setting_bond ()

NMSettingBond *
-nm_connection_get_setting_bond (NMConnection *connection);
+nm_connection_get_setting_bond (NMConnection *connection);

A shortcut to return any NMSettingBond the connection might contain.

Parameters

@@ -1638,7 +1638,7 @@ nm_connection_get_setting_bond (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1653,7 +1653,7 @@ nm_connection_get_setting_bond (

nm_connection_get_setting_team ()

NMSettingTeam *
-nm_connection_get_setting_team (NMConnection *connection);
+nm_connection_get_setting_team (NMConnection *connection);

A shortcut to return any NMSettingTeam the connection might contain.

Parameters

@@ -1665,7 +1665,7 @@ nm_connection_get_setting_team (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1680,7 +1680,7 @@ nm_connection_get_setting_team (

nm_connection_get_setting_team_port ()

NMSettingTeamPort *
-nm_connection_get_setting_team_port (NMConnection *connection);
+nm_connection_get_setting_team_port (NMConnection *connection);

A shortcut to return any NMSettingTeamPort the connection might contain.

Parameters

@@ -1692,7 +1692,7 @@ nm_connection_get_setting_team_port (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1707,7 +1707,7 @@ nm_connection_get_setting_team_port (

nm_connection_get_setting_bridge ()

NMSettingBridge *
-nm_connection_get_setting_bridge (NMConnection *connection);
+nm_connection_get_setting_bridge (NMConnection *connection);

A shortcut to return any NMSettingBridge the connection might contain.

Parameters

@@ -1719,7 +1719,7 @@ nm_connection_get_setting_bridge (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1734,7 +1734,7 @@ nm_connection_get_setting_bridge (

nm_connection_get_setting_bridge_port ()

NMSettingBridgePort *
-nm_connection_get_setting_bridge_port (NMConnection *connection);
+nm_connection_get_setting_bridge_port (NMConnection *connection);

A shortcut to return any NMSettingBridgePort the connection might contain.

Parameters

@@ -1746,7 +1746,7 @@ nm_connection_get_setting_bridge_port (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1761,7 +1761,7 @@ nm_connection_get_setting_bridge_port (

nm_connection_get_setting_cdma ()

NMSettingCdma *
-nm_connection_get_setting_cdma (NMConnection *connection);
+nm_connection_get_setting_cdma (NMConnection *connection);

A shortcut to return any NMSettingCdma the connection might contain.

Parameters

@@ -1773,7 +1773,7 @@ nm_connection_get_setting_cdma (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1788,7 +1788,7 @@ nm_connection_get_setting_cdma (

nm_connection_get_setting_connection ()

NMSettingConnection *
-nm_connection_get_setting_connection (NMConnection *connection);
+nm_connection_get_setting_connection (NMConnection *connection);

A shortcut to return any NMSettingConnection the connection might contain.

Parameters

@@ -1800,7 +1800,7 @@ nm_connection_get_setting_connection (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1815,7 +1815,7 @@ nm_connection_get_setting_connection (

nm_connection_get_setting_dcb ()

NMSettingDcb *
-nm_connection_get_setting_dcb (NMConnection *connection);
+nm_connection_get_setting_dcb (NMConnection *connection);

A shortcut to return any NMSettingDcb the connection might contain.

Parameters

@@ -1827,7 +1827,7 @@ nm_connection_get_setting_dcb (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1842,7 +1842,7 @@ nm_connection_get_setting_dcb (

nm_connection_get_setting_generic ()

NMSettingGeneric *
-nm_connection_get_setting_generic (NMConnection *connection);
+nm_connection_get_setting_generic (NMConnection *connection);

A shortcut to return any NMSettingGeneric the connection might contain.

Parameters

@@ -1854,7 +1854,7 @@ nm_connection_get_setting_generic (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1869,7 +1869,7 @@ nm_connection_get_setting_generic (

nm_connection_get_setting_gsm ()

NMSettingGsm *
-nm_connection_get_setting_gsm (NMConnection *connection);
+nm_connection_get_setting_gsm (NMConnection *connection);

A shortcut to return any NMSettingGsm the connection might contain.

Parameters

@@ -1881,7 +1881,7 @@ nm_connection_get_setting_gsm (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1896,7 +1896,7 @@ nm_connection_get_setting_gsm (

nm_connection_get_setting_infiniband ()

NMSettingInfiniband *
-nm_connection_get_setting_infiniband (NMConnection *connection);
+nm_connection_get_setting_infiniband (NMConnection *connection);

A shortcut to return any NMSettingInfiniband the connection might contain.

Parameters

@@ -1908,7 +1908,7 @@ nm_connection_get_setting_infiniband (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1923,7 +1923,7 @@ nm_connection_get_setting_infiniband (

nm_connection_get_setting_ip_tunnel ()

NMSettingIPTunnel *
-nm_connection_get_setting_ip_tunnel (NMConnection *connection);
+nm_connection_get_setting_ip_tunnel (NMConnection *connection);

A shortcut to return any NMSettingIPTunnel the connection might contain.

Parameters

@@ -1935,7 +1935,7 @@ nm_connection_get_setting_ip_tunnel (

connection

-

the NMConnection

+

the NMConnection

 
@@ -1951,7 +1951,7 @@ nm_connection_get_setting_ip_tunnel (

nm_connection_get_setting_ip4_config ()

NMSettingIPConfig *
-nm_connection_get_setting_ip4_config (NMConnection *connection);
+nm_connection_get_setting_ip4_config (NMConnection *connection);

A shortcut to return any NMSettingIP4Config the connection might contain.

Note that it returns the value as type NMSettingIPConfig, since the vast majority of IPv4-setting-related methods are on that type, not @@ -1966,7 +1966,7 @@ majority of IPv4-setting-related methods are on that type, not

connection

-

the NMConnection

+

the NMConnection

 
@@ -1982,7 +1982,7 @@ connection contains one, otherwise NULL.

nm_connection_get_setting_ip6_config ()

NMSettingIPConfig *
-nm_connection_get_setting_ip6_config (NMConnection *connection);
+nm_connection_get_setting_ip6_config (NMConnection *connection);

A shortcut to return any NMSettingIP6Config the connection might contain.

Note that it returns the value as type NMSettingIPConfig, since the vast majority of IPv6-setting-related methods are on that type, not @@ -1997,7 +1997,7 @@ majority of IPv6-setting-related methods are on that type, not

connection

-

the NMConnection

+

the NMConnection

 
@@ -2013,7 +2013,7 @@ connection contains one, otherwise NULL.

nm_connection_get_setting_macvlan ()

NMSettingMacvlan *
-nm_connection_get_setting_macvlan (NMConnection *connection);
+nm_connection_get_setting_macvlan (NMConnection *connection);

A shortcut to return any NMSettingMacvlan the connection might contain.

Parameters

@@ -2025,7 +2025,7 @@ nm_connection_get_setting_macvlan (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2041,7 +2041,7 @@ nm_connection_get_setting_macvlan (

nm_connection_get_setting_olpc_mesh ()

NMSettingOlpcMesh *
-nm_connection_get_setting_olpc_mesh (NMConnection *connection);
+nm_connection_get_setting_olpc_mesh (NMConnection *connection);

A shortcut to return any NMSettingOlpcMesh the connection might contain.

Parameters

@@ -2053,7 +2053,7 @@ nm_connection_get_setting_olpc_mesh (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2068,7 +2068,7 @@ nm_connection_get_setting_olpc_mesh (

nm_connection_get_setting_ppp ()

NMSettingPpp *
-nm_connection_get_setting_ppp (NMConnection *connection);
+nm_connection_get_setting_ppp (NMConnection *connection);

A shortcut to return any NMSettingPpp the connection might contain.

Parameters

@@ -2080,7 +2080,7 @@ nm_connection_get_setting_ppp (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2095,7 +2095,7 @@ nm_connection_get_setting_ppp (

nm_connection_get_setting_pppoe ()

NMSettingPppoe *
-nm_connection_get_setting_pppoe (NMConnection *connection);
+nm_connection_get_setting_pppoe (NMConnection *connection);

A shortcut to return any NMSettingPppoe the connection might contain.

Parameters

@@ -2107,7 +2107,7 @@ nm_connection_get_setting_pppoe (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2122,7 +2122,7 @@ nm_connection_get_setting_pppoe (

nm_connection_get_setting_serial ()

NMSettingSerial *
-nm_connection_get_setting_serial (NMConnection *connection);
+nm_connection_get_setting_serial (NMConnection *connection);

A shortcut to return any NMSettingSerial the connection might contain.

Parameters

@@ -2134,7 +2134,7 @@ nm_connection_get_setting_serial (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2149,7 +2149,7 @@ nm_connection_get_setting_serial (

nm_connection_get_setting_tun ()

NMSettingTun *
-nm_connection_get_setting_tun (NMConnection *connection);
+nm_connection_get_setting_tun (NMConnection *connection);

A shortcut to return any NMSettingTun the connection might contain.

Parameters

@@ -2161,7 +2161,7 @@ nm_connection_get_setting_tun (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2177,7 +2177,7 @@ nm_connection_get_setting_tun (

nm_connection_get_setting_vpn ()

NMSettingVpn *
-nm_connection_get_setting_vpn (NMConnection *connection);
+nm_connection_get_setting_vpn (NMConnection *connection);

A shortcut to return any NMSettingVpn the connection might contain.

Parameters

@@ -2189,7 +2189,7 @@ nm_connection_get_setting_vpn (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2204,7 +2204,7 @@ nm_connection_get_setting_vpn (

nm_connection_get_setting_wimax ()

NMSettingWimax *
-nm_connection_get_setting_wimax (NMConnection *connection);
+nm_connection_get_setting_wimax (NMConnection *connection);

A shortcut to return any NMSettingWimax the connection might contain.

Parameters

@@ -2216,7 +2216,7 @@ nm_connection_get_setting_wimax (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2231,7 +2231,7 @@ nm_connection_get_setting_wimax (

nm_connection_get_setting_adsl ()

NMSettingAdsl *
-nm_connection_get_setting_adsl (NMConnection *connection);
+nm_connection_get_setting_adsl (NMConnection *connection);

A shortcut to return any NMSettingAdsl the connection might contain.

Parameters

@@ -2243,7 +2243,7 @@ nm_connection_get_setting_adsl (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2258,7 +2258,7 @@ nm_connection_get_setting_adsl (

nm_connection_get_setting_wired ()

NMSettingWired *
-nm_connection_get_setting_wired (NMConnection *connection);
+nm_connection_get_setting_wired (NMConnection *connection);

A shortcut to return any NMSettingWired the connection might contain.

Parameters

@@ -2270,7 +2270,7 @@ nm_connection_get_setting_wired (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2285,7 +2285,7 @@ nm_connection_get_setting_wired (

nm_connection_get_setting_wireless ()

NMSettingWireless *
-nm_connection_get_setting_wireless (NMConnection *connection);
+nm_connection_get_setting_wireless (NMConnection *connection);

A shortcut to return any NMSettingWireless the connection might contain.

Parameters

@@ -2297,7 +2297,7 @@ nm_connection_get_setting_wireless (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2313,7 +2313,7 @@ nm_connection_get_setting_wireless (

nm_connection_get_setting_wireless_security ()

NMSettingWirelessSecurity *
 nm_connection_get_setting_wireless_security
-                               (NMConnection *connection);
+ (NMConnection *connection);

A shortcut to return any NMSettingWirelessSecurity the connection might contain.

Parameters

@@ -2325,7 +2325,7 @@ nm_connection_get_setting_wireless_security

connection

-

the NMConnection

+

the NMConnection

 
@@ -2340,7 +2340,7 @@ nm_connection_get_setting_wireless_security

nm_connection_get_setting_vlan ()

NMSettingVlan *
-nm_connection_get_setting_vlan (NMConnection *connection);
+nm_connection_get_setting_vlan (NMConnection *connection);

A shortcut to return any NMSettingVlan the connection might contain.

Parameters

@@ -2352,7 +2352,7 @@ nm_connection_get_setting_vlan (

connection

-

the NMConnection

+

the NMConnection

 
@@ -2367,7 +2367,7 @@ nm_connection_get_setting_vlan (

nm_connection_get_setting_vxlan ()

NMSettingVxlan *
-nm_connection_get_setting_vxlan (NMConnection *connection);
+nm_connection_get_setting_vxlan (NMConnection *connection);

A shortcut to return any NMSettingVxlan the connection might contain.

Parameters

@@ -2379,7 +2379,7 @@ nm_connection_get_setting_vxlan (

connection

-

the NMConnection

+

the NMConnection

 
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html index 595a766b..eee7968d 100644 --- a/docs/libnm/html/libnm-nm-errors.html +++ b/docs/libnm/html/libnm-nm-errors.html @@ -284,7 +284,7 @@ nm_vpn_plugin_error_quark (void

enum NMAgentManagerError

Errors returned from the secret-agent manager.

These errors may be returned from operations that could cause secrets to be -requested (such as nm_client_activate_connection()), and correspond to D-Bus +requested (such as nm_client_activate_connection()), and correspond to D-Bus errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

Members

@@ -349,9 +349,9 @@ errors in the "org.freedesktop.NetworkManager.AgentManager" namespace.

enum NMConnectionError

-

Describes errors that may result from operations involving a NMConnection +

Describes errors that may result from operations involving a NMConnection or its NMSettings.

-

These errors may be returned directly from NMConnection and NMSetting +

These errors may be returned directly from NMConnection and NMSetting methods, or may be returned from D-Bus operations (eg on NMClient or NMDevice), where they correspond to errors in the "org.freedesktop.NetworkManager.Settings.Connection" namespace.

@@ -374,7 +374,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_SETTING_NOT_FOUND

-

the NMConnection object +

the NMConnection object did not contain the specified NMSetting object

  @@ -382,7 +382,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_PROPERTY_NOT_FOUND

-

the NMConnection did not contain the +

the NMConnection did not contain the requested NMSetting property

  @@ -398,7 +398,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_MISSING_SETTING

-

the NMConnection object is missing an +

the NMConnection object is missing an NMSetting which is required for its configuration. The error message will always be prefixed with "<setting-name>: ", where "<setting-name>" is the name of the setting that is missing.

@@ -408,7 +408,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_INVALID_SETTING

-

the NMConnection object contains an +

the NMConnection object contains an invalid or inappropriate NMSetting. The error message will always be prefixed with "<setting-name>: ", where "<setting-name>" is the name of the setting that is invalid.

@@ -418,7 +418,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_MISSING_PROPERTY

-

the NMConnection object is invalid +

the NMConnection object is invalid because it is missing a required property. The error message will always be prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is the name of the setting with the missing property, and "<property-name>" is @@ -429,7 +429,7 @@ methods, or may be returned from D-Bus operations (eg on

NM_CONNECTION_ERROR_INVALID_PROPERTY

-

the NMConnection object is invalid +

the NMConnection object is invalid because a property has an invalid value. The error message will always be prefixed with "<setting-name>.<property-name>: ", where "<setting-name>" is the name of the setting with the invalid property, and "<property-name>" is @@ -725,7 +725,7 @@ errors in that namespace.

when they encounter problems retrieving secrets on behalf of NM. They correspond to errors in the "org.freedesktop.NetworkManager.SecretManager" namespace.

-

Client APIs such as nm_client_activate_connection() will not see these error +

Client APIs such as nm_client_activate_connection() will not see these error codes; instead, the secret agent manager will translate them to the corresponding NMAgentManagerError codes.

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index 864e8463..1ae50f34 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -1091,7 +1091,7 @@ metric).

routes

-

an array of NMIP4Route objects.

+

an array of NMIP4Route objects.

[element-type NMIPRoute]
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index 6629a241..fdc83666 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -10,7 +10,7 @@ for libnm &version; The latest version of this documentation can be found on-line at - https://developer.gnome.org/libnm/1.0/. + https://developer.gnome.org/libnm/stable/. diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index ead65f0a..26aaba0e 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.1.94 +1.2.0 diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c index f206340e..7b20c9ab 100644 --- a/examples/C/glib/add-connection-libnm.c +++ b/examples/C/glib/add-connection-libnm.c @@ -37,7 +37,7 @@ added_cb (GObject *client, { GMainLoop *loop = user_data; NMRemoteConnection *remote; - GError *error; + GError *error = NULL; /* NM responded to our request; either handle the resulting error or * print out the object path of the connection we just added. diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am index 23aa042d..58dc204b 100644 --- a/libnm-core/Makefile.am +++ b/libnm-core/Makefile.am @@ -11,6 +11,7 @@ AM_CPPFLAGS = \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ + -DNMPLUGINDIR=\"$(pkglibdir)\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) diff --git a/libnm-core/Makefile.in b/libnm-core/Makefile.in index 62f1275f..bd66c069 100644 --- a/libnm-core/Makefile.in +++ b/libnm-core/Makefile.in @@ -592,6 +592,7 @@ SUBDIRS = . tests AM_CPPFLAGS = -I${top_srcdir}/shared -I${top_builddir}/shared \ -DG_LOG_DOMAIN=\""libnm"\" -DLOCALEDIR=\"$(datadir)/locale\" \ -DNMCONFDIR=\"$(nmconfdir)\" -DNMLIBDIR=\"$(nmlibdir)\" \ + -DNMPLUGINDIR=\"$(pkglibdir)\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ $(GLIB_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(am__append_1) \ $(am__append_4) diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c index ecbe6c6e..c27f5c0d 100644 --- a/libnm-core/crypto.c +++ b/libnm-core/crypto.c @@ -641,6 +641,9 @@ crypto_is_pkcs12_data (const guint8 *data, GError *local = NULL; gboolean success; + if (!data_len) + return FALSE; + g_return_val_if_fail (data != NULL, FALSE); if (!crypto_init (error)) diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 082ebc9e..2041a1d3 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -72,6 +72,7 @@ #include "nm-utils.h" #include "nm-vpn-dbus-interface.h" #include "nm-core-types-internal.h" +#include "nm-vpn-editor-plugin.h" /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated * connection can be replaced by a already-defined connection. This flag only diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index 5a1eed88..a49c3957 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -71,69 +71,59 @@ nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface) /*********************************************************************/ -/** - * nm_vpn_editor_plugin_load_from_file: - * @plugin_filename: The path to the share library to load. - * Apply some common heuristics to find the library, such as - * appending "so" file ending. - * If the path is not an absolute path or no matching module - * can be found, lookup inside a directory defined at compile time. - * Due to this, @check_file might be called for two different paths. - * @check_service: if not-null, check that the loaded plugin advertises - * the given service. - * @check_owner: if non-negative, check whether the file is owned - * by UID @check_owner or by root. In this case also check that - * the file is not writable by anybody else. - * @check_file: (scope call): optional callback to validate the file prior to - * loading the shared library. - * @user_data: user data for @check_file - * @error: on failure the error reason. - * - * Load the shared libary @plugin_filename and create a new - * #NMVpnEditorPlugin instace via the #NMVpnEditorPluginFactory - * function. - * - * Returns: (transfer full): a new plugin instance or %NULL on error. - * - * Since: 1.2 - */ -NMVpnEditorPlugin * -nm_vpn_editor_plugin_load_from_file (const char *plugin_filename, - const char *check_service, - int check_owner, - NMUtilsCheckFilePredicate check_file, - gpointer user_data, - GError **error) +static NMVpnEditorPlugin * +_nm_vpn_editor_plugin_load (const char *plugin_name, + gboolean do_file_checks, + const char *check_service, + int check_owner, + NMUtilsCheckFilePredicate check_file, + gpointer user_data, + GError **error) { GModule *module = NULL; - gs_free_error GError *local = NULL; NMVpnEditorPluginFactory factory = NULL; NMVpnEditorPlugin *editor_plugin = NULL; + gs_free char *plugin_filename_free = NULL; + const char *plugin_filename; + + g_return_val_if_fail (plugin_name && *plugin_name, NULL); - g_return_val_if_fail (plugin_filename && *plugin_filename, NULL); + /* if @do_file_checks is FALSE, we pass plugin_name directly to + * g_module_open(). + * + * Otherwise, we allow for library names without path component. + * In which case, we prepend the plugin directory and form an + * absolute path. In that case, we perform checks on the file. + * + * One exception is that we don't allow for the "la" suffix. The + * reason is that g_module_open() interprets files with this extension + * special and we don't want that. */ + plugin_filename = plugin_name; + if (do_file_checks) { + if ( !strchr (plugin_name, '/') + && !g_str_has_suffix (plugin_name, ".la")) { + plugin_filename_free = g_module_build_path (NMPLUGINDIR, plugin_name); + plugin_filename = plugin_filename_free; + } - /* _nm_utils_check_module_file() fails with ENOENT if the plugin file - * does not exist. That is relevant, because nm-applet checks for that. */ - if (_nm_utils_check_module_file (plugin_filename, - check_owner, - check_file, - user_data, - &local)) - module = g_module_open (plugin_filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + /* _nm_utils_check_module_file() fails with ENOENT if the plugin file + * does not exist. That is relevant, because nm-applet checks for that. */ + if (!_nm_utils_check_module_file (plugin_filename, + check_owner, + check_file, + user_data, + error)) + return NULL; + } + module = g_module_open (plugin_filename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if (!module) { - if (local) { - g_propagate_error (error, local); - local = NULL; - } else { - g_set_error (error, - NM_VPN_PLUGIN_ERROR, - NM_VPN_PLUGIN_ERROR_FAILED, - _("cannot load plugin %s"), plugin_filename); - } + g_set_error (error, + NM_VPN_PLUGIN_ERROR, + NM_VPN_PLUGIN_ERROR_FAILED, + _("cannot load plugin %s"), plugin_name); return NULL; } - g_clear_error (&local); if (g_module_symbol (module, "nm_vpn_editor_plugin_factory", (gpointer) &factory)) { gs_free_error GError *factory_error = NULL; @@ -180,7 +170,7 @@ nm_vpn_editor_plugin_load_from_file (const char *plugin_filename, g_set_error (error, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_FAILED, - _("unknown error initializing plugin %s"), plugin_filename); + _("unknown error initializing plugin %s"), plugin_name); } } @@ -201,6 +191,52 @@ nm_vpn_editor_plugin_load_from_file (const char *plugin_filename, return editor_plugin; } +/** + * nm_vpn_editor_plugin_load_from_file: + * @plugin_name: The path or name of the shared library to load. + * The path must either be an absolute filename to an existing file. + * Alternatively, it can be the name (without path) of a library in the + * plugin directory of NetworkManager. + * @check_service: if not-null, check that the loaded plugin advertises + * the given service. + * @check_owner: if non-negative, check whether the file is owned + * by UID @check_owner or by root. In this case also check that + * the file is not writable by anybody else. + * @check_file: (scope call): optional callback to validate the file prior to + * loading the shared library. + * @user_data: user data for @check_file + * @error: on failure the error reason. + * + * Load the shared libary @plugin_name and create a new + * #NMVpnEditorPlugin instace via the #NMVpnEditorPluginFactory + * function. + * + * If @plugin_name is not an absolute path name, it assumes the file + * is in the plugin directory of NetworkManager. In any case, the call + * will do certain checks on the file before passing it to dlopen. + * A consequence for that is, that you cannot omit the ".so" suffix. + * + * Returns: (transfer full): a new plugin instance or %NULL on error. + * + * Since: 1.2 + */ +NMVpnEditorPlugin * +nm_vpn_editor_plugin_load_from_file (const char *plugin_name, + const char *check_service, + int check_owner, + NMUtilsCheckFilePredicate check_file, + gpointer user_data, + GError **error) +{ + return _nm_vpn_editor_plugin_load (plugin_name, + TRUE, + check_service, + check_owner, + check_file, + user_data, + error); +} + /*********************************************************************/ /** diff --git a/libnm-core/nm-vpn-editor-plugin.h b/libnm-core/nm-vpn-editor-plugin.h index 16e9533d..9ff23a81 100644 --- a/libnm-core/nm-vpn-editor-plugin.h +++ b/libnm-core/nm-vpn-editor-plugin.h @@ -140,7 +140,7 @@ char *nm_vpn_editor_plugin_get_suggested_filename (NMVpnEditorPlugin *pl NMConnection *connection); NM_AVAILABLE_IN_1_2 -NMVpnEditorPlugin *nm_vpn_editor_plugin_load_from_file (const char *plugin_filename, +NMVpnEditorPlugin *nm_vpn_editor_plugin_load_from_file (const char *plugin_name, const char *check_service, int check_owner, NMUtilsCheckFilePredicate check_file, diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index 53278fca..2e6275e3 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -620,12 +620,12 @@ nm_vpn_plugin_info_get_program (NMVpnPluginInfo *self) gboolean nm_vpn_plugin_info_supports_multiple (NMVpnPluginInfo *self) { + const char *s; + g_return_val_if_fail (NM_IS_VPN_PLUGIN_INFO (self), FALSE); - return g_key_file_get_boolean (NM_VPN_PLUGIN_INFO_GET_PRIVATE (self)->keyfile, - NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION, - "supports-multiple-connections", - NULL); + s = nm_vpn_plugin_info_lookup_property (self, NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION, "supports-multiple-connections"); + return _nm_utils_ascii_str_to_bool (s, FALSE); } @@ -877,15 +877,16 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) for (j = 0; keys && keys[j]; j++) { char *s; - /* Lookup the value via get_string(). We want that behavior. - * You could still lookup the original values via g_key_file_get_value() - * based on priv->keyfile. */ + /* Lookup the value via get_string(). We want that behavior for all our + * values. */ s = g_key_file_get_string (priv->keyfile, groups[i], keys[j], NULL); if (s) g_hash_table_insert (priv->keys, _nm_utils_strstrdictkey_create (groups[i], keys[j]), s); } } + g_clear_pointer (&priv->keyfile, g_key_file_unref); + return TRUE; } @@ -948,9 +949,10 @@ finalize (GObject *object) g_free (priv->service); g_strfreev (priv->aliases); g_free (priv->filename); - g_key_file_unref (priv->keyfile); g_hash_table_unref (priv->keys); + g_clear_pointer (&priv->keyfile, g_key_file_unref); + G_OBJECT_CLASS (nm_vpn_plugin_info_parent_class)->finalize (object); } diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 7fdf0f72..3dd89f95 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -654,6 +654,9 @@ crypto_is_pkcs12_data (const GByteArray *data) g_return_val_if_fail (data != NULL, FALSE); + if (!data->len) + return FALSE; + success = crypto_verify_pkcs12 (data, NULL, &error); if (success == FALSE) { /* If the error was just a decryption error, then it's pkcs#12 */ diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 82e29ee8..bf4369e4 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -994,19 +994,6 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) if (!proxy) goto out; - ret = g_dbus_proxy_call_sync (proxy, - "RequestName", - g_variant_new ("(su)", priv->dbus_service_name, 0), - G_DBUS_CALL_FLAGS_NONE, -1, - cancellable, error); - g_object_unref (proxy); - if (!ret) { - if (error && *error) - g_dbus_error_strip_remote_error (*error); - goto out; - } - g_variant_unref (ret); - priv->dbus_vpn_service_plugin = nmdbus_vpn_plugin_skeleton_new (); if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin), connection, @@ -1030,6 +1017,19 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) nm_vpn_service_plugin_set_connection (plugin, connection); nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_INIT); + ret = g_dbus_proxy_call_sync (proxy, + "RequestName", + g_variant_new ("(su)", priv->dbus_service_name, 0), + G_DBUS_CALL_FLAGS_NONE, -1, + cancellable, error); + g_object_unref (proxy); + if (!ret) { + if (error && *error) + g_dbus_error_strip_remote_error (*error); + goto out; + } + g_variant_unref (ret); + success = TRUE; out: diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index 4c06ffa3..6fc58362 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.1\&.94" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.2\&.0" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index 95e36983..b058e562 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.1\&.94" "Configuration" +.TH "NETWORKMANAGER\&.CON" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-online.1 b/man/nm-online.1 index 7a0c8087..601433e9 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.1\&.94" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 1dbc66dc..fddbc118 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.1\&.94" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index b7af978f..23ed0018 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.1.94nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.2.0nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index 5f187d5d..80b89d0d 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.1\&.94" "Configuration" +.TH "NM\-SETTINGS\-KEYFIL" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index f4c8e322..0af413a3 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.1.94nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.2.0nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings.5 b/man/nm-settings.5 index 3f94730c..746a428c 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: Configuration -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.1\&.94" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.2\&.0" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings.xml b/man/nm-settings.xml index 4d51f648..d97c36fc 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.1.94nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription +nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.2.0nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index 9c173aff..ae3c8c0b 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: Examples -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.1\&.94" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.2\&.0" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index 85d7d1bd..ffeb3e9a 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.1\&.94" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmtui.1 b/man/nmtui.1 index 3d99ddc5..2b825dfe 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 04/12/2016 +.\" Date: 04/20/2016 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.1.94 +.\" Source: NetworkManager 1.2.0 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.1\&.94" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.2\&.0" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/po/fr.po b/po/fr.po index 128bbc2b..4041c462 100644 --- a/po/fr.po +++ b/po/fr.po @@ -104,7 +104,7 @@ msgstr "Erreur : l'initialisation de l'agent de secret a échoué" #: ../clients/cli/agent.c:166 #, c-format msgid "Error: polkit agent initialization failed: %s" -msgstr "Erreur : l'initialisation de l'agent polkit a échoué" +msgstr "Erreur : l'initialisation de l'agent polkit a échoué : %s" #: ../clients/cli/agent.c:174 #, c-format diff --git a/po/pl.po b/po/pl.po index 545e4a13..32c35837 100644 --- a/po/pl.po +++ b/po/pl.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-05 15:00+0200\n" -"PO-Revision-Date: 2016-03-29 18:11+0200\n" +"POT-Creation-Date: 2016-04-12 15:49+0200\n" +"PO-Revision-Date: 2016-04-12 15:50+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -6958,7 +6958,7 @@ msgstr "Połączenie DSL %d" #: ../clients/tui/nm-editor-utils.c:190 ../libnm-core/nm-connection.c:1708 #: ../libnm-glib/nm-device.c:1863 ../libnm-util/nm-connection.c:1626 -#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4190 +#: ../libnm/nm-device.c:1814 ../src/settings/plugins/ifcfg-rh/reader.c:4182 msgid "Bond" msgstr "Wiązane" @@ -6969,7 +6969,7 @@ msgstr "Połączenie wiązane %d" #: ../clients/tui/nm-editor-utils.c:199 ../libnm-core/nm-connection.c:1712 #: ../libnm-glib/nm-device.c:1867 ../libnm-util/nm-connection.c:1630 -#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4487 +#: ../libnm/nm-device.c:1818 ../src/settings/plugins/ifcfg-rh/reader.c:4479 msgid "Bridge" msgstr "Mostek" @@ -6980,7 +6980,7 @@ msgstr "Połączenie mostkowane %d" #: ../clients/tui/nm-editor-utils.c:208 ../libnm-core/nm-connection.c:1710 #: ../libnm-glib/nm-device.c:1865 ../libnm-util/nm-connection.c:1628 -#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4296 +#: ../libnm/nm-device.c:1816 ../src/settings/plugins/ifcfg-rh/reader.c:4288 msgid "Team" msgstr "Zespół" @@ -8026,7 +8026,7 @@ msgstr "Znormalizowanie połączenia niespodziewanie się nie powiodło" #: ../libnm-core/nm-setting-connection.c:837 #: ../libnm-core/nm-setting-connection.c:876 #: ../libnm-core/nm-setting-connection.c:989 -#: ../libnm-core/nm-setting-ip-config.c:2162 +#: ../libnm-core/nm-setting-ip-config.c:2167 #: ../libnm-core/nm-setting-olpc-mesh.c:120 #: ../libnm-core/nm-setting-pppoe.c:142 ../libnm-core/nm-setting-vpn.c:419 #: ../libnm-core/nm-setting-vxlan.c:360 ../libnm-core/nm-setting-wimax.c:126 @@ -8267,7 +8267,7 @@ msgstr "nieprawidłowy klucz prywatny drugiego etapu" #: ../libnm-core/nm-setting-connection.c:844 #: ../libnm-core/nm-setting-connection.c:887 ../libnm-core/nm-setting-gsm.c:281 #: ../libnm-core/nm-setting-gsm.c:338 ../libnm-core/nm-setting-gsm.c:375 -#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2169 +#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-ip-config.c:2174 #: ../libnm-core/nm-setting-ip4-config.c:198 #: ../libnm-core/nm-setting-ip4-config.c:205 #: ../libnm-core/nm-setting-pppoe.c:149 ../libnm-core/nm-setting-pppoe.c:158 @@ -8432,7 +8432,7 @@ msgstr "opcja „%s” jest prawidłowa tylko z trybem „%s”" #: ../libnm-core/nm-setting-bond.c:687 #, c-format msgid "'%s' and '%s' cannot have different values" -msgstr "" +msgstr "„%s” i „%s” nie mogą mieć różnych wartości" #: ../libnm-core/nm-setting-bond.c:703 #, c-format @@ -8632,55 +8632,55 @@ msgstr "Nieprawidłowy adres IPv4 „%s”" msgid "Invalid IPv6 address '%s'" msgstr "Nieprawidłowy adres IPv6 „%s”" -#: ../libnm-core/nm-setting-ip-config.c:152 +#: ../libnm-core/nm-setting-ip-config.c:153 #, c-format msgid "Invalid IPv4 address prefix '%u'" msgstr "Nieprawidłowy przedrostek adresu IPv4 „%u”" -#: ../libnm-core/nm-setting-ip-config.c:152 +#: ../libnm-core/nm-setting-ip-config.c:153 #, c-format msgid "Invalid IPv6 address prefix '%u'" msgstr "Nieprawidłowy przedrostek adresu IPv6 „%u”" -#: ../libnm-core/nm-setting-ip-config.c:170 +#: ../libnm-core/nm-setting-ip-config.c:168 #, c-format msgid "Invalid routing metric '%s'" msgstr "Nieprawidłowe parametry trasy „%s”" -#: ../libnm-core/nm-setting-ip-config.c:2182 +#: ../libnm-core/nm-setting-ip-config.c:2187 #, c-format msgid "%d. DNS server address is invalid" msgstr "%d. adres serwera DNS jest nieprawidłowy" -#: ../libnm-core/nm-setting-ip-config.c:2198 +#: ../libnm-core/nm-setting-ip-config.c:2203 #, c-format msgid "%d. IP address is invalid" msgstr "%d. adres IP jest nieprawidłowy" -#: ../libnm-core/nm-setting-ip-config.c:2210 +#: ../libnm-core/nm-setting-ip-config.c:2215 #, c-format msgid "%d. IP address has 'label' property with invalid type" msgstr "%d. adres IP posiada właściwość „label” z nieprawidłowym typem" -#: ../libnm-core/nm-setting-ip-config.c:2219 +#: ../libnm-core/nm-setting-ip-config.c:2224 #, c-format msgid "%d. IP address has invalid label '%s'" msgstr "%d. adres IP posiada nieprawidłową etykietę „%s”" -#: ../libnm-core/nm-setting-ip-config.c:2233 +#: ../libnm-core/nm-setting-ip-config.c:2238 msgid "gateway cannot be set if there are no addresses configured" msgstr "brama nie może być ustawiona, jeśli nie skonfigurowano żadnych adresów" -#: ../libnm-core/nm-setting-ip-config.c:2242 +#: ../libnm-core/nm-setting-ip-config.c:2247 msgid "gateway is invalid" msgstr "brama jest nieprawidłowa" -#: ../libnm-core/nm-setting-ip-config.c:2256 +#: ../libnm-core/nm-setting-ip-config.c:2261 #, c-format msgid "%d. route is invalid" msgstr "%d. trasa jest nieprawidłowa" -#: ../libnm-core/nm-setting-ip-config.c:2265 +#: ../libnm-core/nm-setting-ip-config.c:2270 #, c-format msgid "%d. route cannot be a default route" msgstr "%d trasa nie może być domyślną trasą" @@ -8760,9 +8760,8 @@ msgid "property is not specified and neither is '%s:%s'" msgstr "właściwość nie została podana, tak jak i „%s:%s”" #: ../libnm-core/nm-setting-macvlan.c:192 -#, fuzzy msgid "non promiscuous operation is allowed only in passthru mode" -msgstr "nierozwiązłe działanie jest dozwolone tylko w trybie przejścia\"" +msgstr "nierozwiązłe działanie jest dozwolone tylko w trybie przejścia" #: ../libnm-core/nm-setting-olpc-mesh.c:130 #: ../libnm-core/nm-setting-wireless.c:739 @@ -9570,25 +9569,25 @@ msgid "Failed to read configuration: %s\n" msgstr "Odczytanie konfiguracji się nie powiodło: %s\n" #. Logging/debugging -#: ../src/main.c:234 ../src/nm-iface-helper.c:297 +#: ../src/main.c:234 ../src/nm-iface-helper.c:298 msgid "Print NetworkManager version and exit" msgstr "Wyświetla wersję usługi NetworkManager i kończy działanie" -#: ../src/main.c:235 ../src/nm-iface-helper.c:298 +#: ../src/main.c:235 ../src/nm-iface-helper.c:299 msgid "Don't become a daemon" msgstr "Bez zmiany w usługę" -#: ../src/main.c:236 ../src/nm-iface-helper.c:300 +#: ../src/main.c:236 ../src/nm-iface-helper.c:301 #, c-format msgid "Log level: one of [%s]" msgstr "Poziom dziennika: jeden z [%s]" -#: ../src/main.c:238 ../src/nm-iface-helper.c:302 +#: ../src/main.c:238 ../src/nm-iface-helper.c:303 #, c-format msgid "Log domains separated by ',': any combination of [%s]" msgstr "Domeny dziennika oddzielone przez „,”: dowolne połączenie [%s]" -#: ../src/main.c:240 ../src/nm-iface-helper.c:304 +#: ../src/main.c:240 ../src/nm-iface-helper.c:305 msgid "Make all warnings fatal" msgstr "Wszystkie ostrzeżenia jako krytyczne" @@ -9616,12 +9615,12 @@ msgstr "" "wybranie bezprzewodowych punktów dostępowych, z którymi karty\n" "sieciowe w komputerze powinny być powiązane." -#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:392 +#: ../src/main.c:343 ../src/main-utils.c:269 ../src/nm-iface-helper.c:393 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s. Parametr --help wyświetli listę prawidłowych opcji.\n" -#: ../src/main.c:348 ../src/nm-iface-helper.c:397 +#: ../src/main.c:348 ../src/nm-iface-helper.c:398 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n" msgstr "" @@ -9639,7 +9638,7 @@ msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n" msgstr "" "Ignorowanie nierozpoznanych domen dziennika „%s” z plików konfiguracji.\n" -#: ../src/main.c:389 ../src/nm-iface-helper.c:407 +#: ../src/main.c:389 ../src/nm-iface-helper.c:408 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "Nie można zmienić w usługę: %s [błąd %u]\n" @@ -9989,7 +9988,7 @@ msgstr "Lista wtyczek oddzielonych „,”" msgid "Quit after initial configuration" msgstr "Kończy działanie po początkowej konfiguracji" -#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:299 +#: ../src/nm-config.c:472 ../src/nm-iface-helper.c:300 msgid "Don't become a daemon, and log to stderr" msgstr "" "Bez zmiany w usługę i zapisywanie dziennika do standardowego wyjścia błędów" @@ -10008,87 +10007,87 @@ msgid "The expected start of the response" msgstr "Oczekiwany początek odpowiedzi" #. Interface/IP config -#: ../src/nm-iface-helper.c:280 +#: ../src/nm-iface-helper.c:281 msgid "The interface to manage" msgstr "Interfejs do zarządzania" -#: ../src/nm-iface-helper.c:280 +#: ../src/nm-iface-helper.c:281 msgid "eth0" msgstr "eth0" -#: ../src/nm-iface-helper.c:281 +#: ../src/nm-iface-helper.c:282 msgid "Connection UUID" msgstr "UUID połączenia" -#: ../src/nm-iface-helper.c:281 +#: ../src/nm-iface-helper.c:282 msgid "661e8cd0-b618-46b8-9dc9-31a52baaa16b" msgstr "661e8cd0-b618-46b8-9dc9-31a52baaa16b" -#: ../src/nm-iface-helper.c:282 +#: ../src/nm-iface-helper.c:283 msgid "Whether to manage IPv6 SLAAC" msgstr "Czy zarządzać SLAAC IPv6" -#: ../src/nm-iface-helper.c:283 +#: ../src/nm-iface-helper.c:284 msgid "Whether SLAAC must be successful" msgstr "Czy SLAAC musi się powieść" -#: ../src/nm-iface-helper.c:284 +#: ../src/nm-iface-helper.c:285 msgid "Use an IPv6 temporary privacy address" msgstr "Użycie tymczasowego adresu prywatnego IPv6" -#: ../src/nm-iface-helper.c:285 +#: ../src/nm-iface-helper.c:286 msgid "Current DHCPv4 address" msgstr "Bieżący adres DHCPv4" -#: ../src/nm-iface-helper.c:286 +#: ../src/nm-iface-helper.c:287 msgid "Whether DHCPv4 must be successful" msgstr "Czy DHCPv4 musi się powieść" -#: ../src/nm-iface-helper.c:287 +#: ../src/nm-iface-helper.c:288 msgid "Hex-encoded DHCPv4 client ID" msgstr "Identyfikator klienta DHCPv4 zakodowany szesnastkowo" -#: ../src/nm-iface-helper.c:288 +#: ../src/nm-iface-helper.c:289 msgid "Hostname to send to DHCP server" msgstr "Nazwa komputera wysyłana do serwera DHCP" -#: ../src/nm-iface-helper.c:288 +#: ../src/nm-iface-helper.c:289 msgid "barbar" msgstr "barbar" -#: ../src/nm-iface-helper.c:289 +#: ../src/nm-iface-helper.c:290 msgid "FQDN to send to DHCP server" msgstr "FQDN wysyłane do serwera DHCP" -#: ../src/nm-iface-helper.c:289 +#: ../src/nm-iface-helper.c:290 msgid "host.domain.org" msgstr "komputer.domena.org" -#: ../src/nm-iface-helper.c:290 +#: ../src/nm-iface-helper.c:291 msgid "Route priority for IPv4" msgstr "Priorytet trasy dla IPv4" -#: ../src/nm-iface-helper.c:290 +#: ../src/nm-iface-helper.c:291 msgid "0" msgstr "0" -#: ../src/nm-iface-helper.c:291 +#: ../src/nm-iface-helper.c:292 msgid "Route priority for IPv6" msgstr "Priorytet trasy dla IPv6" -#: ../src/nm-iface-helper.c:291 +#: ../src/nm-iface-helper.c:292 msgid "1024" msgstr "1024" -#: ../src/nm-iface-helper.c:292 +#: ../src/nm-iface-helper.c:293 msgid "Hex-encoded Interface Identifier" msgstr "Identyfikator interfejsu zakodowany szesnastkowo" -#: ../src/nm-iface-helper.c:293 +#: ../src/nm-iface-helper.c:294 msgid "IPv6 SLAAC address generation mode" msgstr "Tryb tworzenia adresów SLAAC IPv6" -#: ../src/nm-iface-helper.c:294 +#: ../src/nm-iface-helper.c:295 msgid "" "The logging backend configuration value. See logging.backend in " "NetworkManager.conf" @@ -10096,7 +10095,7 @@ msgstr "" "Właściwość konfiguracji mechanizmu dziennika. Więcej informacji zawiera " "„logging.backend” w pliku NetworkManager.conf" -#: ../src/nm-iface-helper.c:314 +#: ../src/nm-iface-helper.c:315 msgid "" "nm-iface-helper is a small, standalone process that manages a single network " "interface." @@ -10104,17 +10103,17 @@ msgstr "" "nm-iface-helper to mały, samodzielny proces zarządzający pojedynczym " "interfejsem sieciowym." -#: ../src/nm-iface-helper.c:373 +#: ../src/nm-iface-helper.c:374 #, c-format msgid "An interface name and UUID are required\n" msgstr "Wymagana jest nazwa interfejsu i UUID\n" -#: ../src/nm-iface-helper.c:379 +#: ../src/nm-iface-helper.c:380 #, c-format msgid "Failed to find interface index for %s (%s)\n" msgstr "Odnalezienie indeksu interfejsu dla %s (%s) się nie powiodło\n" -#: ../src/nm-iface-helper.c:441 +#: ../src/nm-iface-helper.c:442 #, c-format msgid "(%s): Invalid IID %s\n" msgstr "(%s): nieprawidłowy IID %s\n" diff --git a/po/sv.po b/po/sv.po index 4f71159d..e4754dbf 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,22 +1,25 @@ # Swedish messages for NetworkManager. -# Copyright © 2004-2014 Free Software Foundation, Inc. +# Copyright © 2004-2016 Free Software Foundation, Inc. # Christian Rose , 2004, 2005, 2006. # Daniel Nylander , 2006, 2008, 2009, 2010, 2012. # Josef Andersson , 2014, 2015. +# Anders Jonsson , 2015, 2016. +# msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-05 15:00+0200\n" -"PO-Revision-Date: 2015-07-21 11:55+0100\n" -"Last-Translator: Josef Andersson \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=NetworkManager&keywords=I18N+L10N&component=Translations\n" +"POT-Creation-Date: 2016-04-07 13:40+0000\n" +"PO-Revision-Date: 2016-04-05 22:40+0200\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\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" -"X-Generator: Poedit 1.7.5\n" +"X-Generator: Poedit 1.8.7.1\n" "X-Project-Style: gnome\n" #: ../clients/cli/agent.c:39 @@ -45,10 +48,11 @@ msgid "" msgstr "" "Användning: nmcli agent secret { help }\n" "\n" -"Kör nmcli som en hemlig agent för Nätverkshanteraren. När Nätverkshanteraren " -"kräver ett lösenord frågar den efter dess registrerade agenter. Detta " -"kommando håller nmcli körandes,\n" -"och om ett lösenord begärs frågas användaren om det.\n" +"Kör nmcli som en hemlig agent för Nätverkshanteraren. När " +"Nätverkshanteraren\n" +"begär ett lösenord kommer den att fråga registrerade agenter om detta.\n" +"Detta kommando håller nmcli körandes, och om ett lösenord begärs frågas\n" +"användaren om det.\n" "\n" #: ../clients/cli/agent.c:57 @@ -64,7 +68,7 @@ msgid "" msgstr "" "Användning: nmcli agent polkit { help }\n" "\n" -"Registrerar nmcli some en polkit-åtgärd för dess användarsession.\n" +"Registrerar nmcli som en polkit-åtgärd för användarsessionen.\n" "När en polkit-demon begär behörighet frågar nmcli användaren och ger\n" "tillbaka svaret till polkit.\n" "\n" @@ -597,7 +601,7 @@ msgid "" "without '--ask' option.\n" msgstr "" "Varning: Lösenord för ”%s” inte angivet i ”passwd-file” och nmcli kan inte " -"fråga utan alternativet ”--ask”.\n" +"fråga utan flaggan ”--ask”.\n" #. define some prompts for connection editor #: ../clients/cli/connections.c:41 @@ -630,9 +634,8 @@ msgid "Connection (name, UUID, or path): " msgstr "Anslutning (namn, UUID eller sökväg): " #: ../clients/cli/connections.c:50 -#, fuzzy msgid "VPN connection (name, UUID, or path): " -msgstr "Anslutning (namn, UUID eller sökväg): " +msgstr "VPN-anslutning (namn, UUID eller sökväg): " #: ../clients/cli/connections.c:51 msgid "Connection(s) (name, UUID, or path): " @@ -644,11 +647,11 @@ msgstr "Anslutning(ar) (namn, UUID eller sökväg): " #: ../clients/cli/connections.c:53 msgid "Tunnel mode: " -msgstr "" +msgstr "Tunnelläge: " #: ../clients/cli/connections.c:54 msgid "MACVLAN mode: " -msgstr "" +msgstr "MACVLAN-läge: " #. 0 #: ../clients/cli/connections.c:73 ../clients/cli/connections.c:193 @@ -784,7 +787,7 @@ msgstr "VPN" #: ../clients/cli/connections.c:202 ../clients/cli/devices.c:46 #: ../clients/cli/devices.c:78 msgid "CON-PATH" -msgstr "ANS-SÖKV" +msgstr "ANSL-SÖKV" #. 10 #: ../clients/cli/connections.c:203 @@ -845,7 +848,7 @@ msgid "DHCP6" msgstr "DHCP6" #: ../clients/cli/connections.c:272 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" "\n" @@ -886,35 +889,43 @@ msgid "" msgstr "" "Användning: nmcli connection { KOMMANDO | help }\n" "\n" -"KOMMANDO := { show | up | down | add | modify | edit | delete | reload | " -"load }\n" +"KOMMANDO := { show | up | down | add | modify | edit | delete | monitor | " +"reload | load }\n" "\n" -" show [--active] [--order ]\n" -" show [--active] [[--show-secrets] [id | uuid | path | apath] ] ...\n" +" show [--active] [--order ]\n" +" show [--active] [id | uuid | path | apath] …\n" "\n" -" up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file " +" up [[id | uuid | path] ] [ifname ] [ap ] [passwd-file " "]\n" "\n" -" down [id | uuid | path | apath] ...\n" +" down [id | uuid | path | apath] …\n" "\n" -" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS SLAVE_OPTIONS IP_OPTIONS [-- " -"([+|-]. )+]\n" +" add VANLIGA_FLAGGOR TYPSPECIFIKA_FLAGGOR SLAVFLAGGOR IP-FLAGGOR [-- " +"([+|-]. )+]\n" "\n" " modify [--temporary] [id | uuid | path] ([+|-]." " )+\n" "\n" +" clone [--temporary] [id | uuid | path ] \n" +"\n" " edit [id | uuid | path] \n" " edit [type ] [con-name ]\n" "\n" " delete [id | uuid | path] \n" "\n" +" monitor [id | uuid | path] …\n" +"\n" " reload\n" "\n" -" load [ ... ]\n" +" load [ … ]\n" +"\n" +" import [--temporary] type file \n" +"\n" +" export [id | uuid | path] []\n" "\n" #: ../clients/cli/connections.c:294 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" "\n" @@ -941,7 +952,7 @@ msgid "" msgstr "" "Användning: nmcli connection show { ARGUMENT | help }\n" "\n" -"ARGUMENT := [--active]\n" +"ARGUMENT := [--active] [--order ]\n" "\n" "Listar anslutningsprofiler i minnet och på disk, varav några också kan vara\n" "aktiva om enheten använder den anslutningsprofilen. Utan en parameter kommer " @@ -950,14 +961,14 @@ msgstr "" "profilerna att visas. --order möjliggör anpassad anslutningssortering (se " "handboken).\n" "\n" -"ARGUMENT := [--active] [--show-secrets] [id | uuid | sökväg | apath] …\n" +"ARGUMENT := [--active] [id | uuid | path | apath] …\n" "\n" "Visar detaljer för angivna anslutningar. Som standard visas både statiska " "och aktiva\n" "konfigurationer. Det är möjligt att filtrera utdata\n" -"med globala flaggan '--fields'. Se handboken för mer information.\n" -"När flaggan --active anges kommer endast den aktiva profilen att\n" -"räknas. Alternativet --show-secrets kommer också att visa associerade " +"med globala flaggan ”--fields”. Se handboken för mer information.\n" +"När flaggan --active anges kommer endast de aktiva profilerna att\n" +"räknas. Flaggan --show-secrets kommer dessutom att visa associerade " "hemligheter.\n" #: ../clients/cli/connections.c:315 @@ -1020,7 +1031,7 @@ msgid "" msgstr "" "Användning: nmcli connection down { ARGUMENT | help }\n" "\n" -"ARGUMENT := [id | uuid | path | apath] ...\n" +"ARGUMENT := [id | uuid | path | apath] …\n" "\n" "Inaktivera en anslutning från en enhet (utan att hindra enheten från\n" "vidare autoaktivering). Profilen att inaktivera identifieras genom dess " @@ -1029,7 +1040,7 @@ msgstr "" "\n" #: ../clients/cli/connections.c:348 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" "\n" @@ -1172,8 +1183,8 @@ msgid "" msgstr "" "Användning: nmcli connection add { ARGUMENT | help }\n" "\n" -"ARGUMENT := VANLIGA_FLAGGOR TYPSPECIFIKA_FLAGGOR SLAV_FLAGGOR IP-FLAGGOR " -"[-- ([+|-]. )+]\n" +"ARGUMENT := VANLIGA_FLAGGOR TYPSPECIFIKA_FLAGGOR SLAVFLAGGOR IP-FLAGGOR [-- " +"([+|-]. )+]\n" "\n" " VANLIGA_FLAGGOR:\n" " type \n" @@ -1220,11 +1231,11 @@ msgstr "" " bluetooth: [addr ]\n" " [bt-type panu|dun-gsm|dun-cdma]\n" "\n" -" vlan: dev \n" +" vlan: dev \n" " id \n" " [flags ]\n" -" [ingress ]\n" -" [egress ]\n" +" [ingress ]\n" +" [egress ]\n" " [mtu ]\n" "\n" " bond: [mode balance-rr (0) | active-backup (1) | balance-xor (2) " @@ -1271,6 +1282,43 @@ msgstr "" " [channel <1-13>]\n" " [dhcp-anycast ]\n" "\n" +" adsl: username \n" +" protocol pppoa|pppoe|ipoatm\n" +" [password ]\n" +" [encapsulation vcmux|llc]\n" +"\n" +" tun: mode tun|tap\n" +" [owner ]\n" +" [group ]\n" +" [pi yes|no]\n" +" [vnet-hdr yes|no]\n" +" [multi-queue yes|no]\n" +"\n" +" ip-tunnel: mode ipip|gre|sit|isatap|vti|ip6ip6|ipip6|ip6gre|vti6\n" +" remote \n" +" [local ]\n" +" [dev <överordnad enhet (grnamn eller anslutnings-UUID)>]\n" +"\n" +" macvlan: dev <överordnad enhet (anslutnings-UUID, grnamn eller " +"MAC)>\n" +" mode vepa|bridge|private|passthru|source\n" +" [tap yes|no]\n" +"\n" +" vxlan: id \n" +" remote \n" +" [local ]\n" +" [dev <överordnad enhet (grnamn eller anslutnings-UUID)>]\n" +" [source-port-min <0-65535>]\n" +" [source-port-max <0-65535>]\n" +" [destination-port <0-65535>]\n" +"\n" +" SLAVFLAGGOR:\n" +" bridge: [priority <0-63>]\n" +" [path-cost <1-65535>]\n" +" [hairpin yes|no]\n" +"\n" +" team: [config |]\n" +"\n" " IP-FLAGGOR:\n" " [ip4 ] [gw4 ]\n" " [ip6 ] [gw6 ]\n" @@ -1308,20 +1356,20 @@ msgstr "" "Modifiera en eller flera av anslutningsprofilens egenskaper.\n" "Profilen identifieras genom dess namn, UUID eller D-BUS-sökväg. För " "egenskaper\n" -"med flera värden kan du valfritt ange prefix '+' eller '-' till " +"med flera värden kan du valfritt ange prefix ”+” eller ”-” till " "egenskapsnamnet.\n" -"'+'-tecknet gör det möjligt att lägga till objekt istället för att skriva " +"”+”-tecknet gör det möjligt att lägga till objekt istället för att skriva " "över hela värdet.\n" -"'-'-tecknet gör det möjligt att ta bort markerade objekt istället för hela " +"”-”-tecknet gör det möjligt att ta bort markerade objekt istället för hela " "värdet.\n" "\n" "Exempel:\n" "nmcli con mod home-wifi wifi.ssid rakosnicek\n" -"nmcli con mod em1-1 ipv4.method manual ipv4.addr ”192.168.1.2/24, " -"10.10.1.5/8”\n" +"nmcli con mod em1-1 ipv4.method manual ipv4.addr \"192.168.1.2/24, " +"10.10.1.5/8\"\n" "nmcli con mod em1-1 +ipv4.dns 8.8.4.4\n" "nmcli con mod em1-1 -ipv4.dns 1\n" -"nmcli con mod em1-1 -ipv6.addr ”abbe::cafe/56”\n" +"nmcli con mod em1-1 -ipv6.addr \"abbe::cafe/56\"\n" "nmcli con mod bond0 +bond.options mii=500\n" "nmcli con mod bond0 -bond.options downdelay\n" "\n" @@ -1339,6 +1387,15 @@ msgid "" "id (provided as argument).\n" "\n" msgstr "" +"Användning: nmcli connection clone { ARGUMENT | help }\n" +"\n" +"ARGUMENT := [--temporary] [id | uuid | path] \n" +"\n" +"Klona en befintlig anslutningsprofil. Den nyskapade anslutningen kommer " +"vara\n" +"en exakt kopia av , förutom egenskapen uuid (som kommer genereras) och\n" +"id (tillhandahålls av argumentet ).\n" +"\n" #: ../clients/cli/connections.c:495 #, c-format @@ -1355,7 +1412,7 @@ msgid "" "Add a new connection profile in an interactive editor.\n" "\n" msgstr "" -"Usage: nmcli connection edit { ARGUMENT | help }\n" +"Användning: nmcli connection edit { ARGUMENT | help }\n" "\n" "ARGUMENT := [id | uuid | path] \n" "\n" @@ -1387,7 +1444,7 @@ msgstr "" "\n" #: ../clients/cli/connections.c:521 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli connection monitor { ARGUMENTS | help }\n" "\n" @@ -1398,16 +1455,14 @@ msgid "" "Monitors all connection profiles in case none is specified.\n" "\n" msgstr "" -"Usage: nmcli connection edit { ARGUMENT | help }\n" +"Användning: nmcli connection monitor { ARGUMENT | help }\n" "\n" -"ARGUMENT := [id | uuid | path] \n" -"\n" -"Redigera en existerande anslutningsprofil i en interaktiv redigerare.\n" -"Profilen identifieras genom dess namn, UUID eller D-Bus-sökväg\n" +"ARGUMENT := [id | uuid | path] …\n" "\n" -"ARGUMENT := [type ] [con-name ]\n" -"\n" -"Lägg till en ny anslutningsprofil i en interaktiv redigerare.\n" +"Övervaka aktivitet i anslutningsprofiler.\n" +"Detta kommando skriver ut en rad varje gång den angivna anslutningen " +"ändras.\n" +"Övervakar alla anslutningsprofiler om ingen har angivits.\n" "\n" #: ../clients/cli/connections.c:533 @@ -1461,9 +1516,19 @@ msgid "" "is imported by NetworkManager VPN plugins.\n" "\n" msgstr "" +"Användning: nmcli connection import { ARGUMENT | help }\n" +"\n" +"ARGUMENT := [--temporary] type file \n" +"\n" +"Importera en extern/främmande konfiguration som en anslutningsprofil för " +"Nätverkshanteraren.\n" +"Typen för indatafilen anges av typflaggan.\n" +"Endast VPN-konfigurationer stöds för tillfället. Konfigurationen\n" +"importeras av Nätverkshanterarens VPN-insticksmoduler.\n" +"\n" #: ../clients/cli/connections.c:566 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli connection export { ARGUMENTS | help }\n" "\n" @@ -1473,12 +1538,12 @@ msgid "" "The data are directed to standard output or to a file if a name is given.\n" "\n" msgstr "" -"Användning: nmcli connection delete { ARGUMENT | help }\n" +"Användning: nmcli connection export { ARGUMENT | help }\n" "\n" -"ARGUMENT := [id | uuid | path] \n" +"ARGUMENT := [id | uuid | path] []\n" "\n" -"Ta bort en anslutningsprofil.\n" -"Profilen identifieras genom dess namn, UUID, och D-Bus-sökväg.\n" +"Exportera en anslutning. Endast VPN-anslutningar stöds för tillfället.\n" +"Data dirigeras till standard ut eller till en fil om ett namn anges.\n" "\n" #: ../clients/cli/connections.c:644 @@ -1718,7 +1783,7 @@ msgstr "saknar kolon i ”password”-posten ”%s”" #: ../clients/cli/connections.c:2245 #, c-format msgid "missing dot in 'password' entry '%s'" -msgstr "saknar . i ”password”-posten ”%s”" +msgstr "saknar punkt i ”password”-posten ”%s”" #: ../clients/cli/connections.c:2258 #, c-format @@ -1789,7 +1854,7 @@ msgstr "”%s” inte bland [%s]" #: ../clients/cli/connections.c:3032 #, c-format msgid "Error: '%s': '%s' is not a valid %s MAC address." -msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress." +msgstr "Fel: ”%s”: ”%s” är inte en giltig %s-MAC-adress." #. Ask for optional arguments #: ../clients/cli/connections.c:3033 ../clients/cli/connections.c:3565 @@ -1819,9 +1884,9 @@ msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY." msgstr "Fel: ”p-key”: ”%s” är inte en giltig InfiniBand P_KEY." #: ../clients/cli/connections.c:3105 -#, fuzzy, c-format +#, c-format msgid "Error: '%s' is not a valid UID/GID." -msgstr "Fel: ”mtu”: ”%s” är inte ett giltigt MTU." +msgstr "Fel: ”%s” är inte ett giltigt UID/GID." #: ../clients/cli/connections.c:3149 #, c-format @@ -1845,9 +1910,8 @@ msgid "ADSL encapsulation" msgstr "ADSL-inkapsling" #: ../clients/cli/connections.c:3203 -#, fuzzy msgid "TUN device mode" -msgstr "Enheten togs bort" +msgstr "TUN-enhetsläge" #: ../clients/cli/connections.c:3216 #, c-format @@ -1898,11 +1962,11 @@ msgstr "MTU [auto]: " #: ../clients/cli/connections.c:3676 ../clients/cli/connections.c:3715 #: ../clients/cli/connections.c:4101 msgid "MAC [none]: " -msgstr "MAC [none]: " +msgstr "MAC [ingen]: " #: ../clients/cli/connections.c:3544 msgid "Cloned MAC [none]: " -msgstr "Klonad MAC [none]: " +msgstr "Klonad MAC [ingen]: " #: ../clients/cli/connections.c:3592 #, c-format @@ -1911,11 +1975,11 @@ msgstr "Transportläge %s" #: ../clients/cli/connections.c:3605 msgid "Parent interface [none]: " -msgstr "Överordnat gränssnitt [none]: " +msgstr "Överordnat gränssnitt [inget]: " #: ../clients/cli/connections.c:3616 msgid "P_KEY [none]: " -msgstr "P_KEY [none]: " +msgstr "P_KEY [ingen]: " #: ../clients/cli/connections.c:3626 #, c-format @@ -1947,11 +2011,11 @@ msgstr "PPPoE" #: ../clients/cli/connections.c:3698 ../clients/cli/connections.c:3736 #: ../clients/cli/connections.c:4223 msgid "Password [none]: " -msgstr "Lösenord [none]: " +msgstr "Lösenord [inget]: " #: ../clients/cli/connections.c:3700 msgid "Service [none]: " -msgstr "Tjänst [none]: " +msgstr "Tjänst [ingen]: " #. Ask for optional 'gsm' or 'cdma' arguments. #: ../clients/cli/connections.c:3730 @@ -1960,7 +2024,7 @@ msgstr "mobilt bredband" #: ../clients/cli/connections.c:3734 ../clients/cli/connections.c:4173 msgid "Username [none]: " -msgstr "Användarnamn [none]: " +msgstr "Användarnamn [inget]: " #. Ask for optional 'bluetooth' arguments. #: ../clients/cli/connections.c:3749 @@ -1975,7 +2039,7 @@ msgstr "Bluetooth-typen %s" #: ../clients/cli/connections.c:3762 #, c-format msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n" -msgstr "Fel: ”bt-type'”: ”%s” är inte en giltig Bluetoothtyp.\n" +msgstr "Fel: ”bt-type”: ”%s” är inte en giltig Bluetoothtyp.\n" #. Ask for optional 'vlan' arguments. #. 13 @@ -1988,15 +2052,15 @@ msgstr "VLAN" #: ../clients/cli/connections.c:3794 msgid "VLAN flags (<0-7>) [none]: " -msgstr "VLAN-flaggor (<0-7>) [none]: " +msgstr "VLAN-flaggor (<0-7>) [inga]: " #: ../clients/cli/connections.c:3805 msgid "Ingress priority maps [none]: " -msgstr "Inträdesprioritetshash [none]: " +msgstr "Inträdesprioritetshash [ingen]: " #: ../clients/cli/connections.c:3816 msgid "Egress priority maps [none]: " -msgstr "Utträdesprioritetshash [none]: " +msgstr "Utträdesprioritetshash [ingen]: " #: ../clients/cli/connections.c:3827 msgid "Bonding mode [balance-rr]: " @@ -2009,7 +2073,7 @@ msgstr "kombinera" #: ../clients/cli/connections.c:3865 msgid "Bonding primary interface [none]: " -msgstr "Kombinerar primärt gränssnittet [none]: " +msgstr "Primärt kombineringsgränssnitt [inget]: " #: ../clients/cli/connections.c:3868 #, c-format @@ -2019,7 +2083,7 @@ msgstr "Fel: ”primary”: ”%s” är inte ett giltigt gränssnittsnamn.\n" #: ../clients/cli/connections.c:3876 #, c-format msgid "Bonding monitoring mode %s" -msgstr "Kombinerar övervakningsläget %s" +msgstr "Övervakningsläge %s för kombinering" #: ../clients/cli/connections.c:3882 #, c-format @@ -2029,7 +2093,7 @@ msgstr "" #: ../clients/cli/connections.c:3891 msgid "Bonding miimon [100]: " -msgstr "Kombinerar miimon [100]: " +msgstr "Kombinerings-miimon [100]: " #: ../clients/cli/connections.c:3894 #, c-format @@ -2038,7 +2102,7 @@ msgstr "Fel: ”miimon” : ”%s” är inte ett giltigt nummer <0-%u>.\n" #: ../clients/cli/connections.c:3902 msgid "Bonding downdelay [0]: " -msgstr "Kombinerar nedfördröjning [0]: " +msgstr "Nedfördröjning för kombinering [0]: " #: ../clients/cli/connections.c:3905 #, c-format @@ -2047,7 +2111,7 @@ msgstr "Fel: ”downdelay”: ”%s” är inte ett giltigt nummer <0-%u>.\n" #: ../clients/cli/connections.c:3913 msgid "Bonding updelay [0]: " -msgstr "Kombinerar uppfördröjning [0]: " +msgstr "Uppfördröjning för kombinering [0]: " #: ../clients/cli/connections.c:3916 #, c-format @@ -2056,7 +2120,7 @@ msgstr "Fel: ”updelay”: ”%s” är inte ett giltigt nummer <0-%u>.\n" #: ../clients/cli/connections.c:3925 msgid "Bonding arp-interval [0]: " -msgstr "Kombinerar arp-intervall [0]: " +msgstr "arp-intervall för kombinering [0]: " #: ../clients/cli/connections.c:3928 #, c-format @@ -2066,7 +2130,7 @@ msgstr "Fel: ”arp-interval”: ”%s” är inte ett giltigt nummer <0-%u>.\n #. FIXME: verify the string #: ../clients/cli/connections.c:3936 msgid "Bonding arp-ip-target [none]: " -msgstr "Kombinerar arp-ip-target [none]: " +msgstr "arp-ip-target för kombinering [inget]: " #: ../clients/cli/connections.c:3943 msgid "LACP rate ('slow' or 'fast') [slow]: " @@ -2079,7 +2143,7 @@ msgstr "Fel: ”lacp-rate”: ”%s” är ogiltig (”slow” eller ”fast”) #: ../clients/cli/connections.c:3972 msgid "Team JSON configuration [none]: " -msgstr "JSON-konfiguration för grupp [none]: " +msgstr "JSON-konfiguration för grupp [ingen]: " #: ../clients/cli/connections.c:3989 msgid "team" @@ -2199,7 +2263,7 @@ msgstr "Fel: ”channel”: ”%s” är inte ett giltigt nummer <1-13>.\n" #: ../clients/cli/connections.c:4200 msgid "DHCP anycast MAC address [none]: " -msgstr "DHCP-anycast MAC-adress [none]: " +msgstr "DHCP-anycast MAC-adress [ingen]: " #. Ask for optional 'adsl' arguments. #: ../clients/cli/connections.c:4219 ../libnm-glib/nm-device.c:1871 @@ -2215,79 +2279,77 @@ msgstr "ADSL-inkapsling %s" #. Ask for optional 'macvlan' arguments. #: ../clients/cli/connections.c:4245 msgid "macvlan" -msgstr "" +msgstr "macvlan" #: ../clients/cli/connections.c:4251 #, c-format msgid "Tap %s" -msgstr "" +msgstr "Tap %s" #: ../clients/cli/connections.c:4256 -#, fuzzy, c-format +#, c-format msgid "Error: 'tap': %s.\n" -msgstr "Fel: ”stp”: %s.\n" +msgstr "Fel: ”tap”: %s.\n" #. Ask for optional 'vxlan' arguments. #: ../clients/cli/connections.c:4272 ../libnm-glib/nm-device.c:1875 #: ../libnm/nm-device.c:1826 msgid "VXLAN" -msgstr "" +msgstr "VXLAN" #: ../clients/cli/connections.c:4277 ../clients/cli/connections.c:4601 -#, fuzzy msgid "Parent device [none]: " -msgstr "Överordnat gränssnitt [none]: " +msgstr "Överordnad enhet [ingen]: " #: ../clients/cli/connections.c:4282 ../clients/cli/connections.c:4606 -#, fuzzy, c-format +#, c-format msgid "Error: 'dev': '%s' is neither UUID nor interface name.\n" -msgstr "Fel: ”dev”: ”%s” är varken UUID, gränssnittsnamn eller MAC." +msgstr "Fel: ”dev”: ”%s” är varken UUID eller gränssnittsnamn.\n" #: ../clients/cli/connections.c:4291 -#, fuzzy msgid "Local address [none]: " -msgstr "DHCP-anycast MAC-adress [none]: " +msgstr "Lokal adress [ingen]: " #: ../clients/cli/connections.c:4296 -#, fuzzy, c-format +#, c-format msgid "Error: 'local': '%s' is not a valid IP address.\n" -msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress." +msgstr "Fel: ”local”: ”%s” är inte en giltig IP-adress.\n" #: ../clients/cli/connections.c:4305 msgid "Minimum source port [0]: " -msgstr "" +msgstr "Lägsta källport [0]: " #: ../clients/cli/connections.c:4309 -#, fuzzy, c-format +#, c-format msgid "Error: 'source-port-min': '%s' is not a valid number <0-65535>.\n" -msgstr "Fel: ”priority”: ”%s” är inte ett giltigt nummer <0-%d>.\n" +msgstr "Fel: ”source-port-min”: ”%s” är inte ett giltigt nummer <0-65535>.\n" #: ../clients/cli/connections.c:4318 msgid "Maximum source port [0]: " -msgstr "" +msgstr "Högsta källport [0]: " #: ../clients/cli/connections.c:4322 -#, fuzzy, c-format +#, c-format msgid "Error: 'source-port-max': '%s' is not a valid number <0-65535>.\n" -msgstr "Fel: ”priority”: ”%s” är inte ett giltigt nummer <0-%d>.\n" +msgstr "Fel: ”source-port-max”: ”%s” är inte ett giltigt nummer <0-65535>.\n" #: ../clients/cli/connections.c:4331 -#, fuzzy msgid "Destination port [8472]: " -msgstr "Destination" +msgstr "Destinationsport [8472]: " #: ../clients/cli/connections.c:4335 -#, fuzzy, c-format +#, c-format msgid "Error: 'destination-port': '%s' is not a valid number <0-65535>.\n" -msgstr "Fel: ”miimon” : ”%s” är inte ett giltigt nummer <0-%u>.\n" +msgstr "" +"Fel: ”destination-port” : ”%s” är inte ett giltigt nummer <0-65535>.\n" #: ../clients/cli/connections.c:4374 msgid "IPv4 address (IP[/plen]) [none]: " -msgstr "IPv4-adress (IP[/plen]) [none]: " +msgstr "IPv4-adress (IP[/plen]) [ingen]: " #: ../clients/cli/connections.c:4376 msgid "IPv6 address (IP[/plen]) [none]: " -msgstr "IPv6-adress (IP[/plen]) [none]: " +msgstr "IPv6-adress (IP[/plen]) [ingen]: " #: ../clients/cli/connections.c:4390 #, c-format @@ -2312,11 +2374,11 @@ msgstr "Fel: " #: ../clients/cli/connections.c:4416 msgid "IPv4 gateway [none]: " -msgstr "IPv4-gateway [none]: " +msgstr "IPv4-gateway [ingen]: " #: ../clients/cli/connections.c:4419 msgid "IPv6 gateway [none]: " -msgstr "IPv6-gateway [none]: " +msgstr "IPv6-gateway [ingen]: " #: ../clients/cli/connections.c:4439 #, c-format @@ -2338,62 +2400,59 @@ msgstr "Tryck för att sluta lägga till adresser.\n" #: ../clients/cli/connections.c:4504 ../libnm-glib/nm-device.c:1879 #: ../libnm/nm-device.c:1830 msgid "Tun" -msgstr "" +msgstr "Tun" #: ../clients/cli/connections.c:4509 -#, fuzzy msgid "User ID [none]: " -msgstr "Användarnamn [none]: " +msgstr "Användar-ID [inget]: " #: ../clients/cli/connections.c:4522 -#, fuzzy msgid "Group ID [none]: " -msgstr "MAC [none]: " +msgstr "Grupp-ID [inget]: " #: ../clients/cli/connections.c:4536 -#, fuzzy, c-format +#, c-format msgid "Enable PI %s" -msgstr "Aktivera STP %s" +msgstr "Aktivera PI %s" #: ../clients/cli/connections.c:4541 -#, fuzzy, c-format +#, c-format msgid "Error: 'pi': %s.\n" -msgstr "Fel: ”stp”: %s.\n" +msgstr "Fel: ”pi”: %s.\n" #: ../clients/cli/connections.c:4549 -#, fuzzy, c-format +#, c-format msgid "Enable VNET header %s" -msgstr "Aktivera STP %s" +msgstr "Aktivera VNET-huvud %s" #: ../clients/cli/connections.c:4554 -#, fuzzy, c-format +#, c-format msgid "Error: 'vnet-hdr': %s.\n" -msgstr "Fel: ”stp”: %s.\n" +msgstr "Fel: ”vnet-hdr”: %s.\n" #: ../clients/cli/connections.c:4562 #, c-format msgid "Enable multi queue %s" -msgstr "" +msgstr "Aktivera multikö %s" #: ../clients/cli/connections.c:4567 -#, fuzzy, c-format +#, c-format msgid "Error: 'multi-queue': %s.\n" -msgstr "Fel: ”mode”: %s." +msgstr "Fel: ”multi-queue”: %s.\n" #. Ask for optional 'ip-tunnel' arguments. #: ../clients/cli/connections.c:4581 msgid "IP Tunnel" -msgstr "" +msgstr "IP-tunnel" #: ../clients/cli/connections.c:4586 -#, fuzzy msgid "Local endpoint [none]: " -msgstr "Överordnat gränssnitt [none]: " +msgstr "Lokal ändpunkt [ingen]: " #: ../clients/cli/connections.c:4592 -#, fuzzy, c-format +#, c-format msgid "Error: 'local': '%s' is not valid; must be an IP address\n" -msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress." +msgstr "Fel: ”local”: ”%s” är inte giltig, måste vara en IP-adress\n" #: ../clients/cli/connections.c:4658 ../clients/cli/connections.c:10184 #, c-format @@ -2440,7 +2499,7 @@ msgstr "Fel: misslyckades att ta bort ett värde från %s.%s: %s." msgid "" "Warning: 'type' is ignored. Use 'nmcli connection add \"%s\" ...' instead." msgstr "" -"Varning: ”type”-ignoreras. Använd 'nmcli connection add \"%s\"...' istället." +"Varning: ”type” ignoreras. Använd ”nmcli connection add \"%s\"…” istället." #: ../clients/cli/connections.c:4783 msgid "Error: redundant 'master' option." @@ -2509,18 +2568,17 @@ msgid "Error: 'dev' is required." msgstr "Fel: ”dev” krävs." #: ../clients/cli/connections.c:5355 -#, fuzzy msgid "VLAN ID <0-4094>: " -msgstr "VLAN ID <0-4095>: " +msgstr "VLAN-ID <0-4094>: " #: ../clients/cli/connections.c:5358 ../clients/cli/connections.c:6424 msgid "Error: 'id' is required." msgstr "Fel: ”id” krävs." #: ../clients/cli/connections.c:5364 -#, fuzzy, c-format +#, c-format msgid "Error: 'id': '%s' is not valid; use <0-4094>." -msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>." +msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4094>." #: ../clients/cli/connections.c:5374 ../clients/cli/connections.c:6116 #, c-format @@ -2580,109 +2638,103 @@ msgid "Error: 'protocol' is required." msgstr "Fel: ”protocol” krävs." #: ../clients/cli/connections.c:6105 -#, fuzzy msgid "MACVLAN parent device or connection UUID: " -msgstr "Överordnad VLAN-enhet eller anslutnings-UUID: " +msgstr "Överordnad MACVLAN-enhet eller anslutnings-UUID: " #: ../clients/cli/connections.c:6125 ../clients/cli/connections.c:6205 #: ../clients/cli/connections.c:6307 -#, fuzzy msgid "Error: 'mode' is required." -msgstr "Fel: ”dev” krävs." +msgstr "Fel: ”mode” krävs." #: ../clients/cli/connections.c:6131 -#, fuzzy msgid "Error: 'mode' is not valid." -msgstr "Fel: ”dev”-kommandot ”%s” är inte giltigt." +msgstr "Fel: ”mode” är inte giltigt." #: ../clients/cli/connections.c:6144 -#, fuzzy, c-format +#, c-format msgid "Error: 'tap': %s." -msgstr "Fel: ”stp”: %s." +msgstr "Fel: ”tap”: %s." #: ../clients/cli/connections.c:6230 -#, fuzzy, c-format +#, c-format msgid "Error: 'pi': %s." -msgstr "Fel: ”stp”: %s." +msgstr "Fel: ”pi”: %s." #: ../clients/cli/connections.c:6241 -#, fuzzy, c-format +#, c-format msgid "Error: 'vnet-hdr': %s." -msgstr "Fel: ”save”: %s." +msgstr "Fel: ”vnet-hdr”: %s." #: ../clients/cli/connections.c:6252 -#, fuzzy, c-format +#, c-format msgid "Error: 'multi-queue': %s." -msgstr "Fel: ”mode”: %s." +msgstr "Fel: ”multi-queue”: %s." #: ../clients/cli/connections.c:6321 -#, fuzzy, c-format +#, c-format msgid "Error: 'mode': '%s' is not valid, use one of %s" -msgstr "Fel: ”%s”: ”%s” är inte en giltig %s %s." +msgstr "Fel: ”mode”: ”%s” är inte giltigt, använd ett av %s" #: ../clients/cli/connections.c:6327 msgid "Remote endpoint: " -msgstr "" +msgstr "Fjärrändpunkt: " #: ../clients/cli/connections.c:6330 ../clients/cli/connections.c:6432 -#, fuzzy msgid "Error: 'remote' is required." -msgstr "Fel: ”master” krävs." +msgstr "Fel: ”remote” krävs." #: ../clients/cli/connections.c:6337 -#, fuzzy, c-format +#, c-format msgid "Error: 'remote': '%s' is not valid; must be an IP address" -msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress." +msgstr "Fel: ”remote”: ”%s” är inte giltig, måste vara en IP-adress" #: ../clients/cli/connections.c:6351 -#, fuzzy, c-format +#, c-format msgid "Error: 'local': '%s' is not valid; must be an IP address" -msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress." +msgstr "Fel: ”local”: ”%s” är inte giltig, måste vara en IP-adress" #: ../clients/cli/connections.c:6360 ../clients/cli/connections.c:6455 -#, fuzzy, c-format +#, c-format msgid "Error: 'dev': '%s' is neither UUID nor interface name." -msgstr "Fel: ”dev”: ”%s” är varken UUID, gränssnittsnamn eller MAC." +msgstr "Fel: ”dev”: ”%s” är varken UUID eller gränssnittsnamn." #: ../clients/cli/connections.c:6421 -#, fuzzy msgid "VXLAN ID: " -msgstr "VLAN ID <0-4095>: " +msgstr "VXLAN-ID: " #: ../clients/cli/connections.c:6429 -#, fuzzy msgid "Remote: " -msgstr "Ta bort" +msgstr "Fjärr: " #: ../clients/cli/connections.c:6438 -#, fuzzy, c-format +#, c-format msgid "Error: 'id': '%s' is not valid; use <0-16777215>." -msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>." +msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-16777215>." #: ../clients/cli/connections.c:6464 -#, fuzzy, c-format +#, c-format msgid "Error: 'remote': '%s' is not a valid IP address" -msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress." +msgstr "Fel: ”remote”: ”%s” är inte en giltig IP-adress" #: ../clients/cli/connections.c:6473 -#, fuzzy, c-format +#, c-format msgid "Error: 'local': '%s' is not a valid IP address" -msgstr "Fel: '%s': '%s' är inte en giltig %s-MAC-adress." +msgstr "Fel: ”local”: ”%s” är inte en giltig IP-adress" #: ../clients/cli/connections.c:6482 -#, fuzzy, c-format +#, c-format msgid "Error: 'source-port-min': %s is not valid; use <0-65535>." -msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>." +msgstr "Fel: ”source-port-min”: %s är inte giltig; använd <0-65535>." #: ../clients/cli/connections.c:6491 -#, fuzzy, c-format +#, c-format msgid "Error: 'source-port-max': %s is not valid; use <0-65535>." -msgstr "Fel: ”flags”: ”%s” är inte giltig; använd <0-7>." +msgstr "Fel: ”source-port-max”: %s är inte giltig; använd <0-65535>." #: ../clients/cli/connections.c:6500 -#, fuzzy, c-format +#, c-format msgid "Error: 'destination-port': %s is not valid; use <0-65535>." -msgstr "Fel: ”id”: ”%s” är inte giltigt: använd <0-4095>." +msgstr "Fel: ”destination-port”: %s är inte giltig: använd <0-65535>." #: ../clients/cli/connections.c:6540 #, c-format @@ -2916,7 +2968,7 @@ msgstr "" "Verifierar huruvida inställningen eller anslutningen är giltig och kan " "sparas senare.\n" "Indikerar ogiltiga värden vid fel. En del fel kan fixas automatiskt\n" -"genom alternativet ”fix”.\n" +"genom flaggan ”fix”.\n" "\n" "Exempel: nmcli> verify\n" " nmcli> verify fix\n" @@ -2940,7 +2992,7 @@ msgstr "" "save [persistent|temporary] :: spara anslutningen\n" "\n" "Skickar anslutningsprofilen till Nätverkshanteraren som kommer att antingen\n" -"spara den, eller behålla den i minnet.”save” utan argument\n" +"spara den, eller behålla den i minnet. ”save” utan argument\n" "betyder ”save persistent”.\n" "Observera att när du väl har sparat profilen så sparas inställningarna\n" "över omstart. Efterföljande ändringar kan också vara temporära eller\n" @@ -2964,7 +3016,7 @@ msgstr "" "\n" "Aktiverar anslutningen\n" "\n" -"Tillgängliga alternativ:\n" +"Tillgängliga flaggor:\n" " - den enhet anslutningen kommer att aktiveras på\n" "/| - AP (Wi-Fi) eller NSP (WiMAX) (lägg till / i början när " " inte anges)\n" @@ -3002,13 +3054,13 @@ msgid "" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" msgstr "" -"nmcli [ ] :: nmcli configuration\n" +"nmcli [ ] :: nmcli-konfiguration\n" "\n" "Konfigurerar nmcli. Följande flaggor är tillgängliga:\n" -"status-line yes | no [default: no]\n" -"save-confirmation yes | no [default: yes]\n" -"show-secrets yes | no [default: no]\n" -"prompt-color <0-8> [default: 0]\n" +"status-line yes | no [standard: no]\n" +"save-confirmation yes | no [standard: yes]\n" +"show-secrets yes | no [standard: no]\n" +"prompt-color | <0-8> [standard: 0]\n" "%s\n" "Exempel: nmcli> nmcli status-line yes\n" " nmcli> nmcli save-confirmation no\n" @@ -3121,7 +3173,7 @@ msgid "" " nmcli bond.options> remove downdelay\n" "\n" msgstr "" -"remove [||] :: ta bort värdet\n" +"remove [||] :: ta bort värdet\n" "\n" "Tar bort egenskapsvärdet. För enskilda egenskapsvärden sätter denna\n" "egenskapen till dess standardvärde. För värden av behållartyp tar denna " @@ -3130,8 +3182,7 @@ msgstr "" "bort endast\n" "ett enskilt objekt eller alternativ. Argumentet är antingen ett värde eller " "index för objektet som ska\n" -"tas bort, eller ett alternativt namn (för egenskaper med namngivna " -"alternativ).\n" +"tas bort, eller ett flaggnamn (för egenskaper med namngivna flaggor).\n" "\n" "Exempel: nmcli ipv4.dns> remove 8.8.8.8\n" " nmcli ipv4.dns> remove 2\n" @@ -3376,7 +3427,7 @@ msgstr ", inte heller ett giltigt inställningsnamn" #: ../clients/cli/connections.c:9469 #, c-format msgid "Invalid verify option: %s\n" -msgstr "Ogiltigt kontrollalternativ ”%s”\n" +msgstr "Ogiltigt verify-argument ”%s”\n" #: ../clients/cli/connections.c:9477 #, c-format @@ -3549,7 +3600,7 @@ msgstr "" #: ../clients/cli/connections.c:10117 #, c-format msgid "Error: Failed to modify connection '%s': %s" -msgstr "Fel: Misslyckades med att ändra konfigurationen: ”%s” %s" +msgstr "Fel: Misslyckades med att ändra anslutningen ”%s”: %s" #: ../clients/cli/connections.c:10124 #, c-format @@ -3571,22 +3622,21 @@ msgstr "Fel: anslutnings-ID saknas." #: ../clients/cli/connections.c:10228 #, c-format msgid "%s (%s) cloned as %s (%s).\n" -msgstr "" +msgstr "%s (%s) klonad som %s (%s).\n" #: ../clients/cli/connections.c:10260 -#, fuzzy msgid "New connection name: " -msgstr "Ny anslutning" +msgstr "Nytt anslutningsnamn: " #: ../clients/cli/connections.c:10281 ../clients/cli/connections.c:10299 -#, fuzzy, c-format +#, c-format msgid "Error: argument is missing." -msgstr "Fel: %s-argument saknas." +msgstr "Fel: -argument saknas." #: ../clients/cli/connections.c:10287 -#, fuzzy, c-format +#, c-format msgid "Error: unexpected extra argument '%s'." -msgstr "Fel: Oväntat argument ”%s”" +msgstr "Fel: oväntat extra argument ”%s”." #: ../clients/cli/connections.c:10356 #, c-format @@ -3615,24 +3665,24 @@ msgid "Error: cannot delete unknown connection(s): %s." msgstr "Fel: kan inte ta bort okänd(a) anslutning(ar): %s." #: ../clients/cli/connections.c:10470 -#, fuzzy, c-format +#, c-format msgid "%s: connection profile changed\n" -msgstr "Detaljer för anslutningsprofil" +msgstr "%s: anslutningsprofil ändrad\n" #: ../clients/cli/connections.c:10496 -#, fuzzy, c-format +#, c-format msgid "%s: connection profile created\n" -msgstr "Detaljer för anslutningsprofil" +msgstr "%s: anslutningsprofil skapad\n" #: ../clients/cli/connections.c:10505 -#, fuzzy, c-format +#, c-format msgid "%s: connection profile removed\n" -msgstr "anslutningen togs bort" +msgstr "%s: anslutningsprofil borttagen\n" #: ../clients/cli/connections.c:10548 -#, fuzzy, c-format +#, c-format msgid "Error: not all connections found." -msgstr "Fel: hittade inte alla aktiva anslutningar." +msgstr "Fel: hittade inte alla anslutningar." #: ../clients/cli/connections.c:10571 #, c-format @@ -3650,79 +3700,77 @@ msgid "Could not load file '%s'\n" msgstr "Kunde inte läsa in filen: ”%s”\n" #: ../clients/cli/connections.c:10620 -#, fuzzy msgid "File to import: " -msgstr "Misslyckades med att kryptera: %d." +msgstr "Fil att importera: " #: ../clients/cli/connections.c:10655 #, c-format msgid "Warning: 'type' already specified, ignoring extra one.\n" -msgstr "" +msgstr "Varning: ”type” redan angiven, ignorerar extra förekomst.\n" #: ../clients/cli/connections.c:10666 #, c-format msgid "Warning: 'file' already specified, ignoring extra one.\n" -msgstr "" +msgstr "Varning: ”file” redan angiven, ignorerar extra förekomst.\n" #: ../clients/cli/connections.c:10668 -#, fuzzy, c-format +#, c-format msgid "Unknown parameter: %s" -msgstr "Okänd parameter: %s\n" +msgstr "Okänd parameter: %s" #: ../clients/cli/connections.c:10683 -#, fuzzy, c-format +#, c-format msgid "Error: 'file' argument is required." -msgstr "Fel: ”ifname”-argument krävs." +msgstr "Fel: ”file”-argument krävs." #: ../clients/cli/connections.c:10691 ../clients/cli/connections.c:10798 -#, fuzzy, c-format +#, c-format msgid "Error: failed to load VPN plugin: %s." -msgstr "Fel: misslyckades med att läsa in anslutningen: %s." +msgstr "Fel: misslyckades med att läsa in VPN-insticksmodul: %s." #: ../clients/cli/connections.c:10699 -#, fuzzy, c-format +#, c-format msgid "Error: failed to import '%s': %s." -msgstr "Fel: misslyckades med att ändra %s.%s: %s." +msgstr "Fel: misslyckades med att importera ”%s”: %s." #: ../clients/cli/connections.c:10745 -#, fuzzy msgid "Output file name: " -msgstr "filnamn" +msgstr "Utdatafilnamn: " #: ../clients/cli/connections.c:10769 -#, fuzzy, c-format +#, c-format msgid "Error: unknown extra argument: '%s'." -msgstr "Fel: ogiltigt extra argument: ”%s”." +msgstr "Fel: okänt extra argument: ”%s”." #: ../clients/cli/connections.c:10789 -#, fuzzy, c-format +#, c-format msgid "Error: the connection is not VPN." -msgstr "Fel: anslutningen är inte giltig: %s\n" +msgstr "Fel: anslutningen är inte VPN." #: ../clients/cli/connections.c:10810 -#, fuzzy, c-format +#, c-format msgid "Error: failed to create temporary file %s." -msgstr "Kunde inte skapa temporära filen: %s" +msgstr "Fel: misslyckades med att skapa temporära filen %s." #: ../clients/cli/connections.c:10819 -#, fuzzy, c-format +#, c-format msgid "Error: failed to export '%s': %s." -msgstr "Fel: misslyckades med att sätta ”%s”-egenskapen: %s\n" +msgstr "Fel: misslyckades med att exportera ”%s”: %s" #: ../clients/cli/connections.c:10830 -#, fuzzy, c-format +#, c-format msgid "Error: failed to read temporary file '%s': %s." -msgstr "Fel: misslyckades med att ta bort värdet ”%s”: %s\n" +msgstr "Fel: misslyckades med att läsa temporära filen ”%s”: %s." #: ../clients/cli/connections.c:10976 #, c-format msgid "incorrect string '%s' of '--order' option" -msgstr "fel sträng ”%s“ för flaggan ”--order”" +msgstr "fel sträng ”%s” för flaggan ”--order”" #: ../clients/cli/connections.c:11002 #, c-format msgid "incorrect item '%s' in '--order' option" -msgstr "fel objekt ”%s“ i flaggan ”--order”" +msgstr "fel objekt ”%s” i flaggan ”--order”" #: ../clients/cli/connections.c:11089 msgid "'--order' argument is missing" @@ -3731,7 +3779,7 @@ msgstr "”--order”-argumentet saknas" #: ../clients/cli/connections.c:11154 #, c-format msgid "Error: '%s' is not valid 'connection' command." -msgstr "Fel: ”%s” är inte ett giltigt “connection“-kommando." +msgstr "Fel: ”%s” är inte ett giltigt ”connection”-kommando." #. define some prompts #: ../clients/cli/devices.c:35 @@ -3870,7 +3918,7 @@ msgstr "BÄRARE" #. 1 #: ../clients/cli/devices.c:112 msgid "S390-SUBCHANNELS" -msgstr "" +msgstr "S390-UNDERKANALER" #. 0 #: ../clients/cli/devices.c:121 ../clients/cli/devices.c:731 @@ -4078,78 +4126,75 @@ msgstr "ANSLUTNINGAR" #. 1 #: ../clients/cli/devices.c:253 msgid "CHASSIS-ID" -msgstr "" +msgstr "CHASSI-ID" #. 2 #: ../clients/cli/devices.c:254 -#, fuzzy msgid "PORT-ID" -msgstr "FYSI-PORT-ID" +msgstr "PORT-ID" #. 3 #: ../clients/cli/devices.c:255 msgid "PORT-DESCRIPTION" -msgstr "" +msgstr "PORTBESKRIVNING" #. 4 #: ../clients/cli/devices.c:256 -#, fuzzy msgid "SYSTEM-NAME" -msgstr "ANVÄNDARNAMN" +msgstr "SYSTEMNAMN" #. 5 #: ../clients/cli/devices.c:257 msgid "SYSTEM-DESCRIPTION" -msgstr "" +msgstr "SYSTEMBESKRIVNING" #. 6 #: ../clients/cli/devices.c:258 -#, fuzzy msgid "SYSTEM-CAPABILITIES" -msgstr "FÖRMÅGOR" +msgstr "SYSTEMFÖRMÅGOR" #. 7 #: ../clients/cli/devices.c:259 msgid "IEEE-802-1-PVID" -msgstr "" +msgstr "IEEE-802-1-PVID" #. 8 #: ../clients/cli/devices.c:260 msgid "IEEE-802-1-PPVID" -msgstr "" +msgstr "IEEE-802-1-PPVID" #. 9 #: ../clients/cli/devices.c:261 msgid "IEEE-802-1-PPVID-FLAGS" -msgstr "" +msgstr "IEEE-802-1-PPVID-FLAGGOR" #. 10 #: ../clients/cli/devices.c:262 msgid "IEEE-802-1-VID" -msgstr "" +msgstr "IEEE-802-1-VID" #. 11 #: ../clients/cli/devices.c:263 msgid "IEEE-802-1-VLAN-NAME" -msgstr "" +msgstr "IEEE-802-1-VLAN-NAMN" #. 12 #: ../clients/cli/devices.c:264 msgid "DESTINATION" -msgstr "" +msgstr "DESTINATION" #. 13 #: ../clients/cli/devices.c:265 msgid "CHASSIS-ID-TYPE" -msgstr "" +msgstr "CHASSI-ID-TYP" #. 14 #: ../clients/cli/devices.c:266 msgid "PORT-ID-TYPE" -msgstr "" +msgstr "PORT-ID-TYP" #: ../clients/cli/devices.c:283 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli device { COMMAND | help }\n" "\n" @@ -4189,25 +4234,38 @@ msgid "" msgstr "" "Användning: nmcli device { KOMMANDO | help }\n" "\n" -"KOMMANDO := { status | show | connect | disconnect | delete | wifi }\n" +"KOMMANDO := { status | show | connect | reapply | disconnect | delete | " +"monitor | wifi | lldp }\n" "\n" " status\n" "\n" " show []\n" "\n" +" set [ifname] [autoconnect yes|no] [managed yes|no]\n" +"\n" " connect \n" "\n" -" disconnect \n" +" reapply …\n" +"\n" +" disconnect …\n" +"\n" +" delete …\n" "\n" -" delete \n" +" monitor …\n" "\n" " wifi [list [ifname ] [bssid ]]\n" "\n" " wifi connect <(B)SSID> [password ] [wep-key-type key|phrase] " "[ifname ]\n" -" [bssid ] [name ] [private yes|no]\n" +" [bssid ] [name ] [private yes|no] " +"[hidden yes|no]\n" +"\n" +" wifi hotspot [ifname ] [con-name ] [ssid ] [band a|bg] " +"[channel ] [password ]\n" +"\n" +" wifi rescan [ifname ] [[ssid ] …]\n" "\n" -" wifi rescan [[ifname] ]\n" +" lldp [list [ifname ]]\n" "\n" #: ../clients/cli/devices.c:305 @@ -4274,7 +4332,7 @@ msgid "" msgstr "" "Användning: nmcli device connect { ARGUMENT | help }\n" "\n" -"ARGUMENT := \n" +"ARGUMENT := \n" "\n" "Anslut enheten.\n" "Nätverkshanteraren försöker då att finna en passande anslutning att " @@ -4284,7 +4342,7 @@ msgstr "" "\n" #: ../clients/cli/devices.c:343 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli device reapply { ARGUMENTS | help }\n" "\n" @@ -4294,13 +4352,13 @@ msgid "" "made since it was last applied.\n" "\n" msgstr "" -"Användning: nmcli device disconnect { ARGUMENT | help }\n" +"Användning: nmcli device reapply { ARGUMENT | help }\n" "\n" -"ARGUMENT := \n" +"ARGUMENT := …\n" "\n" -"Koppla från enheter.\n" -"Kommandot kopplar från enheten och hindrar den från att autoaktivera\n" -"vidare anslutningar utan användar-/manuellinblandning.\n" +"Försöker uppdatera enhet med ändringar till den aktuellt aktiva " +"anslutningen\n" +"som gjorts sedan den sist tillämpades.\n" "\n" #: ../clients/cli/devices.c:354 @@ -4317,7 +4375,7 @@ msgid "" msgstr "" "Användning: nmcli device disconnect { ARGUMENT | help }\n" "\n" -"ARGUMENT := \n" +"ARGUMENT := \n" "\n" "Koppla från enheter.\n" "Kommandot kopplar från enheten och hindrar den från att autoaktivera\n" @@ -4360,9 +4418,18 @@ msgid "" "Modify device properties.\n" "\n" msgstr "" +"Användning: nmcli device set { ARGUMENT | help }\n" +"\n" +"ARGUMENT := ENHET { EGENSKAP [ EGENSKAP … ] }\n" +"ENHET := [ifname] \n" +"EGENSKAP := { autoconnect { yes | no } |\n" +" { managed { yes | no }\n" +"\n" +"Ändra egenskaper för enhet.\n" +"\n" #: ../clients/cli/devices.c:392 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli device monitor { ARGUMENTS | help }\n" "\n" @@ -4373,16 +4440,18 @@ msgid "" "Monitors all devices in case no interface is specified.\n" "\n" msgstr "" -"Användning: nmcli device show { ARGUMENT | help }\n" +"Användning: nmcli device monitor { ARGUMENT | help }\n" "\n" -"ARGUMENT := []\n" +"ARGUMENT := [] …\n" "\n" -"Visa enhetsdetaljer.\n" -"Kommandot listar detaljer för alla enheter eller för en given enhet.\n" +"Övervaka enhetsaktivitet.\n" +"Detta kommando skriver ut en rad varje gång de angivna enheterna ändrar " +"tillstånd.\n" +"Övervakar alla enheter om inget gränssnitt är angivet.\n" "\n" #: ../clients/cli/devices.c:404 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli device wifi { ARGUMENTS | help }\n" "\n" @@ -4440,14 +4509,15 @@ msgstr "" "\n" "ARGUMENT := [list [ifname ] [bssid ]]\n" "\n" -"Lista över tillgängliga trådlösa accesspunkter. ”ifname” och ”bssid”-" +"Lista över tillgängliga trådlösa accesspunkter. ”ifname”- och ”bssid”-" "flaggorna kan\n" "användas för att lista accesspunkter för ett specifikt gränssnitt, eller med " "ett specifikt BSSID.\n" "\n" "ARGUMENT := connect <(B)SSID> [password ] [wep-key-type key|" -"phrase] [ifname ]\n" -" [bssid ] [name ] [private yes|no]\n" +"phrase] [ifname ]\n" +" [bssid ] [name ] [private yes|no] [hidden " +"yes|no]\n" "\n" "Anslut till ett trådlöst nätverk angivet genom SSID eller BSSID. Kommandot " "skapar\n" @@ -4458,21 +4528,39 @@ msgstr "" "trådlösa\n" "nätverk. Om en anslutning för nätverket redan finns är det bättre att\n" "ta fram befintliga profiler enligt: nmcli con up id . Observera att\n" -"endast öppna WEP och WPA-PSK-nätverk stöds för tillfället. Det antas också\n" +"endast öppna WEP- och WPA-PSK-nätverk stöds för tillfället. Det antas också\n" "att IP-konfiguration erhålls via DHCP.\n" "\n" -"ARGUMENT := rescan [[ifnamn] ]\n" +"ARGUMENT := wifi hotspot [ifname ] [con-name ] [ssid ]\n" +" [band a|bg] [channel ] [password " +"]\n" +"\n" +"Skapa en Wi-Fi-surfzon. Använd ”connection down” eller ”device disconnect”\n" +"för att stoppa surfzonen.\n" +"Parametrar för surfzonen kan påverkars av de valfria parametrarna:\n" +"ifname - Wi-Fi-enhet att använda\n" +"con-name - namn på den skapade anslutningsprofilen för surfzonen\n" +"ssid - SSID för surfzonen\n" +"band - Wi-Fi-band att använda\n" +"channel - Wi-Fi-kanal att använda\n" +"password - lösenord att använda för surfzonen\n" "\n" -"Begär att Nätverkshanteraren omedelbart söker av efter tillgängliga " +"\n" +"ARGUMENT := rescan [[ifname] ] [[ssid ] …]\n" +"\n" +"Begär att Nätverkshanteraren omedelbart på nytt söker efter tillgängliga " "accesspunkter.\n" "Nätverkshanteraren söker av trådlösa nätverk periodiskt, men i några fall\n" -"kan det vara användbart att söka av manuellt. Observera att detta kommando " -"inte visar\n" -"APs, använd ”nmcli device wifi list” för det.\n" +"kan det vara användbart att söka av manuellt. ”ssid” tillåter avsökning " +"efter ett specifikt\n" +"SSID, vilket är praktiskt för accesspunkter med dolda SSID. Flera ”ssid”-" +"parametrar kan\n" +"anges. Observera att detta kommando inte visar\n" +"accesspunkterna, använd ”nmcli device wifi list” för det.\n" "\n" #: ../clients/cli/devices.c:451 -#, fuzzy, c-format +#, c-format msgid "" "Usage: nmcli device lldp { ARGUMENTS | help }\n" "\n" @@ -4483,15 +4571,12 @@ msgid "" "used to list neighbors for a particular interface.\n" "\n" msgstr "" -"Användning: nmcli device wimax { ARGUMENT | help }\n" -"\n" -"Utför åtgärder på WiMAX-enheter.\n" +"Användning: nmcli device lldp { ARGUMENT | help }\n" "\n" -"ARGUMENT := [list [ifname ] [nsp ]]\n" +"ARGUMENT := [list [ifname ]]\n" "\n" -"Lista tillgängliga WiMAX NSP:er. Flaggorna ”ifname” och ”nsp” kan användas " -"för att\n" -"lista nätverk för ett specifikt gränssnitt, eller med ett specifik NSP.\n" +"Lista grannenheter som upptäckts genom LLDP. Flaggan ”ifname” kan\n" +"användas för att lista grannar för ett specifikt gränssnitt.\n" "\n" #: ../clients/cli/devices.c:527 ../clients/cli/devices.c:1676 @@ -4609,9 +4694,9 @@ msgid "Error: Connection activation failed: (%d) %s.\n" msgstr "Fel: Aktivering av anslutningen misslyckades: (%d) %s.\n" #: ../clients/cli/devices.c:1517 -#, fuzzy, c-format +#, c-format msgid "Error: Failed to setup a Wi-Fi hotspot: %s" -msgstr "Fel: misslyckades med att sätta värdnamn: %s" +msgstr "Fel: Misslyckades med att konfigurera en Wi-Fi-surfzon: %s" #: ../clients/cli/devices.c:1520 #, c-format @@ -4619,9 +4704,9 @@ msgid "Error: Failed to add/activate new connection: %s" msgstr "Fel: Misslyckades med att lägga till/aktivera ny anslutning: %s" #: ../clients/cli/devices.c:1530 -#, fuzzy, c-format +#, c-format msgid "Error: Failed to setup a Wi-Fi hotspot" -msgstr "Fel: misslyckades med att sätta värdnamn: %s" +msgstr "Fel: Misslyckades med att konfigurera en Wi-Fi-surfzon" #: ../clients/cli/devices.c:1532 #, c-format @@ -4634,9 +4719,9 @@ msgid "Connection with UUID '%s' created and activated on device '%s'\n" msgstr "Anslutningen med UUID ”%s” skapad och aktiverad på enhet ”%s”\n" #: ../clients/cli/devices.c:1547 -#, fuzzy, c-format +#, c-format msgid "Hotspot '%s' activated on device '%s'\n" -msgstr "Anslutningen med UUID ”%s” skapad och aktiverad på enhet ”%s”\n" +msgstr "Surfzon ”%s” aktiverad på enhet ”%s”\n" #: ../clients/cli/devices.c:1611 #, c-format @@ -4670,19 +4755,20 @@ msgid "Device '%s' successfully removed.\n" msgstr "Enheten ”%s” togs bort.\n" #: ../clients/cli/devices.c:1838 -#, fuzzy, c-format +#, c-format msgid "Error: not all connections reapplied." -msgstr "Fel: alla anslutningar är inte borttagna." +msgstr "Fel: alla anslutningar har inte uppdaterats." #: ../clients/cli/devices.c:1839 -#, fuzzy, c-format +#, c-format msgid "Error: Reapplying connection to device '%s' (%s) failed: %s\n" -msgstr "Fel: Borttagning av enheten ”%s” (%s) misslyckades: %s\n" +msgstr "" +"Fel: Uppdatering av anslutning till enheten ”%s” (%s) misslyckades: %s\n" #: ../clients/cli/devices.c:1849 -#, fuzzy, c-format +#, c-format msgid "Connection successfully reapplied to device '%s'.\n" -msgstr "Anslutning aktiverades (aktiv sökväg för D-Bus: %s)\n" +msgstr "Anslutning uppdaterades till enheten ”%s”.\n" #: ../clients/cli/devices.c:1912 #, c-format @@ -4710,39 +4796,39 @@ msgid "Error: Device '%s' (%s) deletion failed: %s\n" msgstr "Fel: Borttagning av enheten ”%s” (%s) misslyckades: %s\n" #: ../clients/cli/devices.c:2132 -#, fuzzy, c-format +#, c-format msgid "Error: No property specified." -msgstr "Fel: Ingen anslutning angiven." +msgstr "Fel: Ingen egenskap angiven." #: ../clients/cli/devices.c:2144 ../clients/cli/devices.c:2159 #, c-format msgid "Error: '%s' argument is missing." -msgstr "Fel: \"%s\"-argument saknas." +msgstr "Fel: ”%s”-argument saknas." #: ../clients/cli/devices.c:2149 -#, fuzzy, c-format +#, c-format msgid "Error: 'managed': %s." -msgstr "Fel: ”mode”: %s." +msgstr "Fel: ”managed”: %s." #: ../clients/cli/devices.c:2174 -#, fuzzy, c-format +#, c-format msgid "Error: property '%s' is not known." -msgstr "Fel: ogiltig egenskap ”%s”: %s." +msgstr "Fel: egenskapen ”%s” är okänd." #: ../clients/cli/devices.c:2220 -#, fuzzy, c-format +#, c-format msgid "%s: using connection '%s'\n" -msgstr "Fel: Okänd anslutning: ”%s”\n" +msgstr "%s: använder anslutningen ”%s”\n" #: ../clients/cli/devices.c:2246 #, c-format msgid "%s: device created\n" -msgstr "" +msgstr "%s: enhet skapad\n" #: ../clients/cli/devices.c:2253 -#, fuzzy, c-format +#, c-format msgid "%s: device removed\n" -msgstr "Enheten togs bort" +msgstr "%s: enhet borttagen\n" #: ../clients/cli/devices.c:2339 msgid "Wi-Fi scan list" @@ -4845,56 +4931,54 @@ msgid "Password: " msgstr "Lösenord: " #: ../clients/cli/devices.c:3034 -#, fuzzy, c-format +#, c-format msgid "'%s' is not valid WPA PSK" -msgstr "”%s” inte en giltig PSK" +msgstr "”%s” inte giltig WPA PSK" #: ../clients/cli/devices.c:3051 -#, fuzzy, c-format +#, c-format msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)" -msgstr "”%s”-längden är ogiltig (ska vara 5 eller 6 siffror)" +msgstr "”%s” är inte en giltig WEP-nyckel (ska vara 5 eller 13 ASCII-tecken)" #: ../clients/cli/devices.c:3067 #, c-format msgid "Hotspot password: %s\n" -msgstr "" +msgstr "Lösenord för surfzon: %s\n" #: ../clients/cli/devices.c:3125 -#, fuzzy, c-format +#, c-format msgid "Error: ssid is too long." -msgstr "Fel: ”ssid” krävs." +msgstr "Fel: ssid är för långt." #: ../clients/cli/devices.c:3137 -#, fuzzy, c-format +#, c-format msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'." -msgstr "" -"Fel: wep-key-type-argumentvärdet ”%s” är ogiltigt, använd ”key” eller " -"”phrase”." +msgstr "Fel: argumentvärdet ”%s” för band är ogiltigt, använd ”a” eller ”bg”." #: ../clients/cli/devices.c:3161 -#, fuzzy, c-format +#, c-format msgid "Error: Unknown parameter %s." -msgstr "Okänd parameter: %s\n" +msgstr "Fel: Okänd parameter %s." #: ../clients/cli/devices.c:3180 -#, fuzzy, c-format +#, c-format msgid "Error: channel requires band too." -msgstr "Fel: ”apn” krävs." +msgstr "Fel: kanal kräver även band." #: ../clients/cli/devices.c:3186 -#, fuzzy, c-format +#, c-format msgid "Error: channel '%s' not valid for band '%s'." -msgstr "Fel: ”channel”: ”%s” är inte giltigt; använd <1-13>." +msgstr "Fel: kanal ”%s” är inte giltig för bandet ”%s”." #: ../clients/cli/devices.c:3214 -#, fuzzy, c-format +#, c-format msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode." -msgstr "Fel: Enheten ”%s” är inte en trådlös enhet." +msgstr "Fel: Enheten ”%s” stöder varken accesspunkts- eller Ad-Hoc-läge." #: ../clients/cli/devices.c:3249 -#, fuzzy, c-format +#, c-format msgid "Error: Invalid 'password': %s." -msgstr "Fel: ogiltig egenskap ”%s”: %s." +msgstr "Fel: ogiltigt ”password”: %s." # flaggan "ssid" kan upprepas #: ../clients/cli/devices.c:3318 @@ -4905,22 +4989,22 @@ msgstr "Fel: ”%s” kan inte upprepas." #: ../clients/cli/devices.c:3399 #, c-format msgid "Error: 'device wifi' command '%s' is not valid." -msgstr "Fel: “device wifi“-kommandot ”%s” är inte giltigt." +msgstr "Fel: ”device wifi”-kommandot ”%s” är inte giltigt." #. Main header name #: ../clients/cli/devices.c:3425 msgid "Device LLDP neighbors" -msgstr "" +msgstr "LLDP-grannar för enhet" #: ../clients/cli/devices.c:3528 -#, fuzzy, c-format +#, c-format msgid "Error: 'device lldp list': %s" -msgstr "Fel: ”device status”: %s" +msgstr "Fel: ”device lldp list”: %s" #: ../clients/cli/devices.c:3575 -#, fuzzy, c-format +#, c-format msgid "Error: 'device lldp' command '%s' is not valid." -msgstr "Fel: “device wifi“-kommandot ”%s” är inte giltigt." +msgstr "Fel: ”device lldp”-kommandot ”%s” är inte giltigt." #: ../clients/cli/devices.c:3770 #, c-format @@ -5255,6 +5339,11 @@ msgid "" "Prints a line whenever a change occurs in NetworkManager\n" "\n" msgstr "" +"Användning: nmcli monitor\n" +"\n" +"Övervaka ändringar för Nätverkshanteraren.\n" +"Skriver en rad varje gång en ändring inträffar i Nätverkshanteraren\n" +"\n" #: ../clients/cli/general.c:233 msgid "asleep" @@ -5407,52 +5496,49 @@ msgid "Error: 'radio' command '%s' is not valid." msgstr "Fel: ”radio”-kommandot ”%s” är inte giltigt." #: ../clients/cli/general.c:914 -#, fuzzy msgid "NetworkManager has started" -msgstr "Status för Nätverkshanteraren" +msgstr "Nätverkshanteraren har startats" #: ../clients/cli/general.c:917 -#, fuzzy msgid "NetworkManager has stopped" -msgstr "Status för Nätverkshanteraren" +msgstr "Nätverkshanteraren har stoppats" #: ../clients/cli/general.c:931 -#, fuzzy, c-format +#, c-format msgid "Hostname set to '%s'\n" -msgstr "Värdnamnet sattes till ”%s”" +msgstr "Värdnamnet sattes till ”%s”\n" #: ../clients/cli/general.c:946 -#, fuzzy, c-format +#, c-format msgid "'%s' is now the primary connection\n" -msgstr "”%s” är inte en giltig VPN-anslutningsprofil" +msgstr "”%s” är nu den primära anslutningen\n" #: ../clients/cli/general.c:948 -#, fuzzy, c-format +#, c-format msgid "There's no primary connection\n" -msgstr "Gruppanslutning" +msgstr "Det finns ingen primär anslutning\n" #: ../clients/cli/general.c:960 -#, fuzzy, c-format +#, c-format msgid "Connectivity is now '%s'\n" -msgstr "Anslutning" +msgstr "Anslutbarhet är nu ”%s”\n" #: ../clients/cli/general.c:973 -#, fuzzy, c-format +#, c-format msgid "Networkmanager is now in the '%s' state\n" -msgstr "Nätverkshanteraren är inte startad." +msgstr "Nätverkshanteraren är nu i tillståndet ”%s”\n" #: ../clients/cli/general.c:984 -#, fuzzy, c-format +#, c-format msgid "Error: 'monitor' command '%s' is not valid." -msgstr "Fel: ”agent”-kommandot ”%s” är inte giltigt." +msgstr "Fel: ”monitor”-kommandot ”%s” är inte giltigt." #: ../clients/cli/general.c:998 -#, fuzzy msgid "Networkmanager is not running (waiting for it)\n" -msgstr "Nätverkshanteraren är inte startad." +msgstr "Nätverkshanteraren är inte startad (väntar på den)\n" #: ../clients/cli/nmcli.c:83 -#, fuzzy, c-format +#, c-format msgid "" "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" "\n" @@ -5498,6 +5584,7 @@ msgstr "" " -n[ocheck] kontrollera inte nmcli och " "Nätverkshanterarens versioner\n" " -a[sk] fråga efter saknade parametrar\n" +" -s[how-secrets] tillåt att lösenord visas\n" " -w[ait] sätt en tidsgräns för åtgärder\n" " -v[ersion] visa programversionen\n" " -h[elp] skriv ut denna hjälp\n" @@ -5508,7 +5595,8 @@ msgstr "" " r[adio] Nätverkshanterarens radioväxlar\n" " c[onnection] Nätverkshanterarens anslutningar\n" " d[evice] enheter som hanteras av Nätverkshanteraren\n" -" a[gent] hemlig- eller polkitagent för Nätverkshanteraren\n" +" a[gent] hemlig agent eller polkitagent för Nätverkshanteraren\n" +" m[onitor] övervaka ändringar för Nätverkshanteraren\n" "\n" #: ../clients/cli/nmcli.c:143 @@ -5643,9 +5731,8 @@ msgid "LOOSE_BINDING, " msgstr "LOOSE_BINDING, " #: ../clients/cli/settings.c:836 -#, fuzzy msgid "MVRP, " -msgstr "GVRP, " +msgstr "MVRP, " #: ../clients/cli/settings.c:875 #, c-format @@ -5727,9 +5814,9 @@ msgid "default" msgstr "standard" #: ../clients/cli/settings.c:1556 -#, fuzzy, c-format +#, c-format msgid "%d (off)" -msgstr "%d (nej)" +msgstr "%d (av)" #: ../clients/cli/settings.c:1770 #, c-format @@ -5745,21 +5832,21 @@ msgid "'default' and 'ignore' are incompatible with other flags" msgstr "”default” och ”ignore” är inkompatibla med andra flaggor" #: ../clients/cli/settings.c:1817 -#, fuzzy, c-format +#, c-format msgid "invalid mode '%s', use one of %s" -msgstr "ogiltigt fält ”%s”; tillåtna fält: %s" +msgstr "ogiltigt läge ”%s”, använd en av %s" #: ../clients/cli/settings.c:1899 #, c-format msgid "always" -msgstr "" +msgstr "alltid" #: ../clients/cli/settings.c:1999 ../clients/cli/settings.c:3286 #: ../clients/cli/settings.c:4478 ../clients/cli/settings.c:4981 #: ../libnm-core/nm-keyfile-reader.c:573 -#, fuzzy, c-format +#, c-format msgid "invalid option '%s', use one of [%s]" -msgstr "ogiltigt alternativ ”%s” eller dess värde ”%s”" +msgstr "ogiltig flagga ”%s”, använd en av [%s]" #: ../clients/cli/settings.c:2116 #, c-format @@ -5841,7 +5928,7 @@ msgstr "ogiltig flagga ”%s”" #: ../clients/cli/settings.c:2654 msgid "missing option" -msgstr "saknat alternativ" +msgstr "saknad flagga" #: ../clients/cli/settings.c:2681 ../clients/cli/settings.c:2701 #: ../clients/cli/settings.c:2721 ../clients/cli/settings.c:2741 @@ -5865,7 +5952,7 @@ msgstr "”%s” är inte en giltig Ethernet MAC" #: ../libnm-util/nm-setting-infiniband.c:269 #, c-format msgid "'%s' is not a valid interface name" -msgstr "'”%s” är inte ett giltigt gränssnittsnamn" +msgstr "”%s” är inte ett giltigt gränssnittsnamn" #: ../clients/cli/settings.c:2856 #, c-format @@ -5912,12 +5999,12 @@ msgstr "" " [user:], [user:],…\n" "Objekten kan separeras med komman eller blanksteg.\n" "\n" -"Exempel: Anders Sebastian Göran\n" +"Exempel: anders maria sebastian\n" #: ../clients/cli/settings.c:3063 #, c-format msgid "'%s' is not valid master; use ifname or connection UUID" -msgstr "”%s” är inte en giltig master; använd ifnamn eller anslutnings-UUID" +msgstr "”%s” är inte en giltig master; använd grnamn eller anslutnings-UUID" #: ../clients/cli/settings.c:3107 #, c-format @@ -6033,7 +6120,7 @@ msgstr "" "file://).\n" " [file://]\n" "Observera att nmcli inte stödjer att ange certifikat som rå blob-data.\n" -"Exempel: /home/cimrman/cacert.crt\n" +"Exempel: /home/cimrman/ca-zweite-phase.crt\n" #: ../clients/cli/settings.c:3476 #, c-format @@ -6181,7 +6268,7 @@ msgid "" "Example: 192.168.1.5/24, 10.0.0.11/24\n" msgstr "" "Ange en lista av IPv4-adresser formaterade som:\n" -" ip[/prefix], ip[/prefix],...\n" +" ip[/prefix], ip[/prefix],…\n" "Saknade prefix räknas som prefix av 32.\n" "\n" "Exempel: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n" @@ -6318,8 +6405,8 @@ msgstr "" "innehållandes konfigurationen. I det senare fallet läses filen in och " "innehållet läggs i denna egenskap.\n" "\n" -"Exempel: set team.config { ”device”: ”team0”, ”runner”: {”name”: " -"”roundrobin”}, ”ports”: {”eth1”: {}, ”eth2”: {}} }\n" +"Exempel: set team.config { \"device\": \"team0\", \"runner\": {\"name\": " +"\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" " set team.config /etc/my-team.conf\n" #: ../clients/cli/settings.c:4602 @@ -6364,7 +6451,7 @@ msgstr "egenskapen innehåller inte MAC-adress ”%s”" #: ../clients/cli/settings.c:4799 #, c-format msgid "'%s' is not valid; 2 or 3 strings should be provided" -msgstr "”%s” är ogiltig; Två eller tre strängar ska ges" +msgstr "”%s” är ogiltig; Två eller tre strängar ska anges" #: ../clients/cli/settings.c:4813 msgid "" @@ -6379,7 +6466,7 @@ msgstr "" #: ../clients/cli/settings.c:4835 #, c-format msgid "'%s' string value should consist of 1 - 199 characters" -msgstr "strängvärdet för ”%s” bör bestå av 1 - 199 tecken" +msgstr "”%s”-strängvärde ska bestå av 1 - 199 tecken" #: ../clients/cli/settings.c:4867 #, c-format @@ -6403,9 +6490,9 @@ msgid "'%ld' is not a valid channel" msgstr "”%ld” är en ogiltig kanal" #: ../clients/cli/settings.c:5013 -#, fuzzy, c-format +#, c-format msgid "invalid option '%s', use 'default', 'never' or 'always'" -msgstr "ogiltigt alternativ ”%s” eller dess värde ”%s”" +msgstr "ogiltig flagga ”%s”, använd ”default”, ”never” eller ”always”" #: ../clients/cli/settings.c:5074 ../clients/cli/settings.c:5113 #: ../clients/cli/settings.c:5152 @@ -6500,12 +6587,12 @@ msgstr "summan för bandbreddsprocenten måste vara 100%%" #: ../clients/cli/settings.c:5549 ../clients/cli/settings.c:5555 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code" -msgstr "" +msgstr "SIM-operatörs-ID måste vara en 5- eller 6-siffrig MCCMNC-kod" #: ../clients/cli/settings.c:5598 -#, fuzzy, c-format +#, c-format msgid "invalid option '%s', use '%s' or '%s'" -msgstr "ogiltigt alternativ ”%s” eller dess värde ”%s”" +msgstr "ogiltig flagga ”%s”, använd ”%s” eller ”%s”" #: ../clients/cli/settings.c:7644 msgid "don't know how to get the property value" @@ -6727,7 +6814,7 @@ msgstr "VPN-lösenord krävs" #: ../clients/common/nm-vpn-helpers.c:61 msgid "could not get VPN plugin info" -msgstr "" +msgstr "kunde inte hämta VPN-insticksinfo" #: ../clients/common/nm-vpn-helpers.c:103 #: ../clients/common/nm-vpn-helpers.c:106 @@ -7101,7 +7188,7 @@ msgstr "TRÅDBUNDET" #: ../clients/tui/nmt-page-ethernet.c:77 ../clients/tui/nmt-page-vlan.c:122 #: ../clients/tui/nmt-page-wifi.c:364 msgid "Cloned MAC address" -msgstr "Klonade MAC-adress" +msgstr "Klonad MAC-adress" #: ../clients/tui/nmt-page-infiniband.c:47 msgid "Datagram" @@ -7727,7 +7814,7 @@ msgstr "Misslyckades med att initiera chifferkontexten för kryptering: %s (%s)" #: ../libnm-core/crypto_gnutls.c:233 ../libnm-util/crypto_gnutls.c:292 #, c-format msgid "Failed to encrypt the data: %s (%s)" -msgstr "Misslyckades med att kryptera datat: %s (%s)" +msgstr "Misslyckades med att kryptera data: %s (%s)" #: ../libnm-core/crypto_gnutls.c:276 ../libnm-util/crypto_gnutls.c:332 #, c-format @@ -7880,9 +7967,8 @@ msgid "unknown setting name" msgstr "okänt inställningsnamn" #: ../libnm-core/nm-connection.c:306 -#, fuzzy msgid "duplicate setting name" -msgstr "okänt inställningsnamn" +msgstr "duplicerat inställningsnamn" #: ../libnm-core/nm-connection.c:873 msgid "setting not found" @@ -8318,7 +8404,7 @@ msgstr "”%s”-alternativet är endast giltigt med läget ”%s”" #: ../libnm-core/nm-setting-bond.c:687 #, c-format msgid "'%s' and '%s' cannot have different values" -msgstr "" +msgstr "”%s” och ”%s” kan inte ha olika värden" #: ../libnm-core/nm-setting-bond.c:703 #, c-format @@ -8459,14 +8545,12 @@ msgid "'%s' length is invalid (should be 5 or 6 digits)" msgstr "”%s”-längden är ogiltig (ska vara 5 eller 6 siffror)" #: ../libnm-core/nm-setting-gsm.c:397 -#, fuzzy msgid "property is empty or wrong size" -msgstr "egenskap är tom" +msgstr "egenskap är tom eller har fel storlek" #: ../libnm-core/nm-setting-gsm.c:407 -#, fuzzy msgid "property must contain only digits" -msgstr "egenskapen innehåller inte protokollet ”%s”" +msgstr "egenskap får endast innehålla siffror" #: ../libnm-core/nm-setting-infiniband.c:217 #: ../libnm-util/nm-setting-infiniband.c:231 @@ -8526,7 +8610,7 @@ msgstr "Ogiltig IPv4-adressprefix ”%u”" #: ../libnm-core/nm-setting-ip-config.c:152 #, c-format msgid "Invalid IPv6 address prefix '%u'" -msgstr "Ogiltig IPv6-adressprefix ”%u”" +msgstr "Ogiltigt IPv6-adressprefix ”%u”" #: ../libnm-core/nm-setting-ip-config.c:170 #, c-format @@ -8546,7 +8630,7 @@ msgstr "%d. IP-adressen är ogiltig" #: ../libnm-core/nm-setting-ip-config.c:2210 #, c-format msgid "%d. IP address has 'label' property with invalid type" -msgstr "%d. IP-adressen har ”label”-egenskap med ogiltigt typ" +msgstr "%d. IP-adressen har ”label”-egenskap med ogiltig typ" #: ../libnm-core/nm-setting-ip-config.c:2219 #, c-format @@ -8596,18 +8680,18 @@ msgid "this property is not allowed for '%s=%s'" msgstr "denna egenskap är inte tillåten för ”%s=%s”" #: ../libnm-core/nm-setting-ip4-config.c:214 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid FQDN" -msgstr "”%s” är inte ett giltigt UUID" +msgstr "”%s” är inte ett giltigt FQDN" #: ../libnm-core/nm-setting-ip4-config.c:223 msgid "property cannot be set when dhcp-hostname is also set" -msgstr "" +msgstr "egenskap kan inte ställas in då dhcp-hostname också är inställd" #: ../libnm-core/nm-setting-ip-tunnel.c:318 -#, fuzzy, c-format +#, c-format msgid "'%d' is not a valid tunnel mode" -msgstr "”%d” är inte en giltig kanal" +msgstr "”%d” är inte ett giltigt tunnelläge" #: ../libnm-core/nm-setting-ip-tunnel.c:330 #: ../libnm-core/nm-setting-macvlan.c:167 ../libnm-core/nm-setting-vlan.c:647 @@ -8618,23 +8702,24 @@ msgstr "”%s” är varken ett UUID eller ett gränssnittsnamn" #: ../libnm-core/nm-setting-ip-tunnel.c:341 #: ../libnm-core/nm-setting-ip-tunnel.c:352 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid IPv%c address" -msgstr "”%s” är inte en giltig MAC-adress" +msgstr "”%s” är inte en giltig IPv%c-adress" #: ../libnm-core/nm-setting-ip-tunnel.c:366 msgid "tunnel keys can only be specified for GRE tunnels" -msgstr "" +msgstr "tunnelnycklar kan endast anges för GRE-tunnlar" #: ../libnm-core/nm-setting-ip-tunnel.c:379 #: ../libnm-core/nm-setting-ip-tunnel.c:395 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid tunnel key" -msgstr "”%s” är inte en giltig kanal" +msgstr "”%s” är inte en giltig tunnelnyckel" #: ../libnm-core/nm-setting-ip-tunnel.c:407 msgid "a fixed TTL is allowed only when path MTU discovery is enabled" msgstr "" +"en fast TTL är endast tillåten då sökvägs-MTU-upptäckt (PMTUD) är aktiverad" #: ../libnm-core/nm-setting-macvlan.c:181 ../libnm-core/nm-setting-vlan.c:661 #: ../libnm-util/nm-setting-vlan.c:580 @@ -8644,7 +8729,7 @@ msgstr "egenskapen är inte angiven och det är inte heller ”%s:%s”" #: ../libnm-core/nm-setting-macvlan.c:192 msgid "non promiscuous operation is allowed only in passthru mode" -msgstr "" +msgstr "icke-promiskuös operation är tillåten endast i genomströmningsläge" #: ../libnm-core/nm-setting-olpc-mesh.c:130 #: ../libnm-core/nm-setting-wireless.c:739 @@ -8672,19 +8757,19 @@ msgid "setting this property requires non-zero '%s' property" msgstr "att sätta denna egenskap kräver icke-noll för ”%s”-egenskapen" #: ../libnm-core/nm-setting-tun.c:187 -#, fuzzy, c-format +#, c-format msgid "'%u': invalid mode" -msgstr "”%s” är inte ett giltigt Wi-Fi-läge" +msgstr "”%u”: ogiltigt läge" #: ../libnm-core/nm-setting-tun.c:197 -#, fuzzy, c-format +#, c-format msgid "'%s': invalid user ID" -msgstr "”%s” är inte ett giltigt UUID" +msgstr "”%s”: ogiltigt användar-ID" #: ../libnm-core/nm-setting-tun.c:208 -#, fuzzy, c-format +#, c-format msgid "'%s': invalid group ID" -msgstr "”%s” är inte ett giltigt UUID" +msgstr "”%s”: ogiltigt grupp-ID" #: ../libnm-core/nm-setting-vlan.c:636 ../libnm-util/nm-setting-vlan.c:556 #, c-format @@ -8694,7 +8779,7 @@ msgstr "”%s”-värde matchar inte ”%s=%s”" #: ../libnm-core/nm-setting-vlan.c:672 ../libnm-util/nm-setting-vlan.c:600 #, c-format msgid "the vlan id must be in range 0-4094 but is %u" -msgstr "" +msgstr "vlan-id måste vara i intervallet 0-4094 men är %u" #: ../libnm-core/nm-setting-vlan.c:681 ../libnm-util/nm-setting-vlan.c:591 msgid "flags are invalid" @@ -8732,19 +8817,19 @@ msgid "secret flags property not found" msgstr "hemliga flaggegenskaper hittades inte" #: ../libnm-core/nm-setting-vxlan.c:375 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid IP address" -msgstr "”%s” är inte en giltig MAC-adress" +msgstr "”%s” är inte en giltig IP-adress" #: ../libnm-core/nm-setting-vxlan.c:388 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid IP%c address" -msgstr "”%s” är inte en giltig MAC-adress" +msgstr "”%s” är inte en giltig IP%c-adress" #: ../libnm-core/nm-setting-vxlan.c:415 #, c-format msgid "%d is greater than local port max %d" -msgstr "" +msgstr "%d är större än lokalt portmaximum %d" #: ../libnm-core/nm-setting-wired.c:619 ../libnm-util/nm-setting-wired.c:613 #, c-format @@ -8810,7 +8895,7 @@ msgstr "”%s” är inte ett giltigt Wi-Fi-läge" #: ../libnm-util/nm-setting-wireless.c:797 #, c-format msgid "'%s' is not a valid band" -msgstr "”%s” är inte en giltig frekvens" +msgstr "”%s” är inte ett giltigt band" #: ../libnm-core/nm-setting-wireless.c:768 #, c-format @@ -8820,7 +8905,7 @@ msgstr "”%s” kräver en ”%s”-inställning" #: ../libnm-core/nm-setting.c:837 #, c-format msgid "duplicate property" -msgstr "" +msgstr "duplicerad egenskap" #: ../libnm-core/nm-setting.c:865 ../libnm-core/nm-setting.c:912 #, c-format @@ -8828,19 +8913,19 @@ msgid "can't set property of type '%s' from value of type '%s'" msgstr "kan inte sätta egenskap för typen ”%s” från värdet av typen ”%s”" #: ../libnm-core/nm-setting.c:884 ../libnm-core/nm-setting.c:898 -#, fuzzy, c-format +#, c-format msgid "failed to set property: %s" -msgstr "Fel: misslyckades med att sätta ”%s”-egenskapen: %s\n" +msgstr "misslyckades med att sätta egenskap: %s" #: ../libnm-core/nm-setting.c:926 -#, fuzzy, c-format +#, c-format msgid "can not set property: %s" -msgstr "inte en hemlig egenskap" +msgstr "kan inte sätta egenskap: %s" #: ../libnm-core/nm-setting.c:942 -#, fuzzy, c-format +#, c-format msgid "unknown property" -msgstr "okänt fel" +msgstr "okänd egenskap" #: ../libnm-core/nm-setting.c:1682 msgid "secret not found" @@ -8851,49 +8936,49 @@ msgid "secret is not set" msgstr "hemlighet inte angiven" #: ../libnm-core/nm-utils.c:2447 -#, fuzzy, c-format +#, c-format msgid "failed stat file %s: %s" -msgstr "misslyckades med att läsa lösenordsfilen ”%s”: %s" +msgstr "stat misslyckades på filen %s: %s" #: ../libnm-core/nm-utils.c:2456 -#, fuzzy, c-format +#, c-format msgid "not a file (%s)" -msgstr "Kunde inte läsa in filen: ”%s”\n" +msgstr "inte en fil (%s)" #: ../libnm-core/nm-utils.c:2467 -#, fuzzy, c-format +#, c-format msgid "invalid file owner %d for %s" -msgstr "ogiltigt fält ”%s”; tillåtna fält: %s" +msgstr "ogiltig filägare %d för %s" #: ../libnm-core/nm-utils.c:2478 #, c-format msgid "file permissions for %s" -msgstr "" +msgstr "filrättigheter för %s" #: ../libnm-core/nm-utils.c:2488 #, c-format msgid "reject %s" -msgstr "" +msgstr "förkasta %s" #: ../libnm-core/nm-utils.c:2508 -#, fuzzy, c-format +#, c-format msgid "path is not absolute (%s)" -msgstr "ogiltigt int64-värde (%s)" +msgstr "sökväg är inte absolut (%s)" #: ../libnm-core/nm-utils.c:2522 #, c-format msgid "Plugin file does not exist (%s)" -msgstr "" +msgstr "Insticksmodulfil existerar inte (%s)" #: ../libnm-core/nm-utils.c:2530 -#, fuzzy, c-format +#, c-format msgid "Plugin is not a valid file (%s)" -msgstr "”%s” är inte ett giltigt värde för ”%s”" +msgstr "Insticksmodul är inte en giltig fil (%s)" #: ../libnm-core/nm-utils.c:2540 #, c-format msgid "libtool archives are not supported (%s)" -msgstr "" +msgstr "libtool-arkiv stöds inte (%s)" #: ../libnm-core/nm-utils.c:2622 ../libnm-util/nm-utils.c:1815 #, c-format @@ -8903,101 +8988,105 @@ msgstr "Kunde inte hitta binären ”%s”" #: ../libnm-core/nm-vpn-editor-plugin.c:132 #, c-format msgid "cannot load plugin %s" -msgstr "" +msgstr "kan inte läsa in insticksmodulen %s" #: ../libnm-core/nm-vpn-editor-plugin.c:160 #, c-format msgid "cannot load VPN plugin in '%s': missing plugin name" msgstr "" +"kan inte läsa in VPN-insticksmodul i ”%s”: saknar namn på insticksmodul" #: ../libnm-core/nm-vpn-editor-plugin.c:167 #, c-format msgid "cannot load VPN plugin in '%s': invalid service name" -msgstr "" +msgstr "kan inte läsa in VPN-insticksmodul i ”%s”: ogiltigt namn på tjänst" #: ../libnm-core/nm-vpn-editor-plugin.c:183 #, c-format msgid "unknown error initializing plugin %s" -msgstr "" +msgstr "okänt fel vid initiering av insticksmodulen %s" #: ../libnm-core/nm-vpn-editor-plugin.c:195 #, c-format msgid "failed to load nm_vpn_editor_plugin_factory() from %s (%s)" msgstr "" +"misslyckades med att läsa in nm_vpn_editor_plugin_factory() från %s (%s)" #: ../libnm-core/nm-vpn-editor-plugin.c:256 #, c-format msgid "the plugin does not support import capability" -msgstr "" +msgstr "insticksmodulen stöder inte importförmåga" #: ../libnm-core/nm-vpn-editor-plugin.c:276 #, c-format msgid "the plugin does not support export capability" -msgstr "" +msgstr "insticksmodulen stöder inte exportförmåga" #: ../libnm-core/nm-vpn-plugin-info.c:109 -#, fuzzy, c-format +#, c-format msgid "missing filename" -msgstr "saknat alternativ" +msgstr "filnamn saknas" #: ../libnm-core/nm-vpn-plugin-info.c:117 #, c-format msgid "filename must be an absolute path (%s)" -msgstr "" +msgstr "filnamn måste vara en absolut sökväg (%s)" #: ../libnm-core/nm-vpn-plugin-info.c:126 #, c-format msgid "filename has invalid format (%s)" -msgstr "" +msgstr "filnamn har ogiltigt format (%s)" #: ../libnm-core/nm-vpn-plugin-info.c:383 #, c-format msgid "there exists a conflicting plugin (%s) that has the same %s.%s value" msgstr "" +"det finns en insticksmodul (%s) som står i konflikt och har samma %s.%s-värde" #: ../libnm-core/nm-vpn-plugin-info.c:421 #, c-format msgid "there exists a conflicting plugin with the same name (%s)" -msgstr "" +msgstr "det finns en insticksmodul med samma namn (%s) som står i konflikt" #: ../libnm-core/nm-vpn-plugin-info.c:740 -#, fuzzy, c-format +#, c-format msgid "missing \"plugin\" setting" -msgstr "saknar inställning" +msgstr "saknar ”plugin”-inställning" #: ../libnm-core/nm-vpn-plugin-info.c:750 #, c-format msgid "%s: don't retry loading plugin which already failed previously" msgstr "" +"%s: försök inte att på nytt läsa in insticksmodul som redan tidigare " +"misslyckats" #: ../libnm-core/nm-vpn-plugin-info.c:842 msgid "missing filename to load VPN plugin info" -msgstr "" +msgstr "saknar filnamn för att läsa in VPN-insticksinfo" #: ../libnm-core/nm-vpn-plugin-info.c:854 msgid "missing name for VPN plugin info" -msgstr "" +msgstr "saknar namn för VPN-insticksinfo" #: ../libnm-core/nm-vpn-plugin-info.c:863 msgid "missing service for VPN plugin info" -msgstr "" +msgstr "saknar tjänst för VPN-insticksinfo" #: ../libnm-glib/nm-device.c:1853 ../libnm/nm-device.c:1804 msgid "Bluetooth" msgstr "Bluetooth" #: ../libnm-glib/nm-device.c:1873 ../libnm/nm-device.c:1824 -#, fuzzy msgid "MACVLAN" -msgstr "VLAN" +msgstr "MACVLAN" #: ../libnm-glib/nm-device.c:1877 ../libnm/nm-device.c:1828 msgid "IPTunnel" -msgstr "" +msgstr "IPTunnel" #: ../libnm-glib/nm-device.c:1881 ../libnm/nm-device.c:1832 msgid "Veth" -msgstr "" +msgstr "Veth" #: ../libnm-glib/nm-device.c:1913 ../libnm/nm-device.c:1864 msgid "Wired" @@ -9135,7 +9224,7 @@ msgstr "Anslutningen var inte en Ethernet eller PPPoE-anslutning." #: ../libnm/nm-device-ethernet.c:222 msgid "The connection and device differ in S390 subchannels." -msgstr "" +msgstr "Anslutningen och enheten skiljer sig åt i S390-underkanaler." #: ../libnm/nm-device-ethernet.c:232 ../libnm/nm-device-infiniband.c:102 #: ../libnm/nm-device-wifi.c:604 ../libnm/nm-device-wimax.c:326 @@ -9143,19 +9232,18 @@ msgid "Invalid device MAC address." msgstr "Ogiltigt MAC-adress för enhet." #: ../libnm/nm-device-ethernet.c:237 -#, fuzzy msgid "The MACs of the device and the connection do not match." -msgstr "MAC-adresserna för enheten och anslutningen matchade inte." +msgstr "MAC-adresserna för enheten och anslutningen matchar inte." #: ../libnm/nm-device-ethernet.c:247 #, c-format msgid "Invalid MAC in the blacklist: %s." -msgstr "" +msgstr "Ogiltig MAC i svartlistan: %s." #: ../libnm/nm-device-ethernet.c:253 -#, fuzzy, c-format +#, c-format msgid "Device MAC (%s) is blacklisted by the connection." -msgstr "Enheten saknar förmågorna som krävs av anslutningen." +msgstr "Enhetens MAC-adress (%s) är svartlistad av anslutningen." #: ../libnm/nm-device-generic.c:91 msgid "The connection was not a generic connection." @@ -9166,14 +9254,12 @@ msgid "The connection did not specify an interface name." msgstr "Anslutningen angav inte ett gränssnittsnamn." #: ../libnm/nm-device-tun.c:209 -#, fuzzy msgid "The connection was not a tun connection." -msgstr "Anslutningen var inte en gruppanslutning." +msgstr "Anslutningen var inte en tun-anslutning." #: ../libnm/nm-device-tun.c:218 -#, fuzzy msgid "The mode of the device and the connection didn't match" -msgstr "MAC-adresserna för enheten och anslutningen matchade inte." +msgstr "Läget för enheten och anslutningen matchade inte" #: ../libnm/nm-device-infiniband.c:94 msgid "The connection was not an InfiniBand connection." @@ -9185,14 +9271,12 @@ msgid "The MACs of the device and the connection didn't match." msgstr "MAC-adresserna för enheten och anslutningen matchade inte." #: ../libnm/nm-device-ip-tunnel.c:254 -#, fuzzy msgid "The connection was not an IP tunnel connection." -msgstr "Anslutningen var inte en gruppanslutning." +msgstr "Anslutningen var inte en IP-tunnelanslutning." #: ../libnm/nm-device-macvlan.c:159 -#, fuzzy msgid "The connection was not a MAC-VLAN connection." -msgstr "Anslutningen var inte en VLAN-anslutning." +msgstr "Anslutningen var inte en MAC-VLAN-anslutning." #: ../libnm/nm-device-modem.c:120 msgid "The connection was not a modem connection." @@ -9227,14 +9311,12 @@ msgid "The hardware address of the device and the connection didn't match." msgstr "Hårdvaruadressen för enheten och anslutningen matchar inte." #: ../libnm/nm-device-vxlan.c:387 -#, fuzzy msgid "The connection was not a VXLAN connection." -msgstr "Anslutningen var inte en VLAN-anslutning." +msgstr "Anslutningen var inte en VXLAN-anslutning." #: ../libnm/nm-device-vxlan.c:394 -#, fuzzy msgid "The VXLAN identifiers of the device and the connection didn't match." -msgstr "VLAN-identifierarna för enheten och anslutningen matchar inte." +msgstr "VXLAN-identifierarna för enheten och anslutningen matchar inte." #: ../libnm/nm-device-wifi.c:595 msgid "The connection was not a Wi-Fi connection." @@ -9391,42 +9473,45 @@ msgid "System policy prevents modification of the persistent system hostname" msgstr "Systemets policy förhindrar ändring av bestående värdnamn för systemet" #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:23 -#, fuzzy msgid "Modify persistent global DNS configuration" -msgstr "Avsluta efter initial konfiguration" +msgstr "Ändra bestående global DNS-konfiguration" #: ../policy/org.freedesktop.NetworkManager.policy.in.in.h:24 -#, fuzzy msgid "" "System policy prevents modification of the persistent global DNS " "configuration" -msgstr "Systemets policy förhindrar ändring av bestående värdnamn för systemet" +msgstr "" +"Systemets policy förhindrar ändring av bestående global DNS-konfiguration" #: ../shared/nm-shared-utils.c:174 #, c-format msgid "object class '%s' has no property named '%s'" -msgstr "" +msgstr "objektklassen ”%s” har ingen egenskap med namnet ”%s”" #: ../shared/nm-shared-utils.c:181 #, c-format msgid "property '%s' of object class '%s' is not writable" -msgstr "" +msgstr "egenskapen ”%s” för objektklassen ”%s” är inte skrivbar" #: ../shared/nm-shared-utils.c:188 #, c-format msgid "" "construct property \"%s\" for object '%s' can't be set after construction" msgstr "" +"konstruktionsegenskap ”%s” för objektet ”%s” kan inte ställas in efter att " +"det skapats" #: ../shared/nm-shared-utils.c:196 #, c-format msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" msgstr "" +"”%s::%s” är inte ett giltigt egenskapsnamn; ”%s” är inte en undertyp till " +"GObject" #: ../shared/nm-shared-utils.c:205 -#, fuzzy, c-format +#, c-format msgid "unable to set property '%s' of type '%s' from value of type '%s'" -msgstr "kan inte sätta egenskap för typen ”%s” från värdet av typen ”%s”" +msgstr "kan inte sätta egenskapen ”%s” av typen ”%s” från värdet av typen ”%s”" #: ../shared/nm-shared-utils.c:216 #, c-format @@ -9434,6 +9519,8 @@ msgid "" "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " "type '%s'" msgstr "" +"värdet ”%s” av typ ”%s” är ogiltigt eller utanför intervallet för egenskapen " +"”%s” av typ ”%s”" #. Translators: the first %s is a prefix for the connection id, such #. * as "Wired Connection" or "VPN Connection". The %d is a number @@ -9642,28 +9729,24 @@ msgid "InfiniBand connection" msgstr "InfiniBand-anslutning" #: ../src/devices/nm-device-ip-tunnel.c:346 -#, fuzzy msgid "IP tunnel connection" -msgstr "PAN-anslutning" +msgstr "IP-tunnelanslutning" #: ../src/devices/nm-device-macvlan.c:428 -#, fuzzy msgid "MACVLAN connection" -msgstr "VLAN-anslutning" +msgstr "MACVLAN-anslutning" #: ../src/devices/nm-device-tun.c:129 -#, fuzzy msgid "TUN connection" -msgstr "PAN-anslutning" +msgstr "TUN-anslutning" #: ../src/devices/nm-device-vlan.c:447 msgid "VLAN connection" msgstr "VLAN-anslutning" #: ../src/devices/nm-device-vxlan.c:373 -#, fuzzy msgid "VXLAN connection" -msgstr "VLAN-anslutning" +msgstr "VXLAN-anslutning" #: ../src/devices/team/nm-device-team.c:115 msgid "Team connection" @@ -9710,7 +9793,7 @@ msgstr "" "nyckelhantering" #: ../src/devices/wifi/nm-wifi-ap-utils.c:164 -#, fuzzy, c-format +#, c-format msgid "a connection using '%s' authentication cannot specify WPA protocols" msgstr "" "en anslutning som använder ”%s”-autentisering kan inte specificera WPA-" @@ -9718,14 +9801,14 @@ msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:180 #: ../src/devices/wifi/nm-wifi-ap-utils.c:197 -#, fuzzy, c-format +#, c-format msgid "a connection using '%s' authentication cannot specify WPA ciphers" msgstr "" "en anslutning som använder ”%s”-autentisering kan inte specificera WPA-" "chiffer" #: ../src/devices/wifi/nm-wifi-ap-utils.c:209 -#, fuzzy, c-format +#, c-format msgid "a connection using '%s' authentication cannot specify a WPA password" msgstr "" "en anslutning som använder ”%s”-autentisering kan inte specificera ett WPA-" @@ -9937,13 +10020,12 @@ msgid "barbar" msgstr "barbar" #: ../src/nm-iface-helper.c:289 -#, fuzzy msgid "FQDN to send to DHCP server" -msgstr "Värdnamn att skicka till DHCP-server" +msgstr "FQDN att skicka till DHCP-server" #: ../src/nm-iface-helper.c:289 msgid "host.domain.org" -msgstr "" +msgstr "host.domain.org" #: ../src/nm-iface-helper.c:290 msgid "Route priority for IPv4" @@ -9967,7 +10049,7 @@ msgstr "Hexkodad gränssnittsidentifierare" #: ../src/nm-iface-helper.c:293 msgid "IPv6 SLAAC address generation mode" -msgstr "" +msgstr "SLAAC-adressgenereringsläge för IPv6" #: ../src/nm-iface-helper.c:294 msgid "" @@ -9981,7 +10063,7 @@ msgid "" "nm-iface-helper is a small, standalone process that manages a single network " "interface." msgstr "" -"nm-iface-helper är en liten fristående process som hanterar ett " +"nm-iface-helper är en liten fristående process som hanterar ett enstaka " "nätverksgränssnitt." #: ../src/nm-iface-helper.c:373 @@ -10021,9 +10103,8 @@ msgstr "Nätverkshanteraren behöver stänga av nätverk" msgid "System" msgstr "System" -#, fuzzy #~ msgid "Error: unknown parameter: %s" -#~ msgstr "Okänd parameter: %s\n" +#~ msgstr "Fel: okänd parameter: %s" #~ msgid "yes (%u)" #~ msgstr "yes (%u)" @@ -10054,8 +10135,14 @@ msgstr "System" #~ msgid "Error: not all devices valid." #~ msgstr "Fel: alla enheter är inte giltiga." -#~ msgid "'%s' not allowed for %s=%s" -#~ msgstr "”%s” inte tillåtet för %s=%s" +#~ msgid "Error: Argument missing." +#~ msgstr "Fel: Argument saknas." + +#~ msgid "property is empty'" +#~ msgstr "egenskap är tom'" + +#~ msgid "Bond master: " +#~ msgstr "Master för kombinering: " #~ msgid "Team master: " #~ msgstr "Master för grupp: " @@ -10070,21 +10157,6 @@ msgstr "System" #~ "Varning: ”type” ignoreras för närvarande. Vi stöder bara trådbundna " #~ "slavar för tillfället.\n" -#~ msgid "/path/to/state.file" -#~ msgstr "/sökväg/till/tillstånds.fil" - -#~ msgid "/path/to/config.file" -#~ msgstr "/sökväg/till/konfigurations.fil" - -#~ msgid "/path/to/config/dir" -#~ msgstr "/sökväg/till/konfiguration/katalog" - -#~ msgid "plugin1,plugin2" -#~ msgstr "insticksmodul1,insticksmodul2" - -#~ msgid "Bingo!" -#~ msgstr "Bingo!" - #~ msgid "Error: bad color number: '%s'; use <0-8>\n" #~ msgstr "Fel: dåligt färgnummer: ”%s”; använd <0-8>\n" @@ -10097,9 +10169,6 @@ msgstr "System" #~ msgid "Roaming" #~ msgstr "Roaming" -#~ msgid "Device '%s' has been disconnected.\n" -#~ msgstr "Enheten ”%s” kopplades från.\n" - #~ msgid "WiMAX NSP list" #~ msgstr "WiMAX NSP-lista" @@ -10136,9 +10205,6 @@ msgstr "System" #~ msgid "WiMAX radio switch" #~ msgstr "WiMAX radioväxel" -#~ msgid "'%s' is ambiguous (on x off)" -#~ msgstr "”%s” är dubbeltydig (på x av)" - #~ msgid "Failed to set symmetric key for decryption: %s / %s." #~ msgstr "" #~ "Misslyckades med att ställa in symmetrisk nyckel för dekryptering: %s / " @@ -10154,6 +10220,30 @@ msgstr "System" #~ msgid "Failed to set IV for encryption: %s / %s." #~ msgstr "Misslyckades med att ställa in IV för kryptering: %s / %s." +#~ msgid "'%s' not allowed for %s=%s" +#~ msgstr "”%s” inte tillåtet för %s=%s" + +#~ msgid "/path/to/state.file" +#~ msgstr "/sökväg/till/tillstånds.fil" + +#~ msgid "/path/to/config.file" +#~ msgstr "/sökväg/till/konfigurations.fil" + +#~ msgid "/path/to/config/dir" +#~ msgstr "/sökväg/till/konfiguration/katalog" + +#~ msgid "plugin1,plugin2" +#~ msgstr "insticksmodul1,insticksmodul2" + +#~ msgid "Bingo!" +#~ msgstr "Bingo!" + +#~ msgid "Device '%s' has been disconnected.\n" +#~ msgstr "Enheten ”%s” kopplades från.\n" + +#~ msgid "'%s' is ambiguous (on x off)" +#~ msgstr "”%s” är dubbeltydig (på x av)" + #~ msgid "Slave connections need a valid '" #~ msgstr "Slavanslutningar behöver en giltig ”" diff --git a/po/te.po b/po/te.po index 46f2588e..0baa4ea4 100644 --- a/po/te.po +++ b/po/te.po @@ -1831,7 +1831,7 @@ msgstr "దోషం: '%s': '%s' చెల్లునది కాదు; <%u-% #. Ask for optional arguments. #: ../clients/cli/connections.c:3497 -#, c-format +#, fuzzy, c-format msgid "There is %d optional argument for '%s' connection type.\n" msgid_plural "There are %d optional arguments for '%s' connection type.\n" msgstr[0] "'%s' అనుసంధాన రకం కొరకు %d ఐచ్చిక ఆర్గుమెంట్ ఉంది.\n" diff --git a/shared/nm-shared-utils.c b/shared/nm-shared-utils.c index 0ae54bdc..932b7432 100644 --- a/shared/nm-shared-utils.c +++ b/shared/nm-shared-utils.c @@ -102,6 +102,40 @@ _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 ma /*****************************************************************************/ +gint +_nm_utils_ascii_str_to_bool (const char *str, + gint default_value) +{ + gsize len; + char *s = NULL; + + if (!str) + return default_value; + + while (str[0] && g_ascii_isspace (str[0])) + str++; + + if (!str[0]) + return default_value; + + len = strlen (str); + if (g_ascii_isspace (str[len - 1])) { + s = g_strdup (str); + g_strchomp (s); + str = s; + } + + if (!g_ascii_strcasecmp (str, "true") || !g_ascii_strcasecmp (str, "yes") || !g_ascii_strcasecmp (str, "on") || !g_ascii_strcasecmp (str, "1")) + default_value = TRUE; + else if (!g_ascii_strcasecmp (str, "false") || !g_ascii_strcasecmp (str, "no") || !g_ascii_strcasecmp (str, "off") || !g_ascii_strcasecmp (str, "0")) + default_value = FALSE; + if (s) + g_free (s); + return default_value; +} + +/*****************************************************************************/ + G_DEFINE_QUARK (nm-utils-error-quark, nm_utils_error) void diff --git a/shared/nm-shared-utils.h b/shared/nm-shared-utils.h index f80c850c..cfa8f994 100644 --- a/shared/nm-shared-utils.h +++ b/shared/nm-shared-utils.h @@ -26,6 +26,9 @@ gint64 _nm_utils_ascii_str_to_int64 (const char *str, guint base, gint64 min, gint64 max, gint64 fallback); +gint _nm_utils_ascii_str_to_bool (const char *str, + gint default_value); + /******************************************************************************/ /** diff --git a/shared/nm-version-macros.h b/shared/nm-version-macros.h index b96b6c87..be94ce76 100644 --- a/shared/nm-version-macros.h +++ b/shared/nm-version-macros.h @@ -37,7 +37,7 @@ * Evaluates to the minor version number of NetworkManager which this source * is compiled against. */ -#define NM_MINOR_VERSION (1) +#define NM_MINOR_VERSION (2) /** * NM_MICRO_VERSION: @@ -45,7 +45,7 @@ * Evaluates to the micro version number of NetworkManager which this source * compiled against. */ -#define NM_MICRO_VERSION (94) +#define NM_MICRO_VERSION (0) /** * NM_CHECK_VERSION: diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index 9dfa9bcb..482eb185 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -187,10 +187,9 @@ nm_device_factory_get_connection_iface (NMDeviceFactory *factory, klass = NM_DEVICE_FACTORY_GET_INTERFACE (factory); - if (klass->get_connection_iface) + ifname = g_strdup (nm_connection_get_interface_name (connection)); + if (!ifname && klass->get_connection_iface) ifname = klass->get_connection_iface (factory, connection, parent_iface); - else - ifname = g_strdup (nm_connection_get_interface_name (connection)); if (!ifname) { g_set_error (error, diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index a27af314..ae9543e4 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -42,6 +42,7 @@ G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE) typedef struct { gboolean is_partition; + int parent_ifindex, p_key; } NMDeviceInfinibandPrivate; enum { @@ -235,36 +236,43 @@ create_and_realize (NMDevice *device, const NMPlatformLink **out_plink, GError **error) { + NMDeviceInfinibandPrivate *priv = NM_DEVICE_INFINIBAND_GET_PRIVATE (device); NMSettingInfiniband *s_infiniband; - int parent_ifindex, p_key; NMPlatformError plerr; - if (!NM_IS_DEVICE_INFINIBAND (parent)) { - g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED, - "Parent interface %s must be an InfiniBand interface", - nm_device_get_iface (parent)); - return FALSE; - } - s_infiniband = nm_connection_get_setting_infiniband (connection); + g_assert (s_infiniband); /* Can only create partitions at this time */ - p_key = nm_setting_infiniband_get_p_key (s_infiniband); - if (p_key < 0) { - g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED, + priv->p_key = nm_setting_infiniband_get_p_key (s_infiniband); + if (priv->p_key < 0) { + g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, "only InfiniBand partitions can be created"); return FALSE; } - parent_ifindex = nm_device_get_ifindex (parent); - if (parent_ifindex <= 0) { - g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED, + if (!parent) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, + "InfiniBand partitions can not be created without a parent interface"); + return FALSE; + } + + if (!NM_IS_DEVICE_INFINIBAND (parent)) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, + "Parent interface %s must be an InfiniBand interface", + nm_device_get_iface (parent)); + return FALSE; + } + + priv->parent_ifindex = nm_device_get_ifindex (parent); + if (priv->parent_ifindex <= 0) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, "failed to get InfiniBand parent %s ifindex", nm_device_get_iface (parent)); return FALSE; } - plerr = nm_platform_link_infiniband_add (NM_PLATFORM_GET, parent_ifindex, p_key, out_plink); + plerr = nm_platform_link_infiniband_add (NM_PLATFORM_GET, priv->parent_ifindex, priv->p_key, out_plink); if (plerr != NM_PLATFORM_ERROR_SUCCESS) { g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED, "Failed to create InfiniBand P_Key interface '%s' for '%s': %s", @@ -274,7 +282,33 @@ create_and_realize (NMDevice *device, return FALSE; } - NM_DEVICE_INFINIBAND_GET_PRIVATE (device)->is_partition = TRUE; + priv->is_partition = TRUE; + return TRUE; +} + +static gboolean +unrealize (NMDevice *device, GError **error) +{ + NMDeviceInfinibandPrivate *priv = NM_DEVICE_INFINIBAND_GET_PRIVATE (device); + NMPlatformError plerr; + + g_return_val_if_fail (NM_IS_DEVICE_INFINIBAND (device), FALSE); + + if (priv->p_key < 0) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, + "Only InfiniBand partitions can be removed"); + return FALSE; + } + + plerr = nm_platform_link_infiniband_delete (NM_PLATFORM_GET, priv->parent_ifindex, priv->p_key); + if (plerr != NM_PLATFORM_ERROR_SUCCESS) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED, + "Failed to remove InfiniBand P_Key interface '%s': %s", + nm_device_get_iface (device), + nm_platform_error_to_string (plerr)); + return FALSE; + } + return TRUE; } @@ -328,6 +362,7 @@ nm_device_infiniband_class_init (NMDeviceInfinibandClass *klass) object_class->set_property = set_property; parent_class->create_and_realize = create_and_realize; + parent_class->unrealize = unrealize; parent_class->get_generic_capabilities = get_generic_capabilities; parent_class->check_connection_compatible = check_connection_compatible; parent_class->complete_connection = complete_connection; diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index cd02cb8e..c431fe89 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -223,12 +223,19 @@ create_and_realize (NMDevice *device, s_macvlan = nm_connection_get_setting_macvlan (connection); g_assert (s_macvlan); + if (!parent) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, + "MACVLAN devices can not be created without a parent interface"); + return FALSE; + } + parent_ifindex = nm_device_get_ifindex (parent); g_warn_if_fail (parent_ifindex > 0); lnk.mode = setting_mode_to_platform (nm_setting_macvlan_get_mode (s_macvlan)); if (!lnk.mode) { - nm_log_info (LOGD_DEVICE, "unsupported MACVLAN mode %u in connection %s", + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, + "unsupported MACVLAN mode %u in connection %s", nm_setting_macvlan_get_mode (s_macvlan), nm_connection_get_uuid (connection)); return FALSE; diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index 4d606e9d..eb6527de 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -80,14 +80,14 @@ parent_state_changed (NMDevice *parent, } static void -parent_hwaddr_changed (NMDevice *parent, - GParamSpec *pspec, - gpointer user_data) +parent_hwaddr_maybe_changed (NMDevice *parent, + GParamSpec *pspec, + gpointer user_data) { NMDeviceVlan *self = NM_DEVICE_VLAN (user_data); NMConnection *connection; NMSettingWired *s_wired; - const char *cloned_mac = NULL, *new_mac; + const char *new_mac, *old_mac; NMSettingIPConfig *s_ip6; /* Never touch assumed devices */ @@ -100,23 +100,26 @@ parent_hwaddr_changed (NMDevice *parent, /* Update the VLAN MAC only if configuration does not specify one */ s_wired = nm_connection_get_setting_wired (connection); - if (s_wired) - cloned_mac = nm_setting_wired_get_cloned_mac_address (s_wired); + if (s_wired) { + if (nm_setting_wired_get_cloned_mac_address (s_wired)) + return; + } - if (!cloned_mac) { - new_mac = nm_device_get_hw_address (parent); - _LOGD (LOGD_VLAN, "parent hardware address changed to %s%s%s", - NM_PRINT_FMT_QUOTE_STRING (new_mac)); - if (new_mac) { - nm_device_set_hw_addr (self, nm_device_get_hw_address (parent), - "set", LOGD_VLAN); - /* When changing the hw address the interface is taken down, - * removing the IPv6 configuration; reapply it. - */ - s_ip6 = nm_connection_get_setting_ip6_config (connection); - if (s_ip6) - nm_device_reactivate_ip6_config (NM_DEVICE (self), s_ip6, s_ip6); - } + old_mac = nm_device_get_hw_address (self); + new_mac = nm_device_get_hw_address (parent); + if (nm_streq0 (old_mac, new_mac)) + return; + + _LOGD (LOGD_VLAN, "parent hardware address changed to %s%s%s", + NM_PRINT_FMT_QUOTE_STRING (new_mac)); + if (new_mac) { + nm_device_set_hw_addr (self, new_mac, "set", LOGD_VLAN); + /* When changing the hw address the interface is taken down, + * removing the IPv6 configuration; reapply it. + */ + s_ip6 = nm_connection_get_setting_ip6_config (connection); + if (s_ip6) + nm_device_reactivate_ip6_config (NM_DEVICE (self), s_ip6, s_ip6); } } @@ -141,7 +144,8 @@ nm_device_vlan_set_parent (NMDeviceVlan *self, NMDevice *parent) device); priv->parent_hwaddr_id = g_signal_connect (priv->parent, "notify::" NM_DEVICE_HW_ADDRESS, - G_CALLBACK (parent_hwaddr_changed), device); + G_CALLBACK (parent_hwaddr_maybe_changed), device); + parent_hwaddr_maybe_changed (parent, NULL, self); /* Set parent-dependent unmanaged flag */ nm_device_set_unmanaged_by_flags (device, @@ -218,6 +222,12 @@ create_and_realize (NMDevice *device, s_vlan = nm_connection_get_setting_vlan (connection); g_assert (s_vlan); + if (!parent) { + g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, + "VLAN devices can not be created without a parent interface"); + return FALSE; + } + if (!nm_device_supports_vlans (parent)) { g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, "no support for VLANs on interface %s of type %s", @@ -537,6 +547,7 @@ update_connection (NMDevice *device, NMConnection *connection) static NMActStageReturn act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) { + NMDeviceVlanPrivate *priv = NM_DEVICE_VLAN_GET_PRIVATE (dev); NMSettingVlan *s_vlan; NMSettingWired *s_wired; const char *cloned_mac; @@ -555,6 +566,10 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) nm_device_set_hw_addr (dev, cloned_mac, "set", LOGD_VLAN); } + /* Change MAC address to parent's one if needed */ + if (priv->parent) + parent_hwaddr_maybe_changed (priv->parent, NULL, dev); + s_vlan = (NMSettingVlan *) nm_device_get_applied_setting (dev, NM_TYPE_SETTING_VLAN); if (s_vlan) { gs_free NMVlanQosMapping *ingress_map = NULL; diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 3d949ec2..08cf6dce 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -280,11 +280,11 @@ typedef struct _NMDevicePrivate { NMIP4Config * wwan_ip4_config; /* WWAN configuration */ GSList * vpn4_configs; /* VPNs which use this device */ struct { - gboolean v4_has; - gboolean v4_is_assumed; + bool v4_has; + bool v4_is_assumed; + bool v6_has; + bool v6_is_assumed; NMPlatformIP4Route v4; - gboolean v6_has; - gboolean v6_is_assumed; NMPlatformIP6Route v6; } default_route; @@ -878,6 +878,34 @@ nm_device_get_ip6_route_metric (NMDevice *self) return _get_ipx_route_metric (self, FALSE); } +static void +_update_default_route (NMDevice *self, int addr_family, gboolean has, gboolean is_assumed) +{ + NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); + bool *p_has, *p_is_assumed; + + nm_assert (NM_IN_SET (addr_family, 0, AF_INET, AF_INET6)); + + if (addr_family == AF_INET) { + p_has = &priv->default_route.v4_has; + p_is_assumed = &priv->default_route.v4_is_assumed; + } else { + p_has = &priv->default_route.v6_has; + p_is_assumed = &priv->default_route.v6_is_assumed; + } + + if (*p_has == has && *p_is_assumed == is_assumed) + return; + + *p_has = has; + *p_is_assumed = is_assumed; + + if (addr_family == AF_INET) + nm_default_route_manager_ip4_update_default_route (nm_default_route_manager_get (), self); + else + nm_default_route_manager_ip6_update_default_route (nm_default_route_manager_get (), self); +} + const NMPlatformIP4Route * nm_device_get_ip4_default_route (NMDevice *self, gboolean *out_is_assumed) { @@ -2067,8 +2095,12 @@ nm_device_unrealize (NMDevice *self, gboolean remove_resources, GError **error) _LOGD (LOGD_DEVICE, "unrealize (ifindex %d)", ifindex > 0 ? ifindex : 0); if (remove_resources) { - if (ifindex > 0) + if (NM_DEVICE_GET_CLASS (self)->unrealize) { + if (!NM_DEVICE_GET_CLASS (self)->unrealize (self, error)) + return FALSE; + } else if (ifindex > 0) { nm_platform_link_delete (NM_PLATFORM_GET, ifindex); + } } NM_DEVICE_GET_CLASS (self)->unrealize_notify (self); @@ -2568,12 +2600,14 @@ nm_device_get_enslaved (NMDevice *self) /** * nm_device_removed: * @self: the #NMDevice + * @unconfigure_ip_config: whether to clear the IP config objects + * of the device (provided, it is still not cleared at this point). * * Called by the manager when the device was removed. Releases the device from * the master in case it's enslaved. */ void -nm_device_removed (NMDevice *self) +nm_device_removed (NMDevice *self, gboolean unconfigure_ip_config) { NMDevicePrivate *priv; @@ -2586,16 +2620,19 @@ nm_device_removed (NMDevice *self) nm_device_master_release_one_slave (priv->master, self, FALSE, NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED); } + if (!unconfigure_ip_config) + return; + /* Clean up IP configs; this does not actually deconfigure the * interface, it just clears the configuration to which policy * is reacting via NM_DEVICE_IP4_CONFIG_CHANGED/NM_DEVICE_IP6_CONFIG_CHANGED * signal. As NMPolicy registered the NMIPxConfig instances in NMDnsManager, * these would be leaked otherwise. */ - priv->default_route.v4_has = FALSE; - priv->default_route.v4_is_assumed = TRUE; + _update_default_route (self, AF_INET, priv->default_route.v4_has, TRUE); + _update_default_route (self, AF_INET6, priv->default_route.v6_has, TRUE); + _update_default_route (self, AF_INET, FALSE, TRUE); + _update_default_route (self, AF_INET6, FALSE, TRUE); nm_device_set_ip4_config (self, NULL, 0, FALSE, FALSE, NULL); - priv->default_route.v6_has = FALSE; - priv->default_route.v6_is_assumed = TRUE; nm_device_set_ip6_config (self, NULL, FALSE, FALSE, NULL); } @@ -9994,20 +10031,15 @@ _cleanup_generic_post (NMDevice *self, CleanupType cleanup_type) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); - priv->default_route.v4_has = FALSE; - priv->default_route.v6_has = FALSE; - if (cleanup_type == CLEANUP_TYPE_DECONFIGURE) { - priv->default_route.v4_is_assumed = FALSE; - priv->default_route.v6_is_assumed = FALSE; - nm_default_route_manager_ip4_update_default_route (nm_default_route_manager_get (), self); - nm_default_route_manager_ip6_update_default_route (nm_default_route_manager_get (), self); + _update_default_route (self, AF_INET, FALSE, FALSE); + _update_default_route (self, AF_INET6, FALSE, FALSE); + } else { + _update_default_route (self, AF_INET, priv->default_route.v4_has, TRUE); + _update_default_route (self, AF_INET6, priv->default_route.v6_has, TRUE); } - - priv->default_route.v4_is_assumed = TRUE; - priv->default_route.v6_is_assumed = TRUE; - nm_default_route_manager_ip4_update_default_route (nm_default_route_manager_get (), self); - nm_default_route_manager_ip6_update_default_route (nm_default_route_manager_get (), self); + _update_default_route (self, AF_INET, FALSE, TRUE); + _update_default_route (self, AF_INET6, FALSE, TRUE); priv->v4_commit_first_time = TRUE; priv->v6_commit_first_time = TRUE; diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 368e77f7..9f689850 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -179,6 +179,14 @@ typedef struct { */ void (*realize_start_notify) (NMDevice *self, const NMPlatformLink *plink); + /** + * unrealize(): + * @self: the #NMDevice + * + * Remove the device backing resources. + */ + gboolean (*unrealize) (NMDevice *self, GError **error); + /** * unrealize_notify(): * @self: the #NMDevice @@ -377,7 +385,7 @@ gboolean nm_device_has_unmodified_applied_connection (NMDevice *self, NMSettingCompareFlags compare_flags); NMSetting * nm_device_get_applied_setting (NMDevice *dev, GType setting_type); -void nm_device_removed (NMDevice *dev); +void nm_device_removed (NMDevice *self, gboolean unconfigure_ip_config); gboolean nm_device_is_available (NMDevice *dev, NMDeviceCheckDevAvailableFlags flags); gboolean nm_device_has_carrier (NMDevice *dev); diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index 2a8a9d1e..804a6d9c 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -742,7 +742,8 @@ cancel_get_secrets (NMModem *self) { NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self); - nm_act_request_cancel_secrets (priv->act_request, priv->secrets_id); + if (priv->secrets_id) + nm_act_request_cancel_secrets (priv->act_request, priv->secrets_id); } static void diff --git a/src/nm-config.c b/src/nm-config.c index 58fd96cb..8bca6870 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -125,7 +125,7 @@ gint nm_config_parse_boolean (const char *str, gint default_value) { - return nm_utils_ascii_str_to_bool (str, default_value); + return _nm_utils_ascii_str_to_bool (str, default_value); } gint diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 714aaa92..bbe46654 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -154,40 +154,6 @@ _nm_singleton_instance_register_destruction (GObject *instance) /*****************************************************************************/ -gint -nm_utils_ascii_str_to_bool (const char *str, - gint default_value) -{ - gsize len; - char *s = NULL; - - if (!str) - return default_value; - - while (str[0] && g_ascii_isspace (str[0])) - str++; - - if (!str[0]) - return default_value; - - len = strlen (str); - if (g_ascii_isspace (str[len - 1])) { - s = g_strdup (str); - g_strchomp (s); - str = s; - } - - if (!g_ascii_strcasecmp (str, "true") || !g_ascii_strcasecmp (str, "yes") || !g_ascii_strcasecmp (str, "on") || !g_ascii_strcasecmp (str, "1")) - default_value = TRUE; - else if (!g_ascii_strcasecmp (str, "false") || !g_ascii_strcasecmp (str, "no") || !g_ascii_strcasecmp (str, "off") || !g_ascii_strcasecmp (str, "0")) - default_value = FALSE; - if (s) - g_free (s); - return default_value; -} - -/*****************************************************************************/ - /* * nm_ethernet_address_is_valid: * @addr: pointer to a binary or ASCII Ethernet address diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h index 280be047..528288c3 100644 --- a/src/nm-core-utils.h +++ b/src/nm-core-utils.h @@ -91,11 +91,6 @@ GETTER (void) \ /*****************************************************************************/ -gint nm_utils_ascii_str_to_bool (const char *str, - gint default_value); - -/*****************************************************************************/ - gboolean nm_ethernet_address_is_valid (gconstpointer addr, gssize len); in_addr_t nm_utils_ip4_address_clear_host_address (in_addr_t addr, guint8 plen); diff --git a/src/nm-manager.c b/src/nm-manager.c index 289a91d6..e64c68af 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -833,13 +833,13 @@ remove_device (NMManager *self, gboolean allow_unmanage) { NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); + gboolean unmanage = FALSE; _LOGD (LOGD_DEVICE, "(%s): removing device (allow_unmanage %d, managed %d)", nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE)); if (allow_unmanage && nm_device_get_managed (device, FALSE)) { NMActRequest *req = nm_device_get_act_request (device); - gboolean unmanage = FALSE; /* Leave activated interfaces up when quitting so their configuration * can be taken over when NM restarts. This ensures connectivity while @@ -869,7 +869,18 @@ remove_device (NMManager *self, priv->devices = g_slist_remove (priv->devices, device); if (nm_device_is_real (device)) { - nm_device_removed (device); + gboolean unconfigure_ip_config = !quitting || unmanage; + + /* When we don't unmanage the device on shutdown, we want to preserve the DNS + * configuration in resolv.conf. For that, we must leak the configuration + * in NMPolicy/NMDnsManager. We do that, by emitting the device-removed signal + * with device's ip-config object still uncleared. In that case, NMPolicy + * never learns to unconfigure the ip-config objects and does not remove them + * from DNS on shutdown (which is ugly, because we don't cleanup the memory + * properly). + * + * Control that by passing @unconfigure_ip_config. */ + nm_device_removed (device, unconfigure_ip_config); g_signal_emit (self, signals[DEVICE_REMOVED], 0, device); _notify (self, PROP_DEVICES); @@ -3512,7 +3523,6 @@ activation_add_done (NMSettings *settings, FALSE, nm_active_connection_get_subject (active), error->message); - g_object_unref (active); g_clear_error (&local); } diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index 15d9c543..7b545076 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -730,6 +730,19 @@ infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMP return TRUE; } +static gboolean +infiniband_partition_delete (NMPlatform *platform, int parent, int p_key) +{ + NMFakePlatformLink *parent_device; + gs_free char *name = NULL; + + parent_device = link_get (platform, parent); + g_return_val_if_fail (parent_device != NULL, FALSE); + + name = g_strdup_printf ("%s.%04x", parent_device->link.name, p_key); + return link_delete (platform, nm_platform_link_get_ifindex (platform, name)); +} + static gboolean wifi_get_capabilities (NMPlatform *platform, int ifindex, NMDeviceWifiCapabilities *caps) { @@ -1460,6 +1473,7 @@ nm_fake_platform_class_init (NMFakePlatformClass *klass) platform_class->link_vxlan_add = link_vxlan_add; platform_class->infiniband_partition_add = infiniband_partition_add; + platform_class->infiniband_partition_delete = infiniband_partition_delete; platform_class->wifi_get_capabilities = wifi_get_capabilities; platform_class->wifi_get_bssid = wifi_get_bssid; diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index ded019e6..254f9c85 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -1562,6 +1562,7 @@ _new_from_nl_link (NMPlatform *platform, const NMPCache *cache, struct nlmsghdr _lookup_cached_link (cache, obj->link.ifindex, completed_from_cache, &link_cached); if ( link_cached && link_cached->link.type == obj->link.type + && link_cached->_link.netlink.lnk && ( !lnk_data || nmp_object_equal (lnk_data, link_cached->_link.netlink.lnk))) { nmp_object_unref (lnk_data); @@ -5077,24 +5078,35 @@ link_release (NMPlatform *platform, int master, int slave) /******************************************************************/ static gboolean -infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMPlatformLink **out_link) +_infiniband_partition_action (NMPlatform *platform, int parent, int p_key, const char *action, char **ifname) { NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); const NMPObject *obj_parent; - const NMPObject *obj; gs_free char *path = NULL; gs_free char *id = NULL; - gs_free char *ifname = NULL; obj_parent = nmp_cache_lookup_link (priv->cache, parent); if (!obj_parent || !obj_parent->link.name[0]) g_return_val_if_reached (FALSE); - ifname = g_strdup_printf ("%s.%04x", obj_parent->link.name, p_key); + *ifname = g_strdup_printf ("%s.%04x", obj_parent->link.name, p_key); - path = g_strdup_printf ("/sys/class/net/%s/create_child", NM_ASSERT_VALID_PATH_COMPONENT (obj_parent->link.name)); + path = g_strdup_printf ("/sys/class/net/%s/%s", + NM_ASSERT_VALID_PATH_COMPONENT (obj_parent->link.name), + action); id = g_strdup_printf ("0x%04x", p_key); - if (!nm_platform_sysctl_set (platform, path, id)) + + return nm_platform_sysctl_set (platform, path, id); +} + + +static gboolean +infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMPlatformLink **out_link) +{ + const NMPObject *obj; + gs_free char *ifname = NULL; + + if (!_infiniband_partition_action (platform, parent, p_key, "create_child", &ifname)) return FALSE; do_request_link (platform, 0, ifname); @@ -5106,6 +5118,19 @@ infiniband_partition_add (NMPlatform *platform, int parent, int p_key, const NMP return !!obj; } +static gboolean +infiniband_partition_delete (NMPlatform *platform, int parent, int p_key) +{ + gs_free char *ifname = NULL; + + if (!_infiniband_partition_action (platform, parent, p_key, "delete_child", &ifname)) { + if (errno != ENODEV) + return FALSE; + } + + return TRUE; +} + /******************************************************************/ static WifiData * @@ -6380,6 +6405,7 @@ nm_linux_platform_class_init (NMLinuxPlatformClass *klass) platform_class->tun_add = tun_add; platform_class->infiniband_partition_add = infiniband_partition_add; + platform_class->infiniband_partition_delete = infiniband_partition_delete; platform_class->wifi_get_capabilities = wifi_get_capabilities; platform_class->wifi_get_bssid = wifi_get_bssid; diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 69b0d420..26ac766d 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -1888,11 +1888,12 @@ nm_platform_link_gre_add (NMPlatform *self, return NM_PLATFORM_ERROR_SUCCESS; } -NMPlatformError -nm_platform_link_infiniband_add (NMPlatform *self, - int parent, - int p_key, - const NMPlatformLink **out_link) +static NMPlatformError +_infiniband_add_add_or_delete (NMPlatform *self, + int parent, + int p_key, + gboolean add, + const NMPlatformLink **out_link) { gs_free char *parent_name = NULL; gs_free char *name = NULL; @@ -1909,17 +1910,42 @@ nm_platform_link_infiniband_add (NMPlatform *self, return NM_PLATFORM_ERROR_WRONG_TYPE; name = g_strdup_printf ("%s.%04x", parent_name, p_key); - plerr = _link_add_check_existing (self, name, NM_LINK_TYPE_INFINIBAND, out_link); - if (plerr != NM_PLATFORM_ERROR_SUCCESS) - return plerr; - _LOGD ("link: adding infiniband partition %s for parent '%s' (%d), key %d", - name, parent_name, parent, p_key); - if (!klass->infiniband_partition_add (self, parent, p_key, out_link)) - return NM_PLATFORM_ERROR_UNSPECIFIED; + if (add) { + plerr = _link_add_check_existing (self, name, NM_LINK_TYPE_INFINIBAND, out_link); + if (plerr != NM_PLATFORM_ERROR_SUCCESS) + return plerr; + + _LOGD ("link: adding infiniband partition %s for parent '%s' (%d), key %d", + name, parent_name, parent, p_key); + if (!klass->infiniband_partition_add (self, parent, p_key, out_link)) + return NM_PLATFORM_ERROR_UNSPECIFIED; + } else { + if (!klass->infiniband_partition_delete (self, parent, p_key)) + return NM_PLATFORM_ERROR_UNSPECIFIED; + } + return NM_PLATFORM_ERROR_SUCCESS; } +NMPlatformError +nm_platform_link_infiniband_add (NMPlatform *self, + int parent, + int p_key, + const NMPlatformLink **out_link) +{ + return _infiniband_add_add_or_delete (self, parent, p_key, TRUE, out_link); +} + +NMPlatformError +nm_platform_link_infiniband_delete (NMPlatform *self, + int parent, + int p_key) +{ + return _infiniband_add_add_or_delete (self, parent, p_key, FALSE, NULL); +} + + gboolean nm_platform_link_infiniband_get_properties (NMPlatform *self, int ifindex, diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 9f055b04..658b709a 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -570,6 +570,7 @@ typedef struct { const NMPlatformLink **out_link); gboolean (*infiniband_partition_add) (NMPlatform *, int parent, int p_key, const NMPlatformLink **out_link); + gboolean (*infiniband_partition_delete) (NMPlatform *, int parent, int p_key); gboolean (*tun_add) (NMPlatform *platform, const char *name, gboolean tap, gint64 owner, gint64 group, gboolean pi, gboolean vnet_hdr, gboolean multi_queue, const NMPlatformLink **out_link); @@ -815,6 +816,9 @@ NMPlatformError nm_platform_link_infiniband_add (NMPlatform *self, int parent, int p_key, const NMPlatformLink **out_link); +NMPlatformError nm_platform_link_infiniband_delete (NMPlatform *self, + int parent, + int p_key); gboolean nm_platform_link_infiniband_get_properties (NMPlatform *self, int ifindex, int *parent, int *p_key, const char **mode); gboolean nm_platform_link_veth_get_properties (NMPlatform *self, int ifindex, int *out_peer_ifindex); diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 2945ad34..a1cd0c32 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -1210,7 +1210,7 @@ process_generic_config (NMVpnConnection *self, GVariant *dict) const char *str; GVariant *v; guint32 u32; - gboolean b, success = FALSE; + gboolean b; if (g_variant_lookup (dict, NM_VPN_PLUGIN_CAN_PERSIST, "b", &b) && b) { /* Defaults to FALSE, so only let service indicate TRUE */ @@ -1246,17 +1246,15 @@ process_generic_config (NMVpnConnection *self, GVariant *dict) if (g_variant_lookup (dict, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, "u", &u32)) { priv->ip4_external_gw = u32; - success = TRUE; } else if (g_variant_lookup (dict, NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY, "@ay", &v)) { priv->ip6_external_gw = ip6_addr_dup_from_variant (v); - success = !!priv->ip6_external_gw; g_variant_unref (v); - } - if (!success) { - _LOGE ("VPN gateway is neither IPv4 nor IPv6"); - nm_vpn_connection_config_maybe_complete (self, FALSE); - return FALSE; + if (!priv->ip6_external_gw) { + _LOGE ("Invalid IPv6 VPN gateway address received"); + nm_vpn_connection_config_maybe_complete (self, FALSE); + return FALSE; + } } priv->mtu = 0; @@ -2021,7 +2019,10 @@ nm_vpn_connection_activate (NMVpnConnection *self, s_vpn = nm_connection_get_setting_vpn (_get_applied_connection (self)); g_return_if_fail (s_vpn); - service = nm_setting_vpn_get_service_type (s_vpn); + service = nm_vpn_plugin_info_lookup_property (plugin_info, + NM_VPN_PLUGIN_INFO_KF_GROUP_CONNECTION, + "service"); + g_return_if_fail (service); if (nm_vpn_plugin_info_supports_multiple (plugin_info)) { const char *path; -- cgit 1.3.0-6-gf8a5