diff --git a/.clang-format b/.clang-format index 110ff05f23..4099440415 100644 --- a/.clang-format +++ b/.clang-format @@ -65,9 +65,9 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: false -ForEachMacros: ['c_list_for_each', - 'c_list_for_each_prev', - 'c_list_for_each_prev_safe', +ForEachMacros: [ + 'FOR_EACH_DELAYED_ACTION', + 'c_list_for_each', 'c_list_for_each_continue', 'c_list_for_each_entry', 'c_list_for_each_entry_continue', @@ -75,6 +75,8 @@ ForEachMacros: ['c_list_for_each', 'c_list_for_each_entry_safe', 'c_list_for_each_entry_safe_continue', 'c_list_for_each_entry_safe_unlink', + 'c_list_for_each_prev', + 'c_list_for_each_prev_safe', 'c_list_for_each_safe', 'c_list_for_each_safe_continue', 'c_list_for_each_safe_unlink', @@ -105,12 +107,12 @@ ForEachMacros: ['c_list_for_each', 'nm_ip_config_iter_ip_route_for_each', 'nm_json_array_foreach', 'nm_json_object_foreach', - 'nm_l3_config_data_iter_ip_address_for_each', 'nm_l3_config_data_iter_ip4_address_for_each', - 'nm_l3_config_data_iter_ip6_address_for_each', - 'nm_l3_config_data_iter_ip_route_for_each', 'nm_l3_config_data_iter_ip4_route_for_each', + 'nm_l3_config_data_iter_ip6_address_for_each', 'nm_l3_config_data_iter_ip6_route_for_each', + 'nm_l3_config_data_iter_ip_address_for_each', + 'nm_l3_config_data_iter_ip_route_for_each', 'nm_l3_config_data_iter_obj_for_each', 'nm_manager_for_each_active_connection', 'nm_manager_for_each_active_connection_prev', diff --git a/.gitignore b/.gitignore index d02bcad683..d4e172c0c6 100644 --- a/.gitignore +++ b/.gitignore @@ -241,7 +241,6 @@ test-*.trs /src/core/NetworkManager-all-sym /src/core/NetworkManager.ver /src/core/devices/bluetooth/tests/nm-bt-test -/src/core/devices/tests/test-acd /src/core/devices/tests/test-lldp /src/core/devices/wifi/tests/test-devices-wifi /src/core/devices/wwan/tests/test-service-providers @@ -250,7 +249,6 @@ test-*.trs /src/core/dhcp/tests/test-dhcp-options /src/core/dhcp/tests/test-dhcp-utils /src/core/dnsmasq/tests/test-dnsmasq-utils -/src/core/nm-iface-helper /src/core/ndisc/tests/test-ndisc-fake /src/core/ndisc/tests/test-ndisc-linux /src/core/platform/tests/monitor @@ -407,10 +405,12 @@ test-*.trs /src/NetworkManager /src/NetworkManager-all-sym /src/NetworkManager.ver +/src/core/devices/tests/test-acd /src/core/initrd/nm-initrd-generator /src/core/initrd/tests/test-cmdline-reader /src/core/initrd/tests/test-dt-reader /src/core/initrd/tests/test-ibft-reader +/src/core/nm-iface-helper /src/devices/bluetooth/tests/nm-bt-test /src/devices/tests/test-acd /src/devices/tests/test-arping diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cfbd51320..e00df3d1e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,11 +47,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bump # ".default_tag". - FEDORA_TAG: '2021-08-30.0-7ff339b89ca1' - UBUNTU_TAG: '2021-08-30.0-432f46c6a3a4' - DEBIAN_TAG: '2021-08-30.0-432f46c6a3a4' - CENTOS_TAG: '2021-08-30.0-7ff339b89ca1' - ALPINE_TAG: '2021-08-30.0-20e22c5d34b7' + FEDORA_TAG: '2021-11-09.0-9dd1e1db773a' + UBUNTU_TAG: '2021-11-09.0-577176f5eb6c' + DEBIAN_TAG: '2021-11-09.0-577176f5eb6c' + CENTOS_TAG: '2021-11-09.0-9dd1e1db773a' + ALPINE_TAG: '2021-11-09.0-a28badea28eb' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' @@ -680,23 +680,23 @@ t_fedora:34: extends: - .build@template - .fdo.distribution-image@fedora - - .nm_artifacts variables: FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_TAG: $FEDORA_TAG needs: - "fedora:34@container-prep" + when: manual t_fedora:35: extends: - .build@template - .fdo.distribution-image@fedora + - .nm_artifacts variables: FDO_DISTRIBUTION_VERSION: '35' FDO_DISTRIBUTION_TAG: $FEDORA_TAG needs: - "fedora:35@container-prep" - when: manual t_fedora:36: extends: @@ -926,7 +926,7 @@ t_alpine:latest: check-patch: extends: - - t_fedora:34 + - t_fedora:35 - .nm_artifacts_undo stage: test script: @@ -935,7 +935,7 @@ check-patch: check-tree: extends: - - t_fedora:34 + - t_fedora:35 - .nm_artifacts_undo stage: test script: @@ -955,9 +955,9 @@ pages: only: - main dependencies: - - t_fedora:34 + - t_fedora:35 needs: - - t_fedora:34 + - t_fedora:35 triage:issues: stage: triage diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 35bc8a29aa..eb96ce18e8 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -8,7 +8,7 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2021-08-30.0' +.default_tag: &default_tag '2021-11-09.0' # The list of all distributions we want to create job for. @@ -64,4 +64,4 @@ distributions: # specifies which of the above distros is used as source for pages pages_build: name: fedora - version: '34' + version: '35' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8f5de7daf2..ddd53d181a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,8 +69,24 @@ $ git config --add 'blame.ignoreRevsFile' '.git-blame-ignore-revs' ### Style -Since our coding style is entirely automated, the following are just -some details of the style we use: +As we use clang-format, our style is in parts determined by the tool. +Run the tool to format the code. See the earlier point. + +The formatting tool cannot cover all questions. The most important rule is +to mimic the existing code and *imitate the surrounding style*. + +In general, we require to build without compiler warnings, for the warnings +that we enable. Our language is C11 with some GCC-isms (like typeof(), +expression statements, cleanup attribute). In practice, we support various versions +of GCC and clang. The supported C "dialect", compilers and libc are those that we +can practically build and test in our CI. We don't target a theoretical, pure C11/POSIX +standard or a libc/compiler that we cannot test. +Patches for making NetworkManager more portable are welcome, if there is a +practical use and checked by CI. Glibc and musl libc are supported. + +We follow a mixture of [glib's](https://developer.gnome.org/documentation/guidelines/programming/coding-style.html) +and [systemd's](https://github.com/systemd/systemd/blob/main/docs/CODING_STYLE.md) style, which already have extensive +guidelines. Following there are a few noteworthy points. * Use cleanup functions (`gs_free`, `gs_*`, `nm_auto*`) to let a stack variable own a resource instead of explicit free. Combine them with @@ -101,14 +117,8 @@ some details of the style we use: - GOOD: `#define MY_CONSTANT 42` - BAD: `static const unsigned myConstant = 42;` -Additionally, we require to build without compiler warnings for the warnings -that we enable. Also, our language is C11 with some GCC-isms (like typeof(), -expression statements, cleanup attribute). In practice, we support various versions -of GCC and clang. The supported C "dialect", compilers and libc are those that we -can practically build and test in our CI. We don't target a theoretical, pure C11/POSIX -standard or a libc/compiler that we cannot test. -Patches for making NetworkManager more portable are welcome, if there is a -practical use and CI tests. Glibc and musl libc are supported. +* Always use curly braces for blocks that span multiple lines. For single lines + the braces may be omitted, but are not prohibited. ### Checkpatch diff --git a/Makefile.am b/Makefile.am index 1c51afbfd2..405577bd44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -202,7 +202,8 @@ data_edit = sed \ -e 's|@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT)|g' \ -e 's|@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \ -e 's|@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER[@]|$(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER)|g' \ - -e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g' + -e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g' \ + -e 's|@NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT)|g' ############################################################################### @@ -2074,9 +2075,6 @@ src_core_ldflags = $(CODE_COVERAGE_LDFLAGS) sbin_PROGRAMS += \ src/core/NetworkManager -libexec_PROGRAMS += \ - src/core/nm-iface-helper - noinst_LTLIBRARIES += \ src/core/libNetworkManagerBase.la \ src/core/libNetworkManager.la \ @@ -2323,8 +2321,6 @@ src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \ src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c \ src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c \ src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c \ - src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c \ - src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c \ src/libnm-systemd-core/src/libsystemd-network/sd-lldp-rx.c \ src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h \ src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c \ @@ -2342,8 +2338,6 @@ src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \ src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h \ src/libnm-systemd-core/src/systemd/sd-event.h \ src/libnm-systemd-core/src/systemd/sd-id128.h \ - src/libnm-systemd-core/src/systemd/sd-ipv4acd.h \ - src/libnm-systemd-core/src/systemd/sd-ipv4ll.h \ src/libnm-systemd-core/src/systemd/sd-lldp-rx.h \ src/libnm-systemd-core/src/systemd/sd-lldp.h \ src/libnm-systemd-core/src/systemd/sd-ndisc.h \ @@ -2394,10 +2388,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \ src/core/nm-l3cfg.h \ src/core/nm-ip-config.c \ src/core/nm-ip-config.h \ - src/core/nm-ip4-config.c \ - src/core/nm-ip4-config.h \ - src/core/nm-ip6-config.c \ - src/core/nm-ip6-config.h \ \ src/core/dhcp/nm-dhcp-client.c \ src/core/dhcp/nm-dhcp-client.h \ @@ -2436,8 +2426,6 @@ src_core_libNetworkManager_la_SOURCES = \ src/core/nm-checkpoint-manager.c \ src/core/nm-checkpoint-manager.h \ \ - src/core/devices/nm-acd-manager.c \ - src/core/devices/nm-acd-manager.h \ src/core/devices/nm-lldp-listener.c \ src/core/devices/nm-lldp-listener.h \ src/core/devices/nm-device-utils.c \ @@ -2513,6 +2501,8 @@ src_core_libNetworkManager_la_SOURCES = \ src/core/dnsmasq/nm-dnsmasq-utils.c \ src/core/dnsmasq/nm-dnsmasq-utils.h \ \ + src/core/ppp/nm-ppp-mgr.c \ + src/core/ppp/nm-ppp-mgr.h \ src/core/ppp/nm-ppp-manager-call.c \ src/core/ppp/nm-ppp-manager-call.h \ src/core/ppp/nm-ppp-manager.h \ @@ -2586,8 +2576,6 @@ src_core_libNetworkManager_la_SOURCES = \ src/core/nm-firewall-utils.h \ src/core/nm-firewalld-manager.c \ src/core/nm-firewalld-manager.h \ - src/core/nm-proxy-config.c \ - src/core/nm-proxy-config.h \ src/core/nm-auth-manager.c \ src/core/nm-auth-manager.h \ src/core/nm-auth-utils.c \ @@ -2721,44 +2709,6 @@ $(src_core_NetworkManager_OBJECTS): $(src_libnm_core_public_mkenums_h) ############################################################################### -src_core_nm_iface_helper_CPPFLAGS = $(src_core_cppflags) - -src_core_nm_iface_helper_SOURCES = \ - src/core/nm-iface-helper.c - -src_core_nm_iface_helper_LDADD = \ - src/core/libNetworkManagerBase.la \ - src/libnm-core-aux-extern/libnm-core-aux-extern.la \ - src/libnm-core-impl/libnm-core-impl.la \ - $(libnm_crypto_lib) \ - src/libnm-core-aux-intern/libnm-core-aux-intern.la \ - src/libnm-platform/libnm-platform.la \ - src/libnm-base/libnm-base.la \ - src/libnm-log-core/libnm-log-core.la \ - src/libnm-udev-aux/libnm-udev-aux.la \ - src/libnm-glib-aux/libnm-glib-aux.la \ - src/libnm-std-aux/libnm-std-aux.la \ - src/libnm-systemd-core/libnm-systemd-core.la \ - src/libnm-systemd-shared/libnm-systemd-shared.la \ - src/n-acd/libn-acd.la \ - src/n-dhcp4/libn-dhcp4.la \ - src/c-rbtree/libc-rbtree.la \ - src/c-siphash/libc-siphash.la \ - $(SYSTEMD_JOURNAL_LIBS) \ - $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) \ - $(LIBNDP_LIBS) \ - $(DL_LIBS) \ - $(NULL) - -src_core_nm_iface_helper_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ - $(SANITIZER_EXEC_LDFLAGS) - -$(src_core_nm_iface_helper_OBJECTS): $(src_libnm_core_public_mkenums_h) - -############################################################################### - noinst_LTLIBRARIES += src/nm-initrd-generator/libnmi-core.la src_nm_initrd_generator_libnmi_core_la_CPPFLAGS = \ @@ -4275,20 +4225,14 @@ src_core_devices_tests_ldflags = \ check_programs += \ src/core/devices/tests/test-lldp \ - src/core/devices/tests/test-acd + $(NULL) src_core_devices_tests_test_lldp_CPPFLAGS = $(src_core_cppflags_test) src_core_devices_tests_test_lldp_LDFLAGS = $(src_core_devices_tests_ldflags) src_core_devices_tests_test_lldp_LDADD = \ src/core/libNetworkManagerTest.la -src_core_devices_tests_test_acd_CPPFLAGS = $(src_core_cppflags_test) -src_core_devices_tests_test_acd_LDFLAGS = $(src_core_devices_tests_ldflags) -src_core_devices_tests_test_acd_LDADD = \ - src/core/libNetworkManagerTest.la - $(src_core_devices_tests_test_lldp_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(src_core_devices_tests_test_acd_OBJECTS): $(src_libnm_core_public_mkenums_h) EXTRA_DIST += \ src/core/devices/tests/meson.build @@ -4391,22 +4335,12 @@ check_programs += \ src/core/tests/test-core \ src/core/tests/test-core-with-expect \ src/core/tests/test-dcb \ - src/core/tests/test-ip4-config \ - src/core/tests/test-ip6-config \ src/core/tests/test-l3cfg \ src/core/tests/test-systemd \ src/core/tests/test-utils \ src/core/tests/test-wired-defname \ $(NULL) -src_core_tests_test_ip4_config_CPPFLAGS = $(src_core_cppflags_test) -src_core_tests_test_ip4_config_LDFLAGS = $(src_core_tests_ldflags) -src_core_tests_test_ip4_config_LDADD = $(src_core_tests_ldadd) - -src_core_tests_test_ip6_config_CPPFLAGS = $(src_core_cppflags_test) -src_core_tests_test_ip6_config_LDFLAGS = $(src_core_tests_ldflags) -src_core_tests_test_ip6_config_LDADD = $(src_core_tests_ldadd) - src_core_tests_test_dcb_CPPFLAGS = $(src_core_cppflags_test) src_core_tests_test_dcb_LDFLAGS = $(src_core_tests_ldflags) src_core_tests_test_dcb_LDADD = $(src_core_tests_ldadd) @@ -4434,8 +4368,6 @@ src_core_tests_test_l3cfg_LDADD = $(src_core_tests_ldadd) $(src_core_tests_test_core_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_tests_test_core_with_expect_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_tests_test_dcb_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(src_core_tests_test_ip4_config_OBJECTS): $(src_libnm_core_public_mkenums_h) -$(src_core_tests_test_ip6_config_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_tests_test_l3cfg_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_tests_test_utils_OBJECTS): $(src_libnm_core_public_mkenums_h) $(src_core_tests_test_wired_defname_OBJECTS): $(src_libnm_core_public_mkenums_h) diff --git a/NEWS b/NEWS index fe0f7fec30..1165a6460f 100644 --- a/NEWS +++ b/NEWS @@ -1,15 +1,29 @@ +============================================= +NetworkManager-1.36 +Overview of changes since NetworkManager-1.34 +============================================= + +This is a snapshot of NetworkManager development. The API is +subject to change and not guaranteed to be compatible with +the later release. +USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! + +* rework IP configuration code to make it more independent from + NMDevice. +* Drop "configure-and-quit" mode and nm-iface-helper. + ============================================= NetworkManager-1.34 Overview of changes since NetworkManager-1.32 ============================================= -* initrd: wait for both IPv4 and IPv6 with "ip=dhcp,dhcp6" -* core: better handle sd-resolved errors when resolving hostnames +* initrd: wait for both IPv4 and IPv6 with "ip=dhcp,dhcp6". +* core: better handle sd-resolved errors when resolving hostnames. * nmcli: fix import WireGuard profile with DNS domain and address - family disabled -* ndisc: send router solicitations before expiry -* policy: send earlier the ip configs to the DNS manager -* core: support linking with LLD 13 + family disabled. +* ndisc: send router solicitations before expiry. +* policy: send earlier the ip configs to the DNS manager. +* core: support linking with LLD 13. * wireguard: importing wg-quick configuration files with nmcli no longer sets a negative, exclusive "dns-priority". This plays better with common split DNS setups that use systemd-resolved. diff --git a/config.h.meson b/config.h.meson index 901535cf9f..192246e558 100644 --- a/config.h.meson +++ b/config.h.meson @@ -100,6 +100,9 @@ /* Default value for main.rc-manager setting */ #mesondefine NM_CONFIG_DEFAULT_MAIN_RC_MANAGER +/* Default configuration option for wifi.backend */ +#mesondefine NM_CONFIG_DEFAULT_WIFI_BACKEND + /* Define the distribution version string */ #mesondefine NM_DIST_VERSION diff --git a/configure.ac b/configure.ac index abd83a60d9..2bb30b4336 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [34]) -m4_define([nm_micro_version], [0]) +m4_define([nm_minor_version], [35]) +m4_define([nm_micro_version], [5]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -404,6 +404,25 @@ AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_LOGGING_BACKEND, "$nm_config_logging_backen NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT="$nm_config_logging_backend_default" AC_SUBST(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT) +AC_ARG_WITH(config-wifi-backend-default, + AS_HELP_STRING([--with-config-wifi-backend-default=backend], + [Default value for wifi.backend]), + nm_config_wifi_backend_default="$withval", + nm_config_wifi_backend_default="wpa_supplicant") + +if test "$nm_config_wifi_backend_default" != 'iwd' \ + -a "$nm_config_wifi_backend_default" != 'wpa_supplicant'; then + AC_MSG_ERROR([The default Wi-Fi backend must be either wpa_supplicant or iwd.]) +fi +if test "$nm_config_wifi_backend_default" = "iwd"; then + if test "$ac_with_iwd" != "yes"; then + AC_MSG_ERROR([Setting the default Wi-Fi backend to iwd requires iwd support.]) + fi +fi +AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_WIFI_BACKEND, "$nm_config_wifi_backend_default", [Default configuration option for wifi.backend]) +NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT="$nm_config_wifi_backend_default" +AC_SUBST(NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT) + # Session tracking support AC_ARG_WITH(systemd-logind, AS_HELP_STRING([--with-systemd-logind=yes|no], diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index f3ef632cb5..7630b82182 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -1000,7 +1000,6 @@ fi %ghost %attr(755, root, root) %{_sbindir}/ifdown %{_libexecdir}/nm-dhcp-helper %{_libexecdir}/nm-dispatcher -%{_libexecdir}/nm-iface-helper %{_libexecdir}/nm-initrd-generator %{_libexecdir}/nm-daemon-helper %{_libexecdir}/nm-priv-helper diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh index 82b804fa49..7c221d69a5 100755 --- a/contrib/fedora/rpm/build_clean.sh +++ b/contrib/fedora/rpm/build_clean.sh @@ -198,6 +198,7 @@ if [[ $NO_DIST != 1 ]]; then --enable-ifcfg-rh \ --enable-ifupdown \ --with-config-logging-backend-default=syslog \ + --with-config-wifi-backend-default=wpa_supplicant \ --with-libaudit=yes-disabled-by-default \ --enable-polkit=yes \ --with-nm-cloud-setup=yes \ diff --git a/contrib/scripts/checkpatch.pl b/contrib/scripts/checkpatch.pl index 57460522b8..733a42d7b0 100755 --- a/contrib/scripts/checkpatch.pl +++ b/contrib/scripts/checkpatch.pl @@ -198,7 +198,7 @@ complain ("Don't use API that uses the numeric source id. Instead, use GSource a complain ("Prefer g_snprintf() over snprintf() (for consistency)") if $line =~ /\b(snprintf)\b/; complain ("Avoid g_clear_pointer() and use nm_clear_pointer() (or nm_clear_g_free(), g_clear_object(), etc.)") if $line =~ /\b(g_clear_pointer)\b/; complain ("Define setting properties with _nm_setting_property_define_direct_*() API") if $line =~ /g_param_spec_/ and $filename =~ /\/libnm-core-impl\/nm-setting/; -#complain ("Use spaces instead of tabs") if $line =~ /\t/; +complain ("Use spaces instead of tabs") if $line =~ /\t/; # Further on we process stuff without comments. $_ = $line; diff --git a/contrib/scripts/find-backports b/contrib/scripts/find-backports index a39cd175af..e1c5aa4194 100755 --- a/contrib/scripts/find-backports +++ b/contrib/scripts/find-backports @@ -77,7 +77,7 @@ def git_merge_base(a, b): def git_all_commits_grep(rnge, grep=None): if grep: - grep = ["--grep=%s" % (str(grep))] + grep = [("--grep=%s" % g) for g in grep] notes = ["-c", "notes.displayref=refs/notes/bugs"] else: grep = [] @@ -204,7 +204,7 @@ def git_ref_commit_body_get_cherry_picked_recurse(ref): def git_commits_annotate_fixes(rnge): commits = git_all_commits(rnge) c_dict = _keys_to_dict(commits) - for c in git_all_commits_grep(rnge, grep="[Ff]ixes:"): + for c in git_all_commits_grep(rnge, grep=["[Ff]ixes:"]): ff = git_ref_commit_body_get_fixes(c) if ff: c_dict[c] = ff @@ -214,7 +214,9 @@ def git_commits_annotate_fixes(rnge): def git_commits_annotate_cherry_picked(rnge): commits = git_all_commits(rnge) c_dict = _keys_to_dict(commits) - for c in git_all_commits_grep(ref_head, grep="cherry picked from commit"): + for c in git_all_commits_grep( + ref_head, grep=["cherry picked from commit", "Ignore-Backport:"] + ): ff = git_ref_commit_body_get_cherry_picked_recurse(c) if ff: c_dict[c] = ff diff --git a/contrib/scripts/nm-code-format-container.sh b/contrib/scripts/nm-code-format-container.sh index 9aa6d56d52..ce09f0eeca 100755 --- a/contrib/scripts/nm-code-format-container.sh +++ b/contrib/scripts/nm-code-format-container.sh @@ -10,7 +10,9 @@ die() { DIR="$(realpath "$(dirname "$0")/../../")" cd "$DIR" -PODNAME=nm-code-format +FEDORA_VERSION=35 + +PODNAME="nm-code-format-f$FEDORA_VERSION" RENEW=0 for a; do @@ -37,7 +39,7 @@ if ! podman container exists "$PODNAME" ; then --name="$PODNAME" \ -v "$DIR:/tmp/NetworkManager:Z" \ -w /tmp/NetworkManager \ - fedora:34 \ + "fedora:$FEDORA_VERSION" \ /bin/bash -c 'dnf upgrade -y && dnf install -y git /usr/bin/clang-format && ./contrib/scripts/nm-code-format.sh -i' exit 0 fi diff --git a/contrib/scripts/nm-copr-build-nm-git-bundle.sh b/contrib/scripts/nm-copr-build-nm-git-bundle.sh index c4281834bc..d046ccac4a 100755 --- a/contrib/scripts/nm-copr-build-nm-git-bundle.sh +++ b/contrib/scripts/nm-copr-build-nm-git-bundle.sh @@ -9,6 +9,17 @@ # # This script is also used by [1] to generate the SRPM. # [1] https://copr.fedorainfracloud.org/coprs/networkmanager/NetworkManager-main/package/nm-git-bundle/ +# +# The purpose is the following. We build (many) NetworkManager packages in copr. The +# build process runs a script (contrib/scripts/nm-copr-build.sh) that fetches the git +# repository (and we cannot just do a shallow copy -- only for the stupid reason +# that the automatic version number counts all the commits in the HEAD's history). +# NetworkManager's git repository is relatively large so fetching it over and over +# is wasteful. The idea is to have a recent git-bundle of the repository, which is +# hosted close-by in the copr infrastructure. So the build script first tries to +# download the bundle to get the bulk of the git history, before doing additional +# fetches from the upstream repository. +# From time to time, a new bundle has to be generated in copr. set -ex diff --git a/contrib/scripts/nm-copr-build.sh b/contrib/scripts/nm-copr-build.sh index 7b02df815d..718bb7f34f 100755 --- a/contrib/scripts/nm-copr-build.sh +++ b/contrib/scripts/nm-copr-build.sh @@ -36,7 +36,7 @@ get_nm_git_bundle() { if [ -n "${NM_GIT_BUNDLE+x}" ]; then return 0 fi - NM_GIT_BUNDLE='https://download.copr.fedorainfracloud.org/results/networkmanager/NetworkManager-main/fedora-34-x86_64/02112667-nm-git-bundle/nm-git-bundle-20210401-202836.noarch.rpm' + NM_GIT_BUNDLE='https://download.copr.fedorainfracloud.org/results/networkmanager/NetworkManager-main/fedora-34-x86_64/03130018-nm-git-bundle/nm-git-bundle-20220106-084022.noarch.rpm' fi mkdir nm-git-bundle pushd nm-git-bundle diff --git a/contrib/scripts/nm-in-container.sh b/contrib/scripts/nm-in-container.sh index 36608961eb..e4dda6d384 100755 --- a/contrib/scripts/nm-in-container.sh +++ b/contrib/scripts/nm-in-container.sh @@ -231,7 +231,6 @@ RUN dnf install -y \\ glib2-doc \\ gnutls-devel \\ gobject-introspection-devel \\ - grc \\ gtk-doc \\ intltool \\ iproute \\ @@ -271,8 +270,8 @@ RUN dnf install -y \\ systemd \\ systemd-devel \\ teamd-devel \\ + vala \\ vala-devel \\ - vala-tools \\ valgrind \\ vim \\ which diff --git a/examples/C/glib/add-connection-gdbus.c b/examples/C/glib/add-connection-gdbus.c index 6dc3b8d471..96006689ef 100644 --- a/examples/C/glib/add-connection-gdbus.c +++ b/examples/C/glib/add-connection-gdbus.c @@ -27,7 +27,7 @@ char * nm_utils_uuid_generate(void) { uuid_t uuid; - char * buf; + char *buf; buf = g_malloc0(37); uuid_generate_random(uuid); @@ -40,10 +40,10 @@ add_connection(GDBusProxy *proxy, const char *con_name) { GVariantBuilder connection_builder; GVariantBuilder setting_builder; - char * uuid; - const char * new_con_path; - GVariant * ret; - GError * error = NULL; + char *uuid; + const char *new_con_path; + GVariant *ret; + GError *error = NULL; /* Initialize connection GVariantBuilder */ g_variant_builder_init(&connection_builder, G_VARIANT_TYPE("a{sa{sv}}")); @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) { GDBusProxy *proxy; - GError * error = NULL; + GError *error = NULL; /* Create a D-Bus proxy; NM_DBUS_* defined in nm-dbus-interface.h */ proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c index 6e4cd6b8ae..a1b48003d7 100644 --- a/examples/C/glib/add-connection-libnm.c +++ b/examples/C/glib/add-connection-libnm.c @@ -19,9 +19,9 @@ static void added_cb(GObject *client, GAsyncResult *result, gpointer user_data) { - GMainLoop * loop = user_data; + GMainLoop *loop = user_data; NMRemoteConnection *remote; - GError * error = NULL; + 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. @@ -43,11 +43,11 @@ added_cb(GObject *client, GAsyncResult *result, gpointer user_data) static void add_connection(NMClient *client, GMainLoop *loop, const char *con_name) { - NMConnection * connection; + NMConnection *connection; NMSettingConnection *s_con; - NMSettingWired * s_wired; - NMSettingIP4Config * s_ip4; - char * uuid; + NMSettingWired *s_wired; + NMSettingIP4Config *s_ip4; + char *uuid; /* Create a new connection object */ connection = nm_simple_connection_new(); @@ -88,9 +88,9 @@ add_connection(NMClient *client, GMainLoop *loop, const char *con_name) int main(int argc, char *argv[]) { - NMClient * client; + NMClient *client; GMainLoop *loop; - GError * error = NULL; + GError *error = NULL; loop = g_main_loop_new(NULL, FALSE); diff --git a/examples/C/glib/get-active-connections-gdbus.c b/examples/C/glib/get-active-connections-gdbus.c index c07b0f15f7..8118d76982 100644 --- a/examples/C/glib/get-active-connections-gdbus.c +++ b/examples/C/glib/get-active-connections-gdbus.c @@ -25,9 +25,9 @@ static void print_setting(const char *setting_name, GVariant *setting) { GVariantIter iter; - const char * property_name; - GVariant * value; - char * printed_value; + const char *property_name; + GVariant *value; + char *printed_value; g_print(" %s:\n", setting_name); g_variant_iter_init(&iter, setting); @@ -43,14 +43,14 @@ print_setting(const char *setting_name, GVariant *setting) static void print_connection(const char *path) { - GDBusProxy * proxy; - GError * error = NULL; - GVariant * ret, *connection = NULL, *s_con = NULL; - const char * id, *type; + GDBusProxy *proxy; + GError *error = NULL; + GVariant *ret, *connection = NULL, *s_con = NULL; + const char *id, *type; gboolean found; GVariantIter iter; - const char * setting_name; - GVariant * setting; + const char *setting_name; + GVariant *setting; /* This function asks NetworkManager for the details of the connection */ @@ -125,9 +125,9 @@ static void get_active_connection_details(const char *obj_path) { GDBusProxy *props_proxy; - GVariant * ret = NULL, *path_value = NULL; + GVariant *ret = NULL, *path_value = NULL; const char *path = NULL; - GError * error = NULL; + GError *error = NULL; /* This function gets the backing Connection object that describes the * network configuration that the ActiveConnection object is actually using. @@ -185,9 +185,9 @@ out: static void get_active_connections(GDBusProxy *proxy) { - GError * error = NULL; + GError *error = NULL; GVariant *ret = NULL, *value = NULL; - char ** paths; + char **paths; int i; /* Get the ActiveConnections property from the NM Manager object */ diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c index 247ab8f191..6c0a4343d5 100644 --- a/examples/C/glib/get-ap-info-libnm.c +++ b/examples/C/glib/get-ap-info-libnm.c @@ -45,6 +45,14 @@ ap_wpa_rsn_flags_to_string(guint32 flags) flags_str[i++] = g_strdup("psk"); if (flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) flags_str[i++] = g_strdup("802.1X"); + if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) + flags_str[i++] = g_strdup("sae"); + if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE) + flags_str[i++] = g_strdup("owe"); + if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE_TM) + flags_str[i++] = g_strdup("owe_transition_mode"); + if (flags & NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192) + flags_str[i++] = g_strdup("wpa-eap-suite-b-192"); if (i == 0) flags_str[i++] = g_strdup("none"); @@ -65,11 +73,11 @@ show_access_point_info(NMAccessPoint *ap) { guint32 flags, wpa_flags, rsn_flags, freq, bitrate; guint8 strength; - GBytes * ssid; + GBytes *ssid; const char *hwaddr; NM80211Mode mode; - char * freq_str, *ssid_str, *bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str; - GString * security_str; + char *freq_str, *ssid_str, *bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str; + GString *security_str; /* Get AP properties */ flags = nm_access_point_get_flags(ap); @@ -103,11 +111,21 @@ show_access_point_info(NMAccessPoint *ap) g_string_append(security_str, "WEP "); if (wpa_flags != NM_802_11_AP_SEC_NONE) g_string_append(security_str, "WPA "); - if (rsn_flags != NM_802_11_AP_SEC_NONE) + if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK) + || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { g_string_append(security_str, "WPA2 "); + } + if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) { + g_string_append(security_str, "WPA3 "); + } + if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE) + || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) { + g_string_append(security_str, "OWE "); + } if ((wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) - || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) - g_string_append(security_str, "Enterprise "); + || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { + g_string_append(security_str, "802.1X "); + } if (security_str->len > 0) g_string_truncate(security_str, security_str->len - 1); /* Chop off last space */ @@ -138,13 +156,13 @@ show_access_point_info(NMAccessPoint *ap) static void show_wifi_device_info(NMDevice *device) { - NMAccessPoint * active_ap = NULL; + NMAccessPoint *active_ap = NULL; const GPtrArray *aps; - const char * iface; - const char * driver; + const char *iface; + const char *driver; guint32 speed; - GBytes * active_ssid; - char * active_ssid_str = NULL; + GBytes *active_ssid; + char *active_ssid_str = NULL; int i; /* Get active AP */ @@ -185,10 +203,10 @@ show_wifi_device_info(NMDevice *device) int main(int argc, char *argv[]) { - NMClient * client; + NMClient *client; const GPtrArray *devices; int i; - GError * error = NULL; + GError *error = NULL; /* Get NMClient object */ client = nm_client_new(NULL, &error); diff --git a/examples/C/glib/list-connections-gdbus.c b/examples/C/glib/list-connections-gdbus.c index babf6f14ae..19c4dbbf8f 100644 --- a/examples/C/glib/list-connections-gdbus.c +++ b/examples/C/glib/list-connections-gdbus.c @@ -21,9 +21,9 @@ static void list_connections(GDBusProxy *proxy) { int i; - GError * error = NULL; + GError *error = NULL; GVariant *ret; - char ** paths; + char **paths; /* Call ListConnections D-Bus method */ ret = g_dbus_proxy_call_sync(proxy, diff --git a/examples/C/glib/list-connections-libnm.c b/examples/C/glib/list-connections-libnm.c index 0cee2f7b24..03c147518c 100644 --- a/examples/C/glib/list-connections-libnm.c +++ b/examples/C/glib/list-connections-libnm.c @@ -24,9 +24,9 @@ show_connection(NMConnection *connection) { NMSettingConnection *s_con; guint64 timestamp; - char * timestamp_str; + char *timestamp_str; char timestamp_real_str[64]; - const char * val1, *val2, *val3, *val4, *val5; + const char *val1, *val2, *val3, *val4, *val5; s_con = nm_connection_get_setting_connection(connection); if (s_con) { @@ -55,8 +55,8 @@ show_connection(NMConnection *connection) int main(int argc, char *argv[]) { - NMClient * client; - GError * error = NULL; + NMClient *client; + GError *error = NULL; const GPtrArray *connections; int i; diff --git a/examples/C/glib/monitor-nm-running-gdbus.c b/examples/C/glib/monitor-nm-running-gdbus.c index 11eddce8b4..f25b2e8544 100644 --- a/examples/C/glib/monitor-nm-running-gdbus.c +++ b/examples/C/glib/monitor-nm-running-gdbus.c @@ -18,8 +18,8 @@ static void on_name_appeared(GDBusConnection *connection, - const char * name, - const char * name_owner, + const char *name, + const char *name_owner, gpointer user_data) { g_print("Name '%s' on the system bus is owned by %s => NM is running\n", name, name_owner); @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) { guint watcher_id; - GMainLoop * loop; + GMainLoop *loop; GBusNameWatcherFlags flags; g_print("Monitor 'org.freedesktop.NetworkManager' D-Bus name\n"); diff --git a/examples/C/glib/monitor-nm-state-gdbus.c b/examples/C/glib/monitor-nm-state-gdbus.c index 5e938f2ba4..927c966cc8 100644 --- a/examples/C/glib/monitor-nm-state-gdbus.c +++ b/examples/C/glib/monitor-nm-state-gdbus.c @@ -45,9 +45,9 @@ nm_state_to_string(NMState state) static void on_signal(GDBusProxy *proxy, - char * sender_name, - char * signal_name, - GVariant * parameters, + char *sender_name, + char *signal_name, + GVariant *parameters, gpointer user_data) { guint32 new_state; @@ -72,10 +72,10 @@ on_signal(GDBusProxy *proxy, int main(int argc, char *argv[]) { - GMainLoop * loop; - GError * error = NULL; + GMainLoop *loop; + GError *error = NULL; GDBusProxyFlags flags; - GDBusProxy * proxy; + GDBusProxy *proxy; /* Monitor 'StateChanged' signal on 'org.freedesktop.NetworkManager' interface */ g_print("Monitor NetworkManager's state\n"); diff --git a/examples/C/glib/vpn-import-libnm.c b/examples/C/glib/vpn-import-libnm.c index 55ed5175c1..61a33a761d 100644 --- a/examples/C/glib/vpn-import-libnm.c +++ b/examples/C/glib/vpn-import-libnm.c @@ -17,18 +17,18 @@ static NMConnection * vpn_connection_import(const char *filename) { NMConnection *conn = NULL; - GSList * plugins; - GSList * iter; + GSList *plugins; + GSList *iter; g_print("Try to import file \"%s\"...\n", filename); plugins = nm_vpn_plugin_info_list_load(); for (iter = plugins; iter; iter = iter->next) { - GError * error = NULL; - NMVpnPluginInfo * plugin = iter->data; + GError *error = NULL; + NMVpnPluginInfo *plugin = iter->data; NMVpnEditorPlugin *editor; - const char * plugin_name = nm_vpn_plugin_info_get_name(plugin); + const char *plugin_name = nm_vpn_plugin_info_get_name(plugin); g_print("plugin[%s]: trying import...\n", plugin_name); @@ -72,8 +72,8 @@ vpn_connection_import(const char *filename) /*****************************************************************************/ typedef struct { - GMainLoop * loop; - GError * error; + GMainLoop *loop; + GError *error; NMRemoteConnection *rconn; } RequestData; @@ -89,8 +89,8 @@ add_cb(GObject *source, GAsyncResult *result, gpointer user_data) static NMRemoteConnection * connection_add(NMConnection *conn) { - GError * error = NULL; - NMClient * client; + GError *error = NULL; + NMClient *client; RequestData rdata; g_print("Adding connection \"%s\" (%s)\n", @@ -137,8 +137,8 @@ int main(int argc, char **argv) { NMRemoteConnection *rconn; - NMConnection * conn; - const char * filename; + NMConnection *conn; + const char *filename; gboolean success; if (argc < 2) { diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 617b94bdf7..c1afaad050 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -254,22 +254,25 @@ no-auto-default=* configure-and-quit - When set to 'true', NetworkManager quits after - performing initial network configuration but spawns small helpers - to preserve DHCP leases and IPv6 addresses. This is useful in - environments where network setup is more or less static or it is - desirable to save process time but still handle some dynamic - configurations. When this option is true, - network configuration for Wi-Fi, WWAN, Bluetooth, ADSL, and PPPoE - interfaces cannot be preserved due to their use of external - services, and these devices will be deconfigured when NetworkManager - quits even though other interface's configuration may be preserved. - Also, to preserve DHCP addresses the 'dhcp' option - must be set to 'internal'. The default value of - the 'configure-and-quit' option is - 'false', meaning that NetworkManager will continue - running after initial network configuration and continue responding - to system and hardware events, D-Bus requests, and user commands. + This option is no longer useful to configure in NetworkManager.conf file. + It can however also be configured on the command line with the same + values, where it has some use. + + + When set to 'initrd', NetworkManager does not connect + to D-Bus and quits after configuring the network. This is an implementation + detail how the NetworkManager module of dracut can run NetworkManager. + An alternative to this is having NetworkManager as a systemd service + with D-Bus in initrd. + + + The value 'true' is unsupported since version 1.36. + Previously this was a mode where NetworkManager would quit after configuring + the network and run helper processes for DHCP and SLAAC. + + + Otherwise, NetworkManager runs a system service with D-Bus and does not + quit during normal operation. @@ -1234,6 +1237,7 @@ managed=1 Specify the Wi-Fi backend used for the device. Currently, supported are wpa_supplicant and iwd (experimental). + If unspecified, the default is "&NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT;". diff --git a/man/common.ent.in b/man/common.ent.in index 9632b4efba..ae792f2529 100644 --- a/man/common.ent.in +++ b/man/common.ent.in @@ -8,3 +8,4 @@ + diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml index 503700fa80..f11be1f64b 100644 --- a/man/nm-initrd-generator.xml +++ b/man/nm-initrd-generator.xml @@ -74,6 +74,21 @@ + + + + + + + path + + + + Persistent connection directory. If it exists, rd.neednet will not + cause a default connection to be generated in absence of other options. + + + diff --git a/meson.build b/meson.build index a02e43f959..48788275fe 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( # - add corresponding NM_VERSION_x_y_z macros in # "src/libnm-core-public/nm-version-macros.h.in" # - update number in configure.ac - version: '1.34.0', + version: '1.35.5', license: 'GPL2+', default_options: [ 'buildtype=debugoptimized', @@ -389,6 +389,14 @@ if config_logging_backend_default == 'default' endif config_h.set_quoted('NM_CONFIG_DEFAULT_LOGGING_BACKEND', config_logging_backend_default) +config_wifi_backend_default = get_option('config_wifi_backend_default') +if config_wifi_backend_default == 'default' + config_wifi_backend_default = 'wpa_supplicant' +elif config_wifi_backend_default == 'iwd' + assert(enable_iwd, 'Setting the default Wi-Fi backend to iwd requires iwd support.') +endif +config_h.set_quoted('NM_CONFIG_DEFAULT_WIFI_BACKEND', config_wifi_backend_default) + session_tracking = get_option('session_tracking') session_trackers = [] @@ -890,6 +898,7 @@ data_conf.set('NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT', config_logging_backend_ data_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_auth_polkit_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default) data_conf.set('NM_CONFIG_DEFAULT_MAIN_RC_MANAGER', config_dns_rc_manager_default) +data_conf.set('NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT', config_wifi_backend_default) data_conf.set('NM_MAJOR_VERSION', nm_major_version) data_conf.set('NM_MICRO_VERSION', nm_micro_version) data_conf.set('NM_MINOR_VERSION', nm_minor_version) diff --git a/meson_options.txt b/meson_options.txt index 76a131ad05..cfebe44619 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -21,6 +21,7 @@ option('polkit_agent_helper_1', type: 'string', value: '', description: 'Path na option('selinux', type: 'boolean', value: true, description: 'Build with SELinux') option('systemd_journal', type: 'boolean', value: true, description: 'Use systemd journal for logging') option('config_logging_backend_default', type: 'combo', choices: ['default', 'syslog', 'journal'], value: 'default', description: 'Default value for logging.backend') +option('config_wifi_backend_default', type: 'combo', choices: ['default', 'wpa_supplicant', 'iwd'], value: 'default', description: 'Default value for wifi.backend') option('hostname_persist', type: 'combo', choices: ['default', 'suse', 'gentoo', 'slackware'], value: 'default', description: 'Hostname persist method') option('libaudit', type: 'combo', choices: ['yes', 'yes-disabled-by-default', 'no'], value: 'yes', description: 'Build with audit daemon support. yes-disabled-by-default enables support, but disables it unless explicitly configured via NetworkManager.conf') diff --git a/po/POTFILES.in b/po/POTFILES.in index 0cd24d9940..76d20094d0 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -33,7 +33,6 @@ src/core/dns/nm-dns-manager.c src/core/main-utils.c src/core/main.c src/core/nm-config.c -src/core/nm-iface-helper.c src/core/nm-manager.c src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c diff --git a/po/ar.po b/po/ar.po index 756da6e8e2..29b8db55a0 100644 --- a/po/ar.po +++ b/po/ar.po @@ -9411,7 +9411,7 @@ msgid "Error: 'connection show': %s" msgstr "خطأ أثناء فتح اتصال VPN '%s'" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/as.po b/po/as.po index a23b1d649a..b94c2e3679 100644 --- a/po/as.po +++ b/po/as.po @@ -9859,7 +9859,7 @@ msgid "Error: 'connection show': %s" msgstr "ত্ৰুটি: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "সক্ৰিয় সংযোগৰ বিৱৰণ" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/be@latin.po b/po/be@latin.po index 65a234efcf..c414dabb93 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -9323,7 +9323,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/bg.po b/po/bg.po index 242592e70f..4eb2f42da0 100644 --- a/po/bg.po +++ b/po/bg.po @@ -9571,7 +9571,7 @@ msgstr "Грешка при „con list“ — %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Активни връзки" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/bn_IN.po b/po/bn_IN.po index d1006a04e7..17316073e6 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -9888,7 +9888,7 @@ msgid "Error: 'connection show': %s" msgstr "ত্রুটি: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "সংযোগের বিবরণ সক্রিয় করুন" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/bs.po b/po/bs.po index 3e7bff2632..8f91e1b9f4 100644 --- a/po/bs.po +++ b/po/bs.po @@ -9384,7 +9384,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ca.po b/po/ca.po index 617c42ccef..e676ac5326 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10019,7 +10019,7 @@ msgid "Error: 'connection show': %s" msgstr "Error: «connection show»: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Detalls de l'activació de la connexió" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/cs.po b/po/cs.po index fd4db16db3..60432bb34c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9512,7 +9512,7 @@ msgstr "Chyba: „con list“: %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktivní připojení" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/da.po b/po/da.po index 7d69b0d962..19aec9b817 100644 --- a/po/da.po +++ b/po/da.po @@ -9865,7 +9865,7 @@ msgid "Error: 'connection show': %s" msgstr "Fejl: “connection show”: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Detaljer for aktiv forbindelse" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/de.po b/po/de.po index 8b8a7aa435..777f563d18 100644 --- a/po/de.po +++ b/po/de.po @@ -11468,7 +11468,7 @@ msgid "Error: 'connection show': %s" msgstr "Fehler: »connection show«: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Verbindungsdetails aktivieren" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/dz.po b/po/dz.po index 106eb57f5c..3b206d2c63 100644 --- a/po/dz.po +++ b/po/dz.po @@ -9445,7 +9445,7 @@ msgid "Error: 'connection show': %s" msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་'%s'སླར་འདྲེན་འབདཝ་ད་འཛོལ་བ་" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/el.po b/po/el.po index e97780eabb..8ec457941a 100644 --- a/po/el.po +++ b/po/el.po @@ -9943,7 +9943,7 @@ msgid "Error: 'connection show': %s" msgstr "Σφάλμα: 'εμφάνιση σύνδεσης': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Ενεργοποίηση λεπτομερειών σύνδεσης" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/en_CA.po b/po/en_CA.po index 6d5f570e9f..5e8ae0f20f 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -9548,7 +9548,7 @@ msgstr "VPN connection to '%s'" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "No active connections!" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/en_GB.po b/po/en_GB.po index 87fb3a2a14..cce756bb9b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -9558,7 +9558,7 @@ msgstr "Error: 'con list': %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Active connection details" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/eo.po b/po/eo.po index 72e8e41b66..d3e3e93c89 100644 --- a/po/eo.po +++ b/po/eo.po @@ -9436,7 +9436,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktivigi detalojn de konekto" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/es.po b/po/es.po index a09570f744..cce25b03f3 100644 --- a/po/es.po +++ b/po/es.po @@ -11374,7 +11374,7 @@ msgstr "Error: «connection show»: %s" # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Activar detalles de conexión" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/et.po b/po/et.po index dcad290cee..2a7942df82 100644 --- a/po/et.po +++ b/po/et.po @@ -9364,7 +9364,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/eu.po b/po/eu.po index 5e6e6dd590..594453f057 100644 --- a/po/eu.po +++ b/po/eu.po @@ -9523,7 +9523,7 @@ msgstr "Errorea: konexio ezezaguna: %s." #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Konexio aktiboak" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/fi.po b/po/fi.po index 477ab68a06..4639bbd304 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9509,7 +9509,7 @@ msgstr "Virhe: tuntematon yhteys: %s." #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktiiviset yhteydet" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/fr.po b/po/fr.po index 2c9e973f0c..73c2fff52a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11642,7 +11642,7 @@ msgid "Error: 'connection show': %s" msgstr "Erreur : « connection show » : %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Informations d'activation de connexion" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/gd.po b/po/gd.po index d1d80cb421..fdf7314812 100644 --- a/po/gd.po +++ b/po/gd.po @@ -9579,7 +9579,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/gl.po b/po/gl.po index be1506498e..88c96ef987 100644 --- a/po/gl.po +++ b/po/gl.po @@ -9619,7 +9619,7 @@ msgid "Error: 'connection show': %s" msgstr "Erro: 'con list': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Activar detalles da conexión" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/gu.po b/po/gu.po index 4aa922072f..a5f01d2822 100644 --- a/po/gu.po +++ b/po/gu.po @@ -9824,7 +9824,7 @@ msgid "Error: 'connection show': %s" msgstr "ભૂલ: 'જોડાણ બતાવો': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "જોડાણ વિગતો સક્રિય કરો" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/he.po b/po/he.po index 7f064b0262..949c51ca2d 100644 --- a/po/he.po +++ b/po/he.po @@ -9320,7 +9320,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/hi.po b/po/hi.po index 39149dc423..3c54873120 100644 --- a/po/hi.po +++ b/po/hi.po @@ -9840,7 +9840,7 @@ msgid "Error: 'connection show': %s" msgstr "त्रुटि: 'कनेक्शन शो': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "सक्रिय कनेक्शन विवरण" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/hr.po b/po/hr.po index 8720f50fa5..e16267ce56 100644 --- a/po/hr.po +++ b/po/hr.po @@ -9529,7 +9529,7 @@ msgstr "Greška: 'con list': %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktivne veze" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/hu.po b/po/hu.po index 8ac1f85998..c76800e6ce 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9599,7 +9599,7 @@ msgstr "Hiba: „device show”: %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktív kapcsolat részletei" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/id.po b/po/id.po index 6cddcd61ee..59129a294d 100644 --- a/po/id.po +++ b/po/id.po @@ -11238,7 +11238,7 @@ msgid "Error: 'connection show': %s" msgstr "Galat: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktifkan rincian koneksi" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/it.po b/po/it.po index 6dfe8cdccb..f993fd47b8 100644 --- a/po/it.po +++ b/po/it.po @@ -11319,7 +11319,7 @@ msgid "Error: 'connection show': %s" msgstr "Errore: «connection show»: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Attiva dettagli connessione" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ja.po b/po/ja.po index 196293ac76..39c742daef 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11231,7 +11231,7 @@ msgid "Error: 'connection show': %s" msgstr "エラー: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "アクティブな接続の詳細" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ka.po b/po/ka.po index 86e5c96cae..880606d216 100644 --- a/po/ka.po +++ b/po/ka.po @@ -9481,7 +9481,7 @@ msgstr "შეერთებულია VPN-ქსელთან '%s'" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "არავითარი აქტიური შეერთება!" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/kn.po b/po/kn.po index 792f8b8533..d7a43ad09f 100644 --- a/po/kn.po +++ b/po/kn.po @@ -9841,7 +9841,7 @@ msgid "Error: 'connection show': %s" msgstr "ದೋಷ: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "ಸಂಪರ್ಕಗಳ ವಿವರಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ko.po b/po/ko.po index 73fbfbdb9a..e5f5c6f810 100644 --- a/po/ko.po +++ b/po/ko.po @@ -11036,7 +11036,7 @@ msgid "Error: 'connection show': %s" msgstr "오류: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "연결 세부 정보 활성화" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ku.po b/po/ku.po index d9c3804db3..d5e82305e1 100644 --- a/po/ku.po +++ b/po/ku.po @@ -9471,7 +9471,7 @@ msgstr "" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Girêdanên çalak tune!" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/lt.po b/po/lt.po index 517ed50ecc..e6d4a28ab3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9661,7 +9661,7 @@ msgstr "Klaida: „connection show“: %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktyvaus ryšio detalės" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/lv.po b/po/lv.po index 158c57bc49..54c1a23f65 100644 --- a/po/lv.po +++ b/po/lv.po @@ -9479,7 +9479,7 @@ msgstr "VPN pieslēgums pie '%s'" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Nav aktīvu sakaru!" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/mk.po b/po/mk.po index 3882663b9b..657a70eff1 100644 --- a/po/mk.po +++ b/po/mk.po @@ -9327,7 +9327,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ml.po b/po/ml.po index f82ffe2522..177ea7cdb4 100644 --- a/po/ml.po +++ b/po/ml.po @@ -9778,7 +9778,7 @@ msgstr "പിശക്: 'device show': %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "സജീവമായ കണക്ഷന്‍ വിശദാംശങ്ങള്‍" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/mr.po b/po/mr.po index ea2aaffb5b..99c7f25816 100644 --- a/po/mr.po +++ b/po/mr.po @@ -9797,7 +9797,7 @@ msgid "Error: 'connection show': %s" msgstr "त्रुटी: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "जोडणी तपशील सक्रीय करा" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/nb.po b/po/nb.po index d9f9d3123c..51340dd5ab 100644 --- a/po/nb.po +++ b/po/nb.po @@ -9339,7 +9339,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ne.po b/po/ne.po index b0fee386fa..ec284f9561 100644 --- a/po/ne.po +++ b/po/ne.po @@ -9406,7 +9406,7 @@ msgid "Error: 'connection show': %s" msgstr "भीपीएन जडान पुन: प्राप्ति गर्दा त्रुटि '%s'" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/nl.po b/po/nl.po index 08d06b7515..b103bf60fc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9377,7 +9377,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/oc.po b/po/oc.po index e6b8650233..521a2ae300 100644 --- a/po/oc.po +++ b/po/oc.po @@ -9620,7 +9620,7 @@ msgid "Error: 'connection show': %s" msgstr "Error : « conneccion show » : %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Informacions d'activacion de connexion" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/or.po b/po/or.po index d1346370d2..b42101b8f6 100644 --- a/po/or.po +++ b/po/or.po @@ -9760,7 +9760,7 @@ msgstr "ତ୍ରୁଟି: 'ଉପକରଣ ଦୃଶ୍ୟ': %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "ସକ୍ରିୟ ସଂଯୋଗ ବିବରଣୀ" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/pa.po b/po/pa.po index 07ab8e2b4b..bad0004e4b 100644 --- a/po/pa.po +++ b/po/pa.po @@ -9600,7 +9600,7 @@ msgid "Error: 'connection show': %s" msgstr "ਗਲਤੀ: 'device show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "ਸਰਗਰਮ ਕਨੈਕਸ਼ਨ ਵੇਰਵੇ" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/pl.po b/po/pl.po index beb27e3aae..1637564f16 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10011,7 +10011,7 @@ msgid "Error: 'connection show': %s" msgstr "Błąd: „connection show”: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Szczegóły aktywowania połączenia" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/pt.po b/po/pt.po index 4dce7e618c..3c3479ccd5 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9441,7 +9441,7 @@ msgid "Error: 'connection show': %s" msgstr "Erro ao obter a ligação VPN '%s'" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/pt_BR.po b/po/pt_BR.po index db5c7f9b8a..987f82af1f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11333,7 +11333,7 @@ msgid "Error: 'connection show': %s" msgstr "Erro: “connection show”: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Ativar detalhes da conexão" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ru.po b/po/ru.po index 4087b269fd..b38f537f40 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11590,7 +11590,7 @@ msgid "Error: 'connection show': %s" msgstr "Ошибка «connection show»: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Сведения об активации соединения" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/rw.po b/po/rw.po index 272d097bdb..c518e88eb8 100644 --- a/po/rw.po +++ b/po/rw.po @@ -9490,7 +9490,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/sk.po b/po/sk.po index 4042e5caeb..19179babdd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -9471,7 +9471,7 @@ msgstr "VPN spojenie s '%s'" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Bez aktívnych sieťových spojení!" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/sl.po b/po/sl.po index c02650bd44..fccc508d9d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -9557,7 +9557,7 @@ msgstr "Napaka: 'con list': %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Podrobnosti dejavne povezave" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/sq.po b/po/sq.po index 279b75d5a8..9bb4b970d3 100644 --- a/po/sq.po +++ b/po/sq.po @@ -9380,7 +9380,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/sr.po b/po/sr.po index 81b649bf66..599b5d30cb 100644 --- a/po/sr.po +++ b/po/sr.po @@ -9595,7 +9595,7 @@ msgstr "Грешка: „con list“: %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Активне везе" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/sr@latin.po b/po/sr@latin.po index 2c33b60275..6fe4fb7120 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -9599,7 +9599,7 @@ msgstr "Greška: „con list“: %s" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktivne veze" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/sv.po b/po/sv.po index 922397e9be..aa6215ed61 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10986,7 +10986,7 @@ msgid "Error: 'connection show': %s" msgstr "Fel: ”connection show”: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Aktivera anslutningsdetaljer" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/ta.po b/po/ta.po index 874072783e..f6a919f67e 100644 --- a/po/ta.po +++ b/po/ta.po @@ -9858,7 +9858,7 @@ msgid "Error: 'connection show': %s" msgstr "பிழை: 'connection show': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "இணைப்பு விவரங்களை செயல்படுத்து" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/te.po b/po/te.po index 72ee9a34f1..74653c3a60 100644 --- a/po/te.po +++ b/po/te.po @@ -9796,7 +9796,7 @@ msgid "Error: 'connection show': %s" msgstr "దోషం: 'అనుసంధానం చూపు': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "క్రియాశీల అనుసంధానము వివరాలు" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/th.po b/po/th.po index c09ce0611d..724217776d 100644 --- a/po/th.po +++ b/po/th.po @@ -9482,7 +9482,7 @@ msgstr "เชื่อมต่อ VPN ไปยัง '%s'" #: ../src/nmcli/connections.c:1497 #, fuzzy -msgid "Activate connection details" +msgid "Active connection details" msgstr "ไม่มีการเชื่อมต่อที่ใช้งานอยู่!" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/tr.po b/po/tr.po index 293bd8c5f3..8b4a767fe8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -9896,7 +9896,7 @@ msgid "Error: 'connection show': %s" msgstr "Hata: 'bağlantıyı göster': %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Bağlantı ayrıntılarını etkinleştir" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/uk.po b/po/uk.po index 4b55b47f32..4cdea05713 100644 --- a/po/uk.po +++ b/po/uk.po @@ -11643,7 +11643,7 @@ msgid "Error: 'connection show': %s" msgstr "Помилка: «connection show»: %s" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "Активувати параметри з'єднання" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/vi.po b/po/vi.po index fc8470ca15..e1fdb660a7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -9355,7 +9355,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/wa.po b/po/wa.po index e253312ba3..0576412736 100644 --- a/po/wa.po +++ b/po/wa.po @@ -9452,7 +9452,7 @@ msgid "Error: 'connection show': %s" msgstr "" #: ../src/nmcli/connections.c:1497 -msgid "Activate connection details" +msgid "Active connection details" msgstr "" #: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610 diff --git a/po/zh_CN.po b/po/zh_CN.po index 67873f138a..be6a002d5e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,23 +11,25 @@ # shijing , 2016. # Mingye Wang (Arthur2e5) , 2016. # Mingcong Bai , 2017. -# Dingzhong Chen , 2016, 2017, 2018. # ljanda , 2019. #zanata # tfu , 2019. #zanata +# Dingzhong Chen , 2016-2021. +# msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-06-01 17:17+0200\n" -"PO-Revision-Date: 2019-08-15 12:20+0000\n" -"Last-Translator: tfu \n" -"Language-Team: Chinese (China) \n" -"Language: zh_Hans\n" +"Project-Id-Version: NetworkManager main\n" +"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/NetworkManager/" +"NetworkManager/issues\n" +"POT-Creation-Date: 2021-11-07 03:29+0000\n" +"PO-Revision-Date: 2021-11-09 20:06+0800\n" +"Last-Translator: Dingzhong Chen \n" +"Language-Team: Chinese - China \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Zanata 4.6.2\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Gtranslator 40.0\n" #: ../data/org.freedesktop.NetworkManager.policy.in.in.h:1 msgid "Enable or disable system networking" @@ -175,18 +177,18 @@ msgstr "系统策略阻止启用或禁用连接性检查" #. * as "Wired Connection" or "VPN Connection". The %d is a number #. * that is combined with the first argument to create a unique #. * connection id. -#: ../src/core/NetworkManagerUtils.c:113 +#: ../src/core/NetworkManagerUtils.c:111 #, c-format msgctxt "connection id fallback" msgid "%s %u" msgstr "%s %u" #: ../src/core/devices/adsl/nm-device-adsl.c:117 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:8080 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:7971 msgid "ADSL connection" msgstr "ADSL 连接" -#: ../src/core/devices/bluetooth/nm-bluez-manager.c:1327 +#: ../src/core/devices/bluetooth/nm-bluez-manager.c:1325 #, c-format msgid "%s Network" msgstr "%s 网络" @@ -250,22 +252,22 @@ msgstr "虚拟连接" msgid "Wired connection %d" msgstr "有线连接 %d" -#: ../src/core/devices/nm-device-ethernet.c:1614 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:8117 -#, fuzzy +#: ../src/core/devices/nm-device-ethernet.c:1613 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:8008 +#| msgid "VPN connection" msgid "Veth connection" -msgstr "VPN 连接" +msgstr "Veth 连接" -#: ../src/core/devices/nm-device-ethernet.c:1680 +#: ../src/core/devices/nm-device-ethernet.c:1679 msgid "PPPoE connection" msgstr "PPPoE 连接" -#: ../src/core/devices/nm-device-ethernet.c:1680 +#: ../src/core/devices/nm-device-ethernet.c:1679 msgid "Wired connection" msgstr "有线连接" #: ../src/core/devices/nm-device-infiniband.c:161 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:8093 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:7984 msgid "InfiniBand connection" msgstr "InfiniBand 连接" @@ -282,17 +284,17 @@ msgid "TUN connection" msgstr "TUN 连接" #: ../src/core/devices/nm-device-vlan.c:401 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:8118 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:8009 msgid "VLAN connection" msgstr "VLAN 连接" #: ../src/core/devices/nm-device-vrf.c:181 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:8120 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:8011 msgid "VRF connection" msgstr "VRF 连接" #: ../src/core/devices/nm-device-vxlan.c:382 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:8121 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:8012 msgid "VXLAN connection" msgstr "VXLAN 连接" @@ -305,159 +307,159 @@ msgid "Team connection" msgstr "组合连接" #: ../src/core/devices/wifi/nm-device-olpc-mesh.c:115 -#: ../src/nmcli/devices.c:1352 +#: ../src/nmcli/devices.c:1338 msgid "Mesh" msgstr "Mesh" -#: ../src/core/devices/wifi/nm-wifi-utils.c:32 +#: ../src/core/devices/wifi/nm-wifi-utils.c:31 #, c-format msgid "%s is incompatible with static WEP keys" msgstr "%s 不兼容静态 WEP 密钥" -#: ../src/core/devices/wifi/nm-wifi-utils.c:67 +#: ../src/core/devices/wifi/nm-wifi-utils.c:66 msgid "LEAP authentication requires a LEAP username" msgstr "LEAP 验证要求 LEAP 用户名" -#: ../src/core/devices/wifi/nm-wifi-utils.c:79 +#: ../src/core/devices/wifi/nm-wifi-utils.c:78 msgid "LEAP username requires 'leap' authentication" msgstr "LEAP 用户名要求 \"leap\" 验证" -#: ../src/core/devices/wifi/nm-wifi-utils.c:94 +#: ../src/core/devices/wifi/nm-wifi-utils.c:93 msgid "LEAP authentication requires IEEE 802.1x key management" msgstr "LEAP 验证要求 IEEE 802.1x 密钥管理" -#: ../src/core/devices/wifi/nm-wifi-utils.c:116 +#: ../src/core/devices/wifi/nm-wifi-utils.c:115 msgid "LEAP authentication is incompatible with Ad-Hoc mode" msgstr "LEAP 验证和 Ad-Hoc 模式不兼容" -#: ../src/core/devices/wifi/nm-wifi-utils.c:128 +#: ../src/core/devices/wifi/nm-wifi-utils.c:127 msgid "LEAP authentication is incompatible with 802.1x setting" msgstr "LEAP 验证和 802.1x 设置不兼容" -#: ../src/core/devices/wifi/nm-wifi-utils.c:148 +#: ../src/core/devices/wifi/nm-wifi-utils.c:147 #, c-format msgid "a connection using '%s' authentication cannot use WPA key management" msgstr "使用 \"%s\" 验证的连接无法使用 WPA 密钥管理" -#: ../src/core/devices/wifi/nm-wifi-utils.c:161 +#: ../src/core/devices/wifi/nm-wifi-utils.c:160 #, c-format msgid "a connection using '%s' authentication cannot specify WPA protocols" msgstr "使用 \"%s\" 验证的连接无法指定 WPA 协议" -#: ../src/core/devices/wifi/nm-wifi-utils.c:179 -#: ../src/core/devices/wifi/nm-wifi-utils.c:198 +#: ../src/core/devices/wifi/nm-wifi-utils.c:178 +#: ../src/core/devices/wifi/nm-wifi-utils.c:197 #, c-format msgid "a connection using '%s' authentication cannot specify WPA ciphers" msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密文" -#: ../src/core/devices/wifi/nm-wifi-utils.c:212 +#: ../src/core/devices/wifi/nm-wifi-utils.c:211 #, c-format msgid "a connection using '%s' authentication cannot specify a WPA password" msgstr "使用 \"%s\" 验证的连接无法指定 WPA 密码" -#: ../src/core/devices/wifi/nm-wifi-utils.c:245 +#: ../src/core/devices/wifi/nm-wifi-utils.c:244 msgid "Dynamic WEP requires an 802.1x setting" msgstr "动态 WEP 要求 802.1x 设置" -#: ../src/core/devices/wifi/nm-wifi-utils.c:255 -#: ../src/core/devices/wifi/nm-wifi-utils.c:287 +#: ../src/core/devices/wifi/nm-wifi-utils.c:254 +#: ../src/core/devices/wifi/nm-wifi-utils.c:286 msgid "Dynamic WEP requires 'open' authentication" msgstr "动态 WEP 要求 \"open\" 验证" -#: ../src/core/devices/wifi/nm-wifi-utils.c:272 +#: ../src/core/devices/wifi/nm-wifi-utils.c:271 msgid "Dynamic WEP requires 'ieee8021x' key management" msgstr "动态 WEP 要求 \"ieee8021x\" 密钥管理" -#: ../src/core/devices/wifi/nm-wifi-utils.c:323 +#: ../src/core/devices/wifi/nm-wifi-utils.c:322 msgid "WPA-PSK authentication is incompatible with 802.1x" msgstr "WPA-PSK 验证和 802.1x 兼容" -#: ../src/core/devices/wifi/nm-wifi-utils.c:333 +#: ../src/core/devices/wifi/nm-wifi-utils.c:332 msgid "WPA-PSK requires 'open' authentication" msgstr "WPA-PSK 要求 \"open\" 验证" -#: ../src/core/devices/wifi/nm-wifi-utils.c:347 +#: ../src/core/devices/wifi/nm-wifi-utils.c:346 msgid "Access point does not support PSK but setting requires it" msgstr "接入点不支持 PSK 但设置要求它" -#: ../src/core/devices/wifi/nm-wifi-utils.c:362 +#: ../src/core/devices/wifi/nm-wifi-utils.c:361 msgid "WPA Ad-Hoc authentication requires 'rsn' protocol" -msgstr "WPA Ad-Hoc 身份验证需要 “rsn” 协议" +msgstr "WPA Ad-Hoc 身份验证需要 \"rsn\" 协议" -#: ../src/core/devices/wifi/nm-wifi-utils.c:375 +#: ../src/core/devices/wifi/nm-wifi-utils.c:374 msgid "WPA Ad-Hoc authentication requires 'ccmp' pairwise cipher" -msgstr "WPA Ad-Hoc 身份验证需要 'ccmp' 成对密码" +msgstr "WPA Ad-Hoc 身份验证需要 \"ccmp\" 成对密码" -#: ../src/core/devices/wifi/nm-wifi-utils.c:388 +#: ../src/core/devices/wifi/nm-wifi-utils.c:387 msgid "WPA Ad-Hoc requires 'ccmp' group cipher" -msgstr "WPA Ad-Hoc 需要 “ccmp” 组密码" +msgstr "WPA Ad-Hoc 需要 \"ccmp\" 组密码" -#: ../src/core/devices/wifi/nm-wifi-utils.c:419 +#: ../src/core/devices/wifi/nm-wifi-utils.c:418 msgid "WPA-EAP authentication requires an 802.1x setting" msgstr "WPA-EAP 验证要求 802.1x 设置" -#: ../src/core/devices/wifi/nm-wifi-utils.c:429 +#: ../src/core/devices/wifi/nm-wifi-utils.c:428 msgid "WPA-EAP requires 'open' authentication" msgstr "WPA-EAP 要求 \"open\" 验证" -#: ../src/core/devices/wifi/nm-wifi-utils.c:442 +#: ../src/core/devices/wifi/nm-wifi-utils.c:441 msgid "802.1x setting requires 'wpa-eap' key management" msgstr "802.1x 设置要求 \"wpa-eap\" 密钥管理" -#: ../src/core/devices/wifi/nm-wifi-utils.c:456 +#: ../src/core/devices/wifi/nm-wifi-utils.c:455 msgid "Access point does not support 802.1x but setting requires it" msgstr "接入点不支持 802.1x 但设置要求它" -#: ../src/core/devices/wifi/nm-wifi-utils.c:486 +#: ../src/core/devices/wifi/nm-wifi-utils.c:485 msgid "Ad-Hoc mode requires 'none' or 'wpa-psk' key management" -msgstr "Ad-Hoc 模式需要 'none' 或 'wpa-psk' 密钥管理" +msgstr "Ad-Hoc 模式需要 \"none\" 或 \"wpa-psk\" 密钥管理" -#: ../src/core/devices/wifi/nm-wifi-utils.c:498 +#: ../src/core/devices/wifi/nm-wifi-utils.c:497 msgid "Ad-Hoc mode is incompatible with 802.1x security" msgstr "Ad-Hoc 模式和 802.1x 安全性不兼容" -#: ../src/core/devices/wifi/nm-wifi-utils.c:507 +#: ../src/core/devices/wifi/nm-wifi-utils.c:506 msgid "Ad-Hoc mode is incompatible with LEAP security" msgstr "Ad-Hoc 模式和 LEAP 安全性不兼容" -#: ../src/core/devices/wifi/nm-wifi-utils.c:519 +#: ../src/core/devices/wifi/nm-wifi-utils.c:518 msgid "Ad-Hoc mode requires 'open' authentication" msgstr "Ad-Hoc 模式要求 \"open\" 验证" -#: ../src/core/devices/wifi/nm-wifi-utils.c:563 -#: ../src/core/devices/wifi/nm-wifi-utils.c:598 +#: ../src/core/devices/wifi/nm-wifi-utils.c:562 +#: ../src/core/devices/wifi/nm-wifi-utils.c:597 #, c-format msgid "connection does not match access point" msgstr "连接和接入点不匹配" -#: ../src/core/devices/wifi/nm-wifi-utils.c:652 +#: ../src/core/devices/wifi/nm-wifi-utils.c:651 #, c-format msgid "connection does not match mesh point" msgstr "连接与 mesh 点不匹配" -#: ../src/core/devices/wifi/nm-wifi-utils.c:671 +#: ../src/core/devices/wifi/nm-wifi-utils.c:670 msgid "Access point is unencrypted but setting specifies security" msgstr "接入点未加密但设置指定了安全性" -#: ../src/core/devices/wifi/nm-wifi-utils.c:762 +#: ../src/core/devices/wifi/nm-wifi-utils.c:761 msgid "" "WPA authentication is incompatible with non-EAP (original) LEAP or Dynamic " "WEP" msgstr "WPA 验证和非 EAP（原始的）LEAP 或动态 WEP 不兼容" -#: ../src/core/devices/wifi/nm-wifi-utils.c:775 +#: ../src/core/devices/wifi/nm-wifi-utils.c:774 msgid "WPA authentication is incompatible with Shared Key authentication" msgstr "WPA 验证和共享密钥（Shared Key）验证不兼容" -#: ../src/core/devices/wifi/nm-wifi-utils.c:866 +#: ../src/core/devices/wifi/nm-wifi-utils.c:857 msgid "Failed to determine AP security information" msgstr "确定 AP 安全信息失败" -#: ../src/core/dhcp/nm-dhcp-dhclient-utils.c:317 +#: ../src/core/dhcp/nm-dhcp-dhclient-utils.c:316 msgid "# Created by NetworkManager\n" msgstr "# 由 NetworkManger 创建\n" -#: ../src/core/dhcp/nm-dhcp-dhclient-utils.c:330 +#: ../src/core/dhcp/nm-dhcp-dhclient-utils.c:329 #, c-format msgid "" "# Merged from %s\n" @@ -496,48 +498,48 @@ msgstr "%s 已在运行中（pid %ld）\n" msgid "You must be root to run %s!\n" msgstr "运行 %s 必须是根用户！\n" -#: ../src/core/main-utils.c:284 ../src/core/main.c:375 +#: ../src/core/main-utils.c:284 ../src/core/main.c:374 #: ../src/core/nm-iface-helper.c:585 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s。请使用 --help 查看有效选项列表。\n" -#: ../src/core/main.c:164 ../src/core/main.c:385 +#: ../src/core/main.c:163 ../src/core/main.c:384 #, c-format msgid "Failed to read configuration: %s\n" msgstr "读取配置失败：%s\n" -#: ../src/core/main.c:191 ../src/core/nm-iface-helper.c:406 +#: ../src/core/main.c:190 ../src/core/nm-iface-helper.c:406 msgid "Print NetworkManager version and exit" msgstr "输出网络管理器版本并退出" -#: ../src/core/main.c:198 ../src/core/nm-iface-helper.c:413 +#: ../src/core/main.c:197 ../src/core/nm-iface-helper.c:413 msgid "Don't become a daemon" msgstr "不成为守护进程" -#: ../src/core/main.c:205 ../src/core/nm-iface-helper.c:427 +#: ../src/core/main.c:204 ../src/core/nm-iface-helper.c:427 #, c-format msgid "Log level: one of [%s]" msgstr "日志级别：取 [%s] 之一" -#: ../src/core/main.c:212 ../src/core/nm-iface-helper.c:434 +#: ../src/core/main.c:211 ../src/core/nm-iface-helper.c:434 #, c-format msgid "Log domains separated by ',': any combination of [%s]" msgstr "以 \",\" 分开的日志域：可以是 [%s] 的任意组合" -#: ../src/core/main.c:219 ../src/core/nm-iface-helper.c:441 +#: ../src/core/main.c:218 ../src/core/nm-iface-helper.c:441 msgid "Make all warnings fatal" msgstr "视所有警告为致命错误" -#: ../src/core/main.c:226 +#: ../src/core/main.c:225 msgid "Specify the location of a PID file" msgstr "指定一个 PID 文件的位置" -#: ../src/core/main.c:240 +#: ../src/core/main.c:239 msgid "Print NetworkManager configuration and exit" msgstr "输出网络管理器配置并退出" -#: ../src/core/main.c:251 +#: ../src/core/main.c:250 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -547,15 +549,15 @@ msgstr "" "网络管理器（NetworkManager）监视所有网络连接，并自动选择要使用的最佳连接。\n" "它还允许用户指定计算机无线网卡连接的无线访问点。" -#: ../src/core/main.c:408 ../src/core/nm-iface-helper.c:599 +#: ../src/core/main.c:407 ../src/core/nm-iface-helper.c:599 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "无法设为守护进程：%s [错误 %u]\n" #: ../src/core/nm-config.c:542 #: ../src/libnm-core-impl/nm-setting-ovs-bridge.c:187 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:2157 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:4175 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:2107 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:4103 #, c-format msgid "'%s' is not valid" msgstr "\"%s\" 无效" @@ -563,7 +565,7 @@ msgstr "\"%s\" 无效" #: ../src/core/nm-config.c:561 #, c-format msgid "Bad '%s' option: " -msgstr "错误的 '%s' 选项： " +msgstr "错误的 \"%s\" 选项：" #: ../src/core/nm-config.c:578 msgid "Config file location" @@ -734,44 +736,44 @@ msgstr "（%s）：无效的 IID %s\n" msgid "(%s): Invalid DHCP client-id %s\n" msgstr "（%s）：无效的 DHCP 客户端 ID %s\n" -#: ../src/core/nm-manager.c:5926 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:8119 +#: ../src/core/nm-manager.c:5867 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:8010 msgid "VPN connection" msgstr "VPN 连接" -#: ../src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5478 +#: ../src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5467 #: ../src/libnm-client-impl/nm-device.c:1683 -#: ../src/libnm-core-impl/nm-connection.c:2707 +#: ../src/libnm-core-impl/nm-connection.c:2696 #: ../src/nmtui/nm-editor-utils.c:180 msgid "Bond" msgstr "绑定" -#: ../src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5549 +#: ../src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5538 #: ../src/libnm-client-impl/nm-device.c:1685 -#: ../src/libnm-core-impl/nm-connection.c:2709 +#: ../src/libnm-core-impl/nm-connection.c:2698 #: ../src/nmtui/nm-editor-utils.c:198 msgid "Team" msgstr "组合" -#: ../src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5886 +#: ../src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5875 #: ../src/libnm-client-impl/nm-device.c:1687 -#: ../src/libnm-core-impl/nm-connection.c:2711 +#: ../src/libnm-core-impl/nm-connection.c:2700 #: ../src/nmtui/nm-editor-utils.c:189 msgid "Bridge" msgstr "网桥" -#: ../src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9974 +#: ../src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c:9973 #: ../src/libnm-core-impl/nm-team-utils.c:2396 #, c-format msgid "invalid json" msgstr "无效的 json" -#: ../src/libnm-client-impl/nm-client.c:3782 +#: ../src/libnm-client-impl/nm-client.c:3773 #, c-format msgid "request succeeded with %s but object is in an unsuitable state" msgstr "使用 %s 请求成功，但对象处于不合适的状态" -#: ../src/libnm-client-impl/nm-client.c:3874 +#: ../src/libnm-client-impl/nm-client.c:3865 #, c-format msgid "operation succeeded but object %s does not exist" msgstr "操作成功，但对象 %s 不存在" @@ -934,7 +936,7 @@ msgstr "此连接不是 VRF 连接。" #: ../src/libnm-client-impl/nm-device-vrf.c:74 msgid "The VRF table of the device and the connection didn't match." -msgstr "设备的 VRF 表和连接不匹配" +msgstr "设备的 VRF 表和连接不匹配。" #: ../src/libnm-client-impl/nm-device-vxlan.c:383 msgid "The connection was not a VXLAN connection." @@ -1001,13 +1003,13 @@ msgid "Mobile Broadband" msgstr "移动宽带" #: ../src/libnm-client-impl/nm-device.c:1681 -#: ../src/libnm-core-impl/nm-connection.c:2715 +#: ../src/libnm-core-impl/nm-connection.c:2704 #: ../src/nmtui/nm-editor-utils.c:153 msgid "InfiniBand" msgstr "InfiniBand" #: ../src/libnm-client-impl/nm-device.c:1689 -#: ../src/libnm-core-impl/nm-connection.c:2713 +#: ../src/libnm-core-impl/nm-connection.c:2702 #: ../src/nmtui/nm-editor-utils.c:207 ../src/nmtui/nmt-page-vlan.c:64 msgid "VLAN" msgstr "VLAN" @@ -1071,8 +1073,8 @@ msgstr "VRF" #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason) #: ../src/libnm-client-impl/nm-device.c:1724 -#: ../src/libnmc-base/nm-client-utils.c:352 -#: ../src/libnmc-base/nm-client-utils.c:473 +#: ../src/libnmc-base/nm-client-utils.c:326 +#: ../src/libnmc-base/nm-client-utils.c:447 msgid "Unknown" msgstr "未知" @@ -1108,135 +1110,135 @@ msgstr "连接无效：%s" #: ../src/libnm-client-impl/nm-device.c:2773 #, c-format -msgid "The interface names of the device and the connection didn't match" +msgid "The interface names of the device and the connection didn't match." msgstr "这个设备的接口名和连接不匹配。" #: ../src/libnm-client-impl/nm-secret-agent-old.c:1384 msgid "registration failed" -msgstr "注册失败。" +msgstr "注册失败" -#: ../src/libnm-client-impl/nm-vpn-plugin-old.c:817 -#: ../src/libnm-client-impl/nm-vpn-service-plugin.c:1063 +#: ../src/libnm-client-impl/nm-vpn-plugin-old.c:819 +#: ../src/libnm-client-impl/nm-vpn-service-plugin.c:1014 msgid "No service name specified" msgstr "未指定服务" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:286 #, c-format msgid "'%s' is not valid: properties should be specified as 'key=value'" -msgstr "'%s' 无效：属性需要以 'key=value' 的形式指定" +msgstr "\"%s\" 无效：属性需要以 \"key=value\" 的形式指定" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:300 #, c-format msgid "'%s' is not a valid key" -msgstr "'%s' 不是一个有效的关键字" +msgstr "\"%s\" 不是一个有效的关键字" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:305 #, c-format msgid "duplicate key '%s'" -msgstr "重复的关键字 '%s'" +msgstr "重复的关键字 \"%s\"" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:319 #, c-format msgid "number for '%s' is out of range" -msgstr "'%s' 的值超出了范围" +msgstr "\"%s\" 的值超出了范围" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:324 #, c-format msgid "value for '%s' must be a number" -msgstr "'%s' 的值需要是一个数字" +msgstr "\"%s\" 的值需要是一个数字" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:337 #, c-format msgid "value for '%s' must be a boolean" -msgstr "'%s' 的值需要是一个布尔值" +msgstr "\"%s\" 的值需要是一个布尔值" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:346 msgid "missing 'name' attribute" -msgstr "缺少 'name' 属性" +msgstr "缺少 \"name\" 属性" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:355 #, c-format msgid "invalid 'name' \"%s\"" -msgstr "无效的 'name' \"%s\"" +msgstr "无效的 \"name\" \"%s\"" #: ../src/libnm-core-aux-extern/nm-libnm-core-aux.c:368 #, c-format msgid "attribute '%s' is invalid for \"%s\"" -msgstr "属性 '%s' 无效（对于\"%s\"）" +msgstr "属性 \"%s\" 对于 \"%s\" 无效" #: ../src/libnm-core-aux-intern/nm-libnm-core-utils.c:293 -#, fuzzy msgid "property cannot be an empty string" -msgstr "\"%s=%s\" 不允许这个属性为空" +msgstr "属性不能为空的字符串" #: ../src/libnm-core-aux-intern/nm-libnm-core-utils.c:310 -#, fuzzy msgid "property cannot be longer than 255 bytes" -msgstr "DHCP选项不能多于 255 个字符" +msgstr "属性不能多于 255 个字符" #: ../src/libnm-core-aux-intern/nm-libnm-core-utils.c:321 -#, fuzzy msgid "property cannot contain any nul bytes" -msgstr "属性必须只包含数字" +msgstr "属性不能包含任何 nul 字节" -#: ../src/libnm-core-impl/nm-connection.c:300 +#: ../src/libnm-core-impl/nm-connection.c:299 msgid "wrong type; should be a list of strings." msgstr "错误的类型；应为一个字符串列表。" -#: ../src/libnm-core-impl/nm-connection.c:374 +#: ../src/libnm-core-impl/nm-connection.c:373 msgid "unknown setting name" msgstr "未知的设置名称" -#: ../src/libnm-core-impl/nm-connection.c:386 +#: ../src/libnm-core-impl/nm-connection.c:385 msgid "duplicate setting name" msgstr "重复的设置名称" -#: ../src/libnm-core-impl/nm-connection.c:1433 +#: ../src/libnm-core-impl/nm-connection.c:1422 msgid "setting not found" msgstr "未找到设置" -#: ../src/libnm-core-impl/nm-connection.c:1486 -#: ../src/libnm-core-impl/nm-connection.c:1511 -#: ../src/libnm-core-impl/nm-connection.c:1536 +#: ../src/libnm-core-impl/nm-connection.c:1475 +#: ../src/libnm-core-impl/nm-connection.c:1500 +#: ../src/libnm-core-impl/nm-connection.c:1525 msgid "setting is required for non-slave connections" msgstr "对于非从连接，设置是必需的" -#: ../src/libnm-core-impl/nm-connection.c:1499 -#: ../src/libnm-core-impl/nm-connection.c:1524 -#: ../src/libnm-core-impl/nm-connection.c:1549 +#: ../src/libnm-core-impl/nm-connection.c:1488 +#: ../src/libnm-core-impl/nm-connection.c:1513 +#: ../src/libnm-core-impl/nm-connection.c:1538 msgid "setting not allowed in slave connection" msgstr "从连接中不允许设置" -#: ../src/libnm-core-impl/nm-connection.c:1654 +#: ../src/libnm-core-impl/nm-connection.c:1643 msgid "Unexpected failure to normalize the connection" msgstr "正常化连接意外地失败" -#: ../src/libnm-core-impl/nm-connection.c:1715 +#: ../src/libnm-core-impl/nm-connection.c:1704 msgid "Unexpected failure to verify the connection" msgstr "检验连接意外地失败" -#: ../src/libnm-core-impl/nm-connection.c:1752 +#: ../src/libnm-core-impl/nm-connection.c:1741 #, c-format msgid "unexpected uuid %s instead of %s" msgstr "非预期的 uuid %s，而不是 %s" -#: ../src/libnm-core-impl/nm-connection.c:2566 +#: ../src/libnm-core-impl/nm-connection.c:2555 #: ../src/libnm-core-impl/nm-setting-8021x.c:2618 #: ../src/libnm-core-impl/nm-setting-8021x.c:2641 #: ../src/libnm-core-impl/nm-setting-8021x.c:2681 #: ../src/libnm-core-impl/nm-setting-8021x.c:2704 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2754 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2795 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2895 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2755 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2773 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2797 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2815 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2845 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2945 #: ../src/libnm-core-impl/nm-setting-adsl.c:157 #: ../src/libnm-core-impl/nm-setting-bluetooth.c:110 #: ../src/libnm-core-impl/nm-setting-bluetooth.c:174 #: ../src/libnm-core-impl/nm-setting-bluetooth.c:191 #: ../src/libnm-core-impl/nm-setting-cdma.c:127 -#: ../src/libnm-core-impl/nm-setting-connection.c:1075 -#: ../src/libnm-core-impl/nm-setting-connection.c:1113 -#: ../src/libnm-core-impl/nm-setting-connection.c:1385 -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5333 +#: ../src/libnm-core-impl/nm-setting-connection.c:1073 +#: ../src/libnm-core-impl/nm-setting-connection.c:1111 +#: ../src/libnm-core-impl/nm-setting-connection.c:1383 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5332 #: ../src/libnm-core-impl/nm-setting-ip-tunnel.c:371 #: ../src/libnm-core-impl/nm-setting-olpc-mesh.c:83 #: ../src/libnm-core-impl/nm-setting-ovs-patch.c:75 @@ -1249,7 +1251,7 @@ msgstr "非预期的 uuid %s，而不是 %s" msgid "property is missing" msgstr "缺少属性" -#: ../src/libnm-core-impl/nm-connection.c:2719 +#: ../src/libnm-core-impl/nm-connection.c:2708 msgid "IP Tunnel" msgstr "IP 隧道" @@ -1511,7 +1513,7 @@ msgstr "无法找到预期的 TSS 起始标记。" #: ../src/libnm-core-impl/nm-crypto.c:426 #, c-format msgid "Failed to find expected TSS end tag '%s'." -msgstr "无法找到预期的 TSS 结束标记 '%s'。" +msgstr "无法找到预期的 TSS 结束标记 \"%s\"。" #: ../src/libnm-core-impl/nm-crypto.c:481 #, c-format @@ -1562,7 +1564,7 @@ msgstr "整数文件为空" #: ../src/libnm-core-impl/nm-crypto.c:778 #, c-format msgid "Failed to recognize certificate" -msgstr "识别证书失败。" +msgstr "识别证书失败" #: ../src/libnm-core-impl/nm-crypto.c:886 #, c-format @@ -1584,237 +1586,239 @@ msgstr "值不能解释为一个数字列表。" msgid "value is not an integer in range [%lld, %lld]" msgstr "值不是在 [%lld, %lld] 范围内的一个整数" -#: ../src/libnm-core-impl/nm-keyfile.c:270 +#: ../src/libnm-core-impl/nm-keyfile.c:269 msgid "ignoring missing number" msgstr "忽略缺失的数字" -#: ../src/libnm-core-impl/nm-keyfile.c:282 +#: ../src/libnm-core-impl/nm-keyfile.c:281 #, c-format msgid "ignoring invalid number '%s'" msgstr "忽略无效的数字 \"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:311 +#: ../src/libnm-core-impl/nm-keyfile.c:310 #, c-format msgid "ignoring invalid %s address: %s" msgstr "忽略无效的 %s 地址：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:357 +#: ../src/libnm-core-impl/nm-keyfile.c:356 #, c-format msgid "ignoring invalid gateway '%s' for %s route" msgstr "忽略 %s%s 路由的无效网关 \"\"" -#: ../src/libnm-core-impl/nm-keyfile.c:379 +#: ../src/libnm-core-impl/nm-keyfile.c:378 #, c-format msgid "ignoring invalid %s route: %s" msgstr "忽略无效的 %s 路由：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:557 +#: ../src/libnm-core-impl/nm-keyfile.c:556 #, c-format msgid "unexpected character '%c' for address %s: '%s' (position %td)" msgstr "对于地址 %2$s 的意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）" -#: ../src/libnm-core-impl/nm-keyfile.c:573 +#: ../src/libnm-core-impl/nm-keyfile.c:572 #, c-format msgid "unexpected character '%c' for %s: '%s' (position %td)" msgstr "对于 %2$s 的意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）" -#: ../src/libnm-core-impl/nm-keyfile.c:588 +#: ../src/libnm-core-impl/nm-keyfile.c:587 #, c-format msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)" msgstr "对于 %2$s，前缀长度中有意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）" -#: ../src/libnm-core-impl/nm-keyfile.c:605 +#: ../src/libnm-core-impl/nm-keyfile.c:604 #, c-format msgid "garbage at the end of value %s: '%s'" msgstr "值 %s 的末尾有无用信息：\"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:615 +#: ../src/libnm-core-impl/nm-keyfile.c:614 #, c-format msgid "deprecated semicolon at the end of value %s: '%s'" msgstr "值 %s 的末尾有舍弃的分号：\"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:634 +#: ../src/libnm-core-impl/nm-keyfile.c:633 #, c-format msgid "invalid prefix length for %s '%s', defaulting to %d" msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d" -#: ../src/libnm-core-impl/nm-keyfile.c:646 +#: ../src/libnm-core-impl/nm-keyfile.c:645 #, c-format msgid "missing prefix length for %s '%s', defaulting to %d" msgstr "缺少 %s 的前缀长度 \"%s\"，默认为 %d" -#: ../src/libnm-core-impl/nm-keyfile.c:989 +#: ../src/libnm-core-impl/nm-keyfile.c:988 #: ../src/libnm-core-impl/nm-setting-ovs-external-ids.c:320 #: ../src/libnm-core-impl/nm-setting-user.c:372 #, c-format msgid "invalid value for \"%s\": %s" msgstr "对 \"%s\" 无效的值：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:1067 +#: ../src/libnm-core-impl/nm-keyfile.c:1066 #, c-format msgid "ignoring invalid DNS server IPv%c address '%s'" msgstr "忽略无效的 DNS 服务器 IPv%c 地址 \"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:1104 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1651 +#: ../src/libnm-core-impl/nm-keyfile.c:1103 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1623 #, c-format msgid "invalid option '%s', use one of [%s]" msgstr "无效选项 \"%s\"，请使用 [%s] 中的一个。" -#: ../src/libnm-core-impl/nm-keyfile.c:1162 +#: ../src/libnm-core-impl/nm-keyfile.c:1161 msgid "ignoring invalid MAC address" msgstr "忽略无效的 MAC 地址" -#: ../src/libnm-core-impl/nm-keyfile.c:1238 -#, fuzzy, c-format +#: ../src/libnm-core-impl/nm-keyfile.c:1237 +#, c-format +#| msgid "ignoring invalid %s address: %s" msgid "ignoring invalid bond option %s%s%s = %s%s%s: %s" -msgstr "忽略无效的 %s 地址：%s" +msgstr "忽略无效的绑定（bond）选项 %s%s%s = %s%s%s：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:1428 +#: ../src/libnm-core-impl/nm-keyfile.c:1427 msgid "ignoring invalid SSID" msgstr "忽略无效的 SSID" -#: ../src/libnm-core-impl/nm-keyfile.c:1446 +#: ../src/libnm-core-impl/nm-keyfile.c:1445 msgid "ignoring invalid raw password" msgstr "忽略无效的原始密码" -#: ../src/libnm-core-impl/nm-keyfile.c:1587 +#: ../src/libnm-core-impl/nm-keyfile.c:1586 msgid "invalid key/cert value" msgstr "无效的密钥/证书值" -#: ../src/libnm-core-impl/nm-keyfile.c:1602 +#: ../src/libnm-core-impl/nm-keyfile.c:1601 #, c-format msgid "invalid key/cert value path \"%s\"" msgstr "无效的密钥/证书值路径 \"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:1627 -#: ../src/libnm-core-impl/nm-keyfile.c:1724 +#: ../src/libnm-core-impl/nm-keyfile.c:1626 +#: ../src/libnm-core-impl/nm-keyfile.c:1723 #, c-format msgid "certificate or key file '%s' does not exist" msgstr "证书或密钥文件 \"%s\" 不存在" -#: ../src/libnm-core-impl/nm-keyfile.c:1640 +#: ../src/libnm-core-impl/nm-keyfile.c:1639 #, c-format msgid "invalid PKCS#11 URI \"%s\"" msgstr "无效的 PKCS#11 URI \"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:1686 +#: ../src/libnm-core-impl/nm-keyfile.c:1685 msgid "invalid key/cert value data:;base64, is not base64" msgstr "无效的密钥/证书值 data:;base64，不是 base64" -#: ../src/libnm-core-impl/nm-keyfile.c:1699 +#: ../src/libnm-core-impl/nm-keyfile.c:1698 msgid "invalid key/cert value data:;base64,file://" msgstr "无效的密钥/证书值 data:;base64,file://" -#: ../src/libnm-core-impl/nm-keyfile.c:1740 +#: ../src/libnm-core-impl/nm-keyfile.c:1739 msgid "invalid key/cert value is not a valid blob" msgstr "无效的密钥/证书值，不是有效的比特块（blob）" -#: ../src/libnm-core-impl/nm-keyfile.c:1842 +#: ../src/libnm-core-impl/nm-keyfile.c:1841 #, c-format msgid "invalid parity value '%s'" msgstr "无效的奇偶校验值 \"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:1864 -#: ../src/libnm-core-impl/nm-keyfile.c:3337 +#: ../src/libnm-core-impl/nm-keyfile.c:1863 +#: ../src/libnm-core-impl/nm-keyfile.c:3336 #, c-format msgid "invalid setting: %s" msgstr "无效设置：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:1884 +#: ../src/libnm-core-impl/nm-keyfile.c:1883 #, c-format msgid "ignoring invalid team configuration: %s" msgstr "忽略无效的组合（team）配置：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:1967 +#: ../src/libnm-core-impl/nm-keyfile.c:1966 #, c-format msgid "invalid qdisc: %s" msgstr "无效的排队规则（qdisc）：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:2017 +#: ../src/libnm-core-impl/nm-keyfile.c:2016 #, c-format msgid "invalid tfilter: %s" msgstr "无效的流量过滤器（tfilter）：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:3162 +#: ../src/libnm-core-impl/nm-keyfile.c:3161 #, c-format msgid "error loading setting value: %s" msgstr "加载设置值时出错：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:3193 -#: ../src/libnm-core-impl/nm-keyfile.c:3205 -#: ../src/libnm-core-impl/nm-keyfile.c:3224 -#: ../src/libnm-core-impl/nm-keyfile.c:3236 -#: ../src/libnm-core-impl/nm-keyfile.c:3248 -#: ../src/libnm-core-impl/nm-keyfile.c:3310 -#: ../src/libnm-core-impl/nm-keyfile.c:3322 +#: ../src/libnm-core-impl/nm-keyfile.c:3192 +#: ../src/libnm-core-impl/nm-keyfile.c:3204 +#: ../src/libnm-core-impl/nm-keyfile.c:3223 +#: ../src/libnm-core-impl/nm-keyfile.c:3235 +#: ../src/libnm-core-impl/nm-keyfile.c:3247 +#: ../src/libnm-core-impl/nm-keyfile.c:3309 +#: ../src/libnm-core-impl/nm-keyfile.c:3321 msgid "value cannot be interpreted as integer" msgstr "值无法被解析为整数" -#: ../src/libnm-core-impl/nm-keyfile.c:3278 +#: ../src/libnm-core-impl/nm-keyfile.c:3277 #, c-format msgid "ignoring invalid byte element '%u' (not between 0 and 255 inclusive)" -msgstr "忽略无效的字节元素 '%u'（不在 0 和 255 之间）" +msgstr "忽略无效的字节元素 \"%u\"（不在 0 和 255 之间）" -#: ../src/libnm-core-impl/nm-keyfile.c:3362 +#: ../src/libnm-core-impl/nm-keyfile.c:3361 #, c-format msgid "invalid setting name '%s'" msgstr "无效的设置名称 \"%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:3409 +#: ../src/libnm-core-impl/nm-keyfile.c:3408 #, c-format msgid "invalid key '%s.%s'" msgstr "无效的密钥 \"%s.%s\"" -#: ../src/libnm-core-impl/nm-keyfile.c:3425 +#: ../src/libnm-core-impl/nm-keyfile.c:3424 #, c-format msgid "key '%s.%s' is not boolean" msgstr "密钥 \"%s.%s\" 不是布尔值" -#: ../src/libnm-core-impl/nm-keyfile.c:3442 +#: ../src/libnm-core-impl/nm-keyfile.c:3441 #, c-format msgid "key '%s.%s' is not a uint32" -msgstr "key '%s.%s' 不是一个 uint32" +msgstr "key \"%s.%s\" 不是一个 uint32" -#: ../src/libnm-core-impl/nm-keyfile.c:3499 +#: ../src/libnm-core-impl/nm-keyfile.c:3498 #, c-format msgid "invalid peer public key in section '%s'" -msgstr "'%s' 项中无效的 peer 公钥" +msgstr "\"%s\" 项中存在无效的对等端公钥" -#: ../src/libnm-core-impl/nm-keyfile.c:3514 +#: ../src/libnm-core-impl/nm-keyfile.c:3513 #, c-format msgid "key '%s.%s' is not a valid 256 bit key in base64 encoding" -msgstr "密钥 '%s.%s' 不是一个以 base64 编码的有效的 256 位密钥" +msgstr "密钥 \"%s.%s\" 不是一个以 base64 编码的有效的 256 位密钥" -#: ../src/libnm-core-impl/nm-keyfile.c:3537 +#: ../src/libnm-core-impl/nm-keyfile.c:3536 #, c-format msgid "key '%s.%s' is not a valid secret flag" -msgstr "'%s.%s' 不是一个有效的 secret 标记" +msgstr "\"%s.%s\" 不是一个有效的机密（secret）标记" -#: ../src/libnm-core-impl/nm-keyfile.c:3560 +#: ../src/libnm-core-impl/nm-keyfile.c:3559 #, c-format msgid "key '%s.%s' is not a integer in range 0 to 2^32" -msgstr "'%s.%s' 不是在 0 到 2^32 范围内的一个整数" +msgstr "\"%s.%s\" 不是在 0 到 2^32 范围内的一个整数" -#: ../src/libnm-core-impl/nm-keyfile.c:3576 +#: ../src/libnm-core-impl/nm-keyfile.c:3575 #, c-format msgid "key '%s.%s' is not a valid endpoint" -msgstr "'%s.%s' 不是一个有效的端点" +msgstr "\"%s.%s\" 不是一个有效的端点" -#: ../src/libnm-core-impl/nm-keyfile.c:3602 +#: ../src/libnm-core-impl/nm-keyfile.c:3601 #, c-format msgid "key '%s.%s' has invalid allowed-ips" -msgstr "'%s.%s' 包括无效的 allowed-ips" +msgstr "\"%s.%s\" 包括无效的 allowed-ips" -#: ../src/libnm-core-impl/nm-keyfile.c:3617 +#: ../src/libnm-core-impl/nm-keyfile.c:3616 #, c-format msgid "peer '%s' is invalid: %s" -msgstr "peer '%s' 无效 : %s" +msgstr "对等端 \"%s\" 无效：%s" -#: ../src/libnm-core-impl/nm-keyfile.c:4108 -#, fuzzy, c-format +#: ../src/libnm-core-impl/nm-keyfile.c:4107 +#, c-format +#| msgid "rule is invalid: %s" msgid "the profile is not valid: %s" -msgstr "规则无效：%s" +msgstr "该配置集无效：%s" #: ../src/libnm-core-impl/nm-setting-6lowpan.c:78 #: ../src/libnm-core-impl/nm-setting-veth.c:80 @@ -1887,19 +1891,22 @@ msgstr "当证书不在 PKCS#11 令牌上时不支持密码" #: ../src/libnm-core-impl/nm-setting-8021x.c:2651 #: ../src/libnm-core-impl/nm-setting-8021x.c:2691 #: ../src/libnm-core-impl/nm-setting-8021x.c:2714 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2759 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2805 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2764 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2782 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2806 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2824 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2855 #: ../src/libnm-core-impl/nm-setting-adsl.c:165 #: ../src/libnm-core-impl/nm-setting-cdma.c:134 #: ../src/libnm-core-impl/nm-setting-cdma.c:143 -#: ../src/libnm-core-impl/nm-setting-connection.c:1085 -#: ../src/libnm-core-impl/nm-setting-connection.c:1128 -#: ../src/libnm-core-impl/nm-setting-connection.c:1323 +#: ../src/libnm-core-impl/nm-setting-connection.c:1083 +#: ../src/libnm-core-impl/nm-setting-connection.c:1126 +#: ../src/libnm-core-impl/nm-setting-connection.c:1321 #: ../src/libnm-core-impl/nm-setting-gsm.c:282 #: ../src/libnm-core-impl/nm-setting-gsm.c:337 #: ../src/libnm-core-impl/nm-setting-gsm.c:380 #: ../src/libnm-core-impl/nm-setting-gsm.c:389 -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5342 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5341 #: ../src/libnm-core-impl/nm-setting-ip4-config.c:206 #: ../src/libnm-core-impl/nm-setting-ip4-config.c:218 #: ../src/libnm-core-impl/nm-setting-pppoe.c:136 @@ -1907,8 +1914,8 @@ msgstr "当证书不在 PKCS#11 令牌上时不支持密码" #: ../src/libnm-core-impl/nm-setting-vpn.c:540 #: ../src/libnm-core-impl/nm-setting-vpn.c:550 #: ../src/libnm-core-impl/nm-setting-wimax.c:104 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:955 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:983 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:956 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:984 #: ../src/libnm-core-impl/nm-setting.c:1240 msgid "property is empty" msgstr "属性为空" @@ -1919,15 +1926,11 @@ msgstr "属性为空" msgid "has to match '%s' property for PKCS#12" msgstr "必须匹配 PKCS#12 的 \"%s\" 属性" -#: ../src/libnm-core-impl/nm-setting-8021x.c:2773 -msgid "exactly one property must be set" -msgstr "" - -#: ../src/libnm-core-impl/nm-setting-8021x.c:2883 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2933 msgid "can be enabled only on Ethernet connections" msgstr "只能为以太网连接启用" -#: ../src/libnm-core-impl/nm-setting-8021x.c:2904 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2954 #: ../src/libnm-core-impl/nm-setting-bluetooth.c:92 #: ../src/libnm-core-impl/nm-setting-infiniband.c:163 #: ../src/libnm-core-impl/nm-setting-infiniband.c:175 @@ -1937,38 +1940,38 @@ msgstr "只能为以太网连接启用" #: ../src/libnm-core-impl/nm-setting-olpc-mesh.c:121 #: ../src/libnm-core-impl/nm-setting-wifi-p2p.c:132 #: ../src/libnm-core-impl/nm-setting-wimax.c:116 -#: ../src/libnm-core-impl/nm-setting-wired.c:820 -#: ../src/libnm-core-impl/nm-setting-wired.c:833 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1008 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1020 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1032 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1045 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1058 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1089 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1156 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1205 +#: ../src/libnm-core-impl/nm-setting-wired.c:802 +#: ../src/libnm-core-impl/nm-setting-wired.c:815 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1009 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1021 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1033 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1046 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1059 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1090 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1141 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1190 #: ../src/libnm-core-impl/nm-setting-wireless.c:884 #: ../src/libnm-core-impl/nm-setting-wireless.c:896 #: ../src/libnm-core-impl/nm-setting-wireless.c:909 #: ../src/libnm-core-impl/nm-setting-wpan.c:161 -#: ../src/libnm-core-impl/nm-utils.c:4232 +#: ../src/libnm-core-impl/nm-utils.c:4454 msgid "property is invalid" msgstr "属性无效" -#: ../src/libnm-core-impl/nm-setting-8021x.c:2929 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2942 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2955 -#: ../src/libnm-core-impl/nm-setting-8021x.c:2989 -#: ../src/libnm-core-impl/nm-setting-8021x.c:3002 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2979 +#: ../src/libnm-core-impl/nm-setting-8021x.c:2992 +#: ../src/libnm-core-impl/nm-setting-8021x.c:3005 +#: ../src/libnm-core-impl/nm-setting-8021x.c:3039 +#: ../src/libnm-core-impl/nm-setting-8021x.c:3052 #: ../src/libnm-core-impl/nm-setting-adsl.c:177 #: ../src/libnm-core-impl/nm-setting-adsl.c:190 #: ../src/libnm-core-impl/nm-setting-bluetooth.c:127 -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:911 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:926 #, c-format msgid "'%s' is not a valid value for the property" msgstr "\"%s\" 不是该属性的有效取值" -#: ../src/libnm-core-impl/nm-setting-8021x.c:2968 +#: ../src/libnm-core-impl/nm-setting-8021x.c:3018 msgid "invalid auth flags" msgstr "无效的验证标记" @@ -1993,19 +1996,19 @@ msgid "'%s' is not a valid IPv4 address for '%s' option" msgstr "\"%s\" 不是 \"%s\" 选项的有效 IPv4 地址" #: ../src/libnm-core-impl/nm-setting-bond.c:531 -#, fuzzy, c-format +#, c-format msgid "missing option name" -msgstr "缺少文件名" +msgstr "缺少选项名" #: ../src/libnm-core-impl/nm-setting-bond.c:536 -#, fuzzy, c-format +#, c-format msgid "invalid option '%s'" -msgstr "无效操作： " +msgstr "无效选项 \"%s\"" #: ../src/libnm-core-impl/nm-setting-bond.c:572 -#, fuzzy, c-format +#, c-format msgid "invalid value '%s' for option '%s'" -msgstr "uint32 值 \"%s\" 对属性 \"%s\" 无效" +msgstr "值 \"%s\" 对选项 \"%s\" 无效" #: ../src/libnm-core-impl/nm-setting-bond.c:814 #, c-format @@ -2041,7 +2044,7 @@ msgstr "\"%s=%s\" 不是 \"%s\" 的有效配置" #: ../src/libnm-core-impl/nm-setting-bond.c:905 #, c-format msgid "'%s' option requires '%s' option to be enabled" -msgstr "'%s' 选项需要 '%s' 选项来启用" +msgstr "\"%s\" 选项需要 \"%s\" 选项来启用" #: ../src/libnm-core-impl/nm-setting-bond.c:922 #: ../src/libnm-core-impl/nm-setting-bond.c:933 @@ -2069,7 +2072,7 @@ msgstr "\"%s\" 选项应该为字符串" msgid "'%s' option is not valid with mode '%s'" msgstr "\"%s\" 选项在 \"%s\" 模式里无效" -#: ../src/libnm-core-impl/nm-setting-bridge-port.c:310 +#: ../src/libnm-core-impl/nm-setting-bridge-port.c:302 #: ../src/libnm-core-impl/nm-setting-ovs-bridge.c:151 #: ../src/libnm-core-impl/nm-setting-ovs-interface.c:289 #: ../src/libnm-core-impl/nm-setting-ovs-port.c:170 @@ -2078,7 +2081,7 @@ msgstr "\"%s\" 选项在 \"%s\" 模式里无效" msgid "missing setting" msgstr "缺少设置" -#: ../src/libnm-core-impl/nm-setting-bridge-port.c:320 +#: ../src/libnm-core-impl/nm-setting-bridge-port.c:312 #: ../src/libnm-core-impl/nm-setting-ovs-interface.c:312 #: ../src/libnm-core-impl/nm-setting-ovs-port.c:193 #: ../src/libnm-core-impl/nm-setting-team-port.c:317 @@ -2088,107 +2091,107 @@ msgid "" "Instead it is '%s'" msgstr "具有 \"%s\" 设置的连接必须将 slave-type 设置为 \"%s\"。而它是 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-bridge.c:1175 +#: ../src/libnm-core-impl/nm-setting-bridge.c:1165 #, c-format msgid "value '%d' is out of range <%d-%d>" -msgstr "值 '%d' 超出了范围 <%d-%d>" +msgstr "值 \"%d\" 超出了范围 <%d-%d>" -#: ../src/libnm-core-impl/nm-setting-bridge.c:1194 +#: ../src/libnm-core-impl/nm-setting-bridge.c:1184 msgid "is not a valid MAC address" msgstr "不是有效的 MAC 地址" -#: ../src/libnm-core-impl/nm-setting-bridge.c:1238 +#: ../src/libnm-core-impl/nm-setting-bridge.c:1228 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)" msgstr "掩码不能包含位 0（STP）、1（MAC）或2（LACP）" -#: ../src/libnm-core-impl/nm-setting-bridge.c:1260 +#: ../src/libnm-core-impl/nm-setting-bridge.c:1250 msgid "is not a valid link local MAC address" msgstr "不是一个有效的链路本地 MAC 地址" -#: ../src/libnm-core-impl/nm-setting-bridge.c:1272 +#: ../src/libnm-core-impl/nm-setting-bridge.c:1262 msgid "is not a valid VLAN filtering protocol" msgstr "不是一个有效的 VLAN 过滤协议" -#: ../src/libnm-core-impl/nm-setting-bridge.c:1284 +#: ../src/libnm-core-impl/nm-setting-bridge.c:1274 msgid "is not a valid option" msgstr "不是一个有效的选项" -#: ../src/libnm-core-impl/nm-setting-bridge.c:1296 +#: ../src/libnm-core-impl/nm-setting-bridge.c:1286 #, c-format msgid "'%s' option must be a power of 2" -msgstr "'%s' 选项需要是 2 个指数" +msgstr "\"%s\" 选项需要是 2 个指数" -#: ../src/libnm-core-impl/nm-setting-connection.c:968 +#: ../src/libnm-core-impl/nm-setting-connection.c:967 #, c-format msgid "setting required for connection of type '%s'" msgstr "类型为 \"%s\" 的连接需要设置" -#: ../src/libnm-core-impl/nm-setting-connection.c:999 +#: ../src/libnm-core-impl/nm-setting-connection.c:998 #, c-format msgid "Unknown slave type '%s'" msgstr "未知的从类型 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-connection.c:1014 +#: ../src/libnm-core-impl/nm-setting-connection.c:1013 #, c-format msgid "Slave connections need a valid '%s' property" msgstr "从连接需要有效的 \"%s\" 属性" -#: ../src/libnm-core-impl/nm-setting-connection.c:1038 +#: ../src/libnm-core-impl/nm-setting-connection.c:1037 #, c-format msgid "Cannot set '%s' without '%s'" msgstr "没有 \"%s\" 无法设置 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-connection.c:1097 +#: ../src/libnm-core-impl/nm-setting-connection.c:1095 #, c-format msgid "'%s' is not a valid UUID" msgstr "\"%s\"不是有效的 UUID" -#: ../src/libnm-core-impl/nm-setting-connection.c:1142 +#: ../src/libnm-core-impl/nm-setting-connection.c:1140 #, c-format msgid "connection type '%s' is not valid" msgstr "连接类型 \"%s\" 无效" -#: ../src/libnm-core-impl/nm-setting-connection.c:1248 +#: ../src/libnm-core-impl/nm-setting-connection.c:1246 #, c-format msgid "'%s' connections must be enslaved to '%s', not '%s'" msgstr "\"%s\" 连接必须从属于 \"%s\"，而不是 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-connection.c:1264 +#: ../src/libnm-core-impl/nm-setting-connection.c:1262 #, c-format msgid "metered value %d is not valid" msgstr "计量值 %d 无效" -#: ../src/libnm-core-impl/nm-setting-connection.c:1278 -#: ../src/libnm-core-impl/nm-setting-connection.c:1292 -#: ../src/libnm-core-impl/nm-setting-connection.c:1309 +#: ../src/libnm-core-impl/nm-setting-connection.c:1276 +#: ../src/libnm-core-impl/nm-setting-connection.c:1290 +#: ../src/libnm-core-impl/nm-setting-connection.c:1307 #, c-format msgid "value %d is not valid" msgstr "值 %d 无效" -#: ../src/libnm-core-impl/nm-setting-connection.c:1337 +#: ../src/libnm-core-impl/nm-setting-connection.c:1335 msgid "DHCP option cannot be longer than 255 characters" -msgstr "DHCP选项不能多于 255 个字符" +msgstr "DHCP 选项不能多于 255 个字符" -#: ../src/libnm-core-impl/nm-setting-connection.c:1348 +#: ../src/libnm-core-impl/nm-setting-connection.c:1346 msgid "MUD URL is not a valid URL" msgstr "MUD URL不是一个有效的URL" -#: ../src/libnm-core-impl/nm-setting-connection.c:1368 -#, fuzzy +#: ../src/libnm-core-impl/nm-setting-connection.c:1366 +#| msgid "invalid permission \"%s\"" msgid "invalid permissions not in format \"user:$UNAME[:]\"" -msgstr "无效的权限 \"%s\"" +msgstr "无效的权限，没有以 \"user:$UNAME[:]\" 为格式" -#: ../src/libnm-core-impl/nm-setting-connection.c:1397 +#: ../src/libnm-core-impl/nm-setting-connection.c:1395 #, c-format msgid "property type should be set to '%s'" msgstr "属性类型应该设置为 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-connection.c:1415 +#: ../src/libnm-core-impl/nm-setting-connection.c:1413 #, c-format msgid "slave-type '%s' requires a '%s' setting in the connection" msgstr "slave-type \"%s\" 要求连接中有 \"%s\" 设置" -#: ../src/libnm-core-impl/nm-setting-connection.c:1426 +#: ../src/libnm-core-impl/nm-setting-connection.c:1424 #, c-format msgid "" "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be " @@ -2196,15 +2199,11 @@ msgid "" msgstr "" "检测到设置了 \"%s\" 和端口类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-connection.c:1452 +#: ../src/libnm-core-impl/nm-setting-connection.c:1450 #, c-format msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting" msgstr "\"%s\" 设为 \"%s\" 的从连接不能有个 \"%s\" 设置" -#: ../src/libnm-core-impl/nm-setting-connection.c:1469 -msgid "UUID needs normalization" -msgstr "" - #: ../src/libnm-core-impl/nm-setting-dcb.c:483 msgid "flags invalid" msgstr "标志无效" @@ -2235,23 +2234,19 @@ msgstr "属性无效" msgid "property missing" msgstr "缺少属性" -#: ../src/libnm-core-impl/nm-setting-ethtool.c:311 +#: ../src/libnm-core-impl/nm-setting-ethtool.c:291 msgid "unsupported ethtool setting" msgstr "不支持的 ethtool 设置" -#: ../src/libnm-core-impl/nm-setting-ethtool.c:320 +#: ../src/libnm-core-impl/nm-setting-ethtool.c:300 msgid "setting has invalid variant type" msgstr "设置有无效的变量类型" -#: ../src/libnm-core-impl/nm-setting-ethtool.c:332 +#: ../src/libnm-core-impl/nm-setting-ethtool.c:312 msgid "coalesce option must be either 0 or 1" -msgstr "coalesce 选项必须是 0 或 1。" +msgstr "coalesce 选项必须是 0 或 1" -#: ../src/libnm-core-impl/nm-setting-ethtool.c:349 -msgid "pause-autoneg cannot be enabled when setting rx/tx options" -msgstr "" - -#: ../src/libnm-core-impl/nm-setting-ethtool.c:374 +#: ../src/libnm-core-impl/nm-setting-ethtool.c:335 #, c-format msgid "unknown ethtool option '%s'" msgstr "未知的 ethtool 选项 \"%s\"" @@ -2341,7 +2336,7 @@ msgstr "无效 IPv6 地址前缀 \"%u\"" #: ../src/libnm-core-impl/nm-setting-ip-config.c:154 #, c-format msgid "Invalid routing metric '%s'" -msgstr "无效的路由度量 \"%s\"" +msgstr "无效的路由跃点数 \"%s\"" #: ../src/libnm-core-impl/nm-setting-ip-config.c:1318 #: ../src/libnm-core-impl/nm-setting-sriov.c:399 @@ -2400,9 +2395,9 @@ msgid "missing table" msgstr "缺少表" #: ../src/libnm-core-impl/nm-setting-ip-config.c:2654 -#, fuzzy +#| msgid "invalid action: " msgid "invalid action type" -msgstr "无效操作： " +msgstr "无效的操作类型" #: ../src/libnm-core-impl/nm-setting-ip-config.c:2663 msgid "has from/src but the prefix-length is zero" @@ -2473,21 +2468,21 @@ msgstr "重复的 %s" #: ../src/libnm-core-impl/nm-setting-ip-config.c:2941 #, c-format msgid "invalid variant type '%s' for \"%s\"" -msgstr "无效的变体类型 '%s'（对于 \"%s\"）" +msgstr "无效的变体类型 \"%s\"（对于 \"%s\"）" #: ../src/libnm-core-impl/nm-setting-ip-config.c:2952 -#, fuzzy +#| msgid "missing \"" msgid "missing \"family\"" -msgstr "缺少 \"" +msgstr "缺少 \"family\"" #: ../src/libnm-core-impl/nm-setting-ip-config.c:2960 -#, fuzzy +#| msgid "invalid address family" msgid "invalid \"family\"" -msgstr "无效的 地址家族" +msgstr "无效的 \"family\"" #: ../src/libnm-core-impl/nm-setting-ip-config.c:3017 msgid "\"uid-range-start\" is greater than \"uid-range-end\"" -msgstr "" +msgstr "\"uid-range-start\" 大于 \"uid-range-end\"" #: ../src/libnm-core-impl/nm-setting-ip-config.c:3211 msgid "Unsupported to-string-flags argument" @@ -2497,126 +2492,126 @@ msgstr "不支持的 to-string-flags 参数" msgid "Unsupported extra-argument" msgstr "不支持的 extra-argument" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3524 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3523 #, c-format msgid "unsupported key \"%s\"" msgstr "不支持的 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3531 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3530 #, c-format msgid "duplicate key \"%s\"" msgstr "重复的 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3538 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3537 #, c-format msgid "invalid value for \"%s\"" msgstr "\"%s\" 无效的值" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3550 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3549 msgid "empty text does not describe a rule" msgstr "空文本没有描述一个规则" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3558 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3557 #, c-format msgid "missing argument for \"%s\"" msgstr "\"%s\" 缺少参数" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3572 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3571 msgid "invalid \"from\" part" msgstr "无效的 \"from\" 部分" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3588 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3587 msgid "invalid \"to\" part" msgstr "无效的 \"to\" 部分" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3599 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3598 #, c-format msgid "cannot detect address family for rule" msgstr "无法为规则检测到地址家族" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3666 -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3756 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3665 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3755 #, c-format msgid "rule is invalid: %s" msgstr "规则无效：%s" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:3737 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:3736 msgid "invalid address family" msgstr "无效的 地址家族" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5010 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5009 #, c-format msgid "rule #%u is invalid: %s" msgstr "规则 #%u 无效：%s" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5358 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5357 #, c-format msgid "%d. DNS server address is invalid" msgstr "%d。DNS 服务器地址无效" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5377 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5376 #, c-format msgid "%d. IP address is invalid" msgstr "%d。IP 地址无效" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5392 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5391 #, c-format msgid "%d. IP address has 'label' property with invalid type" msgstr "%d。IP 地址有无效类型的 \"label\" 属性" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5404 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5403 #, c-format msgid "%d. IP address has invalid label '%s'" msgstr "%d。IP 地址有无效标签 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5422 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5421 msgid "gateway cannot be set if there are no addresses configured" msgstr "如果没有配置地址，网关会无法设置" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5434 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5433 msgid "gateway is invalid" msgstr "网关无效" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5452 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5451 #, c-format msgid "%d. route is invalid" msgstr "%d。路由无效" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5465 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5464 #, c-format msgid "invalid attribute: %s" msgstr "无效的属性：%s" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5485 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5484 #, c-format msgid "%u. rule has wrong address-family" msgstr "%u. 规则带有错误的地址家族" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5497 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5496 #, c-format msgid "%u. rule is invalid: %s" msgstr "%u. 规则无效：%s" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5513 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5512 #, c-format msgid "'%s' is not a valid IAID" -msgstr "'%s' 不是一个有效的 IAID" +msgstr "\"%s\" 不是一个有效的 IAID" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5527 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5526 #, c-format msgid "the property cannot be set when '%s' is disabled" -msgstr "当 '%s' 被禁用时不能设置这个属性" +msgstr "当 \"%s\" 被禁用时不能设置这个属性" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5552 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5551 msgid "the property is currently supported only for DHCPv4" -msgstr "" +msgstr "该属性当前只被 DHCPv4 支持" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5569 -#, fuzzy, c-format +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5568 +#, c-format msgid "'%s' is not a valid IP or subnet" -msgstr "\"%s\" 不是有效的 IP 地址" +msgstr "\"%s\" 不是有效的 IP 或子网" -#: ../src/libnm-core-impl/nm-setting-ip-config.c:5585 +#: ../src/libnm-core-impl/nm-setting-ip-config.c:5584 #, c-format msgid "a gateway is incompatible with '%s'" msgstr "网关与 \"%s\" 不兼容" @@ -2806,9 +2801,9 @@ msgid "key contains invalid characters" msgstr "密钥包含无效的字符" #: ../src/libnm-core-impl/nm-setting-ovs-external-ids.c:123 -#, fuzzy +#| msgid "key cannot contain \"..\"" msgid "key cannot start with \"NM.\"" -msgstr "密钥不能包含 \"..\"" +msgstr "密钥不能以 \"NM.\" 开头" #: ../src/libnm-core-impl/nm-setting-ovs-external-ids.c:153 #: ../src/libnm-core-impl/nm-setting-user.c:180 @@ -2842,6 +2837,8 @@ msgid "" "OVS external IDs can only be added to a profile of type OVS bridge/port/" "interface or to OVS system interface" msgstr "" +"OVS 外部 ID 只能添加到 OVS 桥接/端口/接口类型的配置集，或者添加到 OVS 系统接" +"口" #: ../src/libnm-core-impl/nm-setting-ovs-interface.c:93 #, c-format @@ -2866,7 +2863,7 @@ msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"%s\"" #: ../src/libnm-core-impl/nm-setting-ovs-interface.c:170 #, c-format msgid "A connection can not have both '%s' and '%s' settings at the same time" -msgstr "一个连接不能同时设置 '%s' 和 '%s'" +msgstr "一个连接不能同时设置 \"%s\" 和 \"%s\"" #: ../src/libnm-core-impl/nm-setting-ovs-interface.c:184 #, c-format @@ -2881,7 +2878,7 @@ msgstr "" #, c-format msgid "" "A connection with '%s' setting needs to be of '%s' interface type, not '%s'" -msgstr "一个带有 '%s' 设置的连接需要是 '%s' 接口类型，而不是 '%s'" +msgstr "一个带有 \"%s\" 设置的连接需要是 \"%s\" 接口类型，而不是 \"%s\"" #: ../src/libnm-core-impl/nm-setting-ovs-interface.c:222 #, c-format @@ -2927,7 +2924,7 @@ msgstr "\"%s\" 在 bond_mode 里不允许" #: ../src/libnm-core-impl/nm-setting-ppp.c:335 #, c-format msgid "'%d' is out of valid range <128-16384>" -msgstr "'%d' 超出了有效范围 <128-16384>" +msgstr "\"%d\" 超出了有效范围 <128-16384>" #: ../src/libnm-core-impl/nm-setting-ppp.c:348 #, c-format @@ -2961,13 +2958,13 @@ msgid "the script lacks FindProxyForURL function" msgstr "脚本缺少 FindProxyForURL 功能" #: ../src/libnm-core-impl/nm-setting-sriov.c:424 -#: ../src/libnm-core-impl/nm-setting-wired.c:787 -#: ../src/libnm-core-impl/nm-setting-wired.c:803 -#: ../src/libnm-core-impl/nm-setting-wired.c:877 -#: ../src/libnm-core-impl/nm-setting-wired.c:935 +#: ../src/libnm-core-impl/nm-setting-wired.c:769 +#: ../src/libnm-core-impl/nm-setting-wired.c:785 +#: ../src/libnm-core-impl/nm-setting-wired.c:859 +#: ../src/libnm-core-impl/nm-setting-wired.c:917 #: ../src/libnm-core-impl/nm-setting-wireless.c:944 #: ../src/libnm-core-impl/nm-setting-wireless.c:963 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:4125 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:4053 #, c-format msgid "'%s' is not a valid MAC address" msgstr "\"%s\" 不是有效的 MAC 地址" @@ -3079,9 +3076,10 @@ msgid "maximum number of user data entries reached" msgstr "已达到最大的用户数据输入项" #: ../src/libnm-core-impl/nm-setting-veth.c:89 -#, fuzzy, c-format +#, c-format +#| msgid "'%s' is not a valid interface type" msgid "'%s' is not a valid interface name" -msgstr "\"%s\" 不是有效的接口类型" +msgstr "\"%s\" 不是有效的接口名称" #: ../src/libnm-core-impl/nm-setting-vlan.c:632 #, c-format @@ -3129,48 +3127,51 @@ msgstr "表大小不能为零" #: ../src/libnm-core-impl/nm-setting-vxlan.c:329 #: ../src/libnm-core-impl/nm-setting-vxlan.c:340 -#, fuzzy, c-format +#, c-format +#| msgid "'%s' is not a valid IP%c address" msgid "'%s' is not a valid IP%s address" -msgstr "\"%s\" 不是有效的 IP%c 地址" +msgstr "\"%s\" 不是有效的 IP%s 地址" #: ../src/libnm-core-impl/nm-setting-vxlan.c:363 #, c-format msgid "%d is greater than local port max %d" msgstr "%d 大于本地端口最大值 %d" -#: ../src/libnm-core-impl/nm-setting-wired.c:767 +#: ../src/libnm-core-impl/nm-setting-wired.c:749 #, c-format msgid "'%s' is not a valid Ethernet port value" msgstr "\"%s\" 不是有效的以太网端口值" -#: ../src/libnm-core-impl/nm-setting-wired.c:777 +#: ../src/libnm-core-impl/nm-setting-wired.c:759 #, c-format msgid "'%s' is not a valid duplex value" msgstr "\"%s\"不是有效的双工值" -#: ../src/libnm-core-impl/nm-setting-wired.c:850 -#, fuzzy, c-format +#: ../src/libnm-core-impl/nm-setting-wired.c:832 +#, c-format +#| msgid "invalid key '%s.%s'" msgid "invalid key '%s'" -msgstr "无效的密钥 \"%s.%s\"" +msgstr "无效的密钥 \"%s\"" -#: ../src/libnm-core-impl/nm-setting-wired.c:862 -#, fuzzy, c-format +#: ../src/libnm-core-impl/nm-setting-wired.c:844 +#, c-format +#| msgid "invalid value for \"%s\"" msgid "invalid value for key '%s'" -msgstr "\"%s\" 无效的值" +msgstr "值对于密钥 \"%s\" 无效" -#: ../src/libnm-core-impl/nm-setting-wired.c:911 +#: ../src/libnm-core-impl/nm-setting-wired.c:893 msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags" msgstr "LAN 唤醒模式 \"default\" 和 \"ignore\" 是相互排斥的标记" -#: ../src/libnm-core-impl/nm-setting-wired.c:923 +#: ../src/libnm-core-impl/nm-setting-wired.c:905 msgid "Wake-on-LAN password can only be used with magic packet mode" msgstr "LAN 唤醒密码只能在幻数据包模式使用" -#: ../src/libnm-core-impl/nm-setting-wired.c:954 +#: ../src/libnm-core-impl/nm-setting-wired.c:936 msgid "both speed and duplex should have a valid value or both should be unset" msgstr "速度和双工都应设定有效值或者都保持未设定" -#: ../src/libnm-core-impl/nm-setting-wired.c:955 +#: ../src/libnm-core-impl/nm-setting-wired.c:937 msgid "both speed and duplex are required for static link configuration" msgstr "静态链路配置需要设置速度和双工" @@ -3199,93 +3200,90 @@ msgstr "peer 的 allowed-ip 无效的 IP 地址 \"%s\"" msgid "invalid preshared-key-flags for peer" msgstr "peer 无效的 preshared-key-flags" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1598 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1587 #, c-format msgid "peer #%u has no public-key" msgstr "peer #%u 没有 public-key" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1611 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1600 #, c-format msgid "peer #%u has invalid public-key" msgstr "peer #%u 带有无效的 public-key" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1627 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1616 #, c-format msgid "peer #%u has invalid endpoint" msgstr "peer #%u 带有无效的端点" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1659 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1648 #, c-format msgid "peer #%u has invalid allowed-ips setting" msgstr "peer #%u 带有无效的 allowed-ips 设置" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1673 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1662 #, c-format msgid "peer #%u is invalid: %s" msgstr "peer #%u 无效：%s" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1744 -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1763 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1733 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1752 #, c-format msgid "method \"%s\" is not supported for WireGuard" msgstr "方法 \"%s\" 不支持 WireGuard" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1787 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1776 msgid "key must be 32 bytes base64 encoded" msgstr "密钥需要是基于 base64 编码的 32 个字节" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1918 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1906 msgid "invalid peer secrets" msgstr "无效的 peer secrets" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1944 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1932 #, c-format msgid "peer #%u lacks public-key" msgstr "peer #%u 缺少 public-key" -#: ../src/libnm-core-impl/nm-setting-wireguard.c:1961 +#: ../src/libnm-core-impl/nm-setting-wireguard.c:1949 #, c-format msgid "non-existing peer '%s'" -msgstr "不存在 peer '%s'" +msgstr "不存在 peer \"%s\"" -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:925 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:912 #, c-format msgid "'%s' is not a valid value for '%s' mode connections" msgstr "\"%s\" 不是 \"%s\" 模式连接的有效值" -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:941 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:942 #, c-format msgid "'%s' security requires '%s=%s'" msgstr "\"%s\" 安全需要 \"%s=%s\"" -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:970 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:971 #, c-format msgid "'%s' security requires '%s' setting presence" msgstr "\"%s\" 安全需要 \"%s\" 设置存在" -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:995 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:996 #, c-format msgid "'%d' value is out of range <0-3>" -msgstr "'%d' 值超出了 范围 <0-3>" +msgstr "\"%d\" 值超出了 范围 <0-3>" -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1072 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1073 #, c-format msgid "'%s' can only be used with '%s=%s' (WEP)" msgstr "\"%s\" 只能与 \"%s=%s\"（WEP）共用" -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1109 -#, fuzzy, c-format -msgid "" -"'%s' can only be used with 'owe', 'wpa-psk', 'sae', 'wpa-eap' or 'wpa-eap-" -"suite-b-192' key management" -msgstr "'%s' 只能用于 'wpa-eap'、'wpa-psk' 或 'sae' 密钥管理 " - -#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1127 +#: ../src/libnm-core-impl/nm-setting-wireless-security.c:1111 #, c-format +#| msgid "" +#| "'%s' can only be used with 'wpa-eap', 'wpa-psk' or 'sae' key management " msgid "" -"pmf can only be 'default' or 'required' when using 'owe', 'sae' or 'wpa-eap-" -"suite-b-192' key management" +"'%s' can only be used with 'wpa-eap', 'wpa-eap-suite-b-192', 'wpa-psk' or " +"'sae' key management " msgstr "" +"\"%s\" 只能用于 \"wpa-eap\"、\"wpa-eap-suite-b-192\"、\"wpa-psk\" 或 \"sae\" " +"密钥管理 " #: ../src/libnm-core-impl/nm-setting-wireless.c:813 #, c-format @@ -3305,7 +3303,7 @@ msgstr "\"%s\" 需要设置 \"%s\" 属性" #: ../src/libnm-core-impl/nm-setting-wireless.c:869 #, c-format msgid "'%s' requires '%s' and '%s' property" -msgstr "'%s' 需要 '%s' 和 '%s' 属性" +msgstr "\"%s\" 需要 \"%s\" 和 \"%s\" 属性" #: ../src/libnm-core-impl/nm-setting-wireless.c:981 #: ../src/libnm-core-impl/nm-team-utils.c:2253 @@ -3323,7 +3321,7 @@ msgstr "WLAN 唤醒正在尝试设定未知的标记" #: ../src/libnm-core-impl/nm-setting-wireless.c:1018 msgid "AP isolation can be set only in AP mode" -msgstr "" +msgstr "AP 隔离只能在 AP 模式下设定" #: ../src/libnm-core-impl/nm-setting-wireless.c:1042 #, c-format @@ -3332,7 +3330,7 @@ msgstr "mac-address-randomization 和 cloned-mac-address 的值冲突" #: ../src/libnm-core-impl/nm-setting-wpan.c:171 msgid "page must be defined along with a channel" -msgstr "页需要和一个频道定义" +msgstr "页需要和一个信道定义" #: ../src/libnm-core-impl/nm-setting-wpan.c:180 #, c-format @@ -3342,7 +3340,7 @@ msgstr "页需要在 %d 和 %d 之间" #: ../src/libnm-core-impl/nm-setting-wpan.c:191 #, c-format msgid "channel must not be between %d and %d" -msgstr "频道不能在 %d 和 %d 之间" +msgstr "信道不能在 %d 和 %d 之间" #: ../src/libnm-core-impl/nm-setting.c:795 #, c-format @@ -3446,228 +3444,228 @@ msgstr "无效的 D-Bus 类型 \"%s\"" msgid "invalid link-watchers: %s" msgstr "无效的 link-watcher：%s" -#: ../src/libnm-core-impl/nm-utils.c:2227 +#: ../src/libnm-core-impl/nm-utils.c:2233 #, c-format msgid "'%s' is not a valid handle." msgstr "\"%s\" 不是有效的处理模块。" -#: ../src/libnm-core-impl/nm-utils.c:2375 +#: ../src/libnm-core-impl/nm-utils.c:2381 #, c-format msgid "'%s' unexpected: parent already specified." msgstr "意外的 \"%s\"：已指定上级。" -#: ../src/libnm-core-impl/nm-utils.c:2393 +#: ../src/libnm-core-impl/nm-utils.c:2399 #, c-format msgid "invalid handle: '%s'" msgstr "无效的句柄：\"%s\"" -#: ../src/libnm-core-impl/nm-utils.c:2415 +#: ../src/libnm-core-impl/nm-utils.c:2421 msgid "parent not specified." msgstr "未指定上级。" -#: ../src/libnm-core-impl/nm-utils.c:2479 +#: ../src/libnm-core-impl/nm-utils.c:2485 #, c-format msgid "unsupported qdisc option: '%s'." msgstr "不支持的排队规则（qdisc）选项：\"%s\"。" -#: ../src/libnm-core-impl/nm-utils.c:2609 +#: ../src/libnm-core-impl/nm-utils.c:2615 msgid "action name missing." msgstr "操作名缺失。" -#: ../src/libnm-core-impl/nm-utils.c:2634 +#: ../src/libnm-core-impl/nm-utils.c:2641 #, c-format msgid "unsupported action option: '%s'." msgstr "不支持的操作选项：\"%s\"。" -#: ../src/libnm-core-impl/nm-utils.c:2771 +#: ../src/libnm-core-impl/nm-utils.c:2780 msgid "invalid action: " -msgstr "无效操作： " +msgstr "无效操作：" -#: ../src/libnm-core-impl/nm-utils.c:2775 +#: ../src/libnm-core-impl/nm-utils.c:2784 #, c-format msgid "unsupported tfilter option: '%s'." msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。" -#: ../src/libnm-core-impl/nm-utils.c:3163 +#: ../src/libnm-core-impl/nm-utils.c:3385 #, c-format msgid "failed stat file %s: %s" msgstr "统计文件 %s 失败：%s" -#: ../src/libnm-core-impl/nm-utils.c:3174 +#: ../src/libnm-core-impl/nm-utils.c:3396 #, c-format msgid "not a file (%s)" msgstr "不是一个文件（%s）" -#: ../src/libnm-core-impl/nm-utils.c:3185 +#: ../src/libnm-core-impl/nm-utils.c:3407 #, c-format msgid "invalid file owner %d for %s" msgstr "对 %d%s 无效的文件所有者" -#: ../src/libnm-core-impl/nm-utils.c:3197 +#: ../src/libnm-core-impl/nm-utils.c:3419 #, c-format msgid "file permissions for %s" msgstr "%s 的文件权限" -#: ../src/libnm-core-impl/nm-utils.c:3207 +#: ../src/libnm-core-impl/nm-utils.c:3429 #, c-format msgid "reject %s" msgstr "拒绝 %s" -#: ../src/libnm-core-impl/nm-utils.c:3227 +#: ../src/libnm-core-impl/nm-utils.c:3449 #, c-format msgid "path is not absolute (%s)" msgstr "路径不是绝对路径（%s）" -#: ../src/libnm-core-impl/nm-utils.c:3242 +#: ../src/libnm-core-impl/nm-utils.c:3464 #, c-format msgid "Plugin file does not exist (%s)" msgstr "插件文件不存在（%s）" -#: ../src/libnm-core-impl/nm-utils.c:3251 +#: ../src/libnm-core-impl/nm-utils.c:3473 #, c-format msgid "Plugin is not a valid file (%s)" msgstr "插件不是有效的文件（%s）" -#: ../src/libnm-core-impl/nm-utils.c:3262 +#: ../src/libnm-core-impl/nm-utils.c:3484 #, c-format msgid "libtool archives are not supported (%s)" msgstr "不支持 libtool 归档（%s）" -#: ../src/libnm-core-impl/nm-utils.c:3339 +#: ../src/libnm-core-impl/nm-utils.c:3561 #, c-format msgid "Could not find \"%s\" binary" msgstr "无法找到 \"%s\" 二进制文件" -#: ../src/libnm-core-impl/nm-utils.c:4183 +#: ../src/libnm-core-impl/nm-utils.c:4405 msgid "unknown secret flags" msgstr "未知的 secret 标记" -#: ../src/libnm-core-impl/nm-utils.c:4193 +#: ../src/libnm-core-impl/nm-utils.c:4415 msgid "conflicting secret flags" msgstr "冲突的 secret 标记" -#: ../src/libnm-core-impl/nm-utils.c:4204 +#: ../src/libnm-core-impl/nm-utils.c:4426 msgid "secret flags must not be \"not-required\"" msgstr "secret 标记不能为 \"not-required\"" -#: ../src/libnm-core-impl/nm-utils.c:4212 +#: ../src/libnm-core-impl/nm-utils.c:4434 msgid "unsupported secret flags" msgstr "不支持的 secret 标记" -#: ../src/libnm-core-impl/nm-utils.c:4242 +#: ../src/libnm-core-impl/nm-utils.c:4464 msgid "can't be simultaneously disabled and enabled" msgstr "不能同时启用和禁用" -#: ../src/libnm-core-impl/nm-utils.c:4250 +#: ../src/libnm-core-impl/nm-utils.c:4472 msgid "WPS is required" msgstr "需要 WPS" -#: ../src/libnm-core-impl/nm-utils.c:4318 +#: ../src/libnm-core-impl/nm-utils.c:4540 #, c-format msgid "not a valid ethernet MAC address for mask at position %lld" msgstr "对于 %lld 位置的掩码，该以太网 MAC 地址无效" -#: ../src/libnm-core-impl/nm-utils.c:4337 +#: ../src/libnm-core-impl/nm-utils.c:4559 #, c-format msgid "not a valid ethernet MAC address #%u at position %lld" msgstr "在位置 %u%lld，该以太网 MAC 地址 # 无效" -#: ../src/libnm-core-impl/nm-utils.c:4952 +#: ../src/libnm-core-impl/nm-utils.c:5191 msgid "not valid utf-8" msgstr "不是有效的 utf-8" -#: ../src/libnm-core-impl/nm-utils.c:4973 -#: ../src/libnm-core-impl/nm-utils.c:5026 +#: ../src/libnm-core-impl/nm-utils.c:5212 +#: ../src/libnm-core-impl/nm-utils.c:5265 msgid "is not a JSON object" msgstr "不是 JSON 对象" -#: ../src/libnm-core-impl/nm-utils.c:5002 +#: ../src/libnm-core-impl/nm-utils.c:5241 msgid "value is NULL" msgstr "值为 NULL" -#: ../src/libnm-core-impl/nm-utils.c:5002 +#: ../src/libnm-core-impl/nm-utils.c:5241 msgid "value is empty" msgstr "值为空" -#: ../src/libnm-core-impl/nm-utils.c:5014 +#: ../src/libnm-core-impl/nm-utils.c:5253 #, c-format msgid "invalid JSON at position %d (%s)" msgstr "位置 %d 有无效的 JSON（%s）" -#: ../src/libnm-core-impl/nm-utils.c:5142 -#: ../src/libnm-core-impl/nm-utils.c:5162 +#: ../src/libnm-core-impl/nm-utils.c:5381 +#: ../src/libnm-core-impl/nm-utils.c:5401 msgid "unterminated escape sequence" msgstr "未结束的转义序列" -#: ../src/libnm-core-impl/nm-utils.c:5188 +#: ../src/libnm-core-impl/nm-utils.c:5427 #, c-format msgid "unknown attribute '%s'" msgstr "未知属性 \"%s\"" -#: ../src/libnm-core-impl/nm-utils.c:5206 +#: ../src/libnm-core-impl/nm-utils.c:5445 #, c-format msgid "missing key-value separator '%c' after '%s'" msgstr "在 \"%2$s\" 后缺少键值对分隔符 \"%1$c\"" -#: ../src/libnm-core-impl/nm-utils.c:5226 +#: ../src/libnm-core-impl/nm-utils.c:5465 #, c-format msgid "invalid uint32 value '%s' for attribute '%s'" msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效" -#: ../src/libnm-core-impl/nm-utils.c:5240 +#: ../src/libnm-core-impl/nm-utils.c:5479 #, c-format msgid "invalid int32 value '%s' for attribute '%s'" msgstr "uint32 值 \"%s\" 对属性 \"%s\" 无效" -#: ../src/libnm-core-impl/nm-utils.c:5253 +#: ../src/libnm-core-impl/nm-utils.c:5492 #, c-format msgid "invalid uint64 value '%s' for attribute '%s'" msgstr "uint8 值 \"%s\" 对属性 \"%s\" 无效" -#: ../src/libnm-core-impl/nm-utils.c:5266 +#: ../src/libnm-core-impl/nm-utils.c:5505 #, c-format msgid "invalid uint8 value '%s' for attribute '%s'" msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效" -#: ../src/libnm-core-impl/nm-utils.c:5280 +#: ../src/libnm-core-impl/nm-utils.c:5519 #, c-format msgid "invalid boolean value '%s' for attribute '%s'" msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效" -#: ../src/libnm-core-impl/nm-utils.c:5294 +#: ../src/libnm-core-impl/nm-utils.c:5533 #, c-format msgid "unsupported attribute '%s' of type '%s'" msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\"" -#: ../src/libnm-core-impl/nm-utils.c:5596 +#: ../src/libnm-core-impl/nm-utils.c:5835 #, c-format msgid "Bridge VLANs %d and %d are not sorted by ascending vid" msgstr "网桥 VLANs %d 和 %d 没有根据生序 vid 进行排序" -#: ../src/libnm-core-impl/nm-utils.c:5620 +#: ../src/libnm-core-impl/nm-utils.c:5859 #, c-format msgid "duplicate bridge VLAN vid %u" msgstr "重复的网桥 VLAN vid %u" -#: ../src/libnm-core-impl/nm-utils.c:5632 +#: ../src/libnm-core-impl/nm-utils.c:5871 msgid "only one VLAN can be the PVID" msgstr "只有一个 VLAN 可以是 PVID" -#: ../src/libnm-core-impl/nm-utils.c:5677 +#: ../src/libnm-core-impl/nm-utils.c:5916 #, c-format msgid "unknown flags 0x%x" msgstr "未知标志 0x%x" -#: ../src/libnm-core-impl/nm-utils.c:5689 +#: ../src/libnm-core-impl/nm-utils.c:5928 msgid "" "'fqdn-no-update' and 'fqdn-serv-update' flags cannot be set at the same time" -msgstr "不能同时设置 'fqdn-no-update' 和 'fqdn-serv-update' 标志" +msgstr "不能同时设置 \"fqdn-no-update\" 和 \"fqdn-serv-update\" 标志" -#: ../src/libnm-core-impl/nm-utils.c:5700 +#: ../src/libnm-core-impl/nm-utils.c:5939 msgid "'fqdn-clear-flags' flag is incompatible with other FQDN flags" -msgstr "'fqdn-clear-flags' 标志与其他 FQDN 标志不兼容" +msgstr "\"fqdn-clear-flags\" 标志与其他 FQDN 标志不兼容" -#: ../src/libnm-core-impl/nm-utils.c:5708 +#: ../src/libnm-core-impl/nm-utils.c:5947 msgid "DHCPv6 does not support the E (encoded) FQDN flag" msgstr "DHCPv6 不支持 E（编码）FQDN 标志" @@ -3753,33 +3751,33 @@ msgstr "缺少 VPN 插件信息的名称" msgid "missing service for VPN plugin info" msgstr "缺少 VPN 插件信息的服务" -#: ../src/libnm-glib-aux/nm-shared-utils.c:2453 +#: ../src/libnm-glib-aux/nm-shared-utils.c:2367 #, c-format msgid "object class '%s' has no property named '%s'" msgstr "对象类 \"%s\" 没有名为 \"%s\" 的属性" -#: ../src/libnm-glib-aux/nm-shared-utils.c:2462 +#: ../src/libnm-glib-aux/nm-shared-utils.c:2376 #, c-format msgid "property '%s' of object class '%s' is not writable" msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是不可写的" -#: ../src/libnm-glib-aux/nm-shared-utils.c:2471 +#: ../src/libnm-glib-aux/nm-shared-utils.c:2385 #, c-format msgid "" "construct property \"%s\" for object '%s' can't be set after construction" msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造后不能被设定" -#: ../src/libnm-glib-aux/nm-shared-utils.c:2482 +#: ../src/libnm-glib-aux/nm-shared-utils.c:2396 #, c-format msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" msgstr "\"%s::%s\" 不是有效的属性名；\"%s\" 不是 GObject 子类型" -#: ../src/libnm-glib-aux/nm-shared-utils.c:2495 +#: ../src/libnm-glib-aux/nm-shared-utils.c:2409 #, c-format msgid "unable to set property '%s' of type '%s' from value of type '%s'" msgstr "无法从类型 \"%3$s\" 的值设定类型为 \"%2$s\" 的属性 \"%1$s\"" -#: ../src/libnm-glib-aux/nm-shared-utils.c:2507 +#: ../src/libnm-glib-aux/nm-shared-utils.c:2421 #, c-format msgid "" "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " @@ -3787,46 +3785,46 @@ msgid "" msgstr "" "类型 \"%2$s\" 的值 \"%1$s\" 无效或超出类型为 \"%4$s\" 的属性 \"%3$s\" 范围" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5405 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5287 msgid "interface name is missing" msgstr "缺少接口名" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5413 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5295 msgid "interface name is too short" msgstr "接口名太短" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5421 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5303 msgid "interface name is reserved" msgstr "接口名被保留" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5434 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5316 msgid "interface name contains an invalid character" msgstr "接口名包含无效字符" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5442 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5324 msgid "interface name is longer than 15 characters" msgstr "接口名长度超过 15 字符" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5467 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5349 #, c-format msgid "'%%' is not allowed in interface names" -msgstr "接口名称中不允许使用 '%%'。" +msgstr "接口名称中不允许使用 \"%%\"" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5479 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5361 #, c-format msgid "'%s' is not allowed as interface name" -msgstr "''%s不允许作为接口名" +msgstr "\"\"%s不允许作为接口名" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5501 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5383 msgid "" "interface name must be alphanumerical with no forward or backward slashes" -msgstr "接口名称必须是字母数字，没有正反斜杠。" +msgstr "接口名称必须是字母数字，没有正反斜杠" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5518 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5400 msgid "interface name must not be empty" msgstr "接口名称不能为空" -#: ../src/libnm-glib-aux/nm-shared-utils.c:5526 +#: ../src/libnm-glib-aux/nm-shared-utils.c:5408 msgid "interface name must be UTF-8 encoded" msgstr "接口名称必须是 UTF-8 编码" @@ -3843,513 +3841,513 @@ msgstr "未知的日志域 \"%s\"" #. TRANSLATORS: the first %s is the partial value entered by #. * the user, the second %s a list of compatible values. #. -#: ../src/libnmc-base/nm-client-utils.c:108 -#: ../src/libnmc-base/nm-client-utils.c:152 +#: ../src/libnmc-base/nm-client-utils.c:106 +#: ../src/libnmc-base/nm-client-utils.c:145 #, c-format msgid "'%s' is ambiguous (%s)" msgstr "\"%s\" 不明确（%s）" -#: ../src/libnmc-base/nm-client-utils.c:123 +#: ../src/libnmc-base/nm-client-utils.c:120 #, c-format msgid "'%s' is not valid; use [%s] or [%s]" msgstr "\"%s\" 无效，请使用 [%s] 或 [%s]" -#: ../src/libnmc-base/nm-client-utils.c:176 +#: ../src/libnmc-base/nm-client-utils.c:161 #, c-format msgid "'%s' is not valid; use [%s], [%s] or [%s]" msgstr "\"%s\" 无效，请使用 [%s]、[%s] 或 [%s]" -#: ../src/libnmc-base/nm-client-utils.c:230 +#: ../src/libnmc-base/nm-client-utils.c:213 #, c-format msgid "'%s' is ambiguous: %s" msgstr "\"%s\" 不明确：%s" -#: ../src/libnmc-base/nm-client-utils.c:243 +#: ../src/libnmc-base/nm-client-utils.c:222 #, c-format msgid "missing name, try one of [%s]" msgstr "缺少名称，请尝试使用 [%s] 之一。" -#: ../src/libnmc-base/nm-client-utils.c:248 ../src/nmcli/connections.c:3543 -#: ../src/nmcli/connections.c:3601 +#: ../src/libnmc-base/nm-client-utils.c:224 ../src/nmcli/connections.c:3542 +#: ../src/nmcli/connections.c:3600 #, c-format msgid "'%s' not among [%s]" msgstr "\"%s\" 不在 [%s] 中" -#: ../src/libnmc-base/nm-client-utils.c:291 -#: ../src/libnmc-base/nm-client-utils.c:305 -#: ../src/libnmc-base/nm-client-utils.c:341 -#: ../src/libnmc-base/nm-client-utils.c:346 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1818 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1849 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:2793 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:2850 ../src/nmcli/common.c:1453 -#: ../src/nmcli/connections.c:73 ../src/nmcli/connections.c:83 -#: ../src/nmcli/devices.c:476 ../src/nmcli/devices.c:583 -#: ../src/nmcli/devices.c:589 ../src/nmcli/general.c:30 -#: ../src/nmcli/general.c:85 ../src/nmcli/general.c:91 +#: ../src/libnmc-base/nm-client-utils.c:265 +#: ../src/libnmc-base/nm-client-utils.c:279 +#: ../src/libnmc-base/nm-client-utils.c:315 +#: ../src/libnmc-base/nm-client-utils.c:320 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1768 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1799 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:2743 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:2800 ../src/nmcli/common.c:1497 +#: ../src/nmcli/connections.c:72 ../src/nmcli/connections.c:82 +#: ../src/nmcli/devices.c:474 ../src/nmcli/devices.c:581 +#: ../src/nmcli/devices.c:587 ../src/nmcli/general.c:29 +#: ../src/nmcli/general.c:84 ../src/nmcli/general.c:90 msgid "unknown" msgstr "未知" -#: ../src/libnmc-base/nm-client-utils.c:292 +#: ../src/libnmc-base/nm-client-utils.c:266 msgid "unmanaged" msgstr "未托管" -#: ../src/libnmc-base/nm-client-utils.c:293 +#: ../src/libnmc-base/nm-client-utils.c:267 msgid "unavailable" msgstr "不可用" -#: ../src/libnmc-base/nm-client-utils.c:294 ../src/nmcli/general.c:39 +#: ../src/libnmc-base/nm-client-utils.c:268 ../src/nmcli/general.c:38 msgid "disconnected" msgstr "已断开" -#: ../src/libnmc-base/nm-client-utils.c:295 +#: ../src/libnmc-base/nm-client-utils.c:269 msgid "connecting (prepare)" msgstr "连接中（准备）" -#: ../src/libnmc-base/nm-client-utils.c:296 +#: ../src/libnmc-base/nm-client-utils.c:270 msgid "connecting (configuring)" msgstr "连接中（正在配置）" -#: ../src/libnmc-base/nm-client-utils.c:297 +#: ../src/libnmc-base/nm-client-utils.c:271 msgid "connecting (need authentication)" msgstr "连接中（需要验证）" -#: ../src/libnmc-base/nm-client-utils.c:298 +#: ../src/libnmc-base/nm-client-utils.c:272 msgid "connecting (getting IP configuration)" msgstr "连接中（正在获取 IP 配置）" -#: ../src/libnmc-base/nm-client-utils.c:299 +#: ../src/libnmc-base/nm-client-utils.c:273 msgid "connecting (checking IP connectivity)" msgstr "连接中（正在检查 IP 连接性）" -#: ../src/libnmc-base/nm-client-utils.c:301 +#: ../src/libnmc-base/nm-client-utils.c:275 msgid "connecting (starting secondary connections)" msgstr "连接中（正在启动次级连接）" -#: ../src/libnmc-base/nm-client-utils.c:302 ../src/nmcli/general.c:37 +#: ../src/libnmc-base/nm-client-utils.c:276 ../src/nmcli/general.c:36 msgid "connected" msgstr "已连接" -#: ../src/libnmc-base/nm-client-utils.c:303 ../src/nmcli/connections.c:76 +#: ../src/libnmc-base/nm-client-utils.c:277 ../src/nmcli/connections.c:75 msgid "deactivating" msgstr "停用中" -#: ../src/libnmc-base/nm-client-utils.c:304 +#: ../src/libnmc-base/nm-client-utils.c:278 msgid "connection failed" msgstr "连接失败" -#: ../src/libnmc-base/nm-client-utils.c:311 -#: ../src/libnmc-base/nm-client-utils.c:312 -#: ../src/libnmc-base/nm-client-utils.c:313 -#: ../src/libnmc-base/nm-client-utils.c:314 -#: ../src/libnmc-base/nm-client-utils.c:315 -#: ../src/libnmc-base/nm-client-utils.c:316 +#: ../src/libnmc-base/nm-client-utils.c:285 +#: ../src/libnmc-base/nm-client-utils.c:286 +#: ../src/libnmc-base/nm-client-utils.c:287 +#: ../src/libnmc-base/nm-client-utils.c:288 +#: ../src/libnmc-base/nm-client-utils.c:289 +#: ../src/libnmc-base/nm-client-utils.c:290 msgid "connecting (externally)" msgstr "连接（外部）" -#: ../src/libnmc-base/nm-client-utils.c:317 +#: ../src/libnmc-base/nm-client-utils.c:291 msgid "connected (externally)" msgstr "连接（外部）" -#: ../src/libnmc-base/nm-client-utils.c:318 -#: ../src/libnmc-base/nm-client-utils.c:319 +#: ../src/libnmc-base/nm-client-utils.c:292 +#: ../src/libnmc-base/nm-client-utils.c:293 msgid "deactivating (externally)" msgstr "取消激活（外部）" -#: ../src/libnmc-base/nm-client-utils.c:342 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:880 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:2785 -#: ../src/nmcli/connections.c:5295 ../src/nmcli/connections.c:7221 -#: ../src/nmcli/connections.c:7222 ../src/nmcli/devices.c:582 -#: ../src/nmcli/devices.c:588 ../src/nmcli/devices.c:1363 -#: ../src/nmcli/general.c:92 ../src/nmcli/utils.h:311 +#: ../src/libnmc-base/nm-client-utils.c:316 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:879 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:2735 +#: ../src/nmcli/connections.c:5291 ../src/nmcli/connections.c:7217 +#: ../src/nmcli/connections.c:7218 ../src/nmcli/devices.c:580 +#: ../src/nmcli/devices.c:586 ../src/nmcli/devices.c:1349 +#: ../src/nmcli/general.c:91 ../src/nmcli/utils.h:311 msgid "yes" msgstr "是" -#: ../src/libnmc-base/nm-client-utils.c:343 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:880 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:2788 -#: ../src/nmcli/connections.c:5294 ../src/nmcli/connections.c:7221 -#: ../src/nmcli/connections.c:7222 ../src/nmcli/devices.c:582 -#: ../src/nmcli/devices.c:588 ../src/nmcli/devices.c:1363 -#: ../src/nmcli/general.c:93 ../src/nmcli/utils.h:311 +#: ../src/libnmc-base/nm-client-utils.c:317 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:879 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:2738 +#: ../src/nmcli/connections.c:5290 ../src/nmcli/connections.c:7217 +#: ../src/nmcli/connections.c:7218 ../src/nmcli/devices.c:580 +#: ../src/nmcli/devices.c:586 ../src/nmcli/devices.c:1349 +#: ../src/nmcli/general.c:92 ../src/nmcli/utils.h:311 msgid "no" msgstr "否" -#: ../src/libnmc-base/nm-client-utils.c:344 +#: ../src/libnmc-base/nm-client-utils.c:318 msgid "yes (guessed)" msgstr "是（猜测）" -#: ../src/libnmc-base/nm-client-utils.c:345 +#: ../src/libnmc-base/nm-client-utils.c:319 msgid "no (guessed)" msgstr "否（猜测）" -#: ../src/libnmc-base/nm-client-utils.c:353 +#: ../src/libnmc-base/nm-client-utils.c:327 msgid "No reason given" msgstr "未给出原因" #. We should not really come here -#: ../src/libnmc-base/nm-client-utils.c:354 ../src/nmcli/connections.c:3563 -#: ../src/nmcli/connections.c:3622 +#: ../src/libnmc-base/nm-client-utils.c:328 ../src/nmcli/connections.c:3562 +#: ../src/nmcli/connections.c:3621 #, c-format msgid "Unknown error" msgstr "未知错误" -#: ../src/libnmc-base/nm-client-utils.c:355 +#: ../src/libnmc-base/nm-client-utils.c:329 msgid "Device is now managed" msgstr "设备现在已托管" -#: ../src/libnmc-base/nm-client-utils.c:356 +#: ../src/libnmc-base/nm-client-utils.c:330 msgid "Device is now unmanaged" msgstr "设备现在未托管" -#: ../src/libnmc-base/nm-client-utils.c:358 +#: ../src/libnmc-base/nm-client-utils.c:332 msgid "The device could not be readied for configuration" msgstr "设备配置未就绪" -#: ../src/libnmc-base/nm-client-utils.c:361 +#: ../src/libnmc-base/nm-client-utils.c:335 msgid "" "IP configuration could not be reserved (no available address, timeout, etc.)" msgstr "IP 配置无法保留（无可用地址、超时等）" -#: ../src/libnmc-base/nm-client-utils.c:363 +#: ../src/libnmc-base/nm-client-utils.c:337 msgid "The IP configuration is no longer valid" msgstr "IP 配置不再有效" -#: ../src/libnmc-base/nm-client-utils.c:365 +#: ../src/libnmc-base/nm-client-utils.c:339 msgid "Secrets were required, but not provided" msgstr "需要密钥，但未提供" -#: ../src/libnmc-base/nm-client-utils.c:367 +#: ../src/libnmc-base/nm-client-utils.c:341 msgid "802.1X supplicant disconnected" msgstr "802.1X 请求方已断开连接" -#: ../src/libnmc-base/nm-client-utils.c:369 +#: ../src/libnmc-base/nm-client-utils.c:343 msgid "802.1X supplicant configuration failed" msgstr "802.1X 请求方配置失败" -#: ../src/libnmc-base/nm-client-utils.c:370 +#: ../src/libnmc-base/nm-client-utils.c:344 msgid "802.1X supplicant failed" msgstr "802.1X 请求方失败" -#: ../src/libnmc-base/nm-client-utils.c:372 +#: ../src/libnmc-base/nm-client-utils.c:346 msgid "802.1X supplicant took too long to authenticate" msgstr "802.1X 请求方验证时间过长" -#: ../src/libnmc-base/nm-client-utils.c:374 +#: ../src/libnmc-base/nm-client-utils.c:348 msgid "PPP service failed to start" msgstr "PPP 服务无法启动" -#: ../src/libnmc-base/nm-client-utils.c:375 +#: ../src/libnmc-base/nm-client-utils.c:349 msgid "PPP service disconnected" msgstr "PPP 服务已断开连接" # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0 -#: ../src/libnmc-base/nm-client-utils.c:376 +#: ../src/libnmc-base/nm-client-utils.c:350 msgid "PPP failed" msgstr "PPP 失败" -#: ../src/libnmc-base/nm-client-utils.c:378 +#: ../src/libnmc-base/nm-client-utils.c:352 msgid "DHCP client failed to start" msgstr "DHCP 客户端启动失败" # auto translated by TM merge from project: control-center, version: 3.8.3, DocId: gnome-control-center-2.0 -#: ../src/libnmc-base/nm-client-utils.c:379 +#: ../src/libnmc-base/nm-client-utils.c:353 msgid "DHCP client error" msgstr "DHCP 客户端错误" -#: ../src/libnmc-base/nm-client-utils.c:380 +#: ../src/libnmc-base/nm-client-utils.c:354 msgid "DHCP client failed" msgstr "DHCP 客户端失败" -#: ../src/libnmc-base/nm-client-utils.c:382 +#: ../src/libnmc-base/nm-client-utils.c:356 msgid "Shared connection service failed to start" msgstr "共享连接服务启动失败" -#: ../src/libnmc-base/nm-client-utils.c:384 +#: ../src/libnmc-base/nm-client-utils.c:358 msgid "Shared connection service failed" msgstr "共享连接服务失败" -#: ../src/libnmc-base/nm-client-utils.c:386 +#: ../src/libnmc-base/nm-client-utils.c:360 msgid "AutoIP service failed to start" msgstr "自动 IP（AutoIP）服务无法启动" -#: ../src/libnmc-base/nm-client-utils.c:387 +#: ../src/libnmc-base/nm-client-utils.c:361 msgid "AutoIP service error" msgstr "自动 IP（AutoIP）服务出错" -#: ../src/libnmc-base/nm-client-utils.c:388 +#: ../src/libnmc-base/nm-client-utils.c:362 msgid "AutoIP service failed" msgstr "自动 IP（AutoIP）服务失败" -#: ../src/libnmc-base/nm-client-utils.c:389 +#: ../src/libnmc-base/nm-client-utils.c:363 msgid "The line is busy" msgstr "线路正忙" -#: ../src/libnmc-base/nm-client-utils.c:390 +#: ../src/libnmc-base/nm-client-utils.c:364 msgid "No dial tone" msgstr "无拨号音" -#: ../src/libnmc-base/nm-client-utils.c:392 +#: ../src/libnmc-base/nm-client-utils.c:366 msgid "No carrier could be established" msgstr "无法建立载波" -#: ../src/libnmc-base/nm-client-utils.c:394 +#: ../src/libnmc-base/nm-client-utils.c:368 msgid "The dialing request timed out" msgstr "拨号请求超时" -#: ../src/libnmc-base/nm-client-utils.c:396 +#: ../src/libnmc-base/nm-client-utils.c:370 msgid "The dialing attempt failed" msgstr "拨号尝试失败" -#: ../src/libnmc-base/nm-client-utils.c:398 +#: ../src/libnmc-base/nm-client-utils.c:372 msgid "Modem initialization failed" msgstr "调制解调器初始化失败" -#: ../src/libnmc-base/nm-client-utils.c:400 +#: ../src/libnmc-base/nm-client-utils.c:374 msgid "Failed to select the specified APN" msgstr "无法选择指定的 APN" -#: ../src/libnmc-base/nm-client-utils.c:402 +#: ../src/libnmc-base/nm-client-utils.c:376 msgid "Not searching for networks" msgstr "不搜索网络" -#: ../src/libnmc-base/nm-client-utils.c:404 +#: ../src/libnmc-base/nm-client-utils.c:378 msgid "Network registration denied" msgstr "网络注册遭拒绝" -#: ../src/libnmc-base/nm-client-utils.c:406 +#: ../src/libnmc-base/nm-client-utils.c:380 msgid "Network registration timed out" msgstr "网络注册超时" -#: ../src/libnmc-base/nm-client-utils.c:408 +#: ../src/libnmc-base/nm-client-utils.c:382 msgid "Failed to register with the requested network" msgstr "注册请求的网络失败" -#: ../src/libnmc-base/nm-client-utils.c:409 +#: ../src/libnmc-base/nm-client-utils.c:383 msgid "PIN check failed" msgstr "PIN 检查失败" -#: ../src/libnmc-base/nm-client-utils.c:411 +#: ../src/libnmc-base/nm-client-utils.c:385 msgid "Necessary firmware for the device may be missing" msgstr "该设备所需固件可能缺失" -#: ../src/libnmc-base/nm-client-utils.c:412 +#: ../src/libnmc-base/nm-client-utils.c:386 msgid "The device was removed" msgstr "设备已被移除" -#: ../src/libnmc-base/nm-client-utils.c:413 +#: ../src/libnmc-base/nm-client-utils.c:387 msgid "NetworkManager went to sleep" msgstr "网络管理器已挂起" -#: ../src/libnmc-base/nm-client-utils.c:415 +#: ../src/libnmc-base/nm-client-utils.c:389 msgid "The device's active connection disappeared" msgstr "设备的活动连接已消失" -#: ../src/libnmc-base/nm-client-utils.c:417 +#: ../src/libnmc-base/nm-client-utils.c:391 msgid "Device disconnected by user or client" msgstr "用户或客户端断开了设备连接" -#: ../src/libnmc-base/nm-client-utils.c:418 +#: ../src/libnmc-base/nm-client-utils.c:392 msgid "Carrier/link changed" msgstr "载波/链路已更改" -#: ../src/libnmc-base/nm-client-utils.c:420 +#: ../src/libnmc-base/nm-client-utils.c:394 msgid "The device's existing connection was assumed" msgstr "假定设备已有连接" -#: ../src/libnmc-base/nm-client-utils.c:422 +#: ../src/libnmc-base/nm-client-utils.c:396 msgid "The supplicant is now available" msgstr "客户端目前可用" -#: ../src/libnmc-base/nm-client-utils.c:424 +#: ../src/libnmc-base/nm-client-utils.c:398 msgid "The modem could not be found" msgstr "未找到调制解调器" -#: ../src/libnmc-base/nm-client-utils.c:426 +#: ../src/libnmc-base/nm-client-utils.c:400 msgid "The Bluetooth connection failed or timed out" msgstr "蓝牙连接失败或超时" -#: ../src/libnmc-base/nm-client-utils.c:428 +#: ../src/libnmc-base/nm-client-utils.c:402 msgid "GSM Modem's SIM card not inserted" msgstr "GSM 调制解调器的 SIM 卡未插入" -#: ../src/libnmc-base/nm-client-utils.c:430 +#: ../src/libnmc-base/nm-client-utils.c:404 msgid "GSM Modem's SIM PIN required" msgstr "GSM 调制解调器的 SIM 需要 PIN 码" -#: ../src/libnmc-base/nm-client-utils.c:432 +#: ../src/libnmc-base/nm-client-utils.c:406 msgid "GSM Modem's SIM PUK required" msgstr "GSM 调制解调器的 SIM 需要 PUK 码" -#: ../src/libnmc-base/nm-client-utils.c:433 +#: ../src/libnmc-base/nm-client-utils.c:407 msgid "GSM Modem's SIM wrong" msgstr "GSM 调制解调器的 SIM 错误" -#: ../src/libnmc-base/nm-client-utils.c:435 +#: ../src/libnmc-base/nm-client-utils.c:409 msgid "InfiniBand device does not support connected mode" msgstr "InfiniBand 设备不支持已连接的模式" -#: ../src/libnmc-base/nm-client-utils.c:437 +#: ../src/libnmc-base/nm-client-utils.c:411 msgid "A dependency of the connection failed" msgstr "连接的依赖关系失败" -#: ../src/libnmc-base/nm-client-utils.c:439 +#: ../src/libnmc-base/nm-client-utils.c:413 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" msgstr "ADSL 网桥上的 RFC 2684 以太网出现问题" -#: ../src/libnmc-base/nm-client-utils.c:441 +#: ../src/libnmc-base/nm-client-utils.c:415 msgid "ModemManager is unavailable" msgstr "ModemManager 不可用" -#: ../src/libnmc-base/nm-client-utils.c:443 +#: ../src/libnmc-base/nm-client-utils.c:417 msgid "The Wi-Fi network could not be found" msgstr "未找到 Wi-Fi 网络" -#: ../src/libnmc-base/nm-client-utils.c:445 +#: ../src/libnmc-base/nm-client-utils.c:419 msgid "A secondary connection of the base connection failed" msgstr "基础连接的次级连接失败" -#: ../src/libnmc-base/nm-client-utils.c:446 +#: ../src/libnmc-base/nm-client-utils.c:420 msgid "DCB or FCoE setup failed" msgstr "DCB 或 FCoE 设置失败" -#: ../src/libnmc-base/nm-client-utils.c:447 +#: ../src/libnmc-base/nm-client-utils.c:421 msgid "teamd control failed" msgstr "teamd 控制失败" # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager -#: ../src/libnmc-base/nm-client-utils.c:449 +#: ../src/libnmc-base/nm-client-utils.c:423 msgid "Modem failed or no longer available" msgstr "调制解调器出现故障或不再可用" # auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager -#: ../src/libnmc-base/nm-client-utils.c:451 +#: ../src/libnmc-base/nm-client-utils.c:425 msgid "Modem now ready and available" msgstr "调制解调器现已就绪且可用" -#: ../src/libnmc-base/nm-client-utils.c:452 +#: ../src/libnmc-base/nm-client-utils.c:426 msgid "SIM PIN was incorrect" msgstr "SIM PIN 不正确" -#: ../src/libnmc-base/nm-client-utils.c:454 +#: ../src/libnmc-base/nm-client-utils.c:428 msgid "New connection activation was enqueued" msgstr "新连接激活已排队" -#: ../src/libnmc-base/nm-client-utils.c:455 +#: ../src/libnmc-base/nm-client-utils.c:429 msgid "The device's parent changed" msgstr "设备的上级已更改" -#: ../src/libnmc-base/nm-client-utils.c:457 +#: ../src/libnmc-base/nm-client-utils.c:431 msgid "The device parent's management changed" msgstr "设备的上级管理已更改" -#: ../src/libnmc-base/nm-client-utils.c:459 +#: ../src/libnmc-base/nm-client-utils.c:433 msgid "Open vSwitch database connection failed" msgstr "Open vSwitch 数据库连接失败" -#: ../src/libnmc-base/nm-client-utils.c:461 +#: ../src/libnmc-base/nm-client-utils.c:435 msgid "A duplicate IP address was detected" msgstr "检测到重复的 IP 地址" -#: ../src/libnmc-base/nm-client-utils.c:463 +#: ../src/libnmc-base/nm-client-utils.c:437 msgid "The selected IP method is not supported" msgstr "选中的 IP 方法未支持" -#: ../src/libnmc-base/nm-client-utils.c:465 +#: ../src/libnmc-base/nm-client-utils.c:439 msgid "Failed to configure SR-IOV parameters" msgstr "配置 SR-IOV 参数失败" -#: ../src/libnmc-base/nm-client-utils.c:467 +#: ../src/libnmc-base/nm-client-utils.c:441 msgid "The Wi-Fi P2P peer could not be found" msgstr "无法找到 Wi-Fi P2P peer" -#: ../src/libnmc-base/nm-client-utils.c:474 +#: ../src/libnmc-base/nm-client-utils.c:448 msgid "Unknown reason" msgstr "未知原因" -#: ../src/libnmc-base/nm-client-utils.c:476 +#: ../src/libnmc-base/nm-client-utils.c:450 msgid "The connection was disconnected" msgstr "连接已断开" -#: ../src/libnmc-base/nm-client-utils.c:478 +#: ../src/libnmc-base/nm-client-utils.c:452 msgid "Disconnected by user" msgstr "已被用户断开连接" -#: ../src/libnmc-base/nm-client-utils.c:480 +#: ../src/libnmc-base/nm-client-utils.c:454 msgid "The base network connection was interrupted" msgstr "基础网络连接已中断" -#: ../src/libnmc-base/nm-client-utils.c:482 +#: ../src/libnmc-base/nm-client-utils.c:456 msgid "The VPN service stopped unexpectedly" msgstr "VPN 服务意外停止" -#: ../src/libnmc-base/nm-client-utils.c:484 +#: ../src/libnmc-base/nm-client-utils.c:458 msgid "The VPN service returned invalid configuration" msgstr "VPN 服务返回了无效配置" -#: ../src/libnmc-base/nm-client-utils.c:486 +#: ../src/libnmc-base/nm-client-utils.c:460 msgid "The connection attempt timed out" msgstr "连接尝试超时" -#: ../src/libnmc-base/nm-client-utils.c:488 +#: ../src/libnmc-base/nm-client-utils.c:462 msgid "The VPN service did not start in time" msgstr "VPN 连接没有及时启动" -#: ../src/libnmc-base/nm-client-utils.c:490 +#: ../src/libnmc-base/nm-client-utils.c:464 msgid "The VPN service failed to start" msgstr "VPN 服务启动失败" -#: ../src/libnmc-base/nm-client-utils.c:491 +#: ../src/libnmc-base/nm-client-utils.c:465 msgid "No valid secrets" msgstr "没有有效的密钥" -#: ../src/libnmc-base/nm-client-utils.c:492 +#: ../src/libnmc-base/nm-client-utils.c:466 msgid "Invalid secrets" msgstr "无效的密钥" -#: ../src/libnmc-base/nm-client-utils.c:494 +#: ../src/libnmc-base/nm-client-utils.c:468 msgid "The connection was removed" msgstr "连接已被移除" -#: ../src/libnmc-base/nm-client-utils.c:496 +#: ../src/libnmc-base/nm-client-utils.c:470 msgid "Master connection failed" msgstr "主连接失败" -#: ../src/libnmc-base/nm-client-utils.c:498 +#: ../src/libnmc-base/nm-client-utils.c:472 msgid "Could not create a software link" -msgstr "无法创建软件链路：" +msgstr "无法创建软件链路" -#: ../src/libnmc-base/nm-client-utils.c:500 +#: ../src/libnmc-base/nm-client-utils.c:474 msgid "The device disappeared" msgstr "设备已消失" -#: ../src/libnmc-base/nm-client-utils.c:823 +#: ../src/libnmc-base/nm-client-utils.c:797 msgid "missing colon for \".:\" format" -msgstr "缺少 \".:\" 格式中的冒号" +msgstr "缺少 \"<设置>.<属性>:<机密>\" 格式中的冒号" -#: ../src/libnmc-base/nm-client-utils.c:840 +#: ../src/libnmc-base/nm-client-utils.c:814 msgid "missing dot for \".:\" format" -msgstr "缺少 \".:\" 格式中的点" +msgstr "缺少 \"<设置>.<属性>:<机密>\" 格式中的点" -#: ../src/libnmc-base/nm-client-utils.c:846 +#: ../src/libnmc-base/nm-client-utils.c:820 msgid "missing setting for \".:\" format" -msgstr "缺少 \".:\" 格式的设置" +msgstr "缺少 \"<设置>.<属性>:<机密>\" 格式的设置" -#: ../src/libnmc-base/nm-client-utils.c:857 +#: ../src/libnmc-base/nm-client-utils.c:831 msgid "missing property for \".:\" format" -msgstr "缺少 \".:\" 格式的属性" +msgstr "缺少 \"<设置>.<属性>:<机密>\" 格式的属性" -#: ../src/libnmc-base/nm-client-utils.c:867 +#: ../src/libnmc-base/nm-client-utils.c:841 msgid "invalid setting name" msgstr "无效的设置名称" -#: ../src/libnmc-base/nm-client-utils.c:881 +#: ../src/libnmc-base/nm-client-utils.c:855 msgid "property name is not UTF-8" msgstr "属性名不是UTF-8" -#: ../src/libnmc-base/nm-client-utils.c:898 -#: ../src/libnmc-base/nm-client-utils.c:904 +#: ../src/libnmc-base/nm-client-utils.c:872 +#: ../src/libnmc-base/nm-client-utils.c:878 msgid "secret is not UTF-8" msgstr "secret 不是 UTF-8" @@ -4370,7 +4368,7 @@ msgstr "%s 的预共享密钥" #: ../src/libnmc-base/nm-secret-agent-simple.c:270 #: ../src/libnmc-base/nm-secret-agent-simple.c:357 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:4954 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:4879 #: ../src/nmtui/nmt-page-dsl.c:49 ../src/nmtui/nmt-page-wifi.c:334 msgid "Username" msgstr "用户名" @@ -4379,13 +4377,13 @@ msgstr "用户名" #: ../src/libnmc-base/nm-secret-agent-simple.c:312 #: ../src/libnmc-base/nm-secret-agent-simple.c:335 #: ../src/libnmc-base/nm-secret-agent-simple.c:367 -#: ../src/libnmc-base/nm-secret-agent-simple.c:918 -#: ../src/libnmc-base/nm-secret-agent-simple.c:953 -#: ../src/libnmc-base/nm-secret-agent-simple.c:980 +#: ../src/libnmc-base/nm-secret-agent-simple.c:915 +#: ../src/libnmc-base/nm-secret-agent-simple.c:950 +#: ../src/libnmc-base/nm-secret-agent-simple.c:977 #: ../src/libnmc-base/nm-vpn-helpers.c:143 #: ../src/libnmc-base/nm-vpn-helpers.c:147 #: ../src/libnmc-base/nm-vpn-helpers.c:153 -#: ../src/libnmc-base/nm-vpn-helpers.c:158 ../src/nmcli/devices.c:4641 +#: ../src/libnmc-base/nm-vpn-helpers.c:158 ../src/nmcli/devices.c:4635 #: ../src/nmtui/nmt-page-dsl.c:62 ../src/nmtui/nmt-page-wifi.c:274 #: ../src/nmtui/nmt-page-wifi.c:308 ../src/nmtui/nmt-page-wifi.c:347 msgid "Password" @@ -4416,87 +4414,87 @@ msgstr "WireGuard 私钥" #: ../src/libnmc-base/nm-secret-agent-simple.c:512 #, c-format msgid "Secrets are required to connect WireGuard VPN '%s'" -msgstr "连接到 WireGuard VPN '%s' 所需要的 secret" +msgstr "连接到 WireGuard VPN \"%s\" 所需要的 secret" #: ../src/libnmc-base/nm-secret-agent-simple.c:620 -#: ../src/libnmc-base/nm-secret-agent-simple.c:914 -#: ../src/libnmc-base/nm-secret-agent-simple.c:949 -#: ../src/libnmc-base/nm-secret-agent-simple.c:976 -#: ../src/libnmc-base/nm-secret-agent-simple.c:995 +#: ../src/libnmc-base/nm-secret-agent-simple.c:911 +#: ../src/libnmc-base/nm-secret-agent-simple.c:946 +#: ../src/libnmc-base/nm-secret-agent-simple.c:973 +#: ../src/libnmc-base/nm-secret-agent-simple.c:992 #, c-format msgid "A password is required to connect to '%s'." msgstr "需要密码来连接到 \"%s\"。" -#: ../src/libnmc-base/nm-secret-agent-simple.c:879 +#: ../src/libnmc-base/nm-secret-agent-simple.c:876 msgid "Authentication required by wireless network" msgstr "无线网络要求身份验证" -#: ../src/libnmc-base/nm-secret-agent-simple.c:881 +#: ../src/libnmc-base/nm-secret-agent-simple.c:878 #, c-format msgid "" "Passwords or encryption keys are required to access the wireless network " "'%s'." msgstr "需要密码或密钥来访问无线网络 \"%s\"。" -#: ../src/libnmc-base/nm-secret-agent-simple.c:887 +#: ../src/libnmc-base/nm-secret-agent-simple.c:884 msgid "Wired 802.1X authentication" msgstr "有线 802.1X 身份验证" -#: ../src/libnmc-base/nm-secret-agent-simple.c:888 +#: ../src/libnmc-base/nm-secret-agent-simple.c:885 #, c-format msgid "Secrets are required to access the wired network '%s'" msgstr "需要密钥来访问有线网络 \"%s\"。" -#: ../src/libnmc-base/nm-secret-agent-simple.c:894 +#: ../src/libnmc-base/nm-secret-agent-simple.c:891 msgid "DSL authentication" msgstr "DSL 身份验证" -#: ../src/libnmc-base/nm-secret-agent-simple.c:895 +#: ../src/libnmc-base/nm-secret-agent-simple.c:892 #, c-format msgid "Secrets are required for the DSL connection '%s'" msgstr "DSL 连接 \"%s\" 需要密钥。" -#: ../src/libnmc-base/nm-secret-agent-simple.c:904 +#: ../src/libnmc-base/nm-secret-agent-simple.c:901 msgid "PIN code required" msgstr "需要 PIN 码" -#: ../src/libnmc-base/nm-secret-agent-simple.c:905 +#: ../src/libnmc-base/nm-secret-agent-simple.c:902 msgid "PIN code is needed for the mobile broadband device" msgstr "移动宽带设备需要 PIN 码" -#: ../src/libnmc-base/nm-secret-agent-simple.c:908 +#: ../src/libnmc-base/nm-secret-agent-simple.c:905 msgid "PIN" msgstr "PIN" -#: ../src/libnmc-base/nm-secret-agent-simple.c:913 -#: ../src/libnmc-base/nm-secret-agent-simple.c:948 -#: ../src/libnmc-base/nm-secret-agent-simple.c:975 +#: ../src/libnmc-base/nm-secret-agent-simple.c:910 +#: ../src/libnmc-base/nm-secret-agent-simple.c:945 +#: ../src/libnmc-base/nm-secret-agent-simple.c:972 msgid "Mobile broadband network password" msgstr "移动宽带网络密码" -#: ../src/libnmc-base/nm-secret-agent-simple.c:926 +#: ../src/libnmc-base/nm-secret-agent-simple.c:923 #, c-format msgid "Secrets are required to access the MACsec network '%s'" msgstr "需要密钥来访问 MACsec 网络 \"%s\"。" -#: ../src/libnmc-base/nm-secret-agent-simple.c:930 +#: ../src/libnmc-base/nm-secret-agent-simple.c:927 msgid "MACsec PSK authentication" msgstr "MACsec PSK 身份验证" -#: ../src/libnmc-base/nm-secret-agent-simple.c:932 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:6382 +#: ../src/libnmc-base/nm-secret-agent-simple.c:929 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:6276 msgid "MKA CAK" msgstr "MKA CAK" -#: ../src/libnmc-base/nm-secret-agent-simple.c:937 +#: ../src/libnmc-base/nm-secret-agent-simple.c:934 msgid "MACsec EAP authentication" msgstr "MACsec EAP 身份验证" -#: ../src/libnmc-base/nm-secret-agent-simple.c:942 +#: ../src/libnmc-base/nm-secret-agent-simple.c:939 msgid "WireGuard VPN secret" msgstr "WireGuard VPN secret" -#: ../src/libnmc-base/nm-secret-agent-simple.c:985 +#: ../src/libnmc-base/nm-secret-agent-simple.c:982 msgid "VPN password required" msgstr "需要 VPN 密码" @@ -4550,7 +4548,7 @@ msgstr "网关证书散列" #: ../src/libnmc-base/nm-vpn-helpers.c:267 #, c-format msgid "Invalid peer starting at %s:%zu: %s" -msgstr "于 %s:%zu: %s 启动的无效 peer" +msgstr "在 %s:%zu 正启动无效的对等端：%s" #: ../src/libnmc-base/nm-vpn-helpers.c:388 msgid "" @@ -4566,17 +4564,17 @@ msgstr "无法识别的行 %s:%zu" #: ../src/libnmc-base/nm-vpn-helpers.c:678 #, c-format msgid "invalid value for '%s' at %s:%zu" -msgstr "无效的值 '%s' 于 %s:%zu" +msgstr "%2$s:%3$zu 有无效的值 \"%1$s\"" #: ../src/libnmc-base/nm-vpn-helpers.c:686 #, c-format msgid "invalid secret '%s' at %s:%zu" -msgstr "无效的 secret '%s' 于 %s:%zu" +msgstr "%2$s:%3$zu 有无效的机密（secret）\"%1$s\"" #: ../src/libnmc-base/nm-vpn-helpers.c:815 #, c-format msgid "Failed to create WireGuard connection: %s" -msgstr "创建 WireGuard 连接失败 : %s" +msgstr "创建 WireGuard 连接失败：%s" #: ../src/libnmc-setting/nm-meta-setting-access.c:501 #, c-format @@ -4588,18 +4586,18 @@ msgstr "字段 \"%s\" 必须是单独的" msgid "invalid field '%s%s%s%s%s'; %s%s%s" msgstr "无效字段 \"%s%s%s%s%s\"；%s%s%s" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:263 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:329 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:262 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:328 #, c-format msgid "invalid prefix '%s'; <1-%d> allowed" -msgstr "无效的前缀 '%s'; 只允许 <1-%d>" +msgstr "无效的前缀 \"%s\"；只允许 <1-%d>" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:275 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:274 #, c-format msgid "invalid IP address: %s" msgstr "无效的 IP 地址：%s" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:300 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:299 msgid "" "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [," "ip[/prefix] ...]'" @@ -4607,183 +4605,183 @@ msgstr "" "有效语法为：\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/" "prefix] ...]\"" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:341 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:340 #, c-format msgid "the next hop ('%s') must be first" msgstr "下一跳（\"%s\"）必须在首位" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:351 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:350 #, c-format msgid "the metric ('%s') must be before attributes" msgstr "跃点数（\"%s\"）必需在属性前" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:402 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:401 #, c-format msgid "invalid route: %s. %s" msgstr "无效路由：%s。%s" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:470 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:469 #, c-format msgid "cannot read pac-script from file '%s'" msgstr "无法从文件 \"%s\" 读取 PAC 脚本" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:479 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:478 #, c-format msgid "file '%s' contains non-valid utf-8" msgstr "文件 \"%s\" 包含无效的 utf-8" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:493 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:492 #, c-format msgid "'%s' does not contain a valid PAC Script" msgstr "\"%s\" 没有包含有效的 PAC 脚本" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:499 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:498 #, c-format msgid "Not a valid PAC Script" msgstr "不是有效的 PAC 脚本" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:552 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:551 #, c-format msgid "cannot read team config from file '%s'" msgstr "无法从文件 \"%s\" 读取组合（team）配置" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:561 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:560 #, c-format msgid "team config file '%s' contains non-valid utf-8" msgstr "组合（team）配置文件 \"%s\" 包含无效的 utf-8" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1052 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1051 msgid "auto" msgstr "自动" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1214 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1213 #, c-format msgid "%s (%s)" msgstr "%s（%s）" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1403 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1411 -#: ../src/libnmc-setting/nm-meta-setting-desc.c:4301 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1375 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1383 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:4230 msgid "'%s' is out of range [%" -msgstr "'%s' 超出范围 [%" +msgstr "\"%s\" 超出范围 [%" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1420 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1392 #, c-format msgid "'%s' is not a valid number" msgstr "\"%s\" 不是有效的数字" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1476 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1448 #, c-format msgid "'%s' is out of range [0, %u]" msgstr "\"%s\" 超出范围 [0, %u]" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1520 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1492 #, c-format msgid "'%s' is not a valid Ethernet MAC" msgstr "\"%s\" 不是有效的以太网 MAC" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1644 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1616 #, c-format msgid "invalid option '%s', use a combination of [%s]" msgstr "无效选项 \"%s\"，请使用 [%s] 的组合" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1785 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1735 #, c-format msgid "%d (key)" msgstr "%d（密钥）" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1787 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1737 #, c-format msgid "%d (passphrase)" msgstr "%d（密码）" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1790 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1740 #, c-format msgid "%d (unknown)" msgstr "%d（未知）" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1803 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1753 msgid "0 (NONE)" msgstr "0（无）" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1809 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1759 msgid "REORDER_HEADERS, " msgstr "记录头、 " -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1811 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1761 msgid "GVRP, " msgstr "GVRP、 " -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1813 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1763 msgid "LOOSE_BINDING, " msgstr "松散绑定、 " -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1815 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1765 msgid "MVRP, " msgstr "MVRP、 " -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1836 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1786 msgid "0 (none)" msgstr "0（无）" -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1842 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1792 msgid "agent-owned, " msgstr "为代理拥有、 " -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1844 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1794 msgid "not saved, " msgstr "未保存、 " -#: ../src/libnmc-setting/nm-meta-setting-desc.c:1846 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1796 msgid "not required, " msgstr "不必需、 " -#: ../src/libnmc-setting/nm-meta-setting-desc.c:2048 +#: ../src/libnmc-setting/nm-meta-setting-desc.c:1998 #, c-format msgid "'%s' is not valid; use