From c2c44d16f40bd3cd769d8073d13a3e2009cf59b2 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 3 Nov 2017 16:05:12 +0100 Subject: [PATCH 01/77] release: bump version to 1.11.0 (development) --- configure.ac | 4 ++-- libnm-core/nm-version.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3e413140a5..061c7738e3 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], [9]) -m4_define([nm_micro_version], [90]) +m4_define([nm_minor_version], [11]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h index f6bfaf720c..968fa66384 100644 --- a/libnm-core/nm-version.h +++ b/libnm-core/nm-version.h @@ -146,4 +146,18 @@ # define NM_AVAILABLE_IN_1_10 #endif +#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_12 +# define NM_DEPRECATED_IN_1_12 G_DEPRECATED +# define NM_DEPRECATED_IN_1_12_FOR(f) G_DEPRECATED_FOR(f) +#else +# define NM_DEPRECATED_IN_1_12 +# define NM_DEPRECATED_IN_1_12_FOR(f) +#endif + +#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12 +# define NM_AVAILABLE_IN_1_12 G_UNAVAILABLE(1,12) +#else +# define NM_AVAILABLE_IN_1_12 +#endif + #endif /* NM_VERSION_H */ From cec215147a1763e3e146b3e0fc1152322e3f0d2b Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 3 Nov 2017 17:04:40 +0100 Subject: [PATCH 02/77] shared: update version macros for 1.11 Fixes: c2c44d16f40bd3cd769d8073d13a3e2009cf59b2 --- shared/nm-version-macros.h.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shared/nm-version-macros.h.in b/shared/nm-version-macros.h.in index c39f26045e..3efa350cd5 100644 --- a/shared/nm-version-macros.h.in +++ b/shared/nm-version-macros.h.in @@ -72,9 +72,10 @@ #define NM_VERSION_1_6 (NM_ENCODE_VERSION (1, 6, 0)) #define NM_VERSION_1_8 (NM_ENCODE_VERSION (1, 8, 0)) #define NM_VERSION_1_10 (NM_ENCODE_VERSION (1, 10, 0)) +#define NM_VERSION_1_12 (NM_ENCODE_VERSION (1, 12, 0)) -#define NM_VERSION_CUR_STABLE NM_VERSION_1_8 -#define NM_VERSION_NEXT_STABLE NM_VERSION_1_10 +#define NM_VERSION_CUR_STABLE NM_VERSION_1_10 +#define NM_VERSION_NEXT_STABLE NM_VERSION_1_12 #define NM_VERSION NM_ENCODE_VERSION (NM_MAJOR_VERSION, NM_MINOR_VERSION, NM_MICRO_VERSION) From d529641756b5443ba86141ab13ed14952b02bdbf Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 3 Nov 2017 15:37:11 +0100 Subject: [PATCH 03/77] examples/js: add a javascript example Converted from python/gi/get_ip.py. --- Makefile.examples | 2 + examples/js/get_ips.js | 184 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+) create mode 100755 examples/js/get_ips.js diff --git a/Makefile.examples b/Makefile.examples index 63370e2cbc..fc08851ca6 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -133,6 +133,8 @@ EXTRA_DIST += \ examples/dispatcher/10-ifcfg-rh-routes.sh \ examples/dispatcher/70-wifi-wired-exclusive.sh \ \ + examples/js/get_ips.js \ + \ examples/lua/lgi/add-connection.lua \ examples/lua/lgi/list-connections.lua \ examples/lua/lgi/list-devices.lua \ diff --git a/examples/js/get_ips.js b/examples/js/get_ips.js new file mode 100755 index 0000000000..490ecb2a8a --- /dev/null +++ b/examples/js/get_ips.js @@ -0,0 +1,184 @@ +#!/usr/bin/env gjs + +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2014,2017 Red Hat, Inc. + */ + +const System = imports.system; +const NM = imports.gi.NM; +const GLib = imports.gi.GLib; + +/* + * This example shows how to get addresses, routes and DNS information + * from NMIP4Config and NMIP6Config (got out of NMDevice) + */ + +function show_addresses (dev, family) +{ + let ip_cfg; + if (family == GLib.SYSDEF_AF_INET) + ip_cfg = dev.get_ip4_config (); + else + ip_cfg = dev.get_ip6_config (); + + if (ip_cfg == null) { + print ("None"); + return; + } + + let nm_addresses = ip_cfg.get_addresses (); + if (nm_addresses.length == 0) { + print ("None"); + return; + } + + for (let nm_address of nm_addresses) { + let addr = nm_address.get_address (); + let prefix = nm_address.get_prefix (); + + print (addr + "/" + prefix); + } +} + +function show_gateway (dev, family) +{ + let ip_cfg; + if ((family == GLib.SYSDEF_AF_INET)) + ip_cfg = dev.get_ip4_config (); + else + ip_cfg = dev.get_ip6_config (); + + let gw; + if (ip_cfg == null) + gw = "None" + else { + gw = ip_cfg.get_gateway (); + if (gw == '') + gw = "None" + } + + print (gw); +} + +function show_routes (dev, family) +{ + let ip_cfg; + if ((family == GLib.SYSDEF_AF_INET)) + ip_cfg = dev.get_ip4_config (); + else + ip_cfg = dev.get_ip6_config (); + + if (ip_cfg == null) { + print ("None"); + return; + } + + let nm_routes = ip_cfg.get_routes (); + if (nm_routes.length == 0) { + print ("None"); + return; + } + + for (let nm_route of nm_routes) { + let dest = nm_route.get_dest (); + let prefix = nm_route.get_prefix (); + let next_hop = nm_route.get_next_hop (); + let metric = nm_route.get_metric (); + + print (dest + "/" + prefix + " " + next_hop + " " + metric); + } +} + +function show_dns (dev, family) +{ + let ip_cfg; + if ((family == GLib.SYSDEF_AF_INET)) + ip_cfg = dev.get_ip4_config (); + else + ip_cfg = dev.get_ip6_config (); + + if (ip_cfg == null) { + print ("None"); + return; + } + + print ("Nameservers: " + ip_cfg.get_nameservers ()); + print ("Domains: " + ip_cfg.get_domains ()); + print ("Searches: " + ip_cfg.get_searches ()); + if ((family == GLib.SYSDEF_AF_INET)) + print ("WINS: " + ip_cfg.get_wins_servers ()); +} + +if (ARGV.length != 1) { + print ("Usage: get_ips.js "); + System.exit (1); +} + + +let dev_iface = ARGV[0]; +let c = NM.Client.new (null); + +let dev = c.get_device_by_iface (dev_iface); + +if (dev == null) { + print ("Device '%s' not found " + dev_iface); + System.exit (1); +} + +print ("Device: " + dev_iface + " - " + dev.get_type_description ()); +print ("---------------------------------------"); +print (); + +print ("IPv4 addresses:"); +print ("---------------"); +show_addresses (dev, GLib.SYSDEF_AF_INET); +print (); + +print ("IPv4 gateway:"); +print ("-------------"); +show_gateway (dev, GLib.SYSDEF_AF_INET); +print (); + +print ("IPv4 routes:"); +print ("------------"); +show_routes (dev, GLib.SYSDEF_AF_INET); +print (); + +print ("IPv6 addresses:"); +print ("---------------"); +show_addresses (dev, GLib.SYSDEF_AF_INET6); +print (); + +print ("IPv6 gateway:"); +print ("-------------"); +show_gateway (dev, GLib.SYSDEF_AF_INET6); +print (); + +print ("IPv6 routes:"); +print ("------------"); +show_routes (dev, GLib.SYSDEF_AF_INET6); +print (); + +print ("IPv4 DNS:"); +print ("------------"); +show_dns (dev, GLib.SYSDEF_AF_INET); +print (); + +print ("IPv6 DNS:"); +print ("------------"); +show_dns (dev, GLib.SYSDEF_AF_INET6); +print (); From 4d1f090aedf05c0e2955d431638e311d1e18a52f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 4 Nov 2017 20:41:45 +0100 Subject: [PATCH 04/77] libnm: register empty NMClient and NetworkManager when loading libnm with GIR Register empty "NMClient" and "NetworkManager" GIR modules as soon as libnm is loaded witch gnome-introspection. This prevents the real modules from being loaded because they would in turn load libnm-glib and abort() and crash. In particular this prevents the GNOME shell from crashing with libnm-glib abort and allows gracefully disabling the extensions which use the obsolete library. Test: $ cat test.js const NM = imports.gi.NM; print (NM.SecretAgentGetSecretsFlags.ALLOW_INTERACTION); const NMClient = imports.gi.NMClient; print (NMClient.SecretAgentGetSecretsFlags.ALLOW_INTERACTION); Before: $ gjs test.js 1 (gjs:16253): libnm-util-ERROR **: libnm symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported Trace/breakpoint trap (core dumped) $ After: $ gjs test.js 1 Gjs-Message: JS WARNING: [test.js 5]: reference to undefined property "SecretAgentGetSecretsFlags" (gjs:16228): Gjs-WARNING **: JS ERROR: TypeError: NMClient.SecretAgentGetSecretsFlags is undefined @test.js:5:1 JS_EvaluateScript() failed --- .gitignore | 3 +- Makefile.am | 18 +++++ configure.ac | 20 +++++- libnm/fake-typelib/NMClient.gir | 9 +++ libnm/fake-typelib/NetworkManager.gir | 10 +++ libnm/fake-typelib/typelibs.gresource.xml | 7 ++ libnm/nm-libnm-utils.c | 82 +++++++++++++++++++++++ 7 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 libnm/fake-typelib/NMClient.gir create mode 100644 libnm/fake-typelib/NetworkManager.gir create mode 100644 libnm/fake-typelib/typelibs.gresource.xml diff --git a/.gitignore b/.gitignore index cd4fca45a9..c68d11f516 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ *.gcno *.gcda *.la -*.gir +*-*.gir *.typelib **.stamp .dirstamp @@ -177,6 +177,7 @@ test-*.trs /libnm-util/tests/test-setting-8021x /libnm-util/tests/test-setting-dcb +/libnm/fake-typelib/typelibs.c /libnm/nm-settings-ifcfg-rh-docs.xml /libnm/nm-property-docs.xml /libnm/nm-settings-docs.xml diff --git a/Makefile.am b/Makefile.am index cda851a094..58be8ef91c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -858,6 +858,7 @@ nodist_libnminclude_HEADERS += \ noinst_LTLIBRARIES += libnm/libnm-utils.la libnm_libnm_utils_la_CPPFLAGS = \ + $(INTROSPECTION_CFLAGS) \ $(libnm_lib_cppflags) libnm_libnm_utils_la_SOURCES = \ @@ -956,6 +957,23 @@ libnm/libnm.typelib: libnm/libnm.gir $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ INTROSPECTION_GIRS += libnm/NM-1.0.gir + +if WITH_FAKE_TYPELIBS + +libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir + $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ + +libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir + $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ + +libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/libnm/fake-typelib --generate-source --manual-register --internal + +libnm_libnm_utils_la_SOURCES += \ + libnm/fake-typelib/typelibs.c + +endif + endif if HAVE_INTROSPECTION diff --git a/configure.ac b/configure.ac index 061c7738e3..ad188a7763 100644 --- a/configure.ac +++ b/configure.ac @@ -322,9 +322,12 @@ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_V AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +GOBJECT_INTROSPECTION_CHECK([0.9.6]) + AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], - [don't build legacy libraries])) + [don"'"t build legacy libraries])) +fake_typelibs=no if test "$with_libnm_glib" != "no"; then PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94, :, [AC_MSG_FAILURE([$DBUS_PKG_ERRORS @@ -333,13 +336,24 @@ Configure with --without-libnm-glib if you do not need the legacy libraries]) ]) with_libnm_glib=yes + + if test "${found_introspection}" = "yes"; then + AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) + if ! test x"$GLIB_COMPILE_RESOURCES" = x""; then + fake_typelibs=yes + fi + fi fi AM_CONDITIONAL(WITH_LEGACY_LIBRARIES, test "$with_libnm_glib" != "no") +if test "$fake_typelibs" = "yes"; then + AC_DEFINE(WITH_FAKE_TYPELIBS, 1, [Define for libnm to prevent GIR from loading libnm-glib]) +else + AC_DEFINE(WITH_FAKE_TYPELIBS, 0, [Define for libnm to prevent GIR from loading libnm-glib]) +fi +AM_CONDITIONAL(WITH_FAKE_TYPELIBS, test "${fake_typelibs}" = "yes") PKG_CHECK_MODULES([LIBUDEV], [libudev >= 175]) -GOBJECT_INTROSPECTION_CHECK([0.9.6]) - # Qt4 PKG_CHECK_MODULES(QT, [QtCore >= 4 QtDBus QtNetwork], [have_qt=yes],[have_qt=no]) AC_ARG_ENABLE(qt, diff --git a/libnm/fake-typelib/NMClient.gir b/libnm/fake-typelib/NMClient.gir new file mode 100644 index 0000000000..3002f8d630 --- /dev/null +++ b/libnm/fake-typelib/NMClient.gir @@ -0,0 +1,9 @@ + + + + + diff --git a/libnm/fake-typelib/NetworkManager.gir b/libnm/fake-typelib/NetworkManager.gir new file mode 100644 index 0000000000..d15d29afc7 --- /dev/null +++ b/libnm/fake-typelib/NetworkManager.gir @@ -0,0 +1,10 @@ + + + + + + diff --git a/libnm/fake-typelib/typelibs.gresource.xml b/libnm/fake-typelib/typelibs.gresource.xml new file mode 100644 index 0000000000..9a71d97544 --- /dev/null +++ b/libnm/fake-typelib/typelibs.gresource.xml @@ -0,0 +1,7 @@ + + + + NetworkManager.typelib + NMClient.typelib + + diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c index fbbfe2c552..a01228d5bb 100644 --- a/libnm/nm-libnm-utils.c +++ b/libnm/nm-libnm-utils.c @@ -23,6 +23,8 @@ #include "nm-libnm-utils.h" +#include + /*****************************************************************************/ char * @@ -160,3 +162,83 @@ next: nm_assert (g_utf8_validate (desc_full, -1, NULL)); return desc_full; } + +#if WITH_FAKE_TYPELIBS + +/* + * Here we register empty "NMClient" and "NetworkManager" GIR modules as soon + * as we are loaded (if gnome-introspection is being used). This prevents the + * real modules from being loaded because they would in turn load libnm-glib + * and abort() and crash. + * + * For the high level languages that utilize GIR the crash is highly inconvenient + * while the inability to resolve any methods and attributes is potentially + * recoverable. + */ + +GResource *typelibs_get_resource (void); +void typelibs_register_resource (void); + +static void __attribute__((constructor)) +_nm_libnm_utils_init (void) +{ + GITypelib *typelib; + GBytes *data; + const char *namespace; + GModule *self; + GITypelib *(*_g_typelib_new_from_const_memory) (const guint8 *memory, + gsize len, + GError **error) = NULL; + const char *(*_g_irepository_load_typelib) (GIRepository *repository, + GITypelib *typelib, + GIRepositoryLoadFlags flags, + GError **error) = NULL; + const char *names[] = { "/org/freedesktop/libnm/fake-typelib/NetworkManager.typelib", + "/org/freedesktop/libnm/fake-typelib/NMClient.typelib" }; + int i; + + self = g_module_open (NULL, 0); + if (!self) + return; + g_module_symbol (self, "g_typelib_new_from_const_memory", + (gpointer *) &_g_typelib_new_from_const_memory); + if (_g_typelib_new_from_const_memory) { + g_module_symbol (self, "g_irepository_load_typelib", + (gpointer *) &_g_irepository_load_typelib); + } + g_module_close (self); + + if (!_g_typelib_new_from_const_memory || !_g_irepository_load_typelib) + return; + + typelibs_register_resource (); + + for (i = 0; i < 2; i++) { + gs_free_error GError *error = NULL; + + data = g_resource_lookup_data (typelibs_get_resource (), + names[i], + G_RESOURCE_LOOKUP_FLAGS_NONE, + &error); + if (!data) { + g_warning ("Fake typelib %s could not be loaded: %s", names[i], error->message); + return; + } + + typelib = _g_typelib_new_from_const_memory (g_bytes_get_data (data, NULL), + g_bytes_get_size (data), + &error); + if (!typelib) { + g_warning ("Could not create fake typelib instance %s: %s", names[i], error->message); + return; + } + + namespace = _g_irepository_load_typelib (NULL, typelib, 0, &error); + if (!namespace) { + g_warning ("Could not load fake typelib %s: %s", names[i], error->message); + return; + } + } +} + +#endif /* WITH_FAKE_TYPELIBS */ From 43da186ec36dc9da6ab038783c3350f9206a638c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 6 Nov 2017 11:42:25 +0100 Subject: [PATCH 05/77] man: document PROXY logging domain --- man/NetworkManager.conf.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index e2a914264f..2f09973835 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -530,7 +530,8 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, - TEAM, CONCHECK, DCB, DISPATCH, AUDIT, SYSTEMD, VPN_PLUGIN. + TEAM, CONCHECK, DCB, DISPATCH, AUDIT, SYSTEMD, VPN_PLUGIN, + PROXY. In addition, these special domains can be used: NONE, ALL, DEFAULT, DHCP, IP. You can specify per-domain log level overrides by @@ -578,6 +579,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth AUDIT : Audit records SYSTEMD : Messages from internal libsystemd VPN_PLUGIN : logging messages from VPN plugins + PROXY : logging messages for proxy handling NONE : when given by itself logging is disabled ALL : all log domains From cc993aa02040564c16d78c864f3c3a22d20443eb Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 6 Nov 2017 11:52:05 +0100 Subject: [PATCH 06/77] logging: configure dnsmasq's logging in shared mode via nm-logging --- man/NetworkManager.conf.xml | 2 +- src/dnsmasq/nm-dnsmasq-manager.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 2f09973835..f0c3c5c85b 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -556,7 +556,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth AUTOIP4 : AutoIP operations DNS : Domain Name System related operations VPN : Virtual Private Network connections and operations - SHARING : Connection sharing + SHARING : Connection sharing. With TRACE level log queries for dnsmasq instance SUPPLICANT : WPA supplicant related operations AGENTS : Secret agents operations and communication SETTINGS : Settings/config service operations diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c index 4ac1e7c350..323ef78198 100644 --- a/src/dnsmasq/nm-dnsmasq-manager.c +++ b/src/dnsmasq/nm-dnsmasq-manager.c @@ -175,7 +175,8 @@ create_dm_cmd_line (const char *iface, cmd = nm_cmd_line_new (); nm_cmd_line_add_string (cmd, dm_binary); - if (getenv ("NM_DNSMASQ_DEBUG")) { + if ( nm_logging_enabled (LOGL_TRACE, LOGD_SHARING) + || getenv ("NM_DNSMASQ_DEBUG")) { nm_cmd_line_add_string (cmd, "--log-dhcp"); nm_cmd_line_add_string (cmd, "--log-queries"); } From a172b901d57712c1ff5c54bcee67e5885ffaf0c3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 6 Nov 2017 12:01:06 +0100 Subject: [PATCH 07/77] build: make dist with fake typelibs Fixes: 4d1f090aedf05c0e2955d431638e311d1e18a52f --- Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 58be8ef91c..a7ae7868c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -969,13 +969,18 @@ libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/libnm/fake-typelib --generate-source --manual-register --internal -libnm_libnm_utils_la_SOURCES += \ +nodist_libnm_libnm_utils_la_SOURCES = \ libnm/fake-typelib/typelibs.c endif endif +EXTRA_DIST += \ + libnm/fake-typelib/NetworkManager.gir \ + libnm/fake-typelib/NMClient.gir \ + libnm/fake-typelib/typelibs.gresource.xml + if HAVE_INTROSPECTION libnm_noinst_data = \ From 5986d92053d5706b49e2a51e28b5802fe2b049cf Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 6 Nov 2017 12:22:06 +0100 Subject: [PATCH 08/77] doc: fix type on documentation for NMSettingOvsPort:bond-updelay Fixes: 8a1ae40a80efcd6632ea7ba4845b85aec5afe19b https://bugzilla.gnome.org/show_bug.cgi?id=789880 --- clients/common/settings-docs.c.in | 2 +- libnm-core/nm-setting-ovs-port.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/common/settings-docs.c.in b/clients/common/settings-docs.c.in index b523a39428..3547c833a7 100644 --- a/clients/common/settings-docs.c.in +++ b/clients/common/settings-docs.c.in @@ -274,7 +274,7 @@ #define DESCRIBE_DOC_NM_SETTING_OVS_PATCH_PEER N_("Specifies the unicast destination IP address of a remote OpenVSwitch bridge port to connect to.") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_DOWNDELAY N_("The time port must be inactive in order to be considered down.") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_MODE N_("Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\".") -#define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_UPDELAY N_("The time port must be active befor it starts forwarding traffic.") +#define DESCRIBE_DOC_NM_SETTING_OVS_PORT_BOND_UPDELAY N_("The time port must be active before it starts forwarding traffic.") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_LACP N_("LACP mode. One of \"active\", \"off\", or \"passive\".") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_OVS_PORT_TAG N_("The VLAN tag in the range 0-4095.") diff --git a/libnm-core/nm-setting-ovs-port.c b/libnm-core/nm-setting-ovs-port.c index bd05f2e7b2..456e3fbc33 100644 --- a/libnm-core/nm-setting-ovs-port.c +++ b/libnm-core/nm-setting-ovs-port.c @@ -440,7 +440,7 @@ nm_setting_ovs_port_class_init (NMSettingOvsPortClass *setting_class) /** * NMSettingOvsPort:bond-updelay: * - * The time port must be active befor it starts forwarding traffic. + * The time port must be active before it starts forwarding traffic. * * Since: 1.10 **/ From b7b052c41e84d6f867c16701e56e35dbd10b9a49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Dr=C4=85g?= Date: Fri, 3 Nov 2017 17:57:22 +0100 Subject: [PATCH 09/77] po: update Polish (pl) translation (bgo #789874) https://bugzilla.gnome.org/show_bug.cgi?id=789874 --- po/pl.po | 2696 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 1416 insertions(+), 1280 deletions(-) diff --git a/po/pl.po b/po/pl.po index 975a10e0ed..3eef9e8b29 100644 --- a/po/pl.po +++ b/po/pl.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-06 20:02+0200\n" -"PO-Revision-Date: 2017-09-06 20:03+0200\n" +"POT-Creation-Date: 2017-11-03 17:54+0100\n" +"PO-Revision-Date: 2017-11-03 17:55+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -107,399 +107,26 @@ msgstr "Błąd: zainicjowanie agenta polkit się nie powiodło: %s" msgid "nmcli successfully registered as a polkit agent.\n" msgstr "Pomyślnie zarejestrowano program nmcli jako agenta polkit.\n" -#: ../clients/cli/common.c:149 +#: ../clients/cli/common.c:263 ../clients/cli/common.c:278 msgid "GROUP" msgstr "GRUPA" -#: ../clients/cli/common.c:381 -msgid "unmanaged" -msgstr "niezarządzane" - -#: ../clients/cli/common.c:383 -msgid "unavailable" -msgstr "niedostępne" - -#: ../clients/cli/common.c:385 ../clients/cli/general.c:48 -msgid "disconnected" -msgstr "rozłączono" - -#: ../clients/cli/common.c:387 -msgid "connecting (prepare)" -msgstr "łączenie (przygotowanie)" - -#: ../clients/cli/common.c:389 -msgid "connecting (configuring)" -msgstr "łączenie (konfigurowanie)" - -#: ../clients/cli/common.c:391 -msgid "connecting (need authentication)" -msgstr "łączenie (wymaga uwierzytelnienia)" - -#: ../clients/cli/common.c:393 -msgid "connecting (getting IP configuration)" -msgstr "łączenie (pobieranie konfiguracji adresu IP)" - -#: ../clients/cli/common.c:395 -msgid "connecting (checking IP connectivity)" -msgstr "łączenie (sprawdzanie łączności IP)" - -#: ../clients/cli/common.c:397 -msgid "connecting (starting secondary connections)" -msgstr "łączenie (uruchamianie drugorzędnych połączeń)" - -#: ../clients/cli/common.c:399 ../clients/cli/general.c:46 -msgid "connected" -msgstr "połączono" - -#: ../clients/cli/common.c:401 ../clients/cli/connections.c:528 -msgid "deactivating" -msgstr "dezaktywowanie" - -#: ../clients/cli/common.c:403 -msgid "connection failed" -msgstr "połączenie się nie powiodło" - -#: ../clients/cli/common.c:405 ../clients/cli/common.c:422 -#: ../clients/cli/connections.c:533 ../clients/cli/connections.c:556 -#: ../clients/cli/devices.c:1210 ../clients/cli/devices.c:1254 -#: ../clients/cli/devices.c:1256 ../clients/cli/general.c:41 -#: ../clients/cli/general.c:79 ../clients/cli/general.c:146 -#: ../clients/cli/general.c:151 ../clients/common/nm-meta-setting-desc.c:1368 -#: ../clients/common/nm-meta-setting-desc.c:1436 -#: ../clients/common/nm-meta-setting-desc.c:2607 -#: ../clients/common/nm-meta-setting-desc.c:2661 -msgid "unknown" -msgstr "nieznane" - -#. "CAPABILITIES" -#: ../clients/cli/common.c:414 ../clients/cli/connections.c:876 -#: ../clients/cli/connections.c:878 ../clients/cli/connections.c:880 -#: ../clients/cli/connections.c:913 ../clients/cli/connections.c:980 -#: ../clients/cli/connections.c:981 ../clients/cli/connections.c:983 -#: ../clients/cli/connections.c:4521 ../clients/cli/connections.c:6449 -#: ../clients/cli/connections.c:6450 ../clients/cli/devices.c:884 -#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174 -#: ../clients/cli/devices.c:1175 ../clients/cli/devices.c:1176 -#: ../clients/cli/devices.c:1177 ../clients/cli/devices.c:1214 -#: ../clients/cli/devices.c:1216 ../clients/cli/devices.c:1217 -#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248 -#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250 -#: ../clients/cli/devices.c:1251 ../clients/cli/devices.c:1252 -#: ../clients/cli/devices.c:1253 ../clients/cli/devices.c:1255 -#: ../clients/cli/devices.c:1257 ../clients/cli/general.c:152 -#: ../clients/common/nm-meta-setting-desc.c:574 -#: ../clients/common/nm-meta-setting-desc.c:2600 -msgid "yes" -msgstr "tak" - -#: ../clients/cli/common.c:416 ../clients/cli/connections.c:876 -#: ../clients/cli/connections.c:878 ../clients/cli/connections.c:880 -#: ../clients/cli/connections.c:980 ../clients/cli/connections.c:981 -#: ../clients/cli/connections.c:983 ../clients/cli/connections.c:4520 -#: ../clients/cli/connections.c:6449 ../clients/cli/connections.c:6450 -#: ../clients/cli/devices.c:884 ../clients/cli/devices.c:1173 -#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1175 -#: ../clients/cli/devices.c:1176 ../clients/cli/devices.c:1177 -#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1216 -#: ../clients/cli/devices.c:1217 ../clients/cli/devices.c:1247 -#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249 -#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1251 -#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1253 -#: ../clients/cli/devices.c:1255 ../clients/cli/devices.c:1257 -#: ../clients/cli/general.c:153 ../clients/common/nm-meta-setting-desc.c:574 -#: ../clients/common/nm-meta-setting-desc.c:2603 -msgid "no" -msgstr "nie" - -#: ../clients/cli/common.c:418 -msgid "yes (guessed)" -msgstr "tak (prawdopodobnie)" - -#: ../clients/cli/common.c:420 -msgid "no (guessed)" -msgstr "nie (prawdopodobnie)" - -#: ../clients/cli/common.c:431 -msgid "No reason given" -msgstr "Nie podano przyczyny" - -#. We should not really come here -#: ../clients/cli/common.c:434 ../clients/cli/connections.c:3095 -#: ../clients/cli/connections.c:3155 -#, c-format -msgid "Unknown error" -msgstr "Nieznany błąd" - -#: ../clients/cli/common.c:437 -msgid "Device is now managed" -msgstr "Urządzenie jest teraz zarządzane" - -#: ../clients/cli/common.c:440 -msgid "Device is now unmanaged" -msgstr "Urządzenie nie jest teraz zarządzane" - -#: ../clients/cli/common.c:443 -msgid "The device could not be readied for configuration" -msgstr "Urządzenie nie może zostać odczytane do konfiguracji" - -#: ../clients/cli/common.c:446 -msgid "" -"IP configuration could not be reserved (no available address, timeout, etc.)" -msgstr "" -"Konfiguracja IP nie mogła zostać zastrzeżona (brak dostępnego adresu, czasu " -"oczekiwania itp.)" - -#: ../clients/cli/common.c:449 -msgid "The IP configuration is no longer valid" -msgstr "Konfiguracja IP nie jest już prawidłowa" - -#: ../clients/cli/common.c:452 -msgid "Secrets were required, but not provided" -msgstr "Hasła są wymagane, ale nie zostały podane" - -#: ../clients/cli/common.c:455 -msgid "802.1X supplicant disconnected" -msgstr "Rozłączono suplikanta 802.1X" - -#: ../clients/cli/common.c:458 -msgid "802.1X supplicant configuration failed" -msgstr "Konfiguracja suplikanta 802.1X się nie powiodła" - -#: ../clients/cli/common.c:461 -msgid "802.1X supplicant failed" -msgstr "Suplikant 802.1X się nie powiódł" - -#: ../clients/cli/common.c:464 -msgid "802.1X supplicant took too long to authenticate" -msgstr "Suplikant 802.1X za długo się uwierzytelniał" - -#: ../clients/cli/common.c:467 -msgid "PPP service failed to start" -msgstr "Uruchomienie usługi PPP się nie powiodło" - -#: ../clients/cli/common.c:470 -msgid "PPP service disconnected" -msgstr "Rozłączono z usługą PPP" - -#: ../clients/cli/common.c:473 -msgid "PPP failed" -msgstr "Usługa PPP się nie powiodła" - -#: ../clients/cli/common.c:476 -msgid "DHCP client failed to start" -msgstr "Uruchomienie klienta DHCP się nie powiodło" - -#: ../clients/cli/common.c:479 -msgid "DHCP client error" -msgstr "Błąd klienta DHCP" - -#: ../clients/cli/common.c:482 -msgid "DHCP client failed" -msgstr "Klient DHCP się nie powiódł" - -#: ../clients/cli/common.c:485 -msgid "Shared connection service failed to start" -msgstr "Uruchomienie usługi udostępniania połączenia się nie powiodło" - -#: ../clients/cli/common.c:488 -msgid "Shared connection service failed" -msgstr "Usługa udostępniania połączenia się nie powiodła" - -#: ../clients/cli/common.c:491 -msgid "AutoIP service failed to start" -msgstr "Uruchomienie usługi AutoIP się nie powiodło" - -#: ../clients/cli/common.c:494 -msgid "AutoIP service error" -msgstr "Błąd usługi AutoIP" - -#: ../clients/cli/common.c:497 -msgid "AutoIP service failed" -msgstr "Usługa AutoIP się nie powiodła" - -#: ../clients/cli/common.c:500 -msgid "The line is busy" -msgstr "Linia jest zajęta" - -#: ../clients/cli/common.c:503 -msgid "No dial tone" -msgstr "Brak sygnału telefonicznego" - -#: ../clients/cli/common.c:506 -msgid "No carrier could be established" -msgstr "Nie można ustanowić operatora" - -#: ../clients/cli/common.c:509 -msgid "The dialing request timed out" -msgstr "Żądanie zadzwonienia przekroczyło czas oczekiwania" - -#: ../clients/cli/common.c:512 -msgid "The dialing attempt failed" -msgstr "Próba zadzwonienia się nie powiodła" - -#: ../clients/cli/common.c:515 -msgid "Modem initialization failed" -msgstr "Zainicjowanie modemu się nie powiodło" - -#: ../clients/cli/common.c:518 -msgid "Failed to select the specified APN" -msgstr "Wybranie podanego APN się nie powiodło" - -#: ../clients/cli/common.c:521 -msgid "Not searching for networks" -msgstr "Sieci nie są wyszukiwane" - -#: ../clients/cli/common.c:524 -msgid "Network registration denied" -msgstr "Odmówiono rejestracji sieci" - -#: ../clients/cli/common.c:527 -msgid "Network registration timed out" -msgstr "Przekroczono czas oczekiwania rejestracji sieci" - -#: ../clients/cli/common.c:530 -msgid "Failed to register with the requested network" -msgstr "Zarejestrowanie w żądanej sieci się nie powiodło" - -#: ../clients/cli/common.c:533 -msgid "PIN check failed" -msgstr "Sprawdzenie kodu PIN się nie powiodło" - -#: ../clients/cli/common.c:536 -msgid "Necessary firmware for the device may be missing" -msgstr "Brak wymaganego oprogramowania sprzętowego dla urządzenia" - -#: ../clients/cli/common.c:539 -msgid "The device was removed" -msgstr "Usunięto urządzenie" - -#: ../clients/cli/common.c:542 -msgid "NetworkManager went to sleep" -msgstr "Uśpiono usługę NetworkManager" - -#: ../clients/cli/common.c:545 -msgid "The device's active connection disappeared" -msgstr "Aktywne połączenie urządzenia zniknęło" - -#: ../clients/cli/common.c:548 -msgid "Device disconnected by user or client" -msgstr "Urządzenie zostało rozłączone przez użytkownika lub klienta" - -#: ../clients/cli/common.c:551 -msgid "Carrier/link changed" -msgstr "Zmieniono operatora/łącze" - -#: ../clients/cli/common.c:554 -msgid "The device's existing connection was assumed" -msgstr "Przyjęto istniejące połączenie urządzenia" - -#: ../clients/cli/common.c:557 -msgid "The supplicant is now available" -msgstr "Suplikant jest teraz dostępny" - -#: ../clients/cli/common.c:560 -msgid "The modem could not be found" -msgstr "Nie można odnaleźć modemu" - -#: ../clients/cli/common.c:563 -msgid "The Bluetooth connection failed or timed out" -msgstr "" -"Połączenie Bluetooth się nie powiodło lub przekroczyło czas oczekiwania" - -#: ../clients/cli/common.c:566 -msgid "GSM Modem's SIM card not inserted" -msgstr "Karta SIM modemu GSM nie została włożona" - -#: ../clients/cli/common.c:569 -msgid "GSM Modem's SIM PIN required" -msgstr "Wymagany jest kod PIN karty SIM modemu GSM" - -#: ../clients/cli/common.c:572 -msgid "GSM Modem's SIM PUK required" -msgstr "Wymagany jest kod PUK karty SIM modemu GSM" - -#: ../clients/cli/common.c:575 -msgid "GSM Modem's SIM wrong" -msgstr "Karta SIM modemu GSM jest błędna" - -#: ../clients/cli/common.c:578 -msgid "InfiniBand device does not support connected mode" -msgstr "Urządzenie InfiniBand nie obsługuje trybu połączonego" - -#: ../clients/cli/common.c:581 -msgid "A dependency of the connection failed" -msgstr "Zależność połączenia się nie powiodła" - -#: ../clients/cli/common.c:584 -msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" -msgstr "Problem z mostkiem ethernetowym RFC 2684 na ADSL" - -#: ../clients/cli/common.c:587 -msgid "ModemManager is unavailable" -msgstr "Usługa ModemManager jest niedostępna" - -#: ../clients/cli/common.c:590 -msgid "The Wi-Fi network could not be found" -msgstr "Nie można odnaleźć sieci Wi-Fi" - -#: ../clients/cli/common.c:593 -msgid "A secondary connection of the base connection failed" -msgstr "Drugorzędne połączenie połączenia podstawowego się nie powiodło" - -#: ../clients/cli/common.c:596 -msgid "DCB or FCoE setup failed" -msgstr "Ustawienie DCB lub FCoE się nie powiodło" - -#: ../clients/cli/common.c:599 -msgid "teamd control failed" -msgstr "kontrola teamd się nie powiodła" - -#: ../clients/cli/common.c:602 -msgid "Modem failed or no longer available" -msgstr "Modem się nie powiódł lub nie jest już dostępny" - -#: ../clients/cli/common.c:605 -msgid "Modem now ready and available" -msgstr "Modem jest teraz gotowy i dostępny" - -#: ../clients/cli/common.c:608 -msgid "SIM PIN was incorrect" -msgstr "Kod PIN karty SIM był niepoprawny" - -#: ../clients/cli/common.c:611 -msgid "New connection activation was enqueued" -msgstr "Dodano aktywację nowego połączenia do kolejki" - -#: ../clients/cli/common.c:614 -msgid "The device's parent changed" -msgstr "Zmieniono urządzenie nadrzędne urządzenia" - -#: ../clients/cli/common.c:617 -msgid "The device parent's management changed" -msgstr "Zmieniono zarządzanie urządzenia nadrzędnego urządzenia" - -#. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) -#: ../clients/cli/common.c:621 ../libnm-glib/nm-device.c:1860 -#: ../libnm/nm-device.c:1563 -msgid "Unknown" -msgstr "Nieznane" - -#: ../clients/cli/common.c:737 +#: ../clients/cli/common.c:561 #, c-format msgid "Error: openconnect failed: %s\n" msgstr "Błąd: polecenie openconnect się nie powiodło: %s\n" -#: ../clients/cli/common.c:744 +#: ../clients/cli/common.c:568 #, c-format msgid "Error: openconnect failed with status %d\n" msgstr "Błąd: polecenie openconnect się nie powiodło ze stanem %d\n" -#: ../clients/cli/common.c:746 +#: ../clients/cli/common.c:570 #, c-format msgid "Error: openconnect failed with signal %d\n" msgstr "Błąd: polecenie openconnect się nie powiodło z sygnałem %d\n" -#: ../clients/cli/common.c:827 +#: ../clients/cli/common.c:651 #, c-format msgid "" "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask " @@ -508,59 +135,59 @@ msgstr "" "Ostrzeżenie: w „passwd-file” nie podano hasła dla „%s”, a program nmcli nie " "może zapytać bez opcji „--ask”.\n" -#: ../clients/cli/common.c:1293 +#: ../clients/cli/common.c:1117 #, c-format msgid "Error: Could not create NMClient object: %s." msgstr "Błąd: nie można utworzyć obiektu NMClient: %s." -#: ../clients/cli/common.c:1313 +#: ../clients/cli/common.c:1137 msgid "Error: NetworkManager is not running." msgstr "Błąd: usługa NetworkManager nie jest uruchomiona." -#: ../clients/cli/common.c:1410 +#: ../clients/cli/common.c:1234 #, c-format msgid "Error: argument '%s' not understood. Try passing --help instead." msgstr "Błąd: nie zrozumiano parametru „%s”. Można użyć „--help” zamiast tego." -#: ../clients/cli/common.c:1420 +#: ../clients/cli/common.c:1244 msgid "Error: missing argument. Try passing --help." msgstr "Błąd: brak parametru. Można użyć „--help” zamiast tego." -#: ../clients/cli/common.c:1473 +#: ../clients/cli/common.c:1297 msgid "access denied" msgstr "odmowa dostępu" #. define some prompts for connection editor -#: ../clients/cli/connections.c:64 +#: ../clients/cli/connections.c:66 msgid "Setting name? " msgstr "Nazwa ustawienia? " -#: ../clients/cli/connections.c:65 +#: ../clients/cli/connections.c:67 msgid "Property name? " msgstr "Nazwa właściwości? " -#: ../clients/cli/connections.c:66 +#: ../clients/cli/connections.c:68 msgid "Enter connection type: " msgstr "Proszę podać typ połączenia: " #. define some other prompts -#: ../clients/cli/connections.c:70 +#: ../clients/cli/connections.c:72 msgid "Connection (name, UUID, or path)" msgstr "Połączenie (nazwa, UUID lub ścieżka)" -#: ../clients/cli/connections.c:71 +#: ../clients/cli/connections.c:73 msgid "VPN connection (name, UUID, or path)" msgstr "Połączenie VPN (nazwa, UUID lub ścieżka)" -#: ../clients/cli/connections.c:72 +#: ../clients/cli/connections.c:74 msgid "Connection(s) (name, UUID, or path)" msgstr "Połączenia (nazwa, UUID lub ścieżka)" -#: ../clients/cli/connections.c:73 +#: ../clients/cli/connections.c:75 msgid "Connection(s) (name, UUID, path or apath)" msgstr "Połączenia (nazwa, UUID, ścieżka lub „apath”)" -#: ../clients/cli/connections.c:190 +#: ../clients/cli/connections.c:196 #, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" @@ -636,7 +263,7 @@ msgstr "" " export [id | uuid | path] []\n" "\n" -#: ../clients/cli/connections.c:212 +#: ../clients/cli/connections.c:218 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" @@ -681,7 +308,7 @@ msgstr "" "więcej informacji. Podanie opcji „--active” spowoduje uwzględnienie tylko\n" "aktywnych profili. Opcja „--show-secrets” ujawni także powiązane hasła.\n" -#: ../clients/cli/connections.c:233 +#: ../clients/cli/connections.c:239 #, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" @@ -726,7 +353,7 @@ msgstr "" "passwd-file — plik z hasłami wymaganymi do aktywowania połączenia\n" "\n" -#: ../clients/cli/connections.c:254 +#: ../clients/cli/connections.c:260 #, c-format msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" @@ -748,7 +375,7 @@ msgstr "" "identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n" "\n" -#: ../clients/cli/connections.c:266 +#: ../clients/cli/connections.c:272 #, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" @@ -1056,7 +683,7 @@ msgstr "" " [ip6 ] [gw6 ]\n" "\n" -#: ../clients/cli/connections.c:384 +#: ../clients/cli/connections.c:390 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -1103,7 +730,7 @@ msgstr "" "nmcli con mod bond0 -bond.options downdelay\n" "\n" -#: ../clients/cli/connections.c:407 +#: ../clients/cli/connections.c:413 #, c-format msgid "" "Usage: nmcli connection clone { ARGUMENTS | help }\n" @@ -1125,7 +752,7 @@ msgstr "" "utworzona) oraz „id” (podana jako parametr ).\n" "\n" -#: ../clients/cli/connections.c:419 +#: ../clients/cli/connections.c:425 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -1153,7 +780,7 @@ msgstr "" "Dodaje nowy profil połączenia w interaktywnym edytorze.\n" "\n" -#: ../clients/cli/connections.c:434 +#: ../clients/cli/connections.c:440 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -1172,7 +799,7 @@ msgstr "" "Profil jest identyfikowany po swojej nazwie, UUID lub ścieżce D-Bus.\n" "\n" -#: ../clients/cli/connections.c:445 +#: ../clients/cli/connections.c:451 #, c-format msgid "" "Usage: nmcli connection monitor { ARGUMENTS | help }\n" @@ -1193,7 +820,7 @@ msgstr "" "Monitoruje wszystkie profile połączeń, jeśli żaden nie zostanie podany.\n" "\n" -#: ../clients/cli/connections.c:457 +#: ../clients/cli/connections.c:463 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -1206,7 +833,7 @@ msgstr "" "Wczytuje ponownie wszystkie pliki połączeń z dysku.\n" "\n" -#: ../clients/cli/connections.c:465 +#: ../clients/cli/connections.c:471 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -1228,7 +855,7 @@ msgstr "" "usługa NetworkManager zna jego najnowszy stan.\n" "\n" -#: ../clients/cli/connections.c:477 +#: ../clients/cli/connections.c:483 #, c-format msgid "" "Usage: nmcli connection import { ARGUMENTS | help }\n" @@ -1253,7 +880,7 @@ msgstr "" "importowana przez wtyczki VPN usługi NetworkManager.\n" "\n" -#: ../clients/cli/connections.c:490 +#: ../clients/cli/connections.c:496 #, c-format msgid "" "Usage: nmcli connection export { ARGUMENTS | help }\n" @@ -1273,118 +900,178 @@ msgstr "" "nazwę.\n" "\n" -#: ../clients/cli/connections.c:524 +#: ../clients/cli/connections.c:530 msgid "activating" msgstr "aktywowanie" -#: ../clients/cli/connections.c:526 +#: ../clients/cli/connections.c:532 msgid "activated" msgstr "aktywowano" -#: ../clients/cli/connections.c:530 +#: ../clients/cli/connections.c:534 ../clients/common/nm-client-utils.c:243 +msgid "deactivating" +msgstr "dezaktywowanie" + +#: ../clients/cli/connections.c:536 msgid "deactivated" msgstr "dezaktywowano" -#: ../clients/cli/connections.c:542 +#: ../clients/cli/connections.c:539 ../clients/cli/connections.c:562 +#: ../clients/cli/devices.c:1210 ../clients/cli/devices.c:1254 +#: ../clients/cli/devices.c:1256 ../clients/cli/general.c:41 +#: ../clients/cli/general.c:79 ../clients/cli/general.c:146 +#: ../clients/cli/general.c:151 ../clients/common/nm-client-utils.c:247 +#: ../clients/common/nm-client-utils.c:250 +#: ../clients/common/nm-client-utils.c:266 +#: ../clients/common/nm-client-utils.c:269 +#: ../clients/common/nm-meta-setting-desc.c:1335 +#: ../clients/common/nm-meta-setting-desc.c:1403 +#: ../clients/common/nm-meta-setting-desc.c:2545 +#: ../clients/common/nm-meta-setting-desc.c:2599 +msgid "unknown" +msgstr "nieznane" + +#: ../clients/cli/connections.c:548 msgid "VPN connecting (prepare)" msgstr "Łączenie z VPN (przygotowanie)" -#: ../clients/cli/connections.c:544 +#: ../clients/cli/connections.c:550 msgid "VPN connecting (need authentication)" msgstr "Łączenie z VPN (wymaga uwierzytelnienia)" -#: ../clients/cli/connections.c:546 +#: ../clients/cli/connections.c:552 msgid "VPN connecting" msgstr "Łączenie z VPN" -#: ../clients/cli/connections.c:548 +#: ../clients/cli/connections.c:554 msgid "VPN connecting (getting IP configuration)" msgstr "Łączenie z VPN (pobieranie konfiguracji adresu IP)" -#: ../clients/cli/connections.c:550 +#: ../clients/cli/connections.c:556 msgid "VPN connected" msgstr "Połączono z VPN" -#: ../clients/cli/connections.c:552 +#: ../clients/cli/connections.c:558 msgid "VPN connection failed" msgstr "Połączenie z VPN się nie powiodło" -#: ../clients/cli/connections.c:554 +#: ../clients/cli/connections.c:560 msgid "VPN disconnected" msgstr "Rozłączono z VPN" -#: ../clients/cli/connections.c:624 +#: ../clients/cli/connections.c:630 #, c-format msgid "Error updating secrets for %s: %s\n" msgstr "Błąd podczas aktualizowania haseł dla %s: %s\n" -#: ../clients/cli/connections.c:644 +#: ../clients/cli/connections.c:650 msgid "Connection profile details" msgstr "Szczegóły profilu połączenia" -#: ../clients/cli/connections.c:657 ../clients/cli/connections.c:1107 +#: ../clients/cli/connections.c:663 ../clients/cli/connections.c:1113 #, c-format msgid "Error: 'connection show': %s" msgstr "Błąd: „connection show”: %s" -#: ../clients/cli/connections.c:875 +#: ../clients/cli/connections.c:881 msgid "never" msgstr "nigdy" -#: ../clients/cli/connections.c:1097 +#. "CAPABILITIES" +#: ../clients/cli/connections.c:882 ../clients/cli/connections.c:884 +#: ../clients/cli/connections.c:886 ../clients/cli/connections.c:919 +#: ../clients/cli/connections.c:986 ../clients/cli/connections.c:987 +#: ../clients/cli/connections.c:989 ../clients/cli/connections.c:4432 +#: ../clients/cli/connections.c:6370 ../clients/cli/connections.c:6371 +#: ../clients/cli/devices.c:884 ../clients/cli/devices.c:1173 +#: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1175 +#: ../clients/cli/devices.c:1176 ../clients/cli/devices.c:1177 +#: ../clients/cli/devices.c:1214 ../clients/cli/devices.c:1216 +#: ../clients/cli/devices.c:1217 ../clients/cli/devices.c:1247 +#: ../clients/cli/devices.c:1248 ../clients/cli/devices.c:1249 +#: ../clients/cli/devices.c:1250 ../clients/cli/devices.c:1251 +#: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1253 +#: ../clients/cli/devices.c:1255 ../clients/cli/devices.c:1257 +#: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258 +#: ../clients/common/nm-meta-setting-desc.c:575 +#: ../clients/common/nm-meta-setting-desc.c:2538 +msgid "yes" +msgstr "tak" + +#: ../clients/cli/connections.c:882 ../clients/cli/connections.c:884 +#: ../clients/cli/connections.c:886 ../clients/cli/connections.c:986 +#: ../clients/cli/connections.c:987 ../clients/cli/connections.c:989 +#: ../clients/cli/connections.c:4431 ../clients/cli/connections.c:6370 +#: ../clients/cli/connections.c:6371 ../clients/cli/devices.c:884 +#: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174 +#: ../clients/cli/devices.c:1175 ../clients/cli/devices.c:1176 +#: ../clients/cli/devices.c:1177 ../clients/cli/devices.c:1214 +#: ../clients/cli/devices.c:1216 ../clients/cli/devices.c:1217 +#: ../clients/cli/devices.c:1247 ../clients/cli/devices.c:1248 +#: ../clients/cli/devices.c:1249 ../clients/cli/devices.c:1250 +#: ../clients/cli/devices.c:1251 ../clients/cli/devices.c:1252 +#: ../clients/cli/devices.c:1253 ../clients/cli/devices.c:1255 +#: ../clients/cli/devices.c:1257 ../clients/cli/general.c:153 +#: ../clients/common/nm-client-utils.c:260 +#: ../clients/common/nm-meta-setting-desc.c:575 +#: ../clients/common/nm-meta-setting-desc.c:2541 +msgid "no" +msgstr "nie" + +#: ../clients/cli/connections.c:1103 msgid "Activate connection details" msgstr "Szczegóły aktywowania połączenia" -#: ../clients/cli/connections.c:1344 +#: ../clients/cli/connections.c:1350 #, c-format msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "nieprawidłowe pole „%s”; dozwolone pola: %s i %s, albo %s,%s" -#: ../clients/cli/connections.c:1359 ../clients/cli/connections.c:1367 +#: ../clients/cli/connections.c:1365 ../clients/cli/connections.c:1373 #, c-format msgid "'%s' has to be alone" msgstr "„%s” musi być same" -#: ../clients/cli/connections.c:1567 +#: ../clients/cli/connections.c:1573 #, c-format msgid "incorrect string '%s' of '--order' option" msgstr "niepoprawny ciąg „%s” opcji „--order”" -#: ../clients/cli/connections.c:1593 +#: ../clients/cli/connections.c:1599 #, c-format msgid "incorrect item '%s' in '--order' option" msgstr "niepoprawny element „%s” w opcji „--order”" -#: ../clients/cli/connections.c:1623 +#: ../clients/cli/connections.c:1629 msgid "No connection specified" msgstr "Nie podano połączenia" -#: ../clients/cli/connections.c:1638 +#: ../clients/cli/connections.c:1644 #, c-format msgid "%s argument is missing" msgstr "Brak parametru %s" -#: ../clients/cli/connections.c:1648 +#: ../clients/cli/connections.c:1654 #, c-format msgid "unknown connection '%s'" msgstr "nieznane połączenie „%s”" -#: ../clients/cli/connections.c:1681 +#: ../clients/cli/connections.c:1687 msgid "'--order' argument is missing" msgstr "Brak parametru „--order”" -#: ../clients/cli/connections.c:1736 +#: ../clients/cli/connections.c:1742 msgid "NetworkManager active profiles" msgstr "Aktywne profile usługi NetworkManager" -#: ../clients/cli/connections.c:1737 +#: ../clients/cli/connections.c:1743 msgid "NetworkManager connection profiles" msgstr "Profile połączeń usługi NetworkManager" -#: ../clients/cli/connections.c:1790 ../clients/cli/connections.c:2558 -#: ../clients/cli/connections.c:2570 ../clients/cli/connections.c:2582 -#: ../clients/cli/connections.c:2758 ../clients/cli/connections.c:8520 -#: ../clients/cli/connections.c:8537 ../clients/cli/devices.c:2681 +#: ../clients/cli/connections.c:1796 ../clients/cli/connections.c:2471 +#: ../clients/cli/connections.c:2483 ../clients/cli/connections.c:2495 +#: ../clients/cli/connections.c:2671 ../clients/cli/connections.c:8431 +#: ../clients/cli/connections.c:8448 ../clients/cli/devices.c:2681 #: ../clients/cli/devices.c:2692 ../clients/cli/devices.c:2934 #: ../clients/cli/devices.c:2945 ../clients/cli/devices.c:2963 #: ../clients/cli/devices.c:2972 ../clients/cli/devices.c:2993 @@ -1398,14 +1085,14 @@ msgstr "Profile połączeń usługi NetworkManager" msgid "Error: %s argument is missing." msgstr "Błąd: brak parametru %s." -#: ../clients/cli/connections.c:1809 +#: ../clients/cli/connections.c:1815 #, c-format msgid "Error: %s - no such connection profile." msgstr "Błąd: %s — nie ma takiego profilu połączenia." -#: ../clients/cli/connections.c:1873 ../clients/cli/connections.c:2545 -#: ../clients/cli/connections.c:2609 ../clients/cli/connections.c:8030 -#: ../clients/cli/connections.c:8141 ../clients/cli/connections.c:8651 +#: ../clients/cli/connections.c:1879 ../clients/cli/connections.c:2458 +#: ../clients/cli/connections.c:2522 ../clients/cli/connections.c:7941 +#: ../clients/cli/connections.c:8052 ../clients/cli/connections.c:8562 #: ../clients/cli/devices.c:1582 ../clients/cli/devices.c:1868 #: ../clients/cli/devices.c:2037 ../clients/cli/devices.c:2145 #: ../clients/cli/devices.c:2334 ../clients/cli/devices.c:3590 @@ -1414,300 +1101,239 @@ msgstr "Błąd: %s — nie ma takiego profilu połączenia." msgid "Error: %s." msgstr "Błąd: %s." -#: ../clients/cli/connections.c:1971 +#: ../clients/cli/connections.c:1977 #, c-format msgid "no active connection on device '%s'" msgstr "brak aktywnych połączeń na urządzeniu „%s”" -#: ../clients/cli/connections.c:1979 +#: ../clients/cli/connections.c:1985 msgid "no active connection or device" msgstr "brak aktywnych połączeń na urządzeń" -#: ../clients/cli/connections.c:1999 +#: ../clients/cli/connections.c:2005 #, c-format msgid "device '%s' not compatible with connection '%s':" msgstr "urządzenie „%s” jest niezgodne z połączeniem „%s”:" -#: ../clients/cli/connections.c:2035 +#: ../clients/cli/connections.c:2041 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "urządzenie „%s” jest niezgodne z połączeniem „%s”" -#: ../clients/cli/connections.c:2038 +#: ../clients/cli/connections.c:2044 #, c-format msgid "no device found for connection '%s'" msgstr "nie odnaleziono urządzenia dla połączenia „%s”" -#: ../clients/cli/connections.c:2058 -msgid "Unknown reason" -msgstr "Nieznana przyczyna" - -#: ../clients/cli/connections.c:2060 -msgid "The connection was disconnected" -msgstr "Połączenie zostało rozłączone" - -#: ../clients/cli/connections.c:2062 -msgid "Disconnected by user" -msgstr "Rozłączono przez użytkownika" - -#: ../clients/cli/connections.c:2064 -msgid "The base network connection was interrupted" -msgstr "Przerwano podstawowe połączenie sieciowe" - -#: ../clients/cli/connections.c:2066 -msgid "The VPN service stopped unexpectedly" -msgstr "Usługa VPN została nieoczekiwanie zatrzymana" - -#: ../clients/cli/connections.c:2068 -msgid "The VPN service returned invalid configuration" -msgstr "Usługa VPN zwróciła nieprawidłową konfigurację" - -#: ../clients/cli/connections.c:2070 -msgid "The connection attempt timed out" -msgstr "Próba połączenia przekroczyła czas oczekiwania" - #: ../clients/cli/connections.c:2072 -msgid "The VPN service did not start in time" -msgstr "Usługa VPN nie została uruchomiona na czas" +#, c-format +msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n" +msgstr "Pomyślnie aktywowano połączenie (%s) (ścieżka aktywacji D-Bus: %s)\n" -#: ../clients/cli/connections.c:2074 -msgid "The VPN service failed to start" -msgstr "Uruchomienie usługi VPN się nie powiodło" - -#: ../clients/cli/connections.c:2076 -msgid "No valid secrets" -msgstr "Brak prawidłowych haseł" - -#: ../clients/cli/connections.c:2078 -msgid "Invalid secrets" -msgstr "Nieprawidłowe hasła" - -#: ../clients/cli/connections.c:2080 -msgid "The connection was removed" -msgstr "Usunięto połączenie" - -#: ../clients/cli/connections.c:2082 -msgid "Master connection failed" -msgstr "Główne połączenie się nie powiodło" - -#: ../clients/cli/connections.c:2084 -msgid "Could not create a software link" -msgstr "Nie można utworzyć łącza programowego" - -#: ../clients/cli/connections.c:2086 -msgid "The device disappeared" -msgstr "Urządzenie zniknęło" - -#: ../clients/cli/connections.c:2089 -msgid "Invalid reason" -msgstr "Nieprawidłowa przyczyna" - -#: ../clients/cli/connections.c:2115 ../clients/cli/connections.c:2307 -#: ../clients/cli/connections.c:6337 +#: ../clients/cli/connections.c:2076 ../clients/cli/connections.c:2224 +#: ../clients/cli/connections.c:6249 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "Pomyślnie aktywowano połączenie (ścieżka aktywacji D-Bus: %s)\n" -#: ../clients/cli/connections.c:2146 ../clients/cli/connections.c:2287 +#: ../clients/cli/connections.c:2083 ../clients/cli/connections.c:2204 #, c-format msgid "Error: Connection activation failed: %s" msgstr "Błąd: aktywacja połączenia się nie powiodła: %s" -#: ../clients/cli/connections.c:2173 -#, c-format -msgid "" -"Connection successfully activated (master waiting for slaves) (D-Bus active " -"path: %s)\n" -msgstr "" -"Pomyślnie aktywowano połączenie (główne oczekujące na podrzędne) (ścieżka " -"aktywacji D-Bus: %s)\n" - -#: ../clients/cli/connections.c:2202 +#: ../clients/cli/connections.c:2119 #, c-format msgid "Error: Timeout expired (%d seconds)" msgstr "Błąd: przekroczono czas oczekiwania (%d s)" -#: ../clients/cli/connections.c:2368 +#: ../clients/cli/connections.c:2285 #, c-format msgid "failed to read passwd-file '%s': %s" msgstr "odczytanie passwd-file „%s” się nie powiodło: %s" -#: ../clients/cli/connections.c:2380 +#: ../clients/cli/connections.c:2297 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "brak dwukropka we wpisie „password” „%s”" -#: ../clients/cli/connections.c:2388 +#: ../clients/cli/connections.c:2305 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "brak kropki we wpisie „password” „%s”" -#: ../clients/cli/connections.c:2401 +#: ../clients/cli/connections.c:2318 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "nieprawidłowa nazwa ustawienia we wpisie „password” „%s”" -#: ../clients/cli/connections.c:2457 +#: ../clients/cli/connections.c:2374 #, c-format msgid "unknown device '%s'." msgstr "nieznane urządzenie „%s”." -#: ../clients/cli/connections.c:2462 +#: ../clients/cli/connections.c:2379 msgid "neither a valid connection nor device given" msgstr "nie podano prawidłowego połączenia ani urządzenia" -#: ../clients/cli/connections.c:2592 ../clients/cli/devices.c:1533 +#: ../clients/cli/connections.c:2505 ../clients/cli/devices.c:1533 #: ../clients/cli/devices.c:2699 ../clients/cli/devices.c:3035 #: ../clients/cli/devices.c:3644 #, c-format msgid "Unknown parameter: %s\n" msgstr "Nieznany parametr: %s\n" -#: ../clients/cli/connections.c:2617 +#: ../clients/cli/connections.c:2530 msgid "preparing" msgstr "przygotowywanie" -#: ../clients/cli/connections.c:2637 +#: ../clients/cli/connections.c:2550 #, c-format msgid "Connection '%s' (%s) successfully deleted.\n" msgstr "Pomyślnie usunięto połączenie „%s” (%s).\n" -#: ../clients/cli/connections.c:2653 +#: ../clients/cli/connections.c:2566 #, c-format msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "" "Pomyślnie dezaktywowano połączenie „%s” (ścieżka aktywacji D-Bus: %s)\n" -#: ../clients/cli/connections.c:2734 ../clients/cli/connections.c:8256 -#: ../clients/cli/connections.c:8288 ../clients/cli/connections.c:8445 +#: ../clients/cli/connections.c:2647 ../clients/cli/connections.c:8167 +#: ../clients/cli/connections.c:8199 ../clients/cli/connections.c:8356 #, c-format msgid "Error: No connection specified." msgstr "Błąd: nie podano połączenia." -#: ../clients/cli/connections.c:2775 +#: ../clients/cli/connections.c:2688 #, c-format msgid "Error: '%s' is not an active connection.\n" msgstr "Błąd: „%s” nie jest aktywnym połączeniem.\n" -#: ../clients/cli/connections.c:2776 +#: ../clients/cli/connections.c:2689 #, c-format msgid "Error: not all active connections found." msgstr "Błąd: nie odnaleziono wszystkich aktywnych połączeń." -#: ../clients/cli/connections.c:2785 +#: ../clients/cli/connections.c:2698 #, c-format msgid "Error: no active connection provided." msgstr "Błąd: nie podano aktywnego połączenia." -#: ../clients/cli/connections.c:2819 +#: ../clients/cli/connections.c:2732 #, c-format msgid "Connection '%s' deactivation failed: %s\n" msgstr "Dezaktywacja połączenia „%s” się nie powiodła: %s\n" -#: ../clients/cli/connections.c:3075 ../clients/cli/connections.c:3132 -#: ../clients/common/nm-client-utils.c:165 +#: ../clients/cli/connections.c:2988 ../clients/cli/connections.c:3045 +#: ../clients/common/nm-client-utils.c:169 #, c-format msgid "'%s' not among [%s]" msgstr "„%s” nie jest w [%s]" -#: ../clients/cli/connections.c:3289 +#. We should not really come here +#: ../clients/cli/connections.c:3008 ../clients/cli/connections.c:3068 +#: ../clients/common/nm-client-utils.c:279 +#, c-format +msgid "Unknown error" +msgstr "Nieznany błąd" + +#: ../clients/cli/connections.c:3202 #, c-format msgid "Warning: master='%s' doesn't refer to any existing profile.\n" msgstr "" "Ostrzeżenie: master=„%s” nie odnosi się do żadnego istniejącego profilu.\n" -#: ../clients/cli/connections.c:3626 +#: ../clients/cli/connections.c:3539 #, c-format msgid "Error: invalid property '%s': %s." msgstr "Błąd: nieprawidłowa właściwość „%s”: %s." -#: ../clients/cli/connections.c:3643 +#: ../clients/cli/connections.c:3556 #, c-format msgid "Error: failed to modify %s.%s: %s." msgstr "Błąd: zmodyfikowanie %s.%s się nie powiodło: %s." -#: ../clients/cli/connections.c:3662 +#: ../clients/cli/connections.c:3575 #, c-format msgid "Error: failed to remove a value from %s.%s: %s." msgstr "Błąd: usunięcie wartości z %s.%s się nie powiodło: %s." -#: ../clients/cli/connections.c:3696 +#: ../clients/cli/connections.c:3609 #, c-format msgid "Error: '%s' is mandatory." msgstr "Błąd: „%s” jest wymagane." -#: ../clients/cli/connections.c:3723 +#: ../clients/cli/connections.c:3636 #, c-format msgid "Error: invalid slave type; %s." msgstr "Błąd: nieznany typ podrzędnego; %s." -#: ../clients/cli/connections.c:3733 +#: ../clients/cli/connections.c:3644 #, c-format msgid "Error: invalid connection type; %s." msgstr "Błąd: nieznany typ połączenia; %s." -#: ../clients/cli/connections.c:3810 +#: ../clients/cli/connections.c:3721 #, c-format msgid "Error: bad connection type: %s" msgstr "Błąd: błędny typ połączenia: %s" -#: ../clients/cli/connections.c:3856 +#: ../clients/cli/connections.c:3767 #, c-format msgid "Error: '%s': %s" msgstr "Błąd: „%s”: %s" -#: ../clients/cli/connections.c:3877 +#: ../clients/cli/connections.c:3788 msgid "Error: master is required" msgstr "Błąd: „master” jest wymagane" -#: ../clients/cli/connections.c:3936 +#: ../clients/cli/connections.c:3847 #, c-format msgid "Error: error adding bond option '%s=%s'." msgstr "Błąd: błąd podczas dodawania opcji wiązania „%s=%s”." -#: ../clients/cli/connections.c:3967 +#: ../clients/cli/connections.c:3878 #, c-format msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" msgstr "" "Błąd: „%s” nie jest prawidłowym trybem monitorowania; należy użyć „%s” lub " "„%s”.\n" -#: ../clients/cli/connections.c:3998 +#: ../clients/cli/connections.c:3909 #, c-format msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]." msgstr "" "Błąd: „bt-type”: „%s” jest nieprawidłowe; należy użyć [%s, %s, %s (%s), %s]." -#: ../clients/cli/connections.c:4247 +#: ../clients/cli/connections.c:4158 #, c-format msgid "Error: value for '%s' is missing." msgstr "Błąd: brak wartości dla „%s”." -#: ../clients/cli/connections.c:4293 +#: ../clients/cli/connections.c:4204 msgid "Error: . argument is missing." msgstr "Błąd: brak parametru .." -#: ../clients/cli/connections.c:4316 +#: ../clients/cli/connections.c:4227 #, c-format msgid "Error: invalid or not allowed setting '%s': %s." msgstr "Błąd: nieprawidłowe lub niedozwolone ustawienie „%s”: %s." -#: ../clients/cli/connections.c:4362 ../clients/cli/connections.c:4378 +#: ../clients/cli/connections.c:4273 ../clients/cli/connections.c:4289 #, c-format msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)." msgstr "Błąd: „%s” jest niejednoznaczne (%s.%s lub %s.%s)." -#: ../clients/cli/connections.c:4396 +#: ../clients/cli/connections.c:4307 #, c-format msgid "Error: invalid . '%s'." msgstr "Błąd: nieprawidłowe . „%s”." -#: ../clients/cli/connections.c:4440 ../clients/cli/connections.c:8081 +#: ../clients/cli/connections.c:4351 ../clients/cli/connections.c:7992 #, c-format msgid "Error: Failed to add '%s' connection: %s" msgstr "Błąd: dodanie połączenia „%s” się nie powiodło: %s" -#: ../clients/cli/connections.c:4458 +#: ../clients/cli/connections.c:4369 #, c-format msgid "" "Warning: There is another connection with the name '%1$s'. Reference the " @@ -1725,12 +1351,12 @@ msgstr[2] "" "Ostrzeżenie: istnieje %3$u innych połączeń o nazwie „%1$s”. Należy odwoływać " "się do połączenia za pomocą UUID „%2$s”\n" -#: ../clients/cli/connections.c:4467 +#: ../clients/cli/connections.c:4378 #, c-format msgid "Connection '%s' (%s) successfully added.\n" msgstr "Pomyślnie dodano połączenie „%s” (%s).\n" -#: ../clients/cli/connections.c:4605 +#: ../clients/cli/connections.c:4516 #, c-format msgid "" "You can specify this option more than once. Press when you're done.\n" @@ -1739,7 +1365,7 @@ msgstr "" "ukończeniu.\n" #. Ask for optional arguments. -#: ../clients/cli/connections.c:4704 +#: ../clients/cli/connections.c:4615 #, c-format msgid "There is %d optional setting for %s.\n" msgid_plural "There are %d optional settings for %s.\n" @@ -1747,7 +1373,7 @@ msgstr[0] "Istnieje %d opcjonalne ustawienie dla %s.\n" msgstr[1] "Istnieją %d opcjonalne ustawienia dla %s.\n" msgstr[2] "Istnieje %d opcjonalnych ustawień dla %s.\n" -#: ../clients/cli/connections.c:4707 +#: ../clients/cli/connections.c:4618 #, c-format msgid "Do you want to provide it? %s" msgid_plural "Do you want to provide them? %s" @@ -1755,22 +1381,22 @@ msgstr[0] "Podać go? %s" msgstr[1] "Podać je? %s" msgstr[2] "Podać je? %s" -#: ../clients/cli/connections.c:4843 ../clients/cli/utils.c:302 +#: ../clients/cli/connections.c:4754 ../clients/cli/utils.c:303 #, c-format msgid "Error: value for '%s' argument is required." msgstr "Błąd: wartość dla parametru „%s” jest wymagana." -#: ../clients/cli/connections.c:4849 +#: ../clients/cli/connections.c:4760 #, c-format msgid "Error: 'save': %s." msgstr "Błąd: „save”: %s." -#: ../clients/cli/connections.c:4937 ../clients/cli/connections.c:4948 +#: ../clients/cli/connections.c:4848 ../clients/cli/connections.c:4859 #, c-format msgid "Error: '%s' argument is required." msgstr "Błąd: parametr „%s” jest wymagany." -#: ../clients/cli/connections.c:5926 +#: ../clients/cli/connections.c:5837 #, c-format msgid "['%s' setting values]\n" msgstr "[wartości ustawienia „%s”]\n" @@ -1778,7 +1404,7 @@ msgstr "[wartości ustawienia „%s”]\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6005 +#: ../clients/cli/connections.c:5916 #, c-format msgid "" "---[ Main menu ]---\n" @@ -1815,7 +1441,7 @@ msgstr "" "nmcli :: konfiguracja nmcli\n" "quit :: kończy działanie nmcli\n" -#: ../clients/cli/connections.c:6032 +#: ../clients/cli/connections.c:5943 #, c-format msgid "" "goto [.] | :: enter setting/property for editing\n" @@ -1836,7 +1462,7 @@ msgstr "" " nmcli connection> goto secondaries\n" " nmcli> goto ipv4.addresses\n" -#: ../clients/cli/connections.c:6039 +#: ../clients/cli/connections.c:5950 #, c-format msgid "" "remove [.] :: remove setting or reset property value\n" @@ -1857,7 +1483,7 @@ msgstr "" "Przykłady: nmcli> remove wifi-sec\n" " nmcli> remove eth.mtu\n" -#: ../clients/cli/connections.c:6046 +#: ../clients/cli/connections.c:5957 #, c-format msgid "" "set [. ] :: set property value\n" @@ -1872,7 +1498,7 @@ msgstr "" "\n" "Przykład: nmcli> set con.id Moje połączenie\n" -#: ../clients/cli/connections.c:6051 +#: ../clients/cli/connections.c:5962 #, c-format msgid "" "describe [.] :: describe property\n" @@ -1885,7 +1511,7 @@ msgstr "" "Wyświetla opis właściwości. Wszystkie ustawienia i właściwości usługi NM\n" "można znaleźć na stronie podręcznika nm-settings(5).\n" -#: ../clients/cli/connections.c:6056 +#: ../clients/cli/connections.c:5967 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -1900,7 +1526,7 @@ msgstr "" "\n" "Przykład: nmcli ipv4> print all\n" -#: ../clients/cli/connections.c:6061 +#: ../clients/cli/connections.c:5972 #, c-format msgid "" "verify [all | fix] :: verify setting or connection validity\n" @@ -1924,7 +1550,7 @@ msgstr "" " nmcli> verify fix\n" " nmcli bond> verify\n" -#: ../clients/cli/connections.c:6070 +#: ../clients/cli/connections.c:5981 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -1950,7 +1576,7 @@ msgstr "" "między ponownymi uruchomieniami. Aby w pełni usunąć trwałe połączenie,\n" "należy usunąć profil połączenia.\n" -#: ../clients/cli/connections.c:6081 +#: ../clients/cli/connections.c:5992 #, c-format msgid "" "activate [] [/|] :: activate the connection\n" @@ -1972,7 +1598,7 @@ msgstr "" " poprzedzić znakiem /, kiedy nie podano\n" " )\n" -#: ../clients/cli/connections.c:6088 ../clients/cli/connections.c:6247 +#: ../clients/cli/connections.c:5999 ../clients/cli/connections.c:6158 #, c-format msgid "" "back :: go to upper menu level\n" @@ -1981,7 +1607,7 @@ msgstr "" "back :: przechodzi do menu wyższego poziomu\n" "\n" -#: ../clients/cli/connections.c:6091 +#: ../clients/cli/connections.c:6002 #, c-format msgid "" "help/? [] :: help for the nmcli commands\n" @@ -1990,7 +1616,7 @@ msgstr "" "help/? [] :: pomoc dla poleceń nmcli\n" "\n" -#: ../clients/cli/connections.c:6094 +#: ../clients/cli/connections.c:6005 #, c-format msgid "" "nmcli [ ] :: nmcli configuration\n" @@ -2017,7 +1643,7 @@ msgstr "" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" -#: ../clients/cli/connections.c:6116 ../clients/cli/connections.c:6253 +#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164 #, c-format msgid "" "quit :: exit nmcli\n" @@ -2030,8 +1656,8 @@ msgstr "" "To polecenie kończy działanie nmcli. Jeśli modyfikowane połączenie nie jest " "zapisane, użytkownik zostanie poproszony o potwierdzenie działania.\n" -#: ../clients/cli/connections.c:6121 ../clients/cli/connections.c:6258 -#: ../clients/cli/connections.c:6684 ../clients/cli/connections.c:7643 +#: ../clients/cli/connections.c:6032 ../clients/cli/connections.c:6169 +#: ../clients/cli/connections.c:6605 ../clients/cli/connections.c:7562 #, c-format msgid "Unknown command: '%s'\n" msgstr "Nieznane polecenie: „%s”\n" @@ -2039,7 +1665,7 @@ msgstr "Nieznane polecenie: „%s”\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6187 +#: ../clients/cli/connections.c:6098 #, c-format msgid "" "---[ Property menu ]---\n" @@ -2066,7 +1692,7 @@ msgstr "" "help/? [] :: wyświetla tę pomoc lub opis polecenia\n" "quit :: kończy działanie nmcli\n" -#: ../clients/cli/connections.c:6212 +#: ../clients/cli/connections.c:6123 #, c-format msgid "" "set [] :: set new value\n" @@ -2077,7 +1703,7 @@ msgstr "" "\n" "To polecenie ustawia podaną tej właściwości\n" -#: ../clients/cli/connections.c:6216 +#: ../clients/cli/connections.c:6127 #, c-format msgid "" "add [] :: append new value to the property\n" @@ -2092,7 +1718,7 @@ msgstr "" "jest typu kontener. W przypadku właściwości zawierających jedną wartość " "zastępuje tę wartość (podobnie jak „set”).\n" -#: ../clients/cli/connections.c:6222 +#: ../clients/cli/connections.c:6133 #, c-format msgid "" "change :: change current value\n" @@ -2103,7 +1729,7 @@ msgstr "" "\n" "Wyświetla bieżącą wartość i umożliwia jej modyfikację.\n" -#: ../clients/cli/connections.c:6226 +#: ../clients/cli/connections.c:6137 #, c-format msgid "" "remove [||