From 7f883e3711780641223e350f8d657f61df6b8924 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 06:48:30 -0500 Subject: [PATCH] import network-manager-applet-1.18.0-2.el8 --- .gitignore | 2 +- .network-manager-applet.metadata | 2 +- .../0001-Import-translations-rh1820554.patch | 4114 +++++++++++++++++ SOURCES/0001-nm-applet-no-notifications.patch | 13 - ...1-po-RHEL-8.1-translations-rh1690001.patch | 3232 ------------- SPECS/network-manager-applet.spec | 138 +- 6 files changed, 4145 insertions(+), 3356 deletions(-) create mode 100644 SOURCES/0001-Import-translations-rh1820554.patch delete mode 100644 SOURCES/0001-nm-applet-no-notifications.patch delete mode 100644 SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch diff --git a/.gitignore b/.gitignore index 41e14ad..1808e67 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/network-manager-applet-1.8.22.tar.xz +SOURCES/network-manager-applet-1.18.0.tar.xz diff --git a/.network-manager-applet.metadata b/.network-manager-applet.metadata index e298943..5bb6144 100644 --- a/.network-manager-applet.metadata +++ b/.network-manager-applet.metadata @@ -1 +1 @@ -052e371469ed3840a9b9015001e3bc2873c5a962 SOURCES/network-manager-applet-1.8.22.tar.xz +6d79ca3373212df29e20fbcc49a6ab33d01c3120 SOURCES/network-manager-applet-1.18.0.tar.xz diff --git a/SOURCES/0001-Import-translations-rh1820554.patch b/SOURCES/0001-Import-translations-rh1820554.patch new file mode 100644 index 0000000..6157958 --- /dev/null +++ b/SOURCES/0001-Import-translations-rh1820554.patch @@ -0,0 +1,4114 @@ +From 45fc5bb3da9144c7d9af8ab33df80951712eb8f0 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Mon, 20 Jul 2020 17:04:06 +0200 +Subject: [PATCH] Import translations + +https://bugzilla.redhat.com/show_bug.cgi?id=1820554 +--- + po/fr.po | 619 +++++++++++++++------------------------------------- + po/ja.po | 433 +++++++++++------------------------- + po/zh_CN.po | 414 +++++++++++------------------------ + 3 files changed, 424 insertions(+), 1042 deletions(-) + +diff --git a/po/fr.po b/po/fr.po +index ffb024c4..945b4e79 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -52,17 +52,13 @@ msgstr "Éditeur de connexion NetworkManager" + msgid "" + "NetworkManager is a system service for managing and configuring your network " + "connections and devices." +-msgstr "" +-"NetworkManager est un service système de gestion et de configuration de vos " +-"connexions et périphériques réseau." ++msgstr "NetworkManager est un service système de gestion et de configuration de vos connexions et périphériques réseau." + + #: nm-connection-editor.appdata.xml.in:13 + msgid "" + "The nm-connection-editor program works with NetworkManager to create and " + "edit existing connection profiles for NetworkManager." +-msgstr "" +-"Le programme nm-connection-editor fonctionne avec NetworkManager pour créer " +-"et éditer les profils de connexions de NetworkManager." ++msgstr "Le programme nm-connection-editor fonctionne avec NetworkManager pour créer et éditer les profils de connexions de NetworkManager." + + #: nm-connection-editor.appdata.xml.in:27 + msgid "The NetworkManager Developers" +@@ -84,40 +80,30 @@ msgstr "la classe d’objet « %s » n’a pas de propriété nommée « %s  + #: shared/nm-utils/nm-shared-utils.c:800 + #, c-format + msgid "property '%s' of object class '%s' is not writable" +-msgstr "" +-"la propriété « %s » de la classe d’objet « %s » n’est pas accessible en " +-"écriture" ++msgstr "la propriété « %s » de la classe d’objet « %s » n’est pas accessible en écriture" + + #: shared/nm-utils/nm-shared-utils.c:807 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +-msgstr "" +-"la propriété de construction « %s » pour l’objet « %s » ne peut pas être " +-"définie après la construction" ++msgstr "la propriété de construction « %s » pour l’objet « %s » ne peut pas être définie après la construction" + + #: shared/nm-utils/nm-shared-utils.c:815 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" +-msgstr "" +-"« %s::%s » n’est pas un nom de propriété valide ; « %s » n’est pas un sous-" +-"type GObject" ++msgstr "« %s::%s » n’est pas un nom de propriété valide ; « %s » n’est pas un sous-type GObject" + + #: shared/nm-utils/nm-shared-utils.c:824 + #, c-format + msgid "unable to set property '%s' of type '%s' from value of type '%s'" +-msgstr "" +-"impossible de définir la propriété « %s » de type « %s » depuis une valeur " +-"de type « %s »" ++msgstr "impossible de définir la propriété « %s » de type « %s » depuis une valeur de type « %s »" + + #: shared/nm-utils/nm-shared-utils.c:835 + #, c-format + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" +-msgstr "" +-"la valeur « %s » de type « %s » est invalide ou hors de la plage pour la " +-"propriété « %s » de type « %s »" ++msgstr "la valeur « %s » de type « %s » est invalide ou hors de la plage pour la propriété « %s » de type « %s »" + + #: src/8021x.ui:11 src/ethernet-dialog.c:85 + msgid "802.1X authentication" +@@ -232,8 +218,7 @@ msgstr "Configuration de la connexion mobile « %s »…" + #: src/applet-device-bt.c:108 src/mobile-helpers.c:590 + #, c-format + msgid "User authentication required for mobile broadband connection “%s”…" +-msgstr "" +-"Authentification personnelle nécessaire pour la connexion mobile « %s »…" ++msgstr "Authentification personnelle nécessaire pour la connexion mobile « %s »…" + + #: src/applet-device-bt.c:111 src/applet.c:2535 src/mobile-helpers.c:593 + #, c-format +@@ -289,8 +274,7 @@ msgstr "Configuration de la connexion au réseau Ethernet « %s »…" + #: src/applet-device-ethernet.c:153 + #, c-format + msgid "User authentication required for ethernet network connection “%s”…" +-msgstr "" +-"Authentification nécessaire pour la connexion au réseau Ethernet « %s »…" ++msgstr "Authentification nécessaire pour la connexion au réseau Ethernet « %s »…" + + #: src/applet-device-ethernet.c:156 + #, c-format +@@ -480,21 +464,21 @@ msgstr "Inconnue" + + #: src/applet-dialogs.c:331 src/applet-dialogs.c:404 + msgid "IP Address" +-msgstr "Adresse IP " ++msgstr "Adresse IP" + + #: src/applet-dialogs.c:353 + msgid "Broadcast Address" +-msgstr "Adresse de broadcast " ++msgstr "Adresse de broadcast" + + #. Prefix + #: src/applet-dialogs.c:365 + msgctxt "Subnet Mask" + msgid "Unknown" +-msgstr "Inconnu" ++msgstr "Inconnue" + + #: src/applet-dialogs.c:366 + msgid "Subnet Mask" +-msgstr "Masque de sous-réseau " ++msgstr "Masque de sous-réseau" + + #: src/applet-dialogs.c:428 + msgid "Primary DNS" +@@ -538,20 +522,20 @@ msgstr "Général" + + #: src/applet-dialogs.c:530 + msgid "Interface" +-msgstr "Interface " ++msgstr "Interface" + + #: src/applet-dialogs.c:545 + msgid "Hardware Address" +-msgstr "Adresse matérielle " ++msgstr "Adresse matérielle" + + #. Driver + #: src/applet-dialogs.c:558 + msgid "Driver" +-msgstr "Pilote " ++msgstr "Pilote" + + #: src/applet-dialogs.c:591 + msgid "Speed" +-msgstr "Vitesse " ++msgstr "Vitesse" + + #: src/applet-dialogs.c:604 + msgid "Security" +@@ -565,7 +549,7 @@ msgstr "IPv4" + + #: src/applet-dialogs.c:648 src/applet-dialogs.c:696 + msgid "Default Route" +-msgstr "Route par défaut " ++msgstr "Route par défaut" + + #: src/applet-dialogs.c:676 src/applet-dialogs.c:918 + #: src/connection-editor/ce-page-team.ui:497 +@@ -582,7 +566,7 @@ msgstr "Mot de passe" + + #: src/applet-dialogs.c:865 + msgid "VPN Type" +-msgstr "Type de VPN " ++msgstr "Type de VPN" + + #: src/applet-dialogs.c:870 + msgid "VPN Gateway" +@@ -590,15 +574,15 @@ msgstr "Passerelle pour le VPN" + + #: src/applet-dialogs.c:874 + msgid "VPN Username" +-msgstr "Nom d’utilisateur pour le VPN " ++msgstr "Nom d’utilisateur pour le VPN" + + #: src/applet-dialogs.c:878 + msgid "VPN Banner" +-msgstr "Bannière pour le VPN " ++msgstr "Bannière pour le VPN" + + #: src/applet-dialogs.c:882 + msgid "Base Connection" +-msgstr "Connexion de base " ++msgstr "Connexion de base" + + #: src/applet-dialogs.c:883 src/wireless-security/wireless-security.c:495 + msgid "Unknown" +@@ -614,17 +598,14 @@ msgid "" + "Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" +-msgstr "" +-"Copyright © 2004-2017 Red Hat, Inc.\n" ++msgstr "Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "et beaucoup d’autres contributeurs et traducteurs de la communauté" + + #: src/applet-dialogs.c:1131 + msgid "" + "Notification area applet for managing your network devices and connections." +-msgstr "" +-"Une zone de notification pour gérer vos périphériques réseaux et vos " +-"connexions." ++msgstr "Une zone de notification pour gérer vos périphériques réseaux et vos connexions." + + #: src/applet-dialogs.c:1133 + msgid "NetworkManager Website" +@@ -632,8 +613,7 @@ msgstr "Site Web de NetworkManager" + + #: src/applet-dialogs.c:1137 + msgid "translator-credits" +-msgstr "" +-"Raphaël Tournoy \n" ++msgstr "Raphaël Tournoy \n" + "Stéphane Raimbault \n" + "Claude Paroz \n" + "Robert-André Mauchin \n" +@@ -648,9 +628,7 @@ msgstr "" + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." +-msgstr "" +-"L’applet NetworkManager n’a pas pu trouver les ressources requises (le " +-"fichier .ui n’a pas été trouvé)." ++msgstr "L’applet NetworkManager n’a pas pu trouver les ressources requises (le fichier .ui n’a pas été trouvé)." + + #: src/applet-dialogs.c:1152 + msgid "Missing resources" +@@ -683,9 +661,7 @@ msgstr "Déverrouillage SIM PIN requis" + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " + "used." +-msgstr "" +-"La connexion mobile « %s » a besoin d’un code SIM PIN pour pouvoir être " +-"utilisé." ++msgstr "La connexion mobile « %s » a besoin d’un code SIM PIN pour pouvoir être utilisé." + + #. Translators: PIN code entry label + #: src/applet-dialogs.c:1488 +@@ -711,9 +687,7 @@ msgstr "Déverrouillage SIM PUK requis" + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " + "used." +-msgstr "" +-"La connexion mobile « %s » a besoin d’un code SIM PUK pour pouvoir être " +-"utilisé." ++msgstr "La connexion mobile « %s » a besoin d’un code SIM PUK pour pouvoir être utilisé." + + #. Translators: PUK code entry label + #: src/applet-dialogs.c:1499 +@@ -746,8 +720,7 @@ msgstr "Échec d’écriture de la connexion vers l’interface VPN : %s (%d)" + + #: src/applet-vpn-request.c:485 + msgid "Failed to write connection to VPN UI: incomplete write" +-msgstr "" +-"Échec d’écriture de la connexion vers l’interface VPN : écriture incomplète" ++msgstr "Échec d’écriture de la connexion vers l’interface VPN : écriture incomplète" + + #: src/applet.c:372 + msgid "Failed to add/activate connection" +@@ -771,10 +744,8 @@ msgid "" + "\n" + "The VPN connection “%s” disconnected because the network connection was " + "interrupted." +-msgstr "" +-"\n" +-"La connexion VPN « %s » a été déconnectée car la connexion réseau a été " +-"interrompue." ++msgstr "\n" ++"La connexion VPN « %s » a été déconnectée car la connexion réseau a été interrompue." + + #: src/applet.c:880 + #, c-format +@@ -782,8 +753,7 @@ msgid "" + "\n" + "The VPN connection “%s” failed because the network connection was " + "interrupted." +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué car la connexion réseau a été interrompue." + + #: src/applet.c:882 +@@ -791,10 +761,8 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service stopped unexpectedly." +-msgstr "" +-"\n" +-"La connexion VPN « %s » a échoué car le service VPN a été arrêté de manière " +-"inattendue." ++msgstr "\n" ++"La connexion VPN « %s » a échoué car le service VPN a été arrêté de manière inattendue." + + #: src/applet.c:884 + #, c-format +@@ -802,18 +770,15 @@ msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service returned invalid " + "configuration." +-msgstr "" +-"\n" +-"La connexion VPN « %s » a échoué car le service VPN a renvoyé une " +-"configuration invalide." ++msgstr "\n" ++"La connexion VPN « %s » a échoué car le service VPN a renvoyé une configuration invalide." + + #: src/applet.c:886 + #, c-format + msgid "" + "\n" + "The VPN connection “%s” failed because the connection attempt timed out." +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué car le délai de connexion est dépassé." + + #: src/applet.c:888 +@@ -821,8 +786,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service did not start in time." +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué car le service VPN n’a pas démarré à temps." + + #: src/applet.c:890 +@@ -830,8 +794,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service failed to start." +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué car le démarrage du service VPN a échoué." + + #: src/applet.c:892 +@@ -839,8 +802,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because there were no valid VPN secrets." +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué car il n’y avait pas de secret VPN valide." + + #: src/applet.c:894 +@@ -848,8 +810,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because of invalid VPN secrets." +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué en raison de secrets VPN non valides." + + #: src/applet.c:899 +@@ -857,8 +818,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed." +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué." + + #: src/applet.c:926 +@@ -867,8 +827,7 @@ msgid "" + "VPN connection has been successfully established.\n" + "\n" + "%s\n" +-msgstr "" +-"La connexion VPN a été établie avec succès.\n" ++msgstr "La connexion VPN a été établie avec succès.\n" + "\n" + "%s\n" + +@@ -891,8 +850,7 @@ msgid "" + "The VPN connection “%s” failed because the VPN service failed to start.\n" + "\n" + "%s" +-msgstr "" +-"\n" ++msgstr "\n" + "La connexion VPN « %s » a échoué car le démarrage du service VPN a échoué.\n" + "\n" + "%s" +@@ -904,8 +862,7 @@ msgid "" + "The VPN connection “%s” failed to start.\n" + "\n" + "%s" +-msgstr "" +-"\n" ++msgstr "\n" + "Le démarrage de la connexion VPN « %s » a échoué.\n" + "\n" + "%s" +@@ -1044,9 +1001,7 @@ msgstr "Applet NetworkManager" + msgid "" + "IP addresses identify your computer on the network. Click the “Add” button " + "to add an IP address." +-msgstr "" +-"Les adresses IP identifient votre ordinateur sur le réseau. Cliquez sur le " +-"bouton « Ajouter » pour ajouter une adresse IP." ++msgstr "Les adresses IP identifient votre ordinateur sur le réseau. Cliquez sur le bouton « Ajouter » pour ajouter une adresse IP." + + #: src/connection-editor/ce-ip4-routes.ui:109 + #: src/connection-editor/ce-ip6-routes.ui:109 +@@ -1088,9 +1043,7 @@ msgstr "_Utiliser cette connexion uniquement pour les ressources de son réseau" + msgid "" + "If enabled, this connection will never be used as the default network " + "connection." +-msgstr "" +-"Si activé, cette connexion ne sera jamais utilisée comme connexion réseau " +-"par défaut." ++msgstr "Si activé, cette connexion ne sera jamais utilisée comme connexion réseau par défaut." + + #: src/connection-editor/ce-new-connection.ui:65 + msgid "C_reate…" +@@ -1106,11 +1059,9 @@ msgid "" + "\n" + "If you are creating a VPN, and the VPN connection you wish to create does " + "not appear in the list, you may not have the correct VPN plugin installed." +-msgstr "" +-"Sélectionnez le type de connexion que vous souhaitez créer.\n" ++msgstr "Sélectionnez le type de connexion que vous souhaitez créer.\n" + "\n" +-"Si vous créez un VPN et qu’il n’apparaît pas dans la liste, il se peut que " +-"vous n’ayez pas le bon greffon VPN installé." ++"Si vous créez un VPN et qu’il n’apparaît pas dans la liste, il se peut que vous n’ayez pas le bon greffon VPN installé." + + #: src/connection-editor/ce-page-bluetooth.ui:35 + #: src/connection-editor/ce-page-ethernet.ui:129 +@@ -1203,9 +1154,7 @@ msgstr "Cibl_es ARP" + msgid "" + "An IP address, or a comma-separated list of IP addresses, to look for when " + "checking the link status." +-msgstr "" +-"Une adresse IP, ou une liste d’adresses IP séparées par des virgules, à " +-"rechercher lors de la vérification du statut du lien." ++msgstr "Une adresse IP, ou une liste d’adresses IP séparées par des virgules, à rechercher lors de la vérification du statut du lien." + + #: src/connection-editor/ce-page-bond.ui:373 + msgid "Link _up delay" +@@ -1223,9 +1172,7 @@ msgstr "_Principal" + msgid "" + "The interface name of the primary device. If set, this device will always be " + "the active slave when it is available." +-msgstr "" +-"Le nom d’interface du périphérique principal. Si défini, ce périphérique " +-"sera toujours l’esclave actif lorsqu’il est disponible." ++msgstr "Le nom d’interface du périphérique principal. Si défini, ce périphérique sera toujours l’esclave actif lorsqu’il est disponible." + + #: src/connection-editor/ce-page-bond.ui:507 + #: src/connection-editor/ce-page-ethernet.ui:188 +@@ -1296,11 +1243,7 @@ msgid "" + "Controls whether IGMP snooping is enabled for this bridge. Note that if " + "snooping was automatically disabled due to hash collisions, the system may " + "refuse to enable the feature until the collisions are resolved." +-msgstr "" +-"Contrôle si le snooping IGMP est activé pour ce pont. Notez que si le " +-"snooping a été automatiquement désactivé en raison de collisions " +-"d’empreintes, le système peut refuser d’activer la fonctionnalité tant que " +-"les collisions ne sont pas réglées." ++msgstr "Contrôle si le snooping IGMP est activé pour ce pont. Notez que si le snooping a été automatiquement désactivé en raison de collisions d’empreintes, le système peut refuser d’activer la fonctionnalité tant que les collisions ne sont pas réglées." + + #: src/connection-editor/ce-page-bridge.ui:344 + msgid "Enable _STP (Spanning Tree Protocol)" +@@ -1315,9 +1258,7 @@ msgstr "Contrôle si le protocole Spanning Tree (STP) est activé pour ce pont" + msgid "" + "STP priority for this bridge. Lower values are “better”; the lowest priority " + "bridge will be elected the root bridge." +-msgstr "" +-"La priorité STP pour ce pont. Les valeurs basses sont « meilleures » ; le " +-"pont à la priorité la plus basse sera élu comme pont racine." ++msgstr "La priorité STP pour ce pont. Les valeurs basses sont « meilleures » ; le pont à la priorité la plus basse sera élu comme pont racine." + + #: src/connection-editor/ce-page-bridge.ui:378 + msgid "_Max age" +@@ -1345,11 +1286,7 @@ msgid "" + "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " + "can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " + "frames and LACP." +-msgstr "" +-"Un masque 16 bits, chacun correspondant à une adresse de groupe dans " +-"l’intervalle 01:80:C2:00:00:00 à 01:80:C2:00:00:0F devant être propagée. Les " +-"bits 0, 1 et 2 du masque ne peuvent être définis car ils sont utilisés par " +-"STP, les trames de pause MAC et LACP." ++msgstr "Un masque 16 bits, chacun correspondant à une adresse de groupe dans l’intervalle 01:80:C2:00:00:00 à 01:80:C2:00:00:0F devant être propagée. Les bits 0, 1 et 2 du masque ne peuvent être définis car ils sont utilisés par STP, les trames de pause MAC et LACP." + + #: src/connection-editor/ce-page-dcb.ui:16 + msgid "_Use Data Center Bridging (DCB) for this connection" +@@ -1426,9 +1363,7 @@ msgstr "Contrôle du flux des priorités" + + #: src/connection-editor/ce-page-dcb.ui:613 + msgid "Enable or disable priority pause transmission for each User Priority." +-msgstr "" +-"Active ou désactive la transmission d’une pause de priorité pour chaque " +-"priorité utilisateur." ++msgstr "Active ou désactive la transmission d’une pause de priorité pour chaque priorité utilisateur." + + #: src/connection-editor/ce-page-dcb.ui:653 + #: src/connection-editor/ce-page-dcb.ui:1086 +@@ -1528,31 +1463,22 @@ msgstr "Identifiant du groupe" + + #: src/connection-editor/ce-page-dcb.ui:2881 + msgid "Enter the priority group ID for each User Priority." +-msgstr "" +-"Saisissez l’identifiant du groupe de priorités pour chaque priorité " +-"utilisateur." ++msgstr "Saisissez l’identifiant du groupe de priorités pour chaque priorité utilisateur." + + #: src/connection-editor/ce-page-dcb.ui:2899 + msgid "" + "Enter the allowed link bandwidth percent each Priority Group may use. The " + "sum of all groups must total 100%." +-msgstr "" +-"Saisissez le pourcentage de bande passante que chaque groupe de priorités " +-"peut utiliser pour la liaison. La somme allouée à tous les groupes doit " +-"faire 100 %." ++msgstr "Saisissez le pourcentage de bande passante que chaque groupe de priorités peut utiliser pour la liaison. La somme allouée à tous les groupes doit faire 100 %." + + #: src/connection-editor/ce-page-dcb.ui:2917 + msgid "" + "Enter the percentage of priority group bandwidth each user priority may use." +-msgstr "" +-"Saisissez le pourcentage de bande passante du groupe de priorités que chaque " +-"priorité utilisateur peut utiliser." ++msgstr "Saisissez le pourcentage de bande passante du groupe de priorités que chaque priorité utilisateur peut utiliser." + + #: src/connection-editor/ce-page-dcb.ui:2935 + msgid "Enable or disable strict bandwidth for each user priority." +-msgstr "" +-"Activez ou désactivez la bande passante stricte de chaque priorité " +-"utilisateur." ++msgstr "Activez ou désactivez la bande passante stricte de chaque priorité utilisateur." + + #: src/connection-editor/ce-page-dcb.ui:2953 + msgid "Enter the traffic class for each user priority." +@@ -1574,10 +1500,7 @@ msgstr "Nom d’utilisateur utilisé pour s’authentifier au service PPPoE." + msgid "" + "Only initiate sessions with access concentrators that provide the specified " + "service. For most providers this should be left blank." +-msgstr "" +-"Ne démarre des sessions qu’avec des concentrateurs d’accès fournissant le " +-"service indiqué. Pour la plupart des fournisseurs, ceci devrait être laissé " +-"vide." ++msgstr "Ne démarre des sessions qu’avec des concentrateurs d’accès fournissant le service indiqué. Pour la plupart des fournisseurs, ceci devrait être laissé vide." + + #: src/connection-editor/ce-page-dsl.ui:59 + msgid "_Service" +@@ -1630,12 +1553,7 @@ msgid "" + "it won’t be possible to activate another connection on it. Note that the " + "option can only be used for Ethernet interfaces. nm-applet is able to " + "activate the connection only if this option is selected." +-msgstr "" +-"Si sélectionné, la connexion prendra le contrôle exclusif de l’interface et " +-"il ne sera plus possible d’activer une autre connexion sur cette interface. " +-"Notez que l’option ne peut être utilisée que pour des interfaces Ethernet. " +-"nm-applet n’est en mesure d’activer une connexion que si cette option est " +-"cochée." ++msgstr "Si sélectionné, la connexion prendra le contrôle exclusif de l’interface et il ne sera plus possible d’activer une autre connexion sur cette interface. Notez que l’option ne peut être utilisée que pour des interfaces Ethernet. nm-applet n’est en mesure d’activer une connexion que si cette option est cochée." + + #: src/connection-editor/ce-page-ethernet.ui:17 + #: src/connection-editor/ce-page-ethernet.ui:77 +@@ -1753,9 +1671,7 @@ msgstr "Mot de passe _Wake on LAN" + #: src/connection-editor/ce-page-ethernet.ui:402 + msgid "" + "Wake-on-LAN password (an Ethernet MAC). It is only valid for magic packets." +-msgstr "" +-"Mot de passe Wake on LAN (une adresse MAC Ethernet). Cela n’est valable que " +-"pour les paquets magiques." ++msgstr "Mot de passe Wake on LAN (une adresse MAC Ethernet). Cela n’est valable que pour les paquets magiques." + + #: src/connection-editor/ce-page-ethernet.ui:414 + msgid "Lin_k negotiation" +@@ -1766,11 +1682,7 @@ msgid "" + "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values " + "will be forced without checking the device compatibility. If unsure, leave " + "here “Ignore” or pick “Automatic”." +-msgstr "" +-"Négociation de lien du périphérique. Si « Manuel » est choisi, les valeurs " +-"« Vitesse » et « Duplex » seront appliquées sans vérifier la compatibilité " +-"du périphérique. Si vous n’êtes pas sûr, laissez « Ignorer » ou choisissez " +-"« Automatique »." ++msgstr "Négociation de lien du périphérique. Si « Manuel » est choisi, les valeurs « Vitesse » et « Duplex » seront appliquées sans vérifier la compatibilité du périphérique. Si vous n’êtes pas sûr, laissez « Ignorer » ou choisissez « Automatique »." + + #: src/connection-editor/ce-page-ethernet.ui:448 + msgid "_Speed" +@@ -1781,10 +1693,7 @@ msgid "" + "Speed value for static link negotiation, required only when “Ignore” and " + "“Automatic” options are not selected. Before specifying a speed value be " + "sure your device supports it." +-msgstr "" +-"Vitesse pour la négociation de lien statique, requise uniquement quand les " +-"options « Ignorer » et « Automatique » ne sont pas sélectionnées. Avant de " +-"spécifier une vitesse, vérifiez que votre périphérique la prend en charge." ++msgstr "Vitesse pour la négociation de lien statique, requise uniquement quand les options « Ignorer » et « Automatique » ne sont pas sélectionnées. Avant de spécifier une vitesse, vérifiez que votre périphérique la prend en charge." + + #: src/connection-editor/ce-page-ethernet.ui:482 + msgid "Duple_x" +@@ -1795,11 +1704,7 @@ msgid "" + "Duplex value for static link negotiation, required only when “Ignore” and " + "“Automatic” options are not selected. Before specifying a duplex mode be " + "sure your device supports it." +-msgstr "" +-"Mode de duplex pour la négociation statique de lien, requise uniquement " +-"quand les options « Ignorer » et « Automatique » ne sont pas sélectionnées. " +-"Avant de spécifier un mode de duplex, vérifiez que votre périphérique le " +-"prend en charge." ++msgstr "Mode de duplex pour la négociation statique de lien, requise uniquement quand les options « Ignorer » et « Automatique » ne sont pas sélectionnées. Avant de spécifier un mode de duplex, vérifiez que votre périphérique le prend en charge." + + #: src/connection-editor/ce-page-general.ui:29 + msgid "Yes" +@@ -1831,12 +1736,7 @@ msgid "" + "and therefore data usage should be restricted. Select which value (“Yes” or " + "“No”) to indicate to applications, or “Automatic” to use a default value " + "based on the connection type and other heuristics." +-msgstr "" +-"NetworkManager indique aux applications si la connexion est limitée et que " +-"l’utilisation de données doit donc être restreinte. Choisissez quelle valeur " +-"(« Oui » ou « Non ») indiquer aux applications, ou « Automatique » pour " +-"utiliser une valeur par défaut basée sur le type de connexion et d’autres " +-"heuristiques." ++msgstr "NetworkManager indique aux applications si la connexion est limitée et que l’utilisation de données doit donc être restreinte. Choisissez quelle valeur (« Oui » ou « Non ») indiquer aux applications, ou « Automatique » pour utiliser une valeur par défaut basée sur le type de connexion et d’autres heuristiques." + + #: src/connection-editor/ce-page-general.ui:150 + msgid "Connect _automatically with priority" +@@ -1847,10 +1747,7 @@ msgid "" + "Connection priority for automatic activation. Connections with higher " + "numbers are preferred when selecting profiles for automatic activation. " + "Default value is 0." +-msgstr "" +-"Priorité de la connexion pour l’activation automatique. Les connexions avec " +-"les plus grands nombres seront préférées lors de la sélection de profils " +-"d’activation automatique. La valeur par défaut est 0." ++msgstr "Priorité de la connexion pour l’activation automatique. Les connexions avec les plus grands nombres seront préférées lors de la sélection de profils d’activation automatique. La valeur par défaut est 0." + + #. IP-over-InfiniBand "datagram mode" + #: src/connection-editor/ce-page-infiniband.ui:17 +@@ -1960,19 +1857,14 @@ msgid "" + "The DHCP client identifier allows the network administrator to customize " + "your computer’s configuration. If you wish to use a DHCP client identifier, " + "enter it here." +-msgstr "" +-"L’identifiant de client DHCP permet à l’administrateur réseau de " +-"personnaliser la configuration de votre ordinateur. Si vous souhaitez " +-"utiliser un identifiant de client DHCP, ajoutez-le ici." ++msgstr "L’identifiant de client DHCP permet à l’administrateur réseau de personnaliser la configuration de votre ordinateur. Si vous souhaitez utiliser un identifiant de client DHCP, ajoutez-le ici." + + #: src/connection-editor/ce-page-ip4.ui:215 + #: src/connection-editor/ce-page-ip6.ui:233 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +-msgstr "" +-"Domaines utilisés lors de la résolution des noms d’hôtes. Utilisez des " +-"virgules pour séparer plusieurs domaines." ++msgstr "Domaines utilisés lors de la résolution des noms d’hôtes. Utilisez des virgules pour séparer plusieurs domaines." + + #: src/connection-editor/ce-page-ip4.ui:228 + msgid "D_HCP client ID" +@@ -1994,9 +1886,7 @@ msgstr "Ser_veurs DNS" + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses." +-msgstr "" +-"Adresses IP des serveurs DNS utilisées pour la résolution des noms d’hôtes. " +-"Utilisez des virgules pour séparer plusieurs adresses DNS." ++msgstr "Adresses IP des serveurs DNS utilisées pour la résolution des noms d’hôtes. Utilisez des virgules pour séparer plusieurs adresses DNS." + + #: src/connection-editor/ce-page-ip4.ui:288 + msgid "Require IPv_4 addressing for this connection to complete" +@@ -2006,10 +1896,7 @@ msgstr "Requiert un adressage IPv_4 pour que cette connexion fonctionne" + msgid "" + "When connecting to IPv6-capable networks, allows the connection to complete " + "if IPv4 configuration fails but IPv6 configuration succeeds." +-msgstr "" +-"Lors d’une connexion sur des réseaux compatibles IPv6, permet à la connexion " +-"de fonctionner lorsque la configuration IPv6 est réussie, même si la " +-"configuration IPv4 échoue." ++msgstr "Lors d’une connexion sur des réseaux compatibles IPv6, permet à la connexion de fonctionner lorsque la configuration IPv6 est réussie, même si la configuration IPv4 échoue." + + #: src/connection-editor/ce-page-ip4.ui:333 + #: src/connection-editor/ce-page-ip6.ui:401 +@@ -2043,10 +1930,7 @@ msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " + "be automatically scoped to the connecting interface." +-msgstr "" +-"Adresses IP des serveurs DNS utilisées pour la résolution des noms d’hôtes. " +-"Utilisez des virgules pour séparer plusieurs adresses DNS. Les adresses de " +-"lien local seront automatiquement liées à l’interface de connexion." ++msgstr "Adresses IP des serveurs DNS utilisées pour la résolution des noms d’hôtes. Utilisez des virgules pour séparer plusieurs adresses DNS. Les adresses de lien local seront automatiquement liées à l’interface de connexion." + + #: src/connection-editor/ce-page-ip6.ui:287 + msgid "IPv6 _privacy extensions" +@@ -2064,10 +1948,7 @@ msgstr "Requiert un adressage IPv_6 pour que cette connexion fonctionne" + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +-msgstr "" +-"Lors d’une connexion sur des réseaux compatibles IPv4, permet à la connexion " +-"de fonctionner lorsque la configuration IPv4 est réussie, même si la " +-"configuration IPv6 échoue." ++msgstr "Lors d’une connexion sur des réseaux compatibles IPv4, permet à la connexion de fonctionner lorsque la configuration IPv4 est réussie, même si la configuration IPv6 échoue." + + #: src/connection-editor/ce-page-macsec.ui:12 + msgid "PSK" +@@ -2102,17 +1983,13 @@ msgstr "_Périphérique parent" + msgid "" + "The parent interface name or parent connection UUID from which this MACSEC " + "interface should be created." +-msgstr "" +-"Le nom d’interface parente ou l’UUID de connexion parente à partir de " +-"laquelle cette interface MACSEC doit être créée." ++msgstr "Le nom d’interface parente ou l’UUID de connexion parente à partir de laquelle cette interface MACSEC doit être créée." + + #: src/connection-editor/ce-page-macsec.ui:104 + msgid "" + "The parent interface name or parent connection UUID from which this MACsec " + "interface should be created" +-msgstr "" +-"Le nom d’interface parente ou l’UUID de connexion parente à partir de " +-"laquelle cette interface MACsec doit être créée" ++msgstr "Le nom d’interface parente ou l’UUID de connexion parente à partir de laquelle cette interface MACsec doit être créée" + + #: src/connection-editor/ce-page-macsec.ui:117 + msgid "Keys" +@@ -2127,10 +2004,7 @@ msgid "" + "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " + "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " + "security page" +-msgstr "" +-"Indique comment la CAK (clé d’association de connectivité) pour le MKA " +-"(accord de clé MACsec) est obtenue. Pour le mode EAP, complétez les " +-"paramètres dans la page de sécurité 802.1x" ++msgstr "Indique comment la CAK (clé d’association de connectivité) pour le MKA (accord de clé MACsec) est obtenue. Pour le mode EAP, complétez les paramètres dans la page de sécurité 802.1x" + + #: src/connection-editor/ce-page-macsec.ui:168 + msgid "C_AK" +@@ -2273,9 +2147,7 @@ msgstr "Pour navigateur uniquement" + + #: src/connection-editor/ce-page-proxy.ui:38 + msgid "Use this proxy configuration for only browser clients/schemes." +-msgstr "" +-"Utiliser cette configuration de proxy seulement pour les clients/protocoles " +-"de navigateur." ++msgstr "Utiliser cette configuration de proxy seulement pour les clients/protocoles de navigateur." + + #: src/connection-editor/ce-page-proxy.ui:52 + msgid "PAC URL" +@@ -2287,9 +2159,7 @@ msgstr "Script de PAC" + + #: src/connection-editor/ce-page-proxy.ui:76 + msgid "URL from where the PAC script is to be obtained." +-msgstr "" +-"URL à partir duquel le script de configuration automatique du proxy doit " +-"être obtenu." ++msgstr "URL à partir duquel le script de configuration automatique du proxy doit être obtenu." + + #: src/connection-editor/ce-page-proxy.ui:86 + msgid "Import script from a file…" +@@ -2337,9 +2207,7 @@ msgstr "ID de _file" + msgid "" + "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after " + "port is enabled or disabled." +-msgstr "" +-"Nombre de rafales de NA non sollicités et de paquets ARP gratuits envoyés " +-"après que le port a été activé ou désactivé." ++msgstr "Nombre de rafales de NA non sollicités et de paquets ARP gratuits envoyés après que le port a été activé ou désactivé." + + #: src/connection-editor/ce-page-team-port.ui:241 + msgid "ID of queue which this port should be mapped to." +@@ -2358,9 +2226,7 @@ msgstr "Priorité du _port" + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." +-msgstr "" +-"La valeur est un nombre positif en millisecondes. Il spécifie l’intervalle " +-"entre les échanges de paquets notify-peer." ++msgstr "La valeur est un nombre positif en millisecondes. Il spécifie l’intervalle entre les échanges de paquets notify-peer." + + #: src/connection-editor/ce-page-team-port.ui:286 + msgid "Port priority. The higher number means higher priority." +@@ -2391,34 +2257,26 @@ msgstr "_Clé de port LACP" + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " + "enabled or disabled." +-msgstr "" +-"Nombre d’échanges de requêtes de participation aux groupes multicast envoyés " +-"après que le port a été activé ou désactivé." ++msgstr "Nombre d’échanges de requêtes de participation aux groupes multicast envoyés après que le port a été activé ou désactivé." + + #: src/connection-editor/ce-page-team-port.ui:361 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." +-msgstr "" +-"Priorité de port selon le standard LACP. Un petit nombre signifie une " +-"priorité élevée." ++msgstr "Priorité de port selon le standard LACP. Un petit nombre signifie une priorité élevée." + + #: src/connection-editor/ce-page-team-port.ui:374 + #: src/connection-editor/ce-page-team.ui:726 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." +-msgstr "" +-"La valeur est un nombre positif en millisecondes. Spécifie un intervalle " +-"entre les échanges de requêtes de participation aux groupes multicast." ++msgstr "La valeur est un nombre positif en millisecondes. Spécifie un intervalle entre les échanges de requêtes de participation aux groupes multicast." + + #: src/connection-editor/ce-page-team-port.ui:376 + msgid "" + "Port key according to LACP standard. It is only possible to aggregate ports " + "with the same key." +-msgstr "" +-"Clé de port selon le standard LACP. Il est uniquement possible d’agréger des " +-"ports ayant la même clé." ++msgstr "Clé de port selon le standard LACP. Il est uniquement possible d’agréger des ports ayant la même clé." + + #: src/connection-editor/ce-page-team-port.ui:416 + #: src/connection-editor/ce-page-team.ui:1143 +@@ -2465,27 +2323,21 @@ msgstr "Hôte _cible" + msgid "" + "Maximum number of missed replies. If this number is exceeded, link is " + "reported as down." +-msgstr "" +-"Nombre maximum de réponses manquantes. Si ce nombre est dépassé, le lien est " +-"considéré comme tombé." ++msgstr "Nombre maximum de réponses manquantes. Si ce nombre est dépassé, le lien est considéré comme tombé." + + #: src/connection-editor/ce-page-team-port.ui:548 + #: src/connection-editor/ce-page-team.ui:1275 + msgid "" + "Hostname to be converted to IP address which will be filled into ARP request " + "as source address." +-msgstr "" +-"Nom d’hôte à convertir en adresse IP et qui sera utilisé comme adresse " +-"source dans la requête ARP." ++msgstr "Nom d’hôte à convertir en adresse IP et qui sera utilisé comme adresse source dans la requête ARP." + + #: src/connection-editor/ce-page-team-port.ui:560 + #: src/connection-editor/ce-page-team.ui:1287 + msgid "" + "Hostname to be converted to IP address which will be filled into request as " + "destination address." +-msgstr "" +-"Nom d’hôte à convertir en adresse IP et qui sera utilisé comme adresse de " +-"destination dans la requête." ++msgstr "Nom d’hôte à convertir en adresse IP et qui sera utilisé comme adresse de destination dans la requête." + + #: src/connection-editor/ce-page-team-port.ui:570 + #: src/connection-editor/ce-page-team.ui:1297 +@@ -2497,9 +2349,7 @@ msgstr "Ignorer les paquets invalides sur les ports _actifs" + msgid "" + "Validate received ARP packets on active ports. If this is not checked, all " + "incoming ARP packets will be considered as a good reply." +-msgstr "" +-"Valider les paquets ARP reçus sur les ports actifs. Si ceci n’est pas coché, " +-"tous les paquets ARP entrants seront considérés comme des réponses valides." ++msgstr "Valider les paquets ARP reçus sur les ports actifs. Si ceci n’est pas coché, tous les paquets ARP entrants seront considérés comme des réponses valides." + + #: src/connection-editor/ce-page-team-port.ui:587 + #: src/connection-editor/ce-page-team.ui:1314 +@@ -2511,10 +2361,7 @@ msgstr "Ignorer les paquets invalides sur les ports i_nactifs" + msgid "" + "Validate received ARP packets on inactive ports. If this is not checked, all " + "incoming ARP packets will be considered as a good reply." +-msgstr "" +-"Valider les paquets ARP reçus sur les ports inactifs. Si ceci n’est pas " +-"coché, tous les paquets ARP entrants seront considérés comme des réponses " +-"valides." ++msgstr "Valider les paquets ARP reçus sur les ports inactifs. Si ceci n’est pas coché, tous les paquets ARP entrants seront considérés comme des réponses valides." + + #: src/connection-editor/ce-page-team-port.ui:604 + #: src/connection-editor/ce-page-team.ui:1331 +@@ -2526,25 +2373,19 @@ msgstr "_Envoyer sur les ports inactifs" + msgid "" + "By default, ARP requests are sent on active ports only. This option allows " + "sending even on inactive ports." +-msgstr "" +-"Par défaut, les requêtes ARP sont envoyées uniquement sur les ports actifs. " +-"Cette option permet de les envoyer sur les ports inactifs également." ++msgstr "Par défaut, les requêtes ARP sont envoyées uniquement sur les ports actifs. Cette option permet de les envoyer sur les ports inactifs également." + + #: src/connection-editor/ce-page-team-port.ui:671 + #: src/connection-editor/ce-page-team.ui:1398 + msgid "" + "The delay between the link coming up and the runner being notified about it." +-msgstr "" +-"Délai entre l’établissement du lien et la notification de cet évènement à " +-"l’exécuteur." ++msgstr "Délai entre l’établissement du lien et la notification de cet évènement à l’exécuteur." + + #: src/connection-editor/ce-page-team-port.ui:684 + #: src/connection-editor/ce-page-team.ui:1411 + msgid "" + "The delay between the link going down and the runner being notified about it." +-msgstr "" +-"Délai entre l’interruption du lien et la notification de cet évènement à " +-"l’exécuteur." ++msgstr "Délai entre l’interruption du lien et la notification de cet évènement à l’exécuteur." + + #: src/connection-editor/ce-page-team-port.ui:697 + #: src/connection-editor/ce-page-team.ui:1424 +@@ -2555,9 +2396,7 @@ msgstr "L’intervalle entre l’envoi de chaque requête." + #: src/connection-editor/ce-page-team.ui:1437 + msgid "" + "The delay between link watch initialization and the first request being sent." +-msgstr "" +-"Délai entre l’initialisation de la surveillance des liens et l’envoi de la " +-"première requête." ++msgstr "Délai entre l’initialisation de la surveillance des liens et l’envoi de la première requête." + + #: src/connection-editor/ce-page-team-port.ui:723 + #: src/connection-editor/ce-page-team.ui:1450 +@@ -2594,7 +2433,7 @@ msgstr "Priorité la plus haute (stable)" + + #: src/connection-editor/ce-page-team.ui:23 + msgid "Bandwidth" +-msgstr "Bande passante " ++msgstr "Bande passante" + + #: src/connection-editor/ce-page-team.ui:27 + msgid "Highest number of ports" +@@ -2688,9 +2527,7 @@ msgstr "Adresse _matérielle" + msgid "" + "Desired hardware address of new team device. Usual MAC address format is " + "accepted." +-msgstr "" +-"Adresse matérielle souhaitée pour le nouveau périphérique en équipe. Le " +-"format d’adresse MAC habituel est accepté." ++msgstr "Adresse matérielle souhaitée pour le nouveau périphérique en équipe. Le format d’adresse MAC habituel est accepté." + + #: src/connection-editor/ce-page-team.ui:799 + msgid "_Runner" +@@ -2708,10 +2545,7 @@ msgstr "Nom de l’exécuteur à utiliser." + msgid "" + "This defines the policy of how hardware addresses of team device and port " + "devices should be set during the team lifetime." +-msgstr "" +-"Ceci définit la politique de définition des adresses matérielles des " +-"périphériques en équipe et des périphériques de port pendant la durée de vie " +-"des équipes." ++msgstr "Ceci définit la politique de définition des adresses matérielles des périphériques en équipe et des périphériques de port pendant la durée de vie des équipes." + + #: src/connection-editor/ce-page-team.ui:867 + msgid "Send LACPDU frames _periodically" +@@ -2721,9 +2555,7 @@ msgstr "Envoyer _périodiquement des trames LACPDU" + msgid "" + "If checked, LACPDU frames are sent along the configured links periodically. " + "If not, it acts as “speak when spoken to”." +-msgstr "" +-"Si cochée, les trames LACPDU seront envoyées périodiquement sur les liens " +-"configurés. Sinon, elles seront envoyées uniquement en réponse." ++msgstr "Si cochée, les trames LACPDU seront envoyées périodiquement sur les liens configurés. Sinon, elles seront envoyées uniquement en réponse." + + #: src/connection-editor/ce-page-team.ui:884 + msgid "Send a LACPDU frame _every second" +@@ -2734,10 +2566,7 @@ msgid "" + "Option specifies the rate at which our link partner is asked to transmit " + "LACPDU packets. If checked, packets will be sent once per second. Otherwise " + "they will be sent every 30 seconds." +-msgstr "" +-"L’option précise la vitesse à laquelle le partenaire du lien doit " +-"transmettre les paquets LACPDU. Si cochée, les paquets seront envoyés une " +-"fois par seconde. Sinon, il seront transmis toutes les 30 secondes." ++msgstr "L’option précise la vitesse à laquelle le partenaire du lien doit transmettre les paquets LACPDU. Si cochée, les paquets seront envoyés une fois par seconde. Sinon, il seront transmis toutes les 30 secondes." + + #: src/connection-editor/ce-page-team.ui:904 + msgid "_System priority" +@@ -2759,10 +2588,7 @@ msgstr "Priorité du système, la valeur doit être comprise entre 0 et 65535." + msgid "" + "Specifies the minimum number of ports that must be active before asserting " + "carrier in the master interface, value can be 1 – 255." +-msgstr "" +-"Désigne le nombre minimum de ports qui doivent être actifs avant de valider " +-"la porteuse dans l’interface maître. La valeur doit être comprise entre 1 et " +-"255." ++msgstr "Désigne le nombre minimum de ports qui doivent être actifs avant de valider la porteuse dans l’interface maître. La valeur doit être comprise entre 1 et 255." + + #: src/connection-editor/ce-page-team.ui:972 + msgid "This selects the policy of how the aggregators will be selected." +@@ -2772,9 +2598,7 @@ msgstr "Sélectionne la règle de sélection des agrégateurs." + msgid "" + "List of fragment types (strings) which should be used for packet Tx hash " + "computation." +-msgstr "" +-"Liste de types de fragments (chaînes) devant être utilisés pour le calcul de " +-"l’empreinte des paquets Tx." ++msgstr "Liste de types de fragments (chaînes) devant être utilisés pour le calcul de l’empreinte des paquets Tx." + + #: src/connection-editor/ce-page-team.ui:1036 + msgid "_Fields for transmission hash" +@@ -2782,13 +2606,11 @@ msgstr "_Champs pour l’empreinte de transmission" + + #: src/connection-editor/ce-page-team.ui:1052 + msgid "In tenths of a second. Periodic interval between rebalancing." +-msgstr "" +-"En dixièmes de seconde. Intervalle périodique entre les rééquilibrages." ++msgstr "En dixièmes de seconde. Intervalle périodique entre les rééquilibrages." + + #: src/connection-editor/ce-page-team.ui:1064 + msgid "Name of active Tx balancer. Active Tx balancing is disabled by default." +-msgstr "" +-"Nom du balanceur Tx actif. La balance Tx active est désactivée par défaut." ++msgstr "Nom du balanceur Tx actif. La balance Tx active est désactivée par défaut." + + #: src/connection-editor/ce-page-team.ui:1086 + msgid "Transmission _balancing interval" +@@ -2902,49 +2724,47 @@ msgstr "SS_ID" + + #: src/connection-editor/ce-page-wireguard.ui:23 + msgid "Edit WireGuard peer" +-msgstr "" ++msgstr "Éditer un pair de WireGuard" + + #: src/connection-editor/ce-page-wireguard.ui:55 + msgid "_Apply" +-msgstr "" ++msgstr "_Appliquer" + + #: src/connection-editor/ce-page-wireguard.ui:159 + msgid "_Public key" +-msgstr "" ++msgstr "_Clé publique" + + #: src/connection-editor/ce-page-wireguard.ui:173 +-#, fuzzy + msgid "Allowed _IPs" +-msgstr "Méthodes autorisées" ++msgstr "IPs _Autorisés" + + #: src/connection-editor/ce-page-wireguard.ui:187 + msgid "_Endpoint" +-msgstr "" ++msgstr "_Endpoint" + + #: src/connection-editor/ce-page-wireguard.ui:201 +-#, fuzzy + msgid "Pre_shared key" +-msgstr "À clé partagée" ++msgstr "Clé pré_partagée" + + #: src/connection-editor/ce-page-wireguard.ui:215 + msgid "Persistent _keepalive" +-msgstr "" ++msgstr "Persistent _keepalive" + + #: src/connection-editor/ce-page-wireguard.ui:228 + msgid "A base64 public key calculated by 'wg pubkey' from a private key." +-msgstr "" ++msgstr "Une clé publique base64 calculée par \"wg pubkey\" à partir d'une clé privée." + + #: src/connection-editor/ce-page-wireguard.ui:240 + msgid "" + "Comma-separated list of IP (v4 or v6) addresses with CIDR masks from which " + "incoming traffic for this peer is allowed and to which outgoing traffic for " + "this peer is directed." +-msgstr "" ++msgstr "Liste d'adresses IP (v4 ou v6) séparées par des virgules avec des masques CIDR à partir desquelles le trafic entrant pour ce pair est autorisé et vers lesquelles le trafic sortant pour ce pair est dirigé." + + #: src/connection-editor/ce-page-wireguard.ui:252 + msgid "" + "An endpoint IP or hostname, followed by a colon, and then a port number." +-msgstr "" ++msgstr "Un nom d'hôte ou d'IP du point de terminaison, suivi de deux points, puis d'un numéro de port." + + #: src/connection-editor/ce-page-wireguard.ui:264 + msgid "" +@@ -2952,74 +2772,70 @@ msgid "" + "omitted. Adds an additional layer of symmetric-key cryptography to be mixed " + "into the already existing public-key cryptography, for post-quantum " + "resistance." +-msgstr "" ++msgstr "Une clé pré-partagée base64 générée par \"wg genpsk\". Facultatif, et peut être omis. Ajoute une couche supplémentaire de cryptographie à clé symétrique à inclure dans la cryptographie clé publique déjà existante, pour une résistance post-quantique." + + #: src/connection-editor/ce-page-wireguard.ui:280 + msgid "" + "How often to send an authenticated empty packet to the peer for the purpose " + "of keeping a stateful firewall or NAT mapping valid. This is optional and " + "not recommended outside of specific setups." +-msgstr "" ++msgstr "Combien de fois faut-il envoyer un paquet vide authentifié à l'homologue afin de maintenir la validité d'un mappage NAT ou d'un pare-feu stateful. Ceci est facultatif et non recommandé en dehors de configurations spécifiques." + + #: src/connection-editor/ce-page-wireguard.ui:297 + msgid "seconds" +-msgstr "" ++msgstr "secondes" + + #: src/connection-editor/ce-page-wireguard.ui:313 +-#, fuzzy + msgid "Sho_w preshared key" +-msgstr "A_fficher la clé" ++msgstr "A_fficher clé pré-partagée" + + #: src/connection-editor/ce-page-wireguard.ui:386 + msgid "The name of the wireguard interface to create." +-msgstr "" ++msgstr "Le nom de l'interface wireguard à créer." + + #: src/connection-editor/ce-page-wireguard.ui:400 +-#, fuzzy + msgid "Private _key" +-msgstr "_Clé privée %s" ++msgstr "Clé_privée" + + #: src/connection-editor/ce-page-wireguard.ui:413 + msgid "The 256 bit private key in base64 encoding" +-msgstr "" ++msgstr "La clé privée 256 bits en encodage base64" + + #: src/connection-editor/ce-page-wireguard.ui:429 +-#, fuzzy + msgid "_Listen port" +-msgstr "Ports _minimums" ++msgstr "_Écoute le port" + + #: src/connection-editor/ce-page-wireguard.ui:442 + msgid "" + "A port to listen on. If set to 'automatic', the port will be chosen randomly " + "when the interface comes up." +-msgstr "" ++msgstr "Un port à écouter. S'il est réglé sur \"automatique\", le port sera choisi de manière aléatoire lorsque l'interface apparaîtra." + + #: src/connection-editor/ce-page-wireguard.ui:459 + msgid "_Fwmark" +-msgstr "" ++msgstr "_Fwmark" + + #: src/connection-editor/ce-page-wireguard.ui:489 + msgid "Add peer _routes" +-msgstr "" ++msgstr "Ajouter des routes _de pairs" + + #: src/connection-editor/ce-page-wireguard.ui:503 + msgid "" + "Whether to automatically add routes for the AllowedIPs ranges of the peers" +-msgstr "" ++msgstr "S'il faut ajouter automatiquement des itinéraires pour les plages de PID autorisés des pairs" + + #: src/connection-editor/ce-page-wireguard.ui:543 + msgid "" + "A 32-bit fwmark for outgoing packets. Leave it to 'off' to disable fwmark." +-msgstr "" ++msgstr "Un fwmark 32 bits pour les paquets sortants. Laissez sur \"off\" pour désactiver fwmark." + + #: src/connection-editor/ce-page-wireguard.ui:554 +-#, fuzzy + msgid "_Show private key" +-msgstr "_Clé privée %s" ++msgstr "_Montrer clé privée" + + #: src/connection-editor/ce-page-wireguard.ui:641 + msgid "_Peers" +-msgstr "" ++msgstr "_Pairs" + + #: src/connection-editor/ce-page.c:105 + msgid "automatic" +@@ -3027,7 +2843,7 @@ msgstr "automatique" + + #: src/connection-editor/ce-page.c:117 + msgid "off" +-msgstr "" ++msgstr "arrêt" + + #: src/connection-editor/ce-page.c:163 + msgid "unspecified error" +@@ -3054,11 +2870,7 @@ msgid "" + "The MAC address entered here will be used as hardware address for the " + "network device this connection is activated on. This feature is known as MAC " + "cloning or spoofing. Example: 00:11:22:33:44:55" +-msgstr "" +-"L’adresse MAC saisie ici est utilisée en tant qu’adresse matérielle du " +-"périphérique réseau pour lequel cette connexion est activée. Cette " +-"fonctionnalité est connue sous le nom de clonage ou usurpation MAC. " +-"Exemple : 00:11:22:33:44:55" ++msgstr "L’adresse MAC saisie ici est utilisée en tant qu’adresse matérielle du périphérique réseau pour lequel cette connexion est activée. Cette fonctionnalité est connue sous le nom de clonage ou usurpation MAC. Exemple : 00:11:22:33:44:55" + + #: src/connection-editor/ce-page.c:315 + msgid "MAC address" +@@ -3114,10 +2926,7 @@ msgstr "%s invalide (%s) " + msgid "" + "IP addresses identify your computer on the network. Click the “Add” button " + "to add static IP address to be configured in addition to the automatic ones." +-msgstr "" +-"Les adresses IP identifient votre ordinateur sur le réseau. Cliquez sur le " +-"bouton « Ajouter » pour ajouter une adresse IP statique en plus de celle " +-"assignée automatiquement." ++msgstr "Les adresses IP identifient votre ordinateur sur le réseau. Cliquez sur le bouton « Ajouter » pour ajouter une adresse IP statique en plus de celle assignée automatiquement." + + #: src/connection-editor/ce-page.h:99 + msgid "" +@@ -3125,11 +2934,7 @@ msgid "" + "address range distributed to other computers. Click the “Add” button to add " + "an IP address. If no address is provided, range will be determined " + "automatically." +-msgstr "" +-"L’adresse IP identifie votre ordinateur sur le réseau et détermine la plage " +-"d’adresses partagée avec les autres ordinateurs. Cliquez sur le bouton " +-"« Ajouter » pour ajouter une adresse IP. Si aucune adresse n’est fournie, la " +-"plage sera déterminée automatiquement." ++msgstr "L’adresse IP identifie votre ordinateur sur le réseau et détermine la plage d’adresses partagée avec les autres ordinateurs. Cliquez sur le bouton « Ajouter » pour ajouter une adresse IP. Si aucune adresse n’est fournie, la plage sera déterminée automatiquement." + + #: src/connection-editor/ce-page.h:104 + msgid "Additional static addresses" +@@ -3196,10 +3001,7 @@ msgstr "Microsoft Challenge Handshake Authentication Protocol version 2" + msgid "" + "In most cases, the provider’s PPP servers will support all authentication " + "methods. If connections fail, try disabling support for some methods." +-msgstr "" +-"Dans la plupart des cas, les serveurs PPP du fournisseur d’accès prennent en " +-"charge toutes les méthodes d’authentification. Si la connexion échoue, " +-"essayez d’en désactiver certaines." ++msgstr "Dans la plupart des cas, les serveurs PPP du fournisseur d’accès prennent en charge toutes les méthodes d’authentification. Si la connexion échoue, essayez d’en désactiver certaines." + + #: src/connection-editor/connection-helpers.c:93 + #: src/connection-editor/page-wifi.c:423 +@@ -3248,9 +3050,8 @@ msgstr "MACsec" + + #: src/connection-editor/connection-helpers.c:110 + #: src/connection-editor/page-wireguard.c:510 +-#, fuzzy + msgid "WireGuard" +-msgstr "Filaire" ++msgstr "WireGuard" + + #: src/connection-editor/connection-helpers.c:112 + #: src/connection-editor/connection-helpers.c:374 +@@ -3264,8 +3065,7 @@ msgstr "Aucun type de service VPN." + + #: src/connection-editor/connection-helpers.c:197 + msgid "The VPN plugin failed to import the VPN connection correctly: " +-msgstr "" +-"Le greffon VPN n’a pas réussi à importer correctement la connexion VPN : " ++msgstr "Le greffon VPN n’a pas réussi à importer correctement la connexion VPN : " + + #: src/connection-editor/connection-helpers.c:281 + #: src/connection-editor/page-proxy.c:104 +@@ -3298,9 +3098,7 @@ msgstr "Importer une configuration VPN enregistrée…" + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." +-msgstr "" +-"La fenêtre d’édition de connexion n’a pas pu être initialisée en raison " +-"d’une erreur inconnue." ++msgstr "La fenêtre d’édition de connexion n’a pas pu être initialisée en raison d’une erreur inconnue." + + #: src/connection-editor/connection-helpers.c:533 + msgid "Could not create new connection" +@@ -3381,9 +3179,7 @@ msgstr "Paramètre %s invalide : %s" + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." +-msgstr "" +-"L’éditeur de connexion n’a pas pu trouver les ressources requises (le " +-"fichier .ui n’a pas été trouvé)." ++msgstr "L’éditeur de connexion n’a pas pu trouver les ressources requises (le fichier .ui n’a pas été trouvé)." + + #: src/connection-editor/nm-connection-editor.c:568 + #: src/connection-editor/vpn-helpers.c:199 +@@ -3396,9 +3192,7 @@ msgstr "Enregistrer toute modification apportée à cette connexion." + + #: src/connection-editor/nm-connection-editor.c:570 + msgid "Authenticate to save this connection for all users of this machine." +-msgstr "" +-"S’authentifier pour enregistrer cette connexion pour tous les utilisateurs " +-"de cet ordinateur." ++msgstr "S’authentifier pour enregistrer cette connexion pour tous les utilisateurs de cet ordinateur." + + #: src/connection-editor/nm-connection-editor.c:586 + msgid "Could not create connection" +@@ -3410,16 +3204,13 @@ msgstr "Impossible de modifier la connexion" + + #: src/connection-editor/nm-connection-editor.c:588 + msgid "Unknown error creating connection editor dialog." +-msgstr "" +-"Erreur inconnue lors de la création de la fenêtre d’édition de connexion." ++msgstr "Erreur inconnue lors de la création de la fenêtre d’édition de connexion." + + #: src/connection-editor/nm-connection-editor.c:729 + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." +-msgstr "" +-"Avertissement : la connexion contient des propriétés non prises en charge " +-"par l’éditeur. Elles seront supprimées au moment de l’enregistrement." ++msgstr "Avertissement : la connexion contient des propriétés non prises en charge par l’éditeur. Elles seront supprimées au moment de l’enregistrement." + + #: src/connection-editor/nm-connection-editor.c:749 + msgid "Error initializing editor" +@@ -3437,9 +3228,7 @@ msgstr "Corriger" + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." +-msgstr "" +-"Les étiquettes de sécurité peuvent empêcher certains fichiers d’être " +-"utilisés avec l’authentification par certificat." ++msgstr "Les étiquettes de sécurité peuvent empêcher certains fichiers d’être utilisés avec l’authentification par certificat." + + #: src/connection-editor/nm-connection-editor.ui:110 + msgid "Connection _name" +@@ -3461,9 +3250,7 @@ msgstr "_Ré-étiqueter" + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" +-msgstr "" +-"Les fichiers suivants ne sont pas étiquetés pour être utilisés avec " +-"l’authentification par certificat. Souhaitez-vous ajuster les étiquettes ?" ++msgstr "Les fichiers suivants ne sont pas étiquetés pour être utilisés avec l’authentification par certificat. Souhaitez-vous ajuster les étiquettes ?" + + #: src/connection-editor/nm-connection-editor.ui:347 + msgid "Relabel" +@@ -3708,11 +3495,7 @@ msgid "" + "This option locks this connection to the network device specified either by " + "its interface name or permanent MAC or both. Examples: “em1”, " + "“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”" +-msgstr "" +-"Cette option verrouille cette connexion sur le périphérique réseau spécifié " +-"soit par son nom d’interface, soit par son adresse MAC permanente, soit par " +-"les deux. Exemples : « em1 », « 3C:97:0E:42:1A:19 », « em1 " +-"(3C:97:0E:42:1A:19) »" ++msgstr "Cette option verrouille cette connexion sur le périphérique réseau spécifié soit par son nom d’interface, soit par son adresse MAC permanente, soit par les deux. Exemples : « em1 », « 3C:97:0E:42:1A:19 », « em1 (3C:97:0E:42:1A:19) »" + + #: src/connection-editor/page-ethernet.c:248 + msgid "ignored" +@@ -3750,11 +3533,7 @@ msgid "" + "The zone defines the trust level of the connection. Default is not a regular " + "zone, selecting it results in the use of the default zone set in the " + "firewall. Only usable if firewalld is active." +-msgstr "" +-"La zone définit le niveau de confiance dans la connexion. La valeur par " +-"défaut n’est pas une zone standard et l’activer revient à utiliser la zone " +-"par défaut paramétrée dans le pare-feu. Cela n’est utilisable que si " +-"FirewallD est activé." ++msgstr "La zone définit le niveau de confiance dans la connexion. La valeur par défaut n’est pas une zone standard et l’activer revient à utiliser la zone par défaut paramétrée dans le pare-feu. Cela n’est utilisable que si FirewallD est activé." + + #: src/connection-editor/page-general.c:358 + msgid "Could not load General user interface." +@@ -3766,12 +3545,7 @@ msgid "" + "its interface name or permanent MAC or both. Examples: “ib0”, “80:00:00:48:" + "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, “ib0 (80:00:00:48:" + "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" +-msgstr "" +-"Cette option verrouille cette connexion sur le périphérique réseau spécifié " +-"soit par son nom d’interface, soit par son adresse MAC permanente, soit par " +-"les deux. Exemples : « ib0 », « 80:00:00:48:fe:80:00:00:00:00:00:00:00:02:" +-"c9:03:00:00:0f:65 », « ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:" +-"c9:03:00:00:0f:65) »" ++msgstr "Cette option verrouille cette connexion sur le périphérique réseau spécifié soit par son nom d’interface, soit par son adresse MAC permanente, soit par les deux. Exemples : « ib0 », « 80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65 », « ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65) »" + + #: src/connection-editor/page-infiniband.c:134 + msgid "Could not load InfiniBand user interface." +@@ -3922,17 +3696,14 @@ msgstr "Esclaves dupliqués" + #: src/connection-editor/page-master.c:222 + #, c-format + msgid "Slaves “%s” and “%s” both apply to device “%s”" +-msgstr "" +-"Les esclaves « %s » et « %s » s’appliquent tous deux au périphérique « %s »" ++msgstr "Les esclaves « %s » et « %s » s’appliquent tous deux au périphérique « %s »" + + #: src/connection-editor/page-master.c:233 + #, c-format + msgid "" + "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the " + "same physical device." +-msgstr "" +-"Les esclaves « %s » et « %s » s’appliquent à des ports virtuels différents " +-"(« %s » et « %s ») du même périphérique physique." ++msgstr "Les esclaves « %s » et « %s » s’appliquent à des ports virtuels différents (« %s » et « %s ») du même périphérique physique." + + #: src/connection-editor/page-master.c:357 + #, c-format +@@ -3956,22 +3727,17 @@ msgstr "Sélection du type de fournisseur de connexion mobile" + msgid "" + "Select the technology your mobile broadband provider uses. If you are " + "unsure, ask your provider." +-msgstr "" +-"Sélectionnez la technologie utilisée par votre fournisseur de connexion " +-"mobile. En cas de doute, interrogez votre fournisseur." ++msgstr "Sélectionnez la technologie utilisée par votre fournisseur de connexion mobile. En cas de doute, interrogez votre fournisseur." + + #: src/connection-editor/page-mobile.c:559 + msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)" +-msgstr "" +-"Mon fournisseur utilise une technologie de type _GSM (GPRS, EDGE, UMTS, " +-"HSDPA, etc.)" ++msgstr "Mon fournisseur utilise une technologie de type _GSM (GPRS, EDGE, UMTS, HSDPA, etc.)" + + #. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button. + #. You may need to change it according to your language. + #: src/connection-editor/page-mobile.c:566 + msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" +-msgstr "" +-"Mon fournisseur utilise une technologie de type C_DMA (1xRTT, EVOD, etc.)" ++msgstr "Mon fournisseur utilise une technologie de type C_DMA (1xRTT, EVOD, etc.)" + + #: src/connection-editor/page-mobile.c:576 src/mb-menu-item.c:36 + #: src/mobile-helpers.c:268 +@@ -4113,10 +3879,7 @@ msgid "" + "Select the type of VPN you wish to use for the new connection. If the type " + "of VPN connection you wish to create does not appear in the list, you may " + "not have the correct VPN plugin installed." +-msgstr "" +-"Sélectionnez le type de VPN que vous souhaitez utiliser pour cette nouvelle " +-"connexion. Si le type de connexion VPN n’apparaît pas dans la liste, il est " +-"possible que vous n’ayez pas le bon greffon VPN installé." ++msgstr "Sélectionnez le type de VPN que vous souhaitez utiliser pour cette nouvelle connexion. Si le type de connexion VPN n’apparaît pas dans la liste, il est possible que vous n’ayez pas le bon greffon VPN installé." + + #: src/connection-editor/page-wifi-security.c:351 + msgid "WEP 40/128-bit Key (Hex or ASCII)" +@@ -4144,13 +3907,11 @@ msgstr "WPA3 personnel" + + #: src/connection-editor/page-wifi-security.c:437 + msgid "Enhanced Open" +-msgstr "" ++msgstr "Enhanced Open" + + #: src/connection-editor/page-wifi-security.c:483 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." +-msgstr "" +-"Impossible de charger l’interface utilisateur de sécurité Wi-Fi ; paramètre " +-"Wi-Fi manquant." ++msgstr "Impossible de charger l’interface utilisateur de sécurité Wi-Fi ; paramètre Wi-Fi manquant." + + #: src/connection-editor/page-wifi-security.c:494 + msgid "Wi-Fi Security" +@@ -4172,20 +3933,14 @@ msgstr "Sécurité incompatible avec le mode Ad-Hoc" + msgid "" + "This option locks this connection to the Wi-Fi access point (AP) specified " + "by the BSSID entered here. Example: 00:11:22:33:44:55" +-msgstr "" +-"Cette option verrouille cette connexion sur le point d’accès (PA) Wi-Fi " +-"spécifié par le BSSID saisi ici. Par exemple : 00:11:22:33:44:55" ++msgstr "Cette option verrouille cette connexion sur le point d’accès (PA) Wi-Fi spécifié par le BSSID saisi ici. Par exemple : 00:11:22:33:44:55" + + #: src/connection-editor/page-wifi.c:74 + msgid "" + "This option locks this connection to the network device specified either by " + "its interface name or permanent MAC or both. Examples: “wlan0”, " + "“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”" +-msgstr "" +-"Cette option verrouille cette connexion sur le périphérique réseau spécifié " +-"ici soit par son nom d’interface, soit par son adresse MAC permanente, soit " +-"les deux. Exemples : « wlan0 », « 3C:97:0E:42:1A:19 », « wlan0 " +-"(3C:97:0E:42:1A:19) »" ++msgstr "Cette option verrouille cette connexion sur le périphérique réseau spécifié ici soit par son nom d’interface, soit par son adresse MAC permanente, soit les deux. Exemples : « wlan0 », « 3C:97:0E:42:1A:19 », « wlan0 (3C:97:0E:42:1A:19) »" + + #: src/connection-editor/page-wifi.c:183 + #, c-format +@@ -4211,22 +3966,20 @@ msgstr "Connexion Wi-Fi %d" + + #: src/connection-editor/page-wireguard.c:261 + msgid "Public key" +-msgstr "" ++msgstr "Clé publique" + + #: src/connection-editor/page-wireguard.c:268 +-#, fuzzy + msgid "Allowed IPs" +-msgstr "Méthodes autorisées" ++msgstr "IP autorisés" + + #: src/connection-editor/page-wireguard.c:512 +-#, fuzzy + msgid "Could not load WireGuard user interface." +-msgstr "Impossible de charger l’interface utilisateur de connexion en équipe." ++msgstr "Impossible de charger l'interface utilisateur de WireGuard." + + #: src/connection-editor/page-wireguard.c:628 +-#, fuzzy, c-format ++#, c-format + msgid "WireGuard connection %d" +-msgstr "Connexion en équipe %d" ++msgstr "Connexion WireGuard %d" + + #: src/connection-editor/vpn-helpers.c:118 + #, c-format +@@ -4240,9 +3993,7 @@ msgstr "_Remplacer" + #: src/connection-editor/vpn-helpers.c:122 + #, c-format + msgid "Do you want to replace %s with the VPN connection you are saving?" +-msgstr "" +-"Voulez-vous remplacer %s par la connexion VPN que vous êtes en train " +-"d’enregistrer ?" ++msgstr "Voulez-vous remplacer %s par la connexion VPN que vous êtes en train d’enregistrer ?" + + #: src/connection-editor/vpn-helpers.c:158 + msgid "Cannot export VPN connection" +@@ -4254,8 +4005,7 @@ msgid "" + "The VPN connection “%s” could not be exported to %s.\n" + "\n" + "Error: %s." +-msgstr "" +-"La connexion VPN « %s » ne peut pas être exportée vers %s.\n" ++msgstr "La connexion VPN « %s » ne peut pas être exportée vers %s.\n" + "\n" + "Erreur : %s." + +@@ -4287,17 +4037,13 @@ msgstr "Utilisation :" + msgid "" + "This program is a component of NetworkManager (https://wiki.gnome.org/" + "Projects/NetworkManager/)." +-msgstr "" +-"Ce programme fait partie de NetworkManager (https://wiki.gnome.org/Projects/" +-"NetworkManager/)." ++msgstr "Ce programme fait partie de NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/)." + + #: src/main.c:31 + msgid "" + "It is not intended for command-line interaction but instead runs in the " + "GNOME desktop environment." +-msgstr "" +-"Il n’est pas conçu pour interagir avec la ligne de commande, mais il " +-"s’intègre plutôt dans l’environnement de bureau GNOME." ++msgstr "Il n’est pas conçu pour interagir avec la ligne de commande, mais il s’intègre plutôt dans l’environnement de bureau GNOME." + + #: src/mb-menu-item.c:38 + msgid "EVDO" +@@ -4427,7 +4173,7 @@ msgstr "GTC" + + #: src/wireless-security/eap-method-fast.c:394 + msgid "Choose a PAC file" +-msgstr "Choisir un fichier PAC…" ++msgstr "Choisir un fichier PAC" + + #: src/wireless-security/eap-method-fast.c:401 + msgid "PAC files (*.pac)" +@@ -4630,26 +4376,20 @@ msgstr "clé WEP manquante" + #: src/wireless-security/ws-wep-key.c:106 + #, c-format + msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" +-msgstr "" +-"clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des " +-"chiffres hexadécimaux" ++msgstr "clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des chiffres hexadécimaux" + + #: src/wireless-security/ws-wep-key.c:114 + #, c-format + msgid "" + "invalid wep-key: key with a length of %zu must contain only ascii characters" +-msgstr "" +-"clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des " +-"caractères ASCII" ++msgstr "clé WEP invalide : les clés de longueur %zu ne peuvent contenir que des caractères ASCII" + + #: src/wireless-security/ws-wep-key.c:120 + #, c-format + msgid "" + "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " + "(ascii) or 10/26 (hex)" +-msgstr "" +-"clé WEP invalide : longueur de clé %zu non valide. La longueur d’une clé " +-"doit être soit de 5/13 (ASCII), soit de 10/26 (hexa)" ++msgstr "clé WEP invalide : longueur de clé %zu non valide. La longueur d’une clé doit être soit de 5/13 (ASCII), soit de 10/26 (hexa)" + + #: src/wireless-security/ws-wep-key.c:127 + msgid "invalid wep-key: passphrase must be non-empty" +@@ -4657,9 +4397,7 @@ msgstr "clé WEP invalide : la phrase de passe ne peut pas être vide" + + #: src/wireless-security/ws-wep-key.c:129 + msgid "invalid wep-key: passphrase must be shorter than 64 characters" +-msgstr "" +-"clé WEP invalide : la phrase de passe doit avoir une taille inférieure à 64 " +-"caractères" ++msgstr "clé WEP invalide : la phrase de passe doit avoir une taille inférieure à 64 caractères" + + #: src/wireless-security/ws-wep-key.ui:12 + msgid "Open System" +@@ -4690,15 +4428,11 @@ msgstr "Inde_x WEP" + msgid "" + "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " + "digits" +-msgstr "" +-"WPA-PSK invalide : longueur de clé %zu non valide. Doit être de [8,63] " +-"octets ou 64 chiffres hexa" ++msgstr "WPA-PSK invalide : longueur de clé %zu non valide. Doit être de [8,63] octets ou 64 chiffres hexa" + + #: src/wireless-security/ws-wpa-psk.c:69 + msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +-msgstr "" +-"WPA-PSK invalide : impossible d’interpréter une clé de 64 octets en " +-"hexadécimal" ++msgstr "WPA-PSK invalide : impossible d’interpréter une clé de 64 octets en hexadécimal" + + #~ msgid "nm-device-wireless" + #~ msgstr "nm-device-wireless" +@@ -4798,19 +4532,15 @@ msgstr "" + #~ msgid "No key set" + #~ msgstr "Aucune clé définie" + +-#, c-format + #~ msgid "Choose a key for %s Certificate" + #~ msgstr "Choisissez une clé pour le certificat %s" + +-#, c-format + #~ msgid "%s key _password" + #~ msgstr "_Mot de passe de la clé %s" + +-#, c-format + #~ msgid "Choose %s Certificate" + #~ msgstr "Choisissez le certificat %s" + +-#, c-format + #~ msgid "%s _certificate" + #~ msgstr "_Certificat %s" + +@@ -4945,11 +4675,9 @@ msgstr "" + #~ msgid "(None)" + #~ msgstr "(aucun)" + +-#, c-format + #~ msgid "Key in %s" + #~ msgstr "Clé dans %s" + +-#, c-format + #~ msgid "Certificate in %s" + #~ msgstr "Certificat dans %s" + +@@ -4965,11 +4693,9 @@ msgstr "" + #~ msgid "Select from file…" + #~ msgstr "Choisir à partir d’un fichier…" + +-#, c-format + #~ msgid "Choose a %s Certificate" + #~ msgstr "Choisissez un certificat %s" + +-#, c-format + #~ msgid "%s certificate _password" + #~ msgstr "_Mot de passe du certificat %s" + +@@ -4985,7 +4711,6 @@ msgstr "" + #~ msgid "Issued By" + #~ msgstr "Émis par" + +-#, c-format + #~ msgid "Enter %s PIN" + #~ msgstr "Saisissez le PIN %s" + +@@ -5035,7 +4760,6 @@ msgstr "" + #~ msgid "C_reate" + #~ msgstr "C_réer" + +-#, c-format + #~ msgid "" + #~ "Passwords or encryption keys are required to access the Wi-Fi network " + #~ "“%s”." +@@ -5105,7 +4829,6 @@ msgstr "" + #~ msgid "USB" + #~ msgstr "USB" + +-#, c-format + #~ msgctxt "long device name" + #~ msgid "%s %s" + #~ msgstr "%s %s" +@@ -5133,5 +4856,3 @@ msgstr "" + #~ msgid "CKN" + #~ msgstr "CKN" + +-#~ msgid "CAK" +-#~ msgstr "CAK" +diff --git a/po/ja.po b/po/ja.po +index c061e24a..525d3e73 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -49,17 +49,13 @@ msgstr "NetworkManager 接続エディター" + msgid "" + "NetworkManager is a system service for managing and configuring your network " + "connections and devices." +-msgstr "" +-"NetworkManager は、ネットワーク接続およびデバイスを管理、設定するためのシステ" +-"ムサービスです。" ++msgstr "NetworkManager は、ネットワーク接続およびデバイスを管理、設定するためのシステムサービスです。" + + #: nm-connection-editor.appdata.xml.in:13 + msgid "" + "The nm-connection-editor program works with NetworkManager to create and " + "edit existing connection profiles for NetworkManager." +-msgstr "" +-"nm-connection-editor プログラムは、NetworkManager と連携して NetworkManager " +-"用の接続プロファイルを作成し、また既存の接続プロファイルを編集します。" ++msgstr "nm-connection-editor プログラムは、NetworkManager と連携して NetworkManager 用の接続プロファイルを作成し、また既存の接続プロファイルを編集します。" + + #: nm-connection-editor.appdata.xml.in:27 + msgid "The NetworkManager Developers" +@@ -76,29 +72,23 @@ msgstr "ネットワーク接続セッティングの管理と変更" + #: shared/nm-utils/nm-shared-utils.c:793 + #, c-format + msgid "object class '%s' has no property named '%s'" +-msgstr "" +-"オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません" ++msgstr "オブジェクトクラス '%s' には、'%s' という名前のプロパティーがありません" + + #: shared/nm-utils/nm-shared-utils.c:800 + #, c-format + msgid "property '%s' of object class '%s' is not writable" +-msgstr "" +-"オブジェクトクラス '%s' のプロパティー '%s' は、書き込み可能ではありません" ++msgstr "オブジェクトクラス '%s' のプロパティー '%s' は、書き込み可能ではありません" + + #: shared/nm-utils/nm-shared-utils.c:807 + #, c-format + msgid "" + "construct property \"%s\" for object '%s' can't be set after construction" +-msgstr "" +-"オブジェクト '%s' のコンストラクトプロパティー \"%s\" は構築後に設定できませ" +-"ん" ++msgstr "オブジェクト '%s' のコンストラクトプロパティー \"%s\" は構築後に設定できません" + + #: shared/nm-utils/nm-shared-utils.c:815 + #, c-format + msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype" +-msgstr "" +-"'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプでは" +-"ありません" ++msgstr "'%s::%s' は有効なプロパティー名ではありません。'%s' は GObject サブタイプではありません" + + #: shared/nm-utils/nm-shared-utils.c:824 + #, c-format +@@ -110,9 +100,7 @@ msgstr "プロパティー '%s' (タイプ '%s') を、タイプ '%s' の値か + msgid "" + "value \"%s\" of type '%s' is invalid or out of range for property '%s' of " + "type '%s'" +-msgstr "" +-"値 \"%s\" (タイプ '%s') が、プロパティー '%s' (タイプ '%s') に対して無効また" +-"は範囲外です" ++msgstr "値 \"%s\" (タイプ '%s') が、プロパティー '%s' (タイプ '%s') に対して無効または範囲外です" + + #: src/8021x.ui:11 src/ethernet-dialog.c:85 + msgid "802.1X authentication" +@@ -166,7 +154,7 @@ msgstr "PIN が違います。プロバイダーに連絡してください。" + #. Start the spinner to show the progress of the unlock + #: src/applet-device-broadband.c:240 + msgid "Sending unlock code…" +-msgstr "ロック解除コードを送信中..." ++msgstr "ロック解除コードを送信中…" + + #: src/applet-device-broadband.c:725 src/applet-dialogs.c:521 + #, c-format +@@ -200,7 +188,7 @@ msgstr "現在、モバイルブロードバンドネットワークに接続し + + #: src/applet-device-broadband.c:948 src/applet-device-broadband.c:954 + msgid "Mobile Broadband network." +-msgstr "モバイルブロードバンドネットワーク" ++msgstr "モバイルブロードバンドネットワーク。" + + #: src/applet-device-broadband.c:949 + msgid "You are now registered on the home network." +@@ -246,20 +234,20 @@ msgstr "自動 Ethernet" + #: src/applet-device-ethernet.c:68 + #, c-format + msgid "Ethernet Networks (%s)" +-msgstr " Ethernet ネットワーク (%s)" ++msgstr "Ethernet ネットワーク (%s)" + + #: src/applet-device-ethernet.c:70 + #, c-format + msgid "Ethernet Network (%s)" +-msgstr " Ethernet ネットワーク (%s)" ++msgstr "Ethernet ネットワーク (%s)" + + #: src/applet-device-ethernet.c:73 + msgid "Ethernet Networks" +-msgstr " Ethernet ネットワーク" ++msgstr "Ethernet ネットワーク" + + #: src/applet-device-ethernet.c:75 + msgid "Ethernet Network" +-msgstr " Ethernet ネットワーク" ++msgstr "Ethernet ネットワーク" + + #. Notify user of unmanaged or unavailable device + #: src/applet-device-ethernet.c:95 src/applet.c:1288 +@@ -268,22 +256,22 @@ msgstr "切断されています" + + #: src/applet-device-ethernet.c:119 + msgid "You are now connected to the ethernet network." +-msgstr " Ethernet ネットワークに接続しました。" ++msgstr "Ethernet ネットワークに接続しました。" + + #: src/applet-device-ethernet.c:147 + #, c-format + msgid "Preparing ethernet network connection “%s”…" +-msgstr " Ethernet ネットワーク接続 '%s' を準備中です..." ++msgstr "Ethernet ネットワーク接続 '%s' を準備中です..." + + #: src/applet-device-ethernet.c:150 + #, c-format + msgid "Configuring ethernet network connection “%s”…" +-msgstr " Ethernet ネットワーク接続 '%s' を設定中です..." ++msgstr "Ethernet ネットワーク接続 '%s' を設定中です..." + + #: src/applet-device-ethernet.c:153 + #, c-format + msgid "User authentication required for ethernet network connection “%s”…" +-msgstr " Ethernet ネットワーク接続 '%s'にはユーザー認証が必要です..." ++msgstr "Ethernet ネットワーク接続 '%s'にはユーザー認証が必要です..." + + #: src/applet-device-ethernet.c:156 + #, c-format +@@ -407,7 +395,7 @@ msgstr "Wi-Fi ネットワーク接続 '%s' はアクティブです: %s (%d%%)" + #: src/applet-device-wifi.c:1350 + #, c-format + msgid "Wi-Fi network connection “%s” active" +-msgstr " Wi-Fi ネットワーク接続 '%s' はアクティブです" ++msgstr "Wi-Fi ネットワーク接続 '%s' はアクティブです" + + #: src/applet-device-wifi.c:1369 + msgid "Failed to activate connection" +@@ -606,8 +594,7 @@ msgid "" + "Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" +-msgstr "" +-"Copyright © 2004-2017 Red Hat, Inc.\n" ++msgstr "Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" + +@@ -628,9 +615,7 @@ msgstr "翻訳者クレジット" + msgid "" + "The NetworkManager Applet could not find some required resources (the .ui " + "file was not found)." +-msgstr "" +-"NetworkManager アプレットは、必要なリソースをいくつか見つけられませんでした " +-"(.ui ファイルが見つかりません)。" ++msgstr "NetworkManager アプレットは、必要なリソースをいくつか見つけられませんでした (.ui ファイルが見つかりません)。" + + #: src/applet-dialogs.c:1152 + msgid "Missing resources" +@@ -663,8 +648,7 @@ msgstr "SIM PIN の開錠が必要です" + msgid "" + "The mobile broadband device “%s” requires a SIM PIN code before it can be " + "used." +-msgstr "" +-"モバイルブロードバンドデバイス %s' を使用するには SIM PIN コードが必要です。" ++msgstr "モバイルブロードバンドデバイス %s' を使用するには SIM PIN コードが必要です。" + + #. Translators: PIN code entry label + #: src/applet-dialogs.c:1488 +@@ -690,8 +674,7 @@ msgstr "SIM PUK のアンロックが必要です" + msgid "" + "The mobile broadband device “%s” requires a SIM PUK code before it can be " + "used." +-msgstr "" +-"モバイルブロードバンドデバイス '%s' を使用するには SIM PUK コードが必要です。" ++msgstr "モバイルブロードバンドデバイス '%s' を使用するには SIM PUK コードが必要です。" + + #. Translators: PUK code entry label + #: src/applet-dialogs.c:1499 +@@ -748,8 +731,7 @@ msgid "" + "\n" + "The VPN connection “%s” disconnected because the network connection was " + "interrupted." +-msgstr "" +-"\n" ++msgstr "\n" + "ネットワーク接続が中断されたため、VPN 接続 '%s' は切断されました。" + + #: src/applet.c:880 +@@ -758,8 +740,7 @@ msgid "" + "\n" + "The VPN connection “%s” failed because the network connection was " + "interrupted." +-msgstr "" +-"\n" ++msgstr "\n" + "ネットワーク接続が中断されたため、VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:882 +@@ -767,8 +748,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service stopped unexpectedly." +-msgstr "" +-"\n" ++msgstr "\n" + "VPN サービスが予期せずに停止したため、VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:884 +@@ -777,8 +757,7 @@ msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service returned invalid " + "configuration." +-msgstr "" +-"\n" ++msgstr "\n" + "VPN サービスが無効な設定を返したため、VPN 接続 '%s'は失敗しました。" + + #: src/applet.c:886 +@@ -786,8 +765,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the connection attempt timed out." +-msgstr "" +-"\n" ++msgstr "\n" + "接続試行がタイムアウトしたため、VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:888 +@@ -795,8 +773,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service did not start in time." +-msgstr "" +-"\n" ++msgstr "\n" + "VPN サービスが時間内に開始しなかったため、VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:890 +@@ -804,8 +781,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service failed to start." +-msgstr "" +-"\n" ++msgstr "\n" + "VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:892 +@@ -813,8 +789,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because there were no valid VPN secrets." +-msgstr "" +-"\n" ++msgstr "\n" + "有効な VPN シークレットがないため、VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:894 +@@ -822,8 +797,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because of invalid VPN secrets." +-msgstr "" +-"\n" ++msgstr "\n" + "VPN シークレットが無効なため、VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:899 +@@ -831,8 +805,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed." +-msgstr "" +-"\n" ++msgstr "\n" + "VPN 接続 '%s' は失敗しました。" + + #: src/applet.c:926 +@@ -841,8 +814,7 @@ msgid "" + "VPN connection has been successfully established.\n" + "\n" + "%s\n" +-msgstr "" +-"VPN 接続の確立に成功しました。\n" ++msgstr "VPN 接続の確立に成功しました。\n" + "\n" + "%s\n" + +@@ -865,8 +837,7 @@ msgid "" + "The VPN connection “%s” failed because the VPN service failed to start.\n" + "\n" + "%s" +-msgstr "" +-"\n" ++msgstr "\n" + "VPN サービスが開始に失敗したため、VPN 接続 '%s' は失敗しました。\n" + "\n" + "%s" +@@ -878,8 +849,7 @@ msgid "" + "The VPN connection “%s” failed to start.\n" + "\n" + "%s" +-msgstr "" +-"\n" ++msgstr "\n" + "VPN 接続 '%s' は開始に失敗しました。\n" + "\n" + "%s" +@@ -1018,9 +988,7 @@ msgstr "NetworkManager アプレット" + msgid "" + "IP addresses identify your computer on the network. Click the “Add” button " + "to add an IP address." +-msgstr "" +-"IP アドレスはネットワーク上のコンピューターを指定します。「追加」ボタンを押し" +-"て IP アドレスを追加します。" ++msgstr "IP アドレスはネットワーク上のコンピューターを指定します。「追加」ボタンを押して IP アドレスを追加します。" + + #: src/connection-editor/ce-ip4-routes.ui:109 + #: src/connection-editor/ce-ip6-routes.ui:109 +@@ -1062,8 +1030,7 @@ msgstr "この接続を、そのネットワーク上のリソースにのみ使 + msgid "" + "If enabled, this connection will never be used as the default network " + "connection." +-msgstr "" +-"有効にすると、この接続はデフォルトのネットワーク接続として 使用されません。" ++msgstr "有効にすると、この接続はデフォルトのネットワーク接続として 使用されません。" + + #: src/connection-editor/ce-new-connection.ui:65 + msgid "C_reate…" +@@ -1079,11 +1046,9 @@ msgid "" + "\n" + "If you are creating a VPN, and the VPN connection you wish to create does " + "not appear in the list, you may not have the correct VPN plugin installed." +-msgstr "" +-"新規接続で使用する接続の種類を選択してください。\n" ++msgstr "新規接続で使用する接続の種類を選択してください。\n" + "\n" +-"VPN 接続の一覧に、作成したい VPN 接続がにない場合は、正しい VPN プラグインが" +-"インストールされていない可能性があります。" ++"VPN 接続の一覧に、作成したい VPN 接続がにない場合は、正しい VPN プラグインがインストールされていない可能性があります。" + + #: src/connection-editor/ce-page-bluetooth.ui:35 + #: src/connection-editor/ce-page-ethernet.ui:129 +@@ -1176,9 +1141,7 @@ msgstr "ARP 対象(_T)" + msgid "" + "An IP address, or a comma-separated list of IP addresses, to look for when " + "checking the link status." +-msgstr "" +-"リンク状態を確認する単一の IP アドレス、またはコンマ区切りの複数 IP アドレス" +-"のリスト。" ++msgstr "リンク状態を確認する単一の IP アドレス、またはコンマ区切りの複数 IP アドレスのリスト。" + + #: src/connection-editor/ce-page-bond.ui:373 + msgid "Link _up delay" +@@ -1196,9 +1159,7 @@ msgstr "プライマリー(_P)" + msgid "" + "The interface name of the primary device. If set, this device will always be " + "the active slave when it is available." +-msgstr "" +-"プライマリーデバイスのインターフェース名を指定した場合、そのデバイスが利用可" +-"能である時、常にアクティブなスレーブになります。" ++msgstr "プライマリーデバイスのインターフェース名を指定した場合、そのデバイスが利用可能である時、常にアクティブなスレーブになります。" + + #: src/connection-editor/ce-page-bond.ui:507 + #: src/connection-editor/ce-page-ethernet.ui:188 +@@ -1269,10 +1230,7 @@ msgid "" + "Controls whether IGMP snooping is enabled for this bridge. Note that if " + "snooping was automatically disabled due to hash collisions, the system may " + "refuse to enable the feature until the collisions are resolved." +-msgstr "" +-"このブリッジにおいて、IGMP スヌーピングが有効かどうかを制御します。ハッシュの" +-"不一致が原因でスヌーピングが自動的に無効になっている場合は、その矛盾が解決す" +-"るまでこの機能が有効にならないことがあります。" ++msgstr "このブリッジにおいて、IGMP スヌーピングが有効かどうかを制御します。ハッシュの不一致が原因でスヌーピングが自動的に無効になっている場合は、その矛盾が解決するまでこの機能が有効にならないことがあります。" + + #: src/connection-editor/ce-page-bridge.ui:344 + msgid "Enable _STP (Spanning Tree Protocol)" +@@ -1281,17 +1239,13 @@ msgstr "STP (スパニングツリープロトコル) を有効にする(_S)" + #: src/connection-editor/ce-page-bridge.ui:348 + msgid "" + "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge" +-msgstr "" +-"このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御し" +-"ます。" ++msgstr "このブリッジにおいて、スパニングツリープロトコル (STP) が有効かどうかを制御します。" + + #: src/connection-editor/ce-page-bridge.ui:363 + msgid "" + "STP priority for this bridge. Lower values are “better”; the lowest priority " + "bridge will be elected the root bridge." +-msgstr "" +-"このブリッジにおける STP の優先度。値が小さい方が優先度が高くなります。優先度" +-"が一番低いブリッジが root ブリッジに選択されます。" ++msgstr "このブリッジにおける STP の優先度。値が小さい方が優先度が高くなります。優先度が一番低いブリッジが root ブリッジに選択されます。" + + #: src/connection-editor/ce-page-bridge.ui:378 + msgid "_Max age" +@@ -1319,11 +1273,7 @@ msgid "" + "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " + "can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " + "frames and LACP." +-msgstr "" +-"16 ビットのマスク。それぞれのマスクが、転送される必要がある範囲 01:80:" +-"C2:00:00:00 から 01:80:C2:00:00:0F のグループアドレスに対応しています。このマ" +-"スクには、ビット 0、1、または 2 を設定することができません。STP で使用する" +-"と、MAC がフレームと LACP を停止するためです。" ++msgstr "16 ビットのマスク。それぞれのマスクが、転送される必要がある範囲 01:80:C2:00:00:00 から 01:80:C2:00:00:0F のグループアドレスに対応しています。このマスクには、ビット 0、1、または 2 を設定することができません。STP で使用すると、MAC がフレームと LACP を停止するためです。" + + #: src/connection-editor/ce-page-dcb.ui:16 + msgid "_Use Data Center Bridging (DCB) for this connection" +@@ -1506,16 +1456,12 @@ msgstr "各ユーザー優先度に優先グループ ID を入力してくだ + msgid "" + "Enter the allowed link bandwidth percent each Priority Group may use. The " + "sum of all groups must total 100%." +-msgstr "" +-"優先グループが使用する利用可能なリンク帯域幅のパーセンテージを入力してくださ" +-"い。各グループの合計を 100% にする必要があります。" ++msgstr "優先グループが使用する利用可能なリンク帯域幅のパーセンテージを入力してください。各グループの合計を 100% にする必要があります。" + + #: src/connection-editor/ce-page-dcb.ui:2917 + msgid "" + "Enter the percentage of priority group bandwidth each user priority may use." +-msgstr "" +-"ユーザー優先度が使用可能な、優先グループ 帯域幅のパーセンテージを入力してくだ" +-"さい。" ++msgstr "ユーザー優先度が使用可能な、優先グループ 帯域幅のパーセンテージを入力してください。" + + #: src/connection-editor/ce-page-dcb.ui:2935 + msgid "Enable or disable strict bandwidth for each user priority." +@@ -1541,9 +1487,7 @@ msgstr "ユーザー名は、PPPoE サービスでの認証に使用されまし + msgid "" + "Only initiate sessions with access concentrators that provide the specified " + "service. For most providers this should be left blank." +-msgstr "" +-"指定したサービスを提供するアクセス集線装置だけを使用してセッションを開始しま" +-"す。多くのプロバイダーでは、これを空白にする必要があります。" ++msgstr "指定したサービスを提供するアクセス集線装置だけを使用してセッションを開始します。多くのプロバイダーでは、これを空白にする必要があります。" + + #: src/connection-editor/ce-page-dsl.ui:59 + msgid "_Service" +@@ -1596,11 +1540,7 @@ msgid "" + "it won’t be possible to activate another connection on it. Note that the " + "option can only be used for Ethernet interfaces. nm-applet is able to " + "activate the connection only if this option is selected." +-msgstr "" +-"選択された場合、接続はインターフェースを排他制御し、別の接続を有効化すること" +-"はできません。このオプションは、Ethernet のインターフェースでのみ使用可能で" +-"す。このオプションが選択されている場合に限り、nm-applet は接続を有効化できま" +-"す。" ++msgstr "選択された場合、接続はインターフェースを排他制御し、別の接続を有効化することはできません。このオプションは、Ethernet のインターフェースでのみ使用可能です。このオプションが選択されている場合に限り、nm-applet は接続を有効化できます。" + + #: src/connection-editor/ce-page-ethernet.ui:17 + #: src/connection-editor/ce-page-ethernet.ui:77 +@@ -1729,10 +1669,7 @@ msgid "" + "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values " + "will be forced without checking the device compatibility. If unsure, leave " + "here “Ignore” or pick “Automatic”." +-msgstr "" +-"デバイスのリンクネゴシエーション。「手動」を選択すると、デバイスの互換性を確" +-"認せずに「スピード」および「二重」の値が強制されます。不明な場合は、「無視」" +-"にしておくか「自動」を選択してください。" ++msgstr "デバイスのリンクネゴシエーション。「手動」を選択すると、デバイスの互換性を確認せずに「スピード」および「二重」の値が強制されます。不明な場合は、「無視」にしておくか「自動」を選択してください。" + + #: src/connection-editor/ce-page-ethernet.ui:448 + msgid "_Speed" +@@ -1743,10 +1680,7 @@ msgid "" + "Speed value for static link negotiation, required only when “Ignore” and " + "“Automatic” options are not selected. Before specifying a speed value be " + "sure your device supports it." +-msgstr "" +-"静的リンクネゴシエーションの速度の値。「無視」または「自動」のオプションを選" +-"択していない場合にのみ必要になります。速度の値を指定する前に、デバイスがサ" +-"ポートしていることを確認してください。" ++msgstr "静的リンクネゴシエーションの速度の値。「無視」または「自動」のオプションを選択していない場合にのみ必要になります。速度の値を指定する前に、デバイスがサポートしていることを確認してください。" + + #: src/connection-editor/ce-page-ethernet.ui:482 + msgid "Duple_x" +@@ -1757,10 +1691,7 @@ msgid "" + "Duplex value for static link negotiation, required only when “Ignore” and " + "“Automatic” options are not selected. Before specifying a duplex mode be " + "sure your device supports it." +-msgstr "" +-"静的リンクネゴシエーションの二重値。「無視」または「自動」のオプションを選択" +-"していない場合にのみ必要になります。二重モードを指定する前に、デバイスがサ" +-"ポートしていることを確認してください。" ++msgstr "静的リンクネゴシエーションの二重値。「無視」または「自動」のオプションを選択していない場合にのみ必要になります。二重モードを指定する前に、デバイスがサポートしていることを確認してください。" + + #: src/connection-editor/ce-page-general.ui:29 + msgid "Yes" +@@ -1792,11 +1723,7 @@ msgid "" + "and therefore data usage should be restricted. Select which value (“Yes” or " + "“No”) to indicate to applications, or “Automatic” to use a default value " + "based on the connection type and other heuristics." +-msgstr "" +-"NetworkManager は、接続が測定されているかどうかをアプリケーションに示すので、" +-"データの使用は制限されなければなりません。アプリケーションに示す値 (「はい」 " +-"または「いいえ」) がどちらなのかを選択するか、または「自動」を選択して接続の" +-"種類とその他のヒューリスティックをもとにデフォルトの値を使用します。" ++msgstr "NetworkManager は、接続が測定されているかどうかをアプリケーションに示すので、データの使用は制限されなければなりません。アプリケーションに示す値 (「はい」 または「いいえ」) がどちらなのかを選択するか、または「自動」を選択して接続の種類とその他のヒューリスティックをもとにデフォルトの値を使用します。" + + #: src/connection-editor/ce-page-general.ui:150 + msgid "Connect _automatically with priority" +@@ -1807,9 +1734,7 @@ msgid "" + "Connection priority for automatic activation. Connections with higher " + "numbers are preferred when selecting profiles for automatic activation. " + "Default value is 0." +-msgstr "" +-"自動アクティベーションの接続優先度。自動アクティベーションのプロファイル選択" +-"時に、より大きい数字の接続が優先されます。デフォルト値は 0 です。" ++msgstr "自動アクティベーションの接続優先度。自動アクティベーションのプロファイル選択時に、より大きい数字の接続が優先されます。デフォルト値は 0 です。" + + #. IP-over-InfiniBand "datagram mode" + #: src/connection-editor/ce-page-infiniband.ui:17 +@@ -1919,19 +1844,14 @@ msgid "" + "The DHCP client identifier allows the network administrator to customize " + "your computer’s configuration. If you wish to use a DHCP client identifier, " + "enter it here." +-msgstr "" +-"ネットワーク管理者は、DHCP クライアント識別子を使用してコンピューター設定をカ" +-"スタマイズできます。DHCP クライアント識別子を使用する場合は、ここに入力しま" +-"す。" ++msgstr "ネットワーク管理者は、DHCP クライアント識別子を使用してコンピューター設定をカスタマイズできます。DHCP クライアント識別子を使用する場合は、ここに入力します。" + + #: src/connection-editor/ce-page-ip4.ui:215 + #: src/connection-editor/ce-page-ip6.ui:233 + msgid "" + "Domains used when resolving host names. Use commas to separate multiple " + "domains." +-msgstr "" +-"ホスト名を解決する時に使用するドメイン。複数のドメインを分離する時はコンマを " +-"使います。" ++msgstr "ホスト名を解決する時に使用するドメイン。複数のドメインを分離する時はコンマを 使います。" + + #: src/connection-editor/ce-page-ip4.ui:228 + msgid "D_HCP client ID" +@@ -1953,9 +1873,7 @@ msgstr "DNS サーバー(_V)" + msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses." +-msgstr "" +-"ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されま" +-"す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。" ++msgstr "ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されます。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。" + + #: src/connection-editor/ce-page-ip4.ui:288 + msgid "Require IPv_4 addressing for this connection to complete" +@@ -1965,9 +1883,7 @@ msgstr "この接続を完了するには、IPv4 アドレスが必要 (_4)" + msgid "" + "When connecting to IPv6-capable networks, allows the connection to complete " + "if IPv4 configuration fails but IPv6 configuration succeeds." +-msgstr "" +-"IPv4 設定が失敗して、IPv6 設定が成功する場合は、IPv6 対応のネットワークに接続" +-"する時に接続が完了するまで待ちます。" ++msgstr "IPv4 設定が失敗して、IPv6 設定が成功する場合は、IPv6 対応のネットワークに接続する時に接続が完了するまで待ちます。" + + #: src/connection-editor/ce-page-ip4.ui:333 + #: src/connection-editor/ce-page-ip6.ui:401 +@@ -2001,10 +1917,7 @@ msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " + "be automatically scoped to the connecting interface." +-msgstr "" +-"ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されま" +-"す。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。リ" +-"ンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。" ++msgstr "ドメインネームサーバーの IP アドレスは、ホスト名を解決するために使用されます。ドメインネームサーバーアドレスが複数になる場合は、コンマで区切ります。リンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。" + + #: src/connection-editor/ce-page-ip6.ui:287 + msgid "IPv6 _privacy extensions" +@@ -2022,9 +1935,7 @@ msgstr "この接続が完了するには、IPv6 アドレスが必要 (_6)" + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +-msgstr "" +-"IPv6 設定が失敗し、IPv4 設定が成功する場合は、IPv4 対応のネットワークに接続す" +-"る時に接続が完了するまで待ちます。" ++msgstr "IPv6 設定が失敗し、IPv4 設定が成功する場合は、IPv4 対応のネットワークに接続する時に接続が完了するまで待ちます。" + + #: src/connection-editor/ce-page-macsec.ui:12 + msgid "PSK" +@@ -2059,16 +1970,13 @@ msgstr "親デバイス(_P)" + msgid "" + "The parent interface name or parent connection UUID from which this MACSEC " + "interface should be created." +-msgstr "" +-"この MACSEC インターフェースが作成される親インターフェースの名前、または親接" +-"続の UUID。" ++msgstr "この MACSEC インターフェースが作成される親インターフェースの名前、または親接続の UUID。" + + #: src/connection-editor/ce-page-macsec.ui:104 + msgid "" + "The parent interface name or parent connection UUID from which this MACsec " + "interface should be created" +-msgstr "" +-"この MACsec インターフェースが作成される親インターフェースまたは親接続の UUID" ++msgstr "この MACsec インターフェースが作成される親インターフェースまたは親接続の UUID" + + #: src/connection-editor/ce-page-macsec.ui:117 + msgid "Keys" +@@ -2083,9 +1991,7 @@ msgid "" + "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " + "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " + "security page" +-msgstr "" +-"MKA (MACsec キー一致) の CAK (接続関連キー) を取得する方法を指定します。EAP " +-"モードでは、802.1X セキュリティーページにパラメーターを追加します。" ++msgstr "MKA (MACsec キー一致) の CAK (接続関連キー) を取得する方法を指定します。EAP モードでは、802.1X セキュリティーページにパラメーターを追加します。" + + #: src/connection-editor/ce-page-macsec.ui:168 + msgid "C_AK" +@@ -2228,8 +2134,7 @@ msgstr "ブラウザー専用" + + #: src/connection-editor/ce-page-proxy.ui:38 + msgid "Use this proxy configuration for only browser clients/schemes." +-msgstr "" +-"このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。" ++msgstr "このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。" + + #: src/connection-editor/ce-page-proxy.ui:52 + msgid "PAC URL" +@@ -2289,9 +2194,7 @@ msgstr "キュー ID(_Q)" + msgid "" + "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after " + "port is enabled or disabled." +-msgstr "" +-"ポートの有効化または無効化後に送信された、未承諾 NA および余分な ARP パケット" +-"のバースト数。" ++msgstr "ポートの有効化または無効化後に送信された、未承諾 NA および余分な ARP パケットのバースト数。" + + #: src/connection-editor/ce-page-team-port.ui:241 + msgid "ID of queue which this port should be mapped to." +@@ -2310,8 +2213,7 @@ msgstr "ポート優先度(_P)" + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." +-msgstr "" +-"値は正の数(ミリ秒単位)。notify-peer パケットのバーストの間隔を指定します。" ++msgstr "値は正の数(ミリ秒単位)。notify-peer パケットのバーストの間隔を指定します。" + + #: src/connection-editor/ce-page-team-port.ui:286 + msgid "Port priority. The higher number means higher priority." +@@ -2323,8 +2225,7 @@ msgstr "ポート付箋(_S)" + + #: src/connection-editor/ce-page-team-port.ui:301 + msgid "Do not unselect the port if a better one becomes available." +-msgstr "" +-"より良いポートが使用可能となった場合、ポートの選択を解除しないでください。" ++msgstr "より良いポートが使用可能となった場合、ポートの選択を解除しないでください。" + + #: src/connection-editor/ce-page-team-port.ui:316 + msgid "LACP runner options" +@@ -2343,25 +2244,20 @@ msgstr "LACP ポートキー(_K)" + msgid "" + "Number of bursts of multicast group rejoin requests sent after port is " + "enabled or disabled." +-msgstr "" +-"ポートの有効化または無効化後に送信された、マルチキャストグループ再参加リクエ" +-"ストのバースト数。" ++msgstr "ポートの有効化または無効化後に送信された、マルチキャストグループ再参加リクエストのバースト数。" + + #: src/connection-editor/ce-page-team-port.ui:361 + msgid "" + "Port priority according to LACP standard. The lower number means higher " + "priority." +-msgstr "" +-"LACP 標準に準拠したポート優先度。数字が小さい方が優先度が高くなります。" ++msgstr "LACP 標準に準拠したポート優先度。数字が小さい方が優先度が高くなります。" + + #: src/connection-editor/ce-page-team-port.ui:374 + #: src/connection-editor/ce-page-team.ui:726 + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of multicast group rejoin requests." +-msgstr "" +-"値は正の数 (ミリ秒単位) です。マルチキャストグループ再参加リクエストのバース" +-"トの間隔を指定します。" ++msgstr "値は正の数 (ミリ秒単位) です。マルチキャストグループ再参加リクエストのバーストの間隔を指定します。" + + #: src/connection-editor/ce-page-team-port.ui:376 + msgid "" +@@ -2414,27 +2310,21 @@ msgstr "ターゲットホスト(_T)" + msgid "" + "Maximum number of missed replies. If this number is exceeded, link is " + "reported as down." +-msgstr "" +-"不在着信となった返信の最大数。この数値を超えるとリンクがダウンしていると報告" +-"されます。" ++msgstr "不在着信となった返信の最大数。この数値を超えるとリンクがダウンしていると報告されます。" + + #: src/connection-editor/ce-page-team-port.ui:548 + #: src/connection-editor/ce-page-team.ui:1275 + msgid "" + "Hostname to be converted to IP address which will be filled into ARP request " + "as source address." +-msgstr "" +-"IP アドレスに変換されるホスト名。この名前は、ソースアドレスとして ARP リクエ" +-"ストに記入されます。" ++msgstr "IP アドレスに変換されるホスト名。この名前は、ソースアドレスとして ARP リクエストに記入されます。" + + #: src/connection-editor/ce-page-team-port.ui:560 + #: src/connection-editor/ce-page-team.ui:1287 + msgid "" + "Hostname to be converted to IP address which will be filled into request as " + "destination address." +-msgstr "" +-"IP アドレスに変換されるホスト名で、宛先アドレスとしてリクエストに記入されま" +-"す。" ++msgstr "IP アドレスに変換されるホスト名で、宛先アドレスとしてリクエストに記入されます。" + + #: src/connection-editor/ce-page-team-port.ui:570 + #: src/connection-editor/ce-page-team.ui:1297 +@@ -2446,9 +2336,7 @@ msgstr "アクティブなポートからの無効なパケットを無視(_A)" + msgid "" + "Validate received ARP packets on active ports. If this is not checked, all " + "incoming ARP packets will be considered as a good reply." +-msgstr "" +-"アクティブなポートで受信した ARP パケットを検証します。これを確認しないと、着" +-"信 ARP パケットがすべて正常な返信とみなされます。" ++msgstr "アクティブなポートで受信した ARP パケットを検証します。これを確認しないと、着信 ARP パケットがすべて正常な返信とみなされます。" + + #: src/connection-editor/ce-page-team-port.ui:587 + #: src/connection-editor/ce-page-team.ui:1314 +@@ -2460,9 +2348,7 @@ msgstr "アクティブでないポートからの無効なパケットを無視 + msgid "" + "Validate received ARP packets on inactive ports. If this is not checked, all " + "incoming ARP packets will be considered as a good reply." +-msgstr "" +-"アクティブでないポートで受信した ARP パケットを検証します。これを確認しない" +-"と、着信 ARP パケットはすべて正常な返信とみなされます。" ++msgstr "アクティブでないポートで受信した ARP パケットを検証します。これを確認しないと、着信 ARP パケットはすべて正常な返信とみなされます。" + + #: src/connection-editor/ce-page-team-port.ui:604 + #: src/connection-editor/ce-page-team.ui:1331 +@@ -2474,9 +2360,7 @@ msgstr "アクティブでないポートで送信(_E)" + msgid "" + "By default, ARP requests are sent on active ports only. This option allows " + "sending even on inactive ports." +-msgstr "" +-"デフォルトでは、ARP リクエストはアクティブなポートでのみ送信されます。このオ" +-"プションを使用すると、アクティブでないポートでも送信されるようになります。" ++msgstr "デフォルトでは、ARP リクエストはアクティブなポートでのみ送信されます。このオプションを使用すると、アクティブでないポートでも送信されるようになります。" + + #: src/connection-editor/ce-page-team-port.ui:671 + #: src/connection-editor/ce-page-team.ui:1398 +@@ -2630,9 +2514,7 @@ msgstr "ハードウェアアドレス(_H)" + msgid "" + "Desired hardware address of new team device. Usual MAC address format is " + "accepted." +-msgstr "" +-"新規チームデバイスのハードウェアアドレス。通常の MAC アドレス形式が使用できま" +-"す。" ++msgstr "新規チームデバイスのハードウェアアドレス。通常の MAC アドレス形式が使用できます。" + + #: src/connection-editor/ce-page-team.ui:799 + msgid "_Runner" +@@ -2650,9 +2532,7 @@ msgstr "使用するランナー名。" + msgid "" + "This defines the policy of how hardware addresses of team device and port " + "devices should be set during the team lifetime." +-msgstr "" +-"チームのライフタイム中に、チームデバイスおよびポートデバイスのハードウェアア" +-"ドレスを設定する方法に関するポリシーを定義します。" ++msgstr "チームのライフタイム中に、チームデバイスおよびポートデバイスのハードウェアアドレスを設定する方法に関するポリシーを定義します。" + + #: src/connection-editor/ce-page-team.ui:867 + msgid "Send LACPDU frames _periodically" +@@ -2662,9 +2542,7 @@ msgstr "LACPDU フレームを定期的に送信(_P)" + msgid "" + "If checked, LACPDU frames are sent along the configured links periodically. " + "If not, it acts as “speak when spoken to”." +-msgstr "" +-"これにチェックを入れると、設定済みリンクとともに LACPDU フレームが定期的に送" +-"信されます。チェックを入れない場合は、「通信があった場合に応答」します。" ++msgstr "これにチェックを入れると、設定済みリンクとともに LACPDU フレームが定期的に送信されます。チェックを入れない場合は、「通信があった場合に応答」します。" + + #: src/connection-editor/ce-page-team.ui:884 + msgid "Send a LACPDU frame _every second" +@@ -2675,10 +2553,7 @@ msgid "" + "Option specifies the rate at which our link partner is asked to transmit " + "LACPDU packets. If checked, packets will be sent once per second. Otherwise " + "they will be sent every 30 seconds." +-msgstr "" +-"このオプションは、リンクパートナーに LACPDU パケットを転送を依頼するレートを" +-"指定します。これにチェックを入れると、パケットは毎秒送信されます。チェックを" +-"入れない場合は、30 秒ごとに送信されます。" ++msgstr "このオプションは、リンクパートナーに LACPDU パケットを転送を依頼するレートを指定します。これにチェックを入れると、パケットは毎秒送信されます。チェックを入れない場合は、30 秒ごとに送信されます。" + + #: src/connection-editor/ce-page-team.ui:904 + msgid "_System priority" +@@ -2700,9 +2575,7 @@ msgstr "システム優先度。値の範囲は 0 – 65535 になります。" + msgid "" + "Specifies the minimum number of ports that must be active before asserting " + "carrier in the master interface, value can be 1 – 255." +-msgstr "" +-"マスターインターフェースにキャリアをアサートする前にアクティブにする必要があ" +-"るポートの最小数を指定します。値の範囲は 1 – 255 になります。" ++msgstr "マスターインターフェースにキャリアをアサートする前にアクティブにする必要があるポートの最小数を指定します。値の範囲は 1 – 255 になります。" + + #: src/connection-editor/ce-page-team.ui:972 + msgid "This selects the policy of how the aggregators will be selected." +@@ -2712,8 +2585,7 @@ msgstr "アグリゲーターを選択する方法に関するポリシーを指 + msgid "" + "List of fragment types (strings) which should be used for packet Tx hash " + "computation." +-msgstr "" +-"パケット Tx ハッシュ計算に使用するフラグメントタイプ (文字列) のリスト。" ++msgstr "パケット Tx ハッシュ計算に使用するフラグメントタイプ (文字列) のリスト。" + + #: src/connection-editor/ce-page-team.ui:1036 + msgid "_Fields for transmission hash" +@@ -2725,9 +2597,7 @@ msgstr "十分の一秒単位。リバランスの間隔。" + + #: src/connection-editor/ce-page-team.ui:1064 + msgid "Name of active Tx balancer. Active Tx balancing is disabled by default." +-msgstr "" +-"アクティブ Tx バランサーの名前。アクティブ Tx バランサーは、デフォルトでは無" +-"効になっています。" ++msgstr "アクティブ Tx バランサーの名前。アクティブ Tx バランサーは、デフォルトでは無効になっています。" + + #: src/connection-editor/ce-page-team.ui:1086 + msgid "Transmission _balancing interval" +@@ -2870,19 +2740,19 @@ msgstr "永続的なキープアライブ(_K)" + + #: src/connection-editor/ce-page-wireguard.ui:228 + msgid "A base64 public key calculated by 'wg pubkey' from a private key." +-msgstr "" ++msgstr "秘密鍵から 'wg pubkey' によって計算された base64 公開鍵。" + + #: src/connection-editor/ce-page-wireguard.ui:240 + msgid "" + "Comma-separated list of IP (v4 or v6) addresses with CIDR masks from which " + "incoming traffic for this peer is allowed and to which outgoing traffic for " + "this peer is directed." +-msgstr "" ++msgstr "CIDR マスクを持つ IP (v4 または v6) アドレスのコンマ区切りリスト。このピアの着信トラフィックが許可され、このピアの発信トラフィックが指示されます。" + + #: src/connection-editor/ce-page-wireguard.ui:252 + msgid "" + "An endpoint IP or hostname, followed by a colon, and then a port number." +-msgstr "" ++msgstr "エンドポイントの IP またはホスト名の後にコロンを続けて、ポート番号を指定します。" + + #: src/connection-editor/ce-page-wireguard.ui:264 + msgid "" +@@ -2890,14 +2760,14 @@ msgid "" + "omitted. Adds an additional layer of symmetric-key cryptography to be mixed " + "into the already existing public-key cryptography, for post-quantum " + "resistance." +-msgstr "" ++msgstr "'genpsk' によって生成された base64 の事前共有鍵。オプションで、省略可能。ポスト量子化耐性のために、既に存在する公開鍵暗号に混合される対称鍵暗号の追加レイヤーを追加します。" + + #: src/connection-editor/ce-page-wireguard.ui:280 + msgid "" + "How often to send an authenticated empty packet to the peer for the purpose " + "of keeping a stateful firewall or NAT mapping valid. This is optional and " + "not recommended outside of specific setups." +-msgstr "" ++msgstr "ステートフルファイアウォールまたは NAT マッピングの有効性を維持する目的で、認証済みの空のパケットをピアに送信する頻度。これはオプションであり、特定の設定以外では推奨されません。" + + #: src/connection-editor/ce-page-wireguard.ui:297 + msgid "seconds" +@@ -2909,7 +2779,7 @@ msgstr "事前共有鍵を表示(_W)" + + #: src/connection-editor/ce-page-wireguard.ui:386 + msgid "The name of the wireguard interface to create." +-msgstr "" ++msgstr "作成する Wireguard インターフェースの名前。" + + #: src/connection-editor/ce-page-wireguard.ui:400 + msgid "Private _key" +@@ -2917,7 +2787,7 @@ msgstr "秘密鍵(_K)" + + #: src/connection-editor/ce-page-wireguard.ui:413 + msgid "The 256 bit private key in base64 encoding" +-msgstr "" ++msgstr "base64 エンコードにおける 256 ビットのプライベートキー" + + #: src/connection-editor/ce-page-wireguard.ui:429 + msgid "_Listen port" +@@ -2927,11 +2797,11 @@ msgstr "待ち受けポート(_L)" + msgid "" + "A port to listen on. If set to 'automatic', the port will be chosen randomly " + "when the interface comes up." +-msgstr "" ++msgstr "リッスンするポート。'automatic' に設定されている場合は、インターフェイスが起動したときにポートがランダムに選択されます。" + + #: src/connection-editor/ce-page-wireguard.ui:459 + msgid "_Fwmark" +-msgstr "" ++msgstr "_Fwmark" + + #: src/connection-editor/ce-page-wireguard.ui:489 + msgid "Add peer _routes" +@@ -2940,12 +2810,12 @@ msgstr "ピアのルートを追加(_R)" + #: src/connection-editor/ce-page-wireguard.ui:503 + msgid "" + "Whether to automatically add routes for the AllowedIPs ranges of the peers" +-msgstr "" ++msgstr "ピアの AllowedIPs 範囲のルートを自動的に追加するかどうか" + + #: src/connection-editor/ce-page-wireguard.ui:543 + msgid "" + "A 32-bit fwmark for outgoing packets. Leave it to 'off' to disable fwmark." +-msgstr "" ++msgstr "32 ビットの送信パケット用の fwmark です。fwmark を無効にするには 'off' のままにしてください。" + + #: src/connection-editor/ce-page-wireguard.ui:554 + msgid "_Show private key" +@@ -2988,10 +2858,7 @@ msgid "" + "The MAC address entered here will be used as hardware address for the " + "network device this connection is activated on. This feature is known as MAC " + "cloning or spoofing. Example: 00:11:22:33:44:55" +-msgstr "" +-"ここに入力された MAC アドレスは、この接続が利用しているネットワークデバイスの" +-"ハードウェアアドレスとして使用されます。この機能は MAC クローニングあるいは " +-"MAC スプーフィングと呼ばれます。例: 00:11:22:33:44:55" ++msgstr "ここに入力された MAC アドレスは、この接続が利用しているネットワークデバイスのハードウェアアドレスとして使用されます。この機能は MAC クローニングあるいは MAC スプーフィングと呼ばれます。例: 00:11:22:33:44:55" + + #: src/connection-editor/ce-page.c:315 + msgid "MAC address" +@@ -3047,9 +2914,7 @@ msgstr "無効な %s (%s) " + msgid "" + "IP addresses identify your computer on the network. Click the “Add” button " + "to add static IP address to be configured in addition to the automatic ones." +-msgstr "" +-"IP アドレスはネットワーク上のコンピューターを指定します。「追加」ボタンを押し" +-"て、自動設定とは別に設定される静的 IP アドレスを追加します。" ++msgstr "IP アドレスはネットワーク上のコンピューターを指定します。「追加」ボタンを押して、自動設定とは別に設定される静的 IP アドレスを追加します。" + + #: src/connection-editor/ce-page.h:99 + msgid "" +@@ -3057,10 +2922,7 @@ msgid "" + "address range distributed to other computers. Click the “Add” button to add " + "an IP address. If no address is provided, range will be determined " + "automatically." +-msgstr "" +-"IP アドレスはネットワーク上のコンピューターを指定し、他のコンピューターに配布" +-"するアドレス範囲を決定します。「追加」ボタンを押して IP アドレスを追加しま" +-"す。アドレスが提供されないと、範囲は自動的に決定します。" ++msgstr "IP アドレスはネットワーク上のコンピューターを指定し、他のコンピューターに配布するアドレス範囲を決定します。「追加」ボタンを押して IP アドレスを追加します。アドレスが提供されないと、範囲は自動的に決定します。" + + #: src/connection-editor/ce-page.h:104 + msgid "Additional static addresses" +@@ -3124,16 +2986,13 @@ msgstr "MSCHAP v2(_2)" + # http://technet.microsoft.com/ja-jp/library/cc739678(WS.10).aspx + #: src/connection-editor/ce-ppp-auth-methods.ui:165 + msgid "Microsoft Challenge Handshake Authentication Protocol version 2" +-msgstr "" +-"Microsoft チャレンジハンドシェイク認証プロトコル バージョン2 (MS-CHAP v2)" ++msgstr "Microsoft チャレンジハンドシェイク認証プロトコル バージョン2 (MS-CHAP v2)" + + #: src/connection-editor/ce-ppp-auth-methods.ui:179 + msgid "" + "In most cases, the provider’s PPP servers will support all authentication " + "methods. If connections fail, try disabling support for some methods." +-msgstr "" +-"通常、プロバイダーの PPP サーバーはすべての認証方法をサポートしています。接続" +-"が失敗する場合は、認証方法を一部無効にしてみてください。" ++msgstr "通常、プロバイダーの PPP サーバーはすべての認証方法をサポートしています。接続が失敗する場合は、認証方法を一部無効にしてみてください。" + + #: src/connection-editor/connection-helpers.c:93 + #: src/connection-editor/page-wifi.c:423 +@@ -3230,8 +3089,7 @@ msgstr "保存した VPN 設定をインポートする..." + msgid "" + "The connection editor dialog could not be initialized due to an unknown " + "error." +-msgstr "" +-"接続エディターのダイアログは、不明なエラーのため初期化できませんでした。" ++msgstr "接続エディターのダイアログは、不明なエラーのため初期化できませんでした。" + + #: src/connection-editor/connection-helpers.c:533 + msgid "Could not create new connection" +@@ -3312,9 +3170,7 @@ msgstr "無効な設定 %s: %s" + msgid "" + "The connection editor could not find some required resources (the .ui file " + "was not found)." +-msgstr "" +-"接続エディターは、必要なリソースをいくつか見つけられませんでした (.ui ファイ" +-"ルが見つかりませんでした)。" ++msgstr "接続エディターは、必要なリソースをいくつか見つけられませんでした (.ui ファイルが見つかりませんでした)。" + + #: src/connection-editor/nm-connection-editor.c:568 + #: src/connection-editor/vpn-helpers.c:199 +@@ -3327,8 +3183,7 @@ msgstr "この接続に対する変更をすべて保存します。" + + #: src/connection-editor/nm-connection-editor.c:570 + msgid "Authenticate to save this connection for all users of this machine." +-msgstr "" +-"このマシンのすべてのユーザーに対して、この接続を保存するために認証する。" ++msgstr "このマシンのすべてのユーザーに対して、この接続を保存するために認証する。" + + #: src/connection-editor/nm-connection-editor.c:586 + msgid "Could not create connection" +@@ -3346,9 +3201,7 @@ msgstr "接続エディターダイアログの作成中に不明なエラーで + msgid "" + "Warning: the connection contains some properties not supported by the " + "editor. They will be cleared upon save." +-msgstr "" +-"警告: この接続には、エディターがサポートしていないプロパティーが含まれていま" +-"す。保存後するとこれらは消去されます。" ++msgstr "警告: この接続には、エディターがサポートしていないプロパティーが含まれています。保存後するとこれらは消去されます。" + + #: src/connection-editor/nm-connection-editor.c:749 + msgid "Error initializing editor" +@@ -3366,9 +3219,7 @@ msgstr "修正" + msgid "" + "Security labels may prevent some files from being used with certificate " + "authentication." +-msgstr "" +-"セキュリティーラベルにより、ファイルを証明書の認証に使用できない場合がありま" +-"す。" ++msgstr "セキュリティーラベルにより、ファイルを証明書の認証に使用できない場合があります。" + + #: src/connection-editor/nm-connection-editor.ui:110 + msgid "Connection _name" +@@ -3390,9 +3241,7 @@ msgstr "再ラベル付け(_R)" + msgid "" + "The following files are not labelled for use with certificate " + "authentication. Do you wish to adjust the labels?" +-msgstr "" +-"以下のファイルは、証明書の認証向けにラベル付けされていません。ラベルを修正し" +-"ますか?" ++msgstr "以下のファイルは、証明書の認証向けにラベル付けされていません。ラベルを修正しますか?" + + #: src/connection-editor/nm-connection-editor.ui:347 + msgid "Relabel" +@@ -3632,10 +3481,7 @@ msgid "" + "This option locks this connection to the network device specified either by " + "its interface name or permanent MAC or both. Examples: “em1”, " + "“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”" +-msgstr "" +-"このオプションは、インターフェース名もしくは永続的 MAC アドレス、またはこれら" +-"の両方で指定されたネットワークデバイスにこの接続をロックします。例: " +-"“em1”、“3C:97:0E:42:1A:19”、“em1 (3C:97:0E:42:1A:19)”" ++msgstr "このオプションは、インターフェース名もしくは永続的 MAC アドレス、またはこれらの両方で指定されたネットワークデバイスにこの接続をロックします。例: “em1”、“3C:97:0E:42:1A:19”、“em1 (3C:97:0E:42:1A:19)”" + + #: src/connection-editor/page-ethernet.c:248 + msgid "ignored" +@@ -3673,10 +3519,7 @@ msgid "" + "The zone defines the trust level of the connection. Default is not a regular " + "zone, selecting it results in the use of the default zone set in the " + "firewall. Only usable if firewalld is active." +-msgstr "" +-"このゾーンは接続の信頼レベルを定義します。デフォルトを選択した場合は、通常の" +-"ゾーンではなく、ファイアウォールでセットされているデフォルトのゾーンを利用す" +-"ることになります。これは firewalld がアクティブの場合にのみ有意です。" ++msgstr "このゾーンは接続の信頼レベルを定義します。デフォルトを選択した場合は、通常のゾーンではなく、ファイアウォールでセットされているデフォルトのゾーンを利用することになります。これは firewalld がアクティブの場合にのみ有意です。" + + #: src/connection-editor/page-general.c:358 + msgid "Could not load General user interface." +@@ -3688,11 +3531,7 @@ msgid "" + "its interface name or permanent MAC or both. Examples: “ib0”, “80:00:00:48:" + "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, “ib0 (80:00:00:48:" + "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" +-msgstr "" +-"このオプションは、インターフェース名もしくは永続的 MAC アドレス、またはこれら" +-"の両方で指定されたネットワークデバイスにこの接続をロックします。例: " +-"“ib0”、“80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”、“ib0 " +-"(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" ++msgstr "このオプションは、インターフェース名もしくは永続的 MAC アドレス、またはこれらの両方で指定されたネットワークデバイスにこの接続をロックします。例: “ib0”、“80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”、“ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" + + #: src/connection-editor/page-infiniband.c:134 + msgid "Could not load InfiniBand user interface." +@@ -3850,9 +3689,7 @@ msgstr "スレーブ '%s' と '%s' は、両方ともデバイス '%s' へ適用 + msgid "" + "Slaves “%s” and “%s” apply to different virtual ports (“%s” and “%s”) of the " + "same physical device." +-msgstr "" +-"スレーブ '%s' と '%s' は、それぞれ同じ物理デバイスの異なる仮想ポート ('%s' " +-"と '%s') へ適用されます。" ++msgstr "スレーブ '%s' と '%s' は、それぞれ同じ物理デバイスの異なる仮想ポート ('%s' と '%s') へ適用されます。" + + #: src/connection-editor/page-master.c:357 + #, c-format +@@ -3876,22 +3713,17 @@ msgstr "モバイルブロードバンドプロバイダーのタイプを選択 + msgid "" + "Select the technology your mobile broadband provider uses. If you are " + "unsure, ask your provider." +-msgstr "" +-"モバイルブロードバンドのプロバイダーが使用する技術を選択してください。不明な" +-"場合は、プロバイダーにお尋ねください。" ++msgstr "モバイルブロードバンドのプロバイダーが使用する技術を選択してください。不明な場合は、プロバイダーにお尋ねください。" + + #: src/connection-editor/page-mobile.c:559 + msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)" +-msgstr "" +-"私のプロバイダーは GSM ベースの技術 (例えば、 GPRS, EDGE, UMTS, HSDPA) を使用" +-"します(_G)" ++msgstr "私のプロバイダーは GSM ベースの技術 (例えば、 GPRS, EDGE, UMTS, HSDPA) を使用します(_G)" + + #. Translators: CDMA has 'D' accelerator key; 'C' collides with 'Cancel' button. + #. You may need to change it according to your language. + #: src/connection-editor/page-mobile.c:566 + msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" +-msgstr "" +-"私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)" ++msgstr "私のプロバイダーは CDMA ベースの技術 (例えば、1xRTT, EVDO)を使用します(_D)" + + #: src/connection-editor/page-mobile.c:576 src/mb-menu-item.c:36 + #: src/mobile-helpers.c:268 +@@ -4033,10 +3865,7 @@ msgid "" + "Select the type of VPN you wish to use for the new connection. If the type " + "of VPN connection you wish to create does not appear in the list, you may " + "not have the correct VPN plugin installed." +-msgstr "" +-"新規接続で使用する VPN タイプを選択してください。作成したい VPN 接続のタイプ" +-"が一覧にない場合は、正しい VPN プラグインがインストールされていない可能性があ" +-"ります。" ++msgstr "新規接続で使用する VPN タイプを選択してください。作成したい VPN 接続のタイプが一覧にない場合は、正しい VPN プラグインがインストールされていない可能性があります。" + + #: src/connection-editor/page-wifi-security.c:351 + msgid "WEP 40/128-bit Key (Hex or ASCII)" +@@ -4065,13 +3894,11 @@ msgstr "WPA3 Personal" + + #: src/connection-editor/page-wifi-security.c:437 + msgid "Enhanced Open" +-msgstr "" ++msgstr "拡張オープン" + + #: src/connection-editor/page-wifi-security.c:483 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." +-msgstr "" +-"Wi-Fi セキュリティーユーザーインターフェースを読み込めません。Wi-Fi 設定があ" +-"りません。" ++msgstr "Wi-Fi セキュリティーユーザーインターフェースを読み込めません。Wi-Fi 設定がありません。" + + #: src/connection-editor/page-wifi-security.c:494 + msgid "Wi-Fi Security" +@@ -4093,19 +3920,14 @@ msgstr "Ad-Hoc モードとのセキュリティーの互換性がありませ + msgid "" + "This option locks this connection to the Wi-Fi access point (AP) specified " + "by the BSSID entered here. Example: 00:11:22:33:44:55" +-msgstr "" +-"このオプションは、ここで入力された BSSID で指定された Wi-Fi アクセスポイント " +-"(AP) へこの接続をロックします。例: 00:11:22:33:44:55" ++msgstr "このオプションは、ここで入力された BSSID で指定された Wi-Fi アクセスポイント (AP) へこの接続をロックします。例: 00:11:22:33:44:55" + + #: src/connection-editor/page-wifi.c:74 + msgid "" + "This option locks this connection to the network device specified either by " + "its interface name or permanent MAC or both. Examples: “wlan0”, " + "“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”" +-msgstr "" +-"このオプションは、インターフェース名もしくは永続的 MAC アドレス、またはこれら" +-"の両方で指定されたネットワークデバイスにこの接続をロックします。例: " +-"“wlan0”、“3C:97:0E:42:1A:19”、“wlan0 (3C:97:0E:42:1A:19)”" ++msgstr "このオプションは、インターフェース名もしくは永続的 MAC アドレス、またはこれらの両方で指定されたネットワークデバイスにこの接続をロックします。例: “wlan0”、“3C:97:0E:42:1A:19”、“wlan0 (3C:97:0E:42:1A:19)”" + + #: src/connection-editor/page-wifi.c:183 + #, c-format +@@ -4170,8 +3992,7 @@ msgid "" + "The VPN connection “%s” could not be exported to %s.\n" + "\n" + "Error: %s." +-msgstr "" +-"VPN 接続 '%s' は、%s にエクスポートできませんでした。\n" ++msgstr "VPN 接続 '%s' は、%s にエクスポートできませんでした。\n" + "\n" + "エラー: %s" + +@@ -4203,17 +4024,13 @@ msgstr "使用法:" + msgid "" + "This program is a component of NetworkManager (https://wiki.gnome.org/" + "Projects/NetworkManager/)." +-msgstr "" +-"このプログラムは、NetworkManager (https://wiki.gnome.org/Projects/" +-"NetworkManager/) のコンポーネントです。" ++msgstr "このプログラムは、NetworkManager (https://wiki.gnome.org/Projects/NetworkManager/) のコンポーネントです。" + + #: src/main.c:31 + msgid "" + "It is not intended for command-line interaction but instead runs in the " + "GNOME desktop environment." +-msgstr "" +-"コマンドラインでの利用は意図されていません。代わりに GNOME デスクトップ環境で" +-"実行します。" ++msgstr "コマンドラインでの利用は意図されていません。代わりに GNOME デスクトップ環境で実行します。" + + #: src/mb-menu-item.c:38 + msgid "EVDO" +@@ -4562,9 +4379,7 @@ msgstr "無効な wep-key: %zu の長さのキーには、ascii 文字しか使 + msgid "" + "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " + "(ascii) or 10/26 (hex)" +-msgstr "" +-"無効な wep-key: キーの長さ %zu が正しくありません。キーの長さは 5/13 (ascii) " +-"か 10/26 (hex) にする必要があります" ++msgstr "無効な wep-key: キーの長さ %zu が正しくありません。キーの長さは 5/13 (ascii) か 10/26 (hex) にする必要があります" + + #: src/wireless-security/ws-wep-key.c:127 + msgid "invalid wep-key: passphrase must be non-empty" +@@ -4603,9 +4418,7 @@ msgstr "WEP インデックス(_X)" + msgid "" + "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " + "digits" +-msgstr "" +-"無効な wpa-psk: キーの長さ %zu が無効です。[8,63] バイトもしくは 16 進数で " +-"64 桁にする必要があります" ++msgstr "無効な wpa-psk: キーの長さ %zu が無効です。[8,63] バイトもしくは 16 進数で 64 桁にする必要があります" + + #: src/wireless-security/ws-wpa-psk.c:69 + msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +@@ -5018,5 +4831,3 @@ msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できま + #~ msgid "CKN" + #~ msgstr "CKN" + +-#~ msgid "CAK" +-#~ msgstr "CAK" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index a197ad0d..ecfdbe8f 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -53,25 +53,21 @@ msgstr "网络管理器连接编辑器" + msgid "" + "NetworkManager is a system service for managing and configuring your network " + "connections and devices." +-msgstr "" +-"网络管理器(NetworkManager)是一项系统服务,用于管理和配置您的网络连接和设" +-"备。" ++msgstr "网络管理器(NetworkManager)是一项系统服务,用于管理和配置您的网络连接和设备。" + + #: nm-connection-editor.appdata.xml.in:13 + msgid "" + "The nm-connection-editor program works with NetworkManager to create and " + "edit existing connection profiles for NetworkManager." +-msgstr "" +-"nm-connection-editor 与网络管理器交互来为网络管理器创建和编辑已有的连接配置。" ++msgstr "nm-connection-editor 与网络管理器交互来为网络管理器创建和编辑已有的连接配置。" + + #: nm-connection-editor.appdata.xml.in:27 + msgid "The NetworkManager Developers" + msgstr "网络管理器开发者" + + #: nm-connection-editor.desktop.in:3 +-#, fuzzy + msgid "Advanced Network Configuration" +-msgstr "原始配置" ++msgstr "高级网络配置" + + #: nm-connection-editor.desktop.in:4 + msgid "Manage and change your network connection settings" +@@ -140,9 +136,8 @@ msgid "C_onnect" + msgstr "连接(_O)" + + #: src/8021x.ui:122 +-#, fuzzy + msgid "_Network name" +-msgstr "网络名称(_N):" ++msgstr "网络名称(_N)" + + #: src/ap-menu-item.c:70 + msgid "ad-hoc" +@@ -444,7 +439,7 @@ msgstr "WEP" + + #: src/applet-dialogs.c:230 + msgid "WPA3" +-msgstr "" ++msgstr "WPA3" + + #: src/applet-dialogs.c:234 src/applet-dialogs.c:243 + #: src/connection-editor/page-wifi-security.c:325 +@@ -469,14 +464,12 @@ msgid "Unknown" + msgstr "未知" + + #: src/applet-dialogs.c:331 src/applet-dialogs.c:404 +-#, fuzzy + msgid "IP Address" +-msgstr "IP 地址:" ++msgstr "IP 地址" + + #: src/applet-dialogs.c:353 +-#, fuzzy + msgid "Broadcast Address" +-msgstr "广播地址:" ++msgstr "广播地址" + + #. Prefix + #: src/applet-dialogs.c:365 +@@ -485,24 +478,20 @@ msgid "Unknown" + msgstr "未知" + + #: src/applet-dialogs.c:366 +-#, fuzzy + msgid "Subnet Mask" +-msgstr "子网掩码:" ++msgstr "子网掩码" + + #: src/applet-dialogs.c:428 +-#, fuzzy + msgid "Primary DNS" +-msgstr "主 DNS:" ++msgstr "主 DNS" + + #: src/applet-dialogs.c:428 +-#, fuzzy + msgid "Secondary DNS" +-msgstr "第二 DNS:" ++msgstr "二级 DNS" + + #: src/applet-dialogs.c:428 +-#, fuzzy + msgid "Tertiary DNS" +-msgstr "第三 DNS:" ++msgstr "三级 DNS" + + #: src/applet-dialogs.c:507 + #, c-format +@@ -510,9 +499,9 @@ msgid "Ethernet (%s)" + msgstr "以太网(%s)" + + #: src/applet-dialogs.c:510 +-#, fuzzy, c-format ++#, c-format + msgid "802.11 Wi-Fi (%s)" +-msgstr "802.11 WiFi(%s)" ++msgstr "802.11 Wi-Fi (%s)" + + #: src/applet-dialogs.c:517 + #, c-format +@@ -533,30 +522,25 @@ msgid "General" + msgstr "常规" + + #: src/applet-dialogs.c:530 +-#, fuzzy + msgid "Interface" +-msgstr "接口:" ++msgstr "接口" + + #: src/applet-dialogs.c:545 +-#, fuzzy + msgid "Hardware Address" +-msgstr "硬件地址:" ++msgstr "硬件地址" + + #. Driver + #: src/applet-dialogs.c:558 +-#, fuzzy + msgid "Driver" +-msgstr "驱动程序:" ++msgstr "驱动程序" + + #: src/applet-dialogs.c:591 +-#, fuzzy + msgid "Speed" +-msgstr "速度:" ++msgstr "速度" + + #: src/applet-dialogs.c:604 +-#, fuzzy + msgid "Security" +-msgstr "安全性:" ++msgstr "安全性" + + #. --- IPv4 --- + #: src/applet-dialogs.c:629 src/applet-dialogs.c:891 +@@ -565,9 +549,8 @@ msgid "IPv4" + msgstr "IPv4" + + #: src/applet-dialogs.c:648 src/applet-dialogs.c:696 +-#, fuzzy + msgid "Default Route" +-msgstr "默认路由:" ++msgstr "默认路由" + + #: src/applet-dialogs.c:676 src/applet-dialogs.c:918 + #: src/connection-editor/ce-page-team.ui:497 +@@ -579,34 +562,28 @@ msgid "Hotspot" + msgstr "热点" + + #: src/applet-dialogs.c:735 +-#, fuzzy + msgid "Password" +-msgstr "密码:" ++msgstr "密码" + + #: src/applet-dialogs.c:865 +-#, fuzzy + msgid "VPN Type" +-msgstr "VPN 类型:" ++msgstr "VPN 类型" + + #: src/applet-dialogs.c:870 +-#, fuzzy + msgid "VPN Gateway" +-msgstr "VPN 网关:" ++msgstr "VPN 网关" + + #: src/applet-dialogs.c:874 +-#, fuzzy + msgid "VPN Username" +-msgstr "VPN 用户名:" ++msgstr "VPN 用户名" + + #: src/applet-dialogs.c:878 +-#, fuzzy + msgid "VPN Banner" +-msgstr "VPN 横幅:" ++msgstr "VPN Banner" + + #: src/applet-dialogs.c:882 +-#, fuzzy + msgid "Base Connection" +-msgstr "基础连接:" ++msgstr "基础连接" + + #: src/applet-dialogs.c:883 src/wireless-security/wireless-security.c:495 + msgid "Unknown" +@@ -622,8 +599,7 @@ msgid "" + "Copyright © 2004-2017 Red Hat, Inc.\n" + "Copyright © 2005-2008 Novell, Inc.\n" + "and many other community contributors and translators" +-msgstr "" +-"Copyright © 2004-2017 Red Hat 公司\n" ++msgstr "Copyright © 2004-2017 Red Hat 公司\n" + "Copyright © 2005-2008 Novell 公司\n" + "和其他众多社区贡献者和翻译者" + +@@ -638,8 +614,7 @@ msgstr "NetworkManager 网站" + + #: src/applet-dialogs.c:1137 + msgid "translator-credits" +-msgstr "" +-"Funda Wang , 2007\n" ++msgstr "Funda Wang , 2007\n" + "Wei Mingzhi , 2009, 2010\n" + "Leah Liu , 2010\n" + "Aron Xu , 2010\n" +@@ -765,8 +740,7 @@ msgid "" + "\n" + "The VPN connection “%s” disconnected because the network connection was " + "interrupted." +-msgstr "" +-"\n" ++msgstr "\n" + "由于网络连接中断,VPN 连接“%s”已断开。" + + #: src/applet.c:880 +@@ -775,8 +749,7 @@ msgid "" + "\n" + "The VPN connection “%s” failed because the network connection was " + "interrupted." +-msgstr "" +-"\n" ++msgstr "\n" + "由于网络连接中断,VPN 连接“%s”失败。" + + #: src/applet.c:882 +@@ -784,8 +757,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service stopped unexpectedly." +-msgstr "" +-"\n" ++msgstr "\n" + "由于 VPN 服务异常停止,VPN 连接“%s”失败。" + + #: src/applet.c:884 +@@ -794,8 +766,7 @@ msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service returned invalid " + "configuration." +-msgstr "" +-"\n" ++msgstr "\n" + "由于 VPN 服务返回了无效的配置,VPN 连接“%s”失败。" + + #: src/applet.c:886 +@@ -803,8 +774,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the connection attempt timed out." +-msgstr "" +-"\n" ++msgstr "\n" + "由于连接尝试超时,VPN 连接“%s”失败。" + + #: src/applet.c:888 +@@ -812,8 +782,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service did not start in time." +-msgstr "" +-"\n" ++msgstr "\n" + "由于 VPN 服务未及时启动,VPN 连接“%s”失败。" + + #: src/applet.c:890 +@@ -821,8 +790,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because the VPN service failed to start." +-msgstr "" +-"\n" ++msgstr "\n" + "由于 VPN 服务启动失败,VPN 连接“%s”失败。" + + #: src/applet.c:892 +@@ -830,8 +798,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because there were no valid VPN secrets." +-msgstr "" +-"\n" ++msgstr "\n" + "由于没有有效的 VPN 密钥(secret),VPN 连接“%s”失败。" + + #: src/applet.c:894 +@@ -839,8 +806,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed because of invalid VPN secrets." +-msgstr "" +-"\n" ++msgstr "\n" + "由于 VPN 密钥(secret)无效,VPN 连接“%s”失败。" + + #: src/applet.c:899 +@@ -848,8 +814,7 @@ msgstr "" + msgid "" + "\n" + "The VPN connection “%s” failed." +-msgstr "" +-"\n" ++msgstr "\n" + "VPN 连接“%s”失败。" + + #: src/applet.c:926 +@@ -858,8 +823,7 @@ msgid "" + "VPN connection has been successfully established.\n" + "\n" + "%s\n" +-msgstr "" +-"已成功建立 VPN 连接。\n" ++msgstr "已成功建立 VPN 连接。\n" + "\n" + "%s\n" + +@@ -882,8 +846,7 @@ msgid "" + "The VPN connection “%s” failed because the VPN service failed to start.\n" + "\n" + "%s" +-msgstr "" +-"\n" ++msgstr "\n" + "由于 VPN 服务启动失败,VPN 连接“%s”失败。\n" + "\n" + "%s" +@@ -895,8 +858,7 @@ msgid "" + "The VPN connection “%s” failed to start.\n" + "\n" + "%s" +-msgstr "" +-"\n" ++msgstr "\n" + "VPN 连接“%s”启动失败。\n" + "\n" + "%s" +@@ -1093,11 +1055,9 @@ msgid "" + "\n" + "If you are creating a VPN, and the VPN connection you wish to create does " + "not appear in the list, you may not have the correct VPN plugin installed." +-msgstr "" +-"请选择您希望创建的连接的类型。\n" ++msgstr "请选择您希望创建的连接的类型。\n" + "\n" +-"如果您要创建 VPN 连接,但需要的类型不在列表中,您可能没有安装相应的 VPN 插" +-"件。" ++"如果您要创建 VPN 连接,但需要的类型不在列表中,您可能没有安装相应的 VPN 插件。" + + #: src/connection-editor/ce-page-bluetooth.ui:35 + #: src/connection-editor/ce-page-ethernet.ui:129 +@@ -1279,9 +1239,7 @@ msgid "" + "Controls whether IGMP snooping is enabled for this bridge. Note that if " + "snooping was automatically disabled due to hash collisions, the system may " + "refuse to enable the feature until the collisions are resolved." +-msgstr "" +-"控制是否为此网桥启用 IGMP 监听。注意如果散列冲突监听会被自动禁用,系统可能拒" +-"绝启用该功能直到冲突解决。" ++msgstr "控制是否为此网桥启用 IGMP 监听。注意如果散列冲突监听会被自动禁用,系统可能拒绝启用该功能直到冲突解决。" + + #: src/connection-editor/ce-page-bridge.ui:344 + msgid "Enable _STP (Spanning Tree Protocol)" +@@ -1296,9 +1254,7 @@ msgstr "控制是否为此网桥启用生成树协议(STP)" + msgid "" + "STP priority for this bridge. Lower values are “better”; the lowest priority " + "bridge will be elected the root bridge." +-msgstr "" +-"此网桥的生成树协议(STP)优先级。值越小优先级越高;最高优先级(值最低)的网桥" +-"将选为根桥。" ++msgstr "此网桥的生成树协议(STP)优先级。值越小优先级越高;最高优先级(值最低)的网桥将选为根桥。" + + #: src/connection-editor/ce-page-bridge.ui:378 + msgid "_Max age" +@@ -1326,10 +1282,7 @@ msgid "" + "01:80:C2:00:00:00 to 01:80:C2:00:00:0F that must be forwarded. The mask " + "can’t have bits 0, 1 or 2 set because they are used for STP, MAC pause " + "frames and LACP." +-msgstr "" +-"16 位的掩码,每个对应于从 01:80:C2:00:00:00 至 01:80:C2:00:00:0F 范围内必须被" +-"转发的组地址。掩码的位 0、1 或2 不能被设定,因为它们用于 SUP、MAC 暂停帧和 " +-"LACP。" ++msgstr "16 位的掩码,每个对应于从 01:80:C2:00:00:00 至 01:80:C2:00:00:0F 范围内必须被转发的组地址。掩码的位 0、1 或2 不能被设定,因为它们用于 SUP、MAC 暂停帧和 LACP。" + + #: src/connection-editor/ce-page-dcb.ui:16 + msgid "_Use Data Center Bridging (DCB) for this connection" +@@ -1596,9 +1549,7 @@ msgid "" + "it won’t be possible to activate another connection on it. Note that the " + "option can only be used for Ethernet interfaces. nm-applet is able to " + "activate the connection only if this option is selected." +-msgstr "" +-"如果选中,连接将独占控制接口而且无法在它上面激活其他接口。注意此选项只能用于" +-"以太网接口。nm-applet 仅在选中此选项时能够激活连接。" ++msgstr "如果选中,连接将独占控制接口而且无法在它上面激活其他接口。注意此选项只能用于以太网接口。nm-applet 仅在选中此选项时能够激活连接。" + + #: src/connection-editor/ce-page-ethernet.ui:17 + #: src/connection-editor/ce-page-ethernet.ui:77 +@@ -1727,9 +1678,7 @@ msgid "" + "Device link negotiation. If “Manual” is chosen, “Speed” and “Duplex” values " + "will be forced without checking the device compatibility. If unsure, leave " + "here “Ignore” or pick “Automatic”." +-msgstr "" +-"设备链路协商。如果选择“手动”,将强制“速度”和“双工”值而不检查设备的兼容性。如" +-"果不确定,保留此处为“忽略”或选择“自动”值。" ++msgstr "设备链路协商。如果选择“手动”,将强制“速度”和“双工”值而不检查设备的兼容性。如果不确定,保留此处为“忽略”或选择“自动”值。" + + #: src/connection-editor/ce-page-ethernet.ui:448 + msgid "_Speed" +@@ -1740,9 +1689,7 @@ msgid "" + "Speed value for static link negotiation, required only when “Ignore” and " + "“Automatic” options are not selected. Before specifying a speed value be " + "sure your device supports it." +-msgstr "" +-"静态链路协商的速度值,仅当未选中“忽略”和“自动”选项时需要。在指定速度值前请确" +-"保您的设备支持它。" ++msgstr "静态链路协商的速度值,仅当未选中“忽略”和“自动”选项时需要。在指定速度值前请确保您的设备支持它。" + + #: src/connection-editor/ce-page-ethernet.ui:482 + msgid "Duple_x" +@@ -1753,9 +1700,7 @@ msgid "" + "Duplex value for static link negotiation, required only when “Ignore” and " + "“Automatic” options are not selected. Before specifying a duplex mode be " + "sure your device supports it." +-msgstr "" +-"静态链路协商的双工值,仅当未选中“忽略”和“自动”选项时需要。在指定双工模式前请" +-"确保您的设备支持它。" ++msgstr "静态链路协商的双工值,仅当未选中“忽略”和“自动”选项时需要。在指定双工模式前请确保您的设备支持它。" + + #: src/connection-editor/ce-page-general.ui:29 + msgid "Yes" +@@ -1787,10 +1732,7 @@ msgid "" + "and therefore data usage should be restricted. Select which value (“Yes” or " + "“No”) to indicate to applications, or “Automatic” to use a default value " + "based on the connection type and other heuristics." +-msgstr "" +-"网络管理器(NetworkManager)指示给应用程序此连接是否按流量计费因而数据使用应" +-"受限。选择指示应用程序的值(“是”或“否”),或者选“自动”以使用基于连接类型和其" +-"他启发的默认值。" ++msgstr "网络管理器(NetworkManager)指示给应用程序此连接是否按流量计费因而数据使用应受限。选择指示应用程序的值(“是”或“否”),或者选“自动”以使用基于连接类型和其他启发的默认值。" + + #: src/connection-editor/ce-page-general.ui:150 + msgid "Connect _automatically with priority" +@@ -1801,9 +1743,7 @@ msgid "" + "Connection priority for automatic activation. Connections with higher " + "numbers are preferred when selecting profiles for automatic activation. " + "Default value is 0." +-msgstr "" +-"自动激活的连接优先级。选择自动激活的配置集时会优先选择更高数字的连接。默认值" +-"为 0。" ++msgstr "自动激活的连接优先级。选择自动激活的配置集时会优先选择更高数字的连接。默认值为 0。" + + #. IP-over-InfiniBand "datagram mode" + #: src/connection-editor/ce-page-infiniband.ui:17 +@@ -1913,9 +1853,7 @@ msgid "" + "The DHCP client identifier allows the network administrator to customize " + "your computer’s configuration. If you wish to use a DHCP client identifier, " + "enter it here." +-msgstr "" +-"DHCP 客户端标识符允许网络管理员自定义您的计算机配置。如果您要使用 DHCP 客户端" +-"标识符,请在此输入。" ++msgstr "DHCP 客户端标识符允许网络管理员自定义您的计算机配置。如果您要使用 DHCP 客户端标识符,请在此输入。" + + #: src/connection-editor/ce-page-ip4.ui:215 + #: src/connection-editor/ce-page-ip6.ui:233 +@@ -1954,9 +1892,7 @@ msgstr "需要 IPv_4 地址完成这个连接" + msgid "" + "When connecting to IPv6-capable networks, allows the connection to complete " + "if IPv4 configuration fails but IPv6 configuration succeeds." +-msgstr "" +-"当连接到兼容 IPv6 的网络时,如果 IPv4 配置失败而 IPv6 配置成功,则允许连接完" +-"成。" ++msgstr "当连接到兼容 IPv6 的网络时,如果 IPv4 配置失败而 IPv6 配置成功,则允许连接完成。" + + #: src/connection-editor/ce-page-ip4.ui:333 + #: src/connection-editor/ce-page-ip6.ui:401 +@@ -1990,9 +1926,7 @@ msgid "" + "IP addresses of domain name servers used to resolve host names. Use commas " + "to separate multiple domain name server addresses. Link-local addresses will " + "be automatically scoped to the connecting interface." +-msgstr "" +-"用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地链路" +-"地址会自动配置到连接中的接口。" ++msgstr "用来解析主机名的域名服务器的 IP 地址。用逗号分隔多个域名服务器地址。本地链路地址会自动配置到连接中的接口。" + + #: src/connection-editor/ce-page-ip6.ui:287 + msgid "IPv6 _privacy extensions" +@@ -2010,9 +1944,7 @@ msgstr "需要 IPv_6 地址完成这个连接" + msgid "" + "When connecting to IPv4-capable networks, allows the connection to complete " + "if IPv6 configuration fails but IPv4 configuration succeeds." +-msgstr "" +-"当连接到兼容 IPv4 的网络时,如果 IPv6 配置失败而 IPv4 配置成功,则允许认定连" +-"接完成。" ++msgstr "当连接到兼容 IPv4 的网络时,如果 IPv6 配置失败而 IPv4 配置成功,则允许认定连接完成。" + + #: src/connection-editor/ce-page-macsec.ui:12 + msgid "PSK" +@@ -2032,18 +1964,16 @@ msgid "Strict" + msgstr "严格" + + #: src/connection-editor/ce-page-macsec.ui:58 +-#, fuzzy + msgid "_Device name" +-msgstr "设备名称" ++msgstr "设备名称(_D)" + + #: src/connection-editor/ce-page-macsec.ui:71 + msgid "The name of the MACsec device." + msgstr "MACsec 设备的名称。" + + #: src/connection-editor/ce-page-macsec.ui:85 +-#, fuzzy + msgid "_Parent device" +-msgstr "上级设备" ++msgstr "上级设备(_P)" + + #: src/connection-editor/ce-page-macsec.ui:98 + msgid "" +@@ -2062,22 +1992,19 @@ msgid "Keys" + msgstr "密钥" + + #: src/connection-editor/ce-page-macsec.ui:135 +-#, fuzzy + msgid "_Mode" +-msgstr "模式" ++msgstr "模式(_M)" + + #: src/connection-editor/ce-page-macsec.ui:148 + msgid "" + "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key " + "Agreement) is obtained. For the EAP mode, fill the parameters in the 802.1X " + "security page" +-msgstr "" +-"指定如何获取用于 MKA(MACsec 密钥管理)的 CAK(连接相关密钥)。对于 EAP 模" +-"式,填写 802.1X 安全页的参数" ++msgstr "指定如何获取用于 MKA(MACsec 密钥管理)的 CAK(连接相关密钥)。对于 EAP 模式,填写 802.1X 安全页的参数" + + #: src/connection-editor/ce-page-macsec.ui:168 + msgid "C_AK" +-msgstr "" ++msgstr "C_AK" + + #: src/connection-editor/ce-page-macsec.ui:181 + msgid "The pre-shared Connectivity Association Key" +@@ -2085,38 +2012,35 @@ msgstr "预共享连接关联的密钥名称" + + #: src/connection-editor/ce-page-macsec.ui:193 + msgid "C_KN" +-msgstr "" ++msgstr "C_KN" + + #: src/connection-editor/ce-page-macsec.ui:206 + msgid " The pre-shared Connectivity-association Key Name" +-msgstr "预共享连接关联的密钥名称" ++msgstr " 预共享连接关联的密钥名称" + + #: src/connection-editor/ce-page-macsec.ui:217 + msgid "Parameters" + msgstr "参数" + + #: src/connection-editor/ce-page-macsec.ui:234 +-#, fuzzy + msgid "_Validation" +-msgstr "验证" ++msgstr "验证(_V)" + + #: src/connection-editor/ce-page-macsec.ui:247 + msgid "Specifies the validation mode for incoming frames" + msgstr "指定传入帧的验证模式" + + #: src/connection-editor/ce-page-macsec.ui:266 +-#, fuzzy + msgid "_SCI port" +-msgstr "SCI 端口" ++msgstr "SCI 端口(_S)" + + #: src/connection-editor/ce-page-macsec.ui:279 + msgid "The port component of the SCI (Secure Channel Identifier)" + msgstr "SCI(安全信道标识符)的端口组件" + + #: src/connection-editor/ce-page-macsec.ui:291 +-#, fuzzy + msgid "_Encrypt" +-msgstr "加密" ++msgstr "加密(_E)" + + #: src/connection-editor/ce-page-macsec.ui:296 + msgid "Whether the transmitted traffic must be encrypted" +@@ -2297,8 +2221,7 @@ msgstr "端口优先级(_P)" + msgid "" + "Value is positive number in milliseconds. Specifies an interval between " + "bursts of notify-peer packets." +-msgstr "" +-"正数的值,以毫秒计。指定通知对等体(notify-peer)数据包的连发间隔时间。" ++msgstr "正数的值,以毫秒计。指定通知对等体(notify-peer)数据包的连发间隔时间。" + + #: src/connection-editor/ce-page-team-port.ui:286 + msgid "Port priority. The higher number means higher priority." +@@ -2310,7 +2233,7 @@ msgstr "端口粘性(_S)" + + #: src/connection-editor/ce-page-team-port.ui:301 + msgid "Do not unselect the port if a better one becomes available." +-msgstr "" ++msgstr "如果有更好的端口,请不要取消选择。" + + #: src/connection-editor/ce-page-team-port.ui:316 + msgid "LACP runner options" +@@ -2421,9 +2344,7 @@ msgstr "忽略来自活动端口的无效数据包(_A)" + msgid "" + "Validate received ARP packets on active ports. If this is not checked, all " + "incoming ARP packets will be considered as a good reply." +-msgstr "" +-"在活动端口上验证接收到的 ARP 包。如果未选中此项,所有传入的 ARP 包将被视为正" +-"常回复。" ++msgstr "在活动端口上验证接收到的 ARP 包。如果未选中此项,所有传入的 ARP 包将被视为正常回复。" + + #: src/connection-editor/ce-page-team-port.ui:587 + #: src/connection-editor/ce-page-team.ui:1314 +@@ -2435,9 +2356,7 @@ msgstr "忽略来自非活动端口的无效数据包(_N)" + msgid "" + "Validate received ARP packets on inactive ports. If this is not checked, all " + "incoming ARP packets will be considered as a good reply." +-msgstr "" +-"在非活动端口上验证接收到的 ARP 包。如果未选中此项,所有传入的 ARP 包将被视为" +-"正常回复。" ++msgstr "在非活动端口上验证接收到的 ARP 包。如果未选中此项,所有传入的 ARP 包将被视为正常回复。" + + #: src/connection-editor/ce-page-team-port.ui:604 + #: src/connection-editor/ce-page-team.ui:1331 +@@ -2621,9 +2540,7 @@ msgstr "要使用的运行程序(runner)名称。" + msgid "" + "This defines the policy of how hardware addresses of team device and port " + "devices should be set during the team lifetime." +-msgstr "" +-"此选项定义组合(team)生存期间组合设备和端口设备的硬件地址应被如何设定的策" +-"略。" ++msgstr "此选项定义组合(team)生存期间组合设备和端口设备的硬件地址应被如何设定的策略。" + + #: src/connection-editor/ce-page-team.ui:867 + msgid "Send LACPDU frames _periodically" +@@ -2633,8 +2550,7 @@ msgstr "定期发送 LACPDU 帧" + msgid "" + "If checked, LACPDU frames are sent along the configured links periodically. " + "If not, it acts as “speak when spoken to”." +-msgstr "" +-"如果选中,LACPDU 帧将定期沿配置的链路发送。如果未选中,它表现得“有问才答”。" ++msgstr "如果选中,LACPDU 帧将定期沿配置的链路发送。如果未选中,它表现得“有问才答”。" + + #: src/connection-editor/ce-page-team.ui:884 + msgid "Send a LACPDU frame _every second" +@@ -2645,9 +2561,7 @@ msgid "" + "Option specifies the rate at which our link partner is asked to transmit " + "LACPDU packets. If checked, packets will be sent once per second. Otherwise " + "they will be sent every 30 seconds." +-msgstr "" +-"此选项指定链路参与方要传输 LACPDU 包的速率。如果未选中,数据包将被每秒发送一" +-"次。否则它们将被每 30 秒发送一次。" ++msgstr "此选项指定链路参与方要传输 LACPDU 包的速率。如果未选中,数据包将被每秒发送一次。否则它们将被每 30 秒发送一次。" + + #: src/connection-editor/ce-page-team.ui:904 + msgid "_System priority" +@@ -2805,50 +2719,47 @@ msgstr "SS_ID" + + #: src/connection-editor/ce-page-wireguard.ui:23 + msgid "Edit WireGuard peer" +-msgstr "" ++msgstr "编辑 WireGuard peer" + + #: src/connection-editor/ce-page-wireguard.ui:55 +-#, fuzzy + msgid "_Apply" +-msgstr "应用" ++msgstr "应用(_A)" + + #: src/connection-editor/ce-page-wireguard.ui:159 + msgid "_Public key" +-msgstr "" ++msgstr "公钥(_P)" + + #: src/connection-editor/ce-page-wireguard.ui:173 +-#, fuzzy + msgid "Allowed _IPs" +-msgstr "允许的方法" ++msgstr "允许的_IP" + + #: src/connection-editor/ce-page-wireguard.ui:187 + msgid "_Endpoint" +-msgstr "" ++msgstr "端点(_E)" + + #: src/connection-editor/ce-page-wireguard.ui:201 +-#, fuzzy + msgid "Pre_shared key" +-msgstr "共享密钥" ++msgstr "预共享密钥(_s)" + + #: src/connection-editor/ce-page-wireguard.ui:215 + msgid "Persistent _keepalive" +-msgstr "" ++msgstr "持久保持活跃(_k)" + + #: src/connection-editor/ce-page-wireguard.ui:228 + msgid "A base64 public key calculated by 'wg pubkey' from a private key." +-msgstr "" ++msgstr "从私钥根据 'wg pubkey' 计算出的 base64 公钥。" + + #: src/connection-editor/ce-page-wireguard.ui:240 + msgid "" + "Comma-separated list of IP (v4 or v6) addresses with CIDR masks from which " + "incoming traffic for this peer is allowed and to which outgoing traffic for " + "this peer is directed." +-msgstr "" ++msgstr "以逗号分隔的、带有 CIDR 掩码的 IP(v4 或 v6)地址列表。该 peer 允许来自这些列表中地址的入站流量,该 peer 的出站流量指向这些列表中的地址。" + + #: src/connection-editor/ce-page-wireguard.ui:252 + msgid "" + "An endpoint IP or hostname, followed by a colon, and then a port number." +-msgstr "" ++msgstr "端点 IP 或主机名,后面是冒号,然后是端口号。" + + #: src/connection-editor/ce-page-wireguard.ui:264 + msgid "" +@@ -2856,75 +2767,70 @@ msgid "" + "omitted. Adds an additional layer of symmetric-key cryptography to be mixed " + "into the already existing public-key cryptography, for post-quantum " + "resistance." +-msgstr "" ++msgstr "由 'wg genpsk' 生成的 base64 预共享密钥。可选,可以省略。增加了一层对称密钥加密技术,混合到已有的公钥加密技术中,用于后量子抗性。" + + #: src/connection-editor/ce-page-wireguard.ui:280 + msgid "" + "How often to send an authenticated empty packet to the peer for the purpose " + "of keeping a stateful firewall or NAT mapping valid. This is optional and " + "not recommended outside of specific setups." +-msgstr "" ++msgstr "为了保持状态防火墙或 NAT 映射的有效性,多久向 peer 发送一次经过验证的空数据包。这是可选的,不建议在特定设置之外使用。" + + #: src/connection-editor/ce-page-wireguard.ui:297 + msgid "seconds" +-msgstr "" ++msgstr "秒" + + #: src/connection-editor/ce-page-wireguard.ui:313 +-#, fuzzy + msgid "Sho_w preshared key" +-msgstr "显示密钥(_W)" ++msgstr " 显示预共享密钥(_w)" + + #: src/connection-editor/ce-page-wireguard.ui:386 + msgid "The name of the wireguard interface to create." +-msgstr "" ++msgstr "要创建的 wireguard 接口的名称。" + + #: src/connection-editor/ce-page-wireguard.ui:400 +-#, fuzzy + msgid "Private _key" +-msgstr "%s 私钥(_K):" ++msgstr "私钥(_k)" + + #: src/connection-editor/ce-page-wireguard.ui:413 + msgid "The 256 bit private key in base64 encoding" +-msgstr "" ++msgstr "以 base64 编码的 256 位私钥。" + + #: src/connection-editor/ce-page-wireguard.ui:429 +-#, fuzzy + msgid "_Listen port" +-msgstr "最小端口(_M)" ++msgstr "监听端口(_L)" + + #: src/connection-editor/ce-page-wireguard.ui:442 + msgid "" + "A port to listen on. If set to 'automatic', the port will be chosen randomly " + "when the interface comes up." +-msgstr "" ++msgstr "一个要监听的端口,如果设置为 'automatic',则在接口上线时随机选择端口。" + + #: src/connection-editor/ce-page-wireguard.ui:459 + msgid "_Fwmark" +-msgstr "" ++msgstr "_Fwmark" + + #: src/connection-editor/ce-page-wireguard.ui:489 + msgid "Add peer _routes" +-msgstr "" ++msgstr "添加 peer 路由(_r)" + + #: src/connection-editor/ce-page-wireguard.ui:503 + msgid "" + "Whether to automatically add routes for the AllowedIPs ranges of the peers" +-msgstr "" ++msgstr "是否为 peer 的 AllowedIPs 范围自动添加路由。" + + #: src/connection-editor/ce-page-wireguard.ui:543 + msgid "" + "A 32-bit fwmark for outgoing packets. Leave it to 'off' to disable fwmark." +-msgstr "" ++msgstr "一个 32 位的用于外发数据包的 fwmark。将其设为 'off' 则禁用 fwmark。" + + #: src/connection-editor/ce-page-wireguard.ui:554 +-#, fuzzy + msgid "_Show private key" +-msgstr "%s 私钥(_K):" ++msgstr "显示私钥(_S)" + + #: src/connection-editor/ce-page-wireguard.ui:641 +-#, fuzzy + msgid "_Peers" +-msgstr "地址" ++msgstr "_Peers" + + #: src/connection-editor/ce-page.c:105 + msgid "automatic" +@@ -2932,7 +2838,7 @@ msgstr "自动" + + #: src/connection-editor/ce-page.c:117 + msgid "off" +-msgstr "" ++msgstr "关" + + #: src/connection-editor/ce-page.c:163 + msgid "unspecified error" +@@ -2959,9 +2865,7 @@ msgid "" + "The MAC address entered here will be used as hardware address for the " + "network device this connection is activated on. This feature is known as MAC " + "cloning or spoofing. Example: 00:11:22:33:44:55" +-msgstr "" +-"此处输入的 MAC 地址将用作此连接激活所在的网络设备的硬件地址。该特性被称为 " +-"MAC 克隆或欺骗。例如:00:11:22:33:44:55" ++msgstr "此处输入的 MAC 地址将用作此连接激活所在的网络设备的硬件地址。该特性被称为 MAC 克隆或欺骗。例如:00:11:22:33:44:55" + + #: src/connection-editor/ce-page.c:315 + msgid "MAC address" +@@ -3017,9 +2921,7 @@ msgstr "无效的 %s(%s)" + msgid "" + "IP addresses identify your computer on the network. Click the “Add” button " + "to add static IP address to be configured in addition to the automatic ones." +-msgstr "" +-"IP 地址可在网络上标识您计算机的。单击“添加”按钮添加一个静态 IP 地址,配置附加" +-"到自动 IP 地址后。" ++msgstr "IP 地址可在网络上标识您计算机的。单击“添加”按钮添加一个静态 IP 地址,配置附加到自动 IP 地址后。" + + #: src/connection-editor/ce-page.h:99 + msgid "" +@@ -3027,9 +2929,7 @@ msgid "" + "address range distributed to other computers. Click the “Add” button to add " + "an IP address. If no address is provided, range will be determined " + "automatically." +-msgstr "" +-"IP 地址 可在网络上标识您计算机的,并确定分发给其他计算机的地址范围。单击“添" +-"加”按钮添加一个 IP 地址。如果未提供地址,将自动确定范围。" ++msgstr "IP 地址 可在网络上标识您计算机的,并确定分发给其他计算机的地址范围。单击“添加”按钮添加一个 IP 地址。如果未提供地址,将自动确定范围。" + + #: src/connection-editor/ce-page.h:104 + msgid "Additional static addresses" +@@ -3096,9 +2996,7 @@ msgstr "微软询问握手认证协议第二版" + msgid "" + "In most cases, the provider’s PPP servers will support all authentication " + "methods. If connections fail, try disabling support for some methods." +-msgstr "" +-"大多数情况下,服务商的 PPP 服务器支持所有的验证方法。如连接失败,请尝试禁用一" +-"些方法的支持。" ++msgstr "大多数情况下,服务商的 PPP 服务器支持所有的验证方法。如连接失败,请尝试禁用一些方法的支持。" + + #: src/connection-editor/connection-helpers.c:93 + #: src/connection-editor/page-wifi.c:423 +@@ -3147,9 +3045,8 @@ msgstr "MACsec" + + #: src/connection-editor/connection-helpers.c:110 + #: src/connection-editor/page-wireguard.c:510 +-#, fuzzy + msgid "WireGuard" +-msgstr "有线" ++msgstr "WireGuard" + + #: src/connection-editor/connection-helpers.c:112 + #: src/connection-editor/connection-helpers.c:374 +@@ -3159,15 +3056,11 @@ msgstr "VPN" + + #: src/connection-editor/connection-helpers.c:192 + msgid "No VPN service type." +-msgstr "" ++msgstr "没有 VPN 服务类型。" + + #: src/connection-editor/connection-helpers.c:197 +-#, fuzzy + msgid "The VPN plugin failed to import the VPN connection correctly: " +-msgstr "" +-"VPN 插件无法正确导入 VPN 连接。\n" +-"\n" +-"错误:没有 VPN 服务类型。" ++msgstr "VPN 插件未能正确导入 VPN 连接: " + + #: src/connection-editor/connection-helpers.c:281 + #: src/connection-editor/page-proxy.c:104 +@@ -3439,19 +3332,17 @@ msgid "Authenticate to delete the selected connection" + msgstr "进行身份验证以删除选中的连接" + + #: src/connection-editor/nm-connection-list.c:1053 +-#, fuzzy + msgid "Unrecognized connection type" +-msgstr "不支持的移动宽带连接类型。" ++msgstr "未识别的连接类型" + + #: src/connection-editor/nm-connection-list.c:1058 +-#, fuzzy, c-format ++#, c-format + msgid "Don’t know how to import “%s” connections" +-msgstr "不知道如何创建“%s”连接" ++msgstr "不知道如何导入\"%s\" 连接\"。" + + #: src/connection-editor/nm-connection-list.c:1062 +-#, fuzzy + msgid "Error importing connection" +-msgstr "编辑连接出错" ++msgstr "导入连接时出错" + + #: src/connection-editor/nm-connection-list.c:1069 + #: src/connection-editor/nm-connection-list.c:1084 +@@ -3460,9 +3351,8 @@ msgid "Error creating connection" + msgstr "创建连接出错" + + #: src/connection-editor/nm-connection-list.c:1069 +-#, fuzzy + msgid "Connection type not specified." +-msgstr "无法修改连接" ++msgstr "未指定连接类型。" + + #: src/connection-editor/nm-connection-list.c:1085 + msgid "No VPN plugins are installed." +@@ -3595,9 +3485,7 @@ msgid "" + "This option locks this connection to the network device specified either by " + "its interface name or permanent MAC or both. Examples: “em1”, " + "“3C:97:0E:42:1A:19”, “em1 (3C:97:0E:42:1A:19)”" +-msgstr "" +-"此选项可将此连接锁定至接口名或者永久 MAC 又或者两者指定的网络设备。例" +-"如:“em1”“3C:97:0E:42:1A:19”“em1 (3C:97:0E:42:1A:19)”" ++msgstr "此选项可将此连接锁定至接口名或者永久 MAC 又或者两者指定的网络设备。例如:“em1”“3C:97:0E:42:1A:19”“em1 (3C:97:0E:42:1A:19)”" + + #: src/connection-editor/page-ethernet.c:248 + msgid "ignored" +@@ -3635,9 +3523,7 @@ msgid "" + "The zone defines the trust level of the connection. Default is not a regular " + "zone, selecting it results in the use of the default zone set in the " + "firewall. Only usable if firewalld is active." +-msgstr "" +-"区(zone)定义了连接的信任等级。默认值不是常规区,选择它会使用防火墙的默认区" +-"设置。只在防火墙启用时有用。" ++msgstr "区(zone)定义了连接的信任等级。默认值不是常规区,选择它会使用防火墙的默认区设置。只在防火墙启用时有用。" + + #: src/connection-editor/page-general.c:358 + msgid "Could not load General user interface." +@@ -3649,10 +3535,7 @@ msgid "" + "its interface name or permanent MAC or both. Examples: “ib0”, “80:00:00:48:" + "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”, “ib0 (80:00:00:48:" + "fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" +-msgstr "" +-"此选项可将此连接锁定至接口名或者永久 MAC 又或者两者指定的网络设备。例" +-"如:“ib0”“80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”“ib0 " +-"(80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" ++msgstr "此选项可将此连接锁定至接口名或者永久 MAC 又或者两者指定的网络设备。例如:“ib0”“80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65”“ib0 (80:00:00:48:fe:80:00:00:00:00:00:00:00:02:c9:03:00:00:0f:65)”" + + #: src/connection-editor/page-infiniband.c:134 + msgid "Could not load InfiniBand user interface." +@@ -3986,9 +3869,7 @@ msgid "" + "Select the type of VPN you wish to use for the new connection. If the type " + "of VPN connection you wish to create does not appear in the list, you may " + "not have the correct VPN plugin installed." +-msgstr "" +-"请为新建连接选择 VPN 类型。如果您希望建立的 VPN 连接类型未出现在列表中,您可" +-"能没有安装正确的 VPN 插件。" ++msgstr "请为新建连接选择 VPN 类型。如果您希望建立的 VPN 连接类型未出现在列表中,您可能没有安装正确的 VPN 插件。" + + #: src/connection-editor/page-wifi-security.c:351 + msgid "WEP 40/128-bit Key (Hex or ASCII)" +@@ -4011,13 +3892,12 @@ msgid "WPA & WPA2 Enterprise" + msgstr "WPA 及 WPA2 企业" + + #: src/connection-editor/page-wifi-security.c:426 +-#, fuzzy + msgid "WPA3 Personal" +-msgstr "WPA 及 WPA2 个人" ++msgstr "WPA3 Personal" + + #: src/connection-editor/page-wifi-security.c:437 + msgid "Enhanced Open" +-msgstr "" ++msgstr "增强型开放" + + #: src/connection-editor/page-wifi-security.c:483 + msgid "Could not load Wi-Fi security user interface; missing Wi-Fi setting." +@@ -4043,18 +3923,14 @@ msgstr "安全性不兼容 Ad-Hoc 模式" + msgid "" + "This option locks this connection to the Wi-Fi access point (AP) specified " + "by the BSSID entered here. Example: 00:11:22:33:44:55" +-msgstr "" +-"此选项锁定此连接到指定 Wi-Fi 接入点(AP),在此处输入接入点的 BSSID。例如:" +-"00:11:22:33:44:55" ++msgstr "此选项锁定此连接到指定 Wi-Fi 接入点(AP),在此处输入接入点的 BSSID。例如:00:11:22:33:44:55" + + #: src/connection-editor/page-wifi.c:74 + msgid "" + "This option locks this connection to the network device specified either by " + "its interface name or permanent MAC or both. Examples: “wlan0”, " + "“3C:97:0E:42:1A:19”, “wlan0 (3C:97:0E:42:1A:19)”" +-msgstr "" +-"此选项可将此连接锁定至接口名或者永久 MAC 又或者两者指定的网络设备。例" +-"如:“wlan0”“3C:97:0E:42:1A:19”“wlan0 (3C:97:0E:42:1A:19)”" ++msgstr "此选项可将此连接锁定至接口名或者永久 MAC 又或者两者指定的网络设备。例如:“wlan0”“3C:97:0E:42:1A:19”“wlan0 (3C:97:0E:42:1A:19)”" + + #: src/connection-editor/page-wifi.c:183 + #, c-format +@@ -4080,22 +3956,20 @@ msgstr "Wi-Fi 连接 %d" + + #: src/connection-editor/page-wireguard.c:261 + msgid "Public key" +-msgstr "" ++msgstr "公钥" + + #: src/connection-editor/page-wireguard.c:268 +-#, fuzzy + msgid "Allowed IPs" +-msgstr "允许的方法" ++msgstr "允许的 IP" + + #: src/connection-editor/page-wireguard.c:512 +-#, fuzzy + msgid "Could not load WireGuard user interface." +-msgstr "无法加载组合用户界面。" ++msgstr "无法加载 WireGuard 用户界面。" + + #: src/connection-editor/page-wireguard.c:628 +-#, fuzzy, c-format ++#, c-format + msgid "WireGuard connection %d" +-msgstr "无线连接 %d" ++msgstr "WireGuard 连接 %d" + + #: src/connection-editor/vpn-helpers.c:118 + #, c-format +@@ -4121,8 +3995,7 @@ msgid "" + "The VPN connection “%s” could not be exported to %s.\n" + "\n" + "Error: %s." +-msgstr "" +-"VPN 连接“%s”无法导出至 %s。\n" ++msgstr "VPN 连接“%s”无法导出至 %s。\n" + "\n" + "错误:%s。" + +@@ -4154,9 +4027,7 @@ msgstr "用法:" + msgid "" + "This program is a component of NetworkManager (https://wiki.gnome.org/" + "Projects/NetworkManager/)." +-msgstr "" +-"此程序是网络管理器(NetworkManager)的一个组件(https://wiki.gnome.org/" +-"Projects/NetworkManager/)。" ++msgstr "此程序是网络管理器(NetworkManager)的一个组件(https://wiki.gnome.org/Projects/NetworkManager/)。" + + #: src/main.c:31 + msgid "" +@@ -4388,17 +4259,15 @@ msgstr "缺失 EAP 密码" + + #: src/wireless-security/eap-method-simple.c:106 + msgid "missing EAP client Private Key passphrase" +-msgstr "" ++msgstr "缺少 EAP 客户端私钥口令" + + #: src/wireless-security/eap-method-simple.ui:103 +-#, fuzzy + msgid "P_rivate Key Passphrase" +-msgstr "WEP 128 位密码句" ++msgstr "私钥密码口令(_r)" + + #: src/wireless-security/eap-method-simple.ui:128 +-#, fuzzy + msgid "Sh_ow passphrase" +-msgstr "显示密码(_O)" ++msgstr "显示密码(_o)" + + #: src/wireless-security/eap-method-tls.c:47 + msgid "missing EAP-TLS identity" +@@ -4466,7 +4335,7 @@ msgstr "受保护的 EAP(PEAP)" + + #: src/wireless-security/wireless-security.c:509 + msgid "Externally configured" +-msgstr "" ++msgstr "外部配置" + + #: src/wireless-security/ws-dynamic-wep.ui:31 + #: src/wireless-security/ws-wep-key.ui:97 +@@ -4483,9 +4352,8 @@ msgid "missing leap-password" + msgstr "缺失 leap-password" + + #: src/wireless-security/ws-sae.c:56 +-#, fuzzy + msgid "missing password" +-msgstr "缺失 EAP 密码" ++msgstr "忘记密码" + + #: src/wireless-security/ws-sae.ui:48 src/wireless-security/ws-wpa-psk.ui:48 + msgid "_Type" +@@ -4511,9 +4379,7 @@ msgstr "无效的 wep-key:%zu 长度的密钥只能包含 ascii 字符" + msgid "" + "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " + "(ascii) or 10/26 (hex)" +-msgstr "" +-"无效的 wep-key:错误的密钥长度 %zu。密钥必须为长度 5/13(ascii)或者 " +-"10/26(十六进制)" ++msgstr "无效的 wep-key:错误的密钥长度 %zu。密钥必须为长度 5/13(ascii)或者 10/26(十六进制)" + + #: src/wireless-security/ws-wep-key.c:127 + msgid "invalid wep-key: passphrase must be non-empty" +@@ -4552,8 +4418,7 @@ msgstr "WEP 索引(_X)" + msgid "" + "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " + "digits" +-msgstr "" +-"无效的 wep-psk:无效的密钥长度 %zu。必须为 [8,63] 字节或者 64 位十六进制数字" ++msgstr "无效的 wep-psk:无效的密钥长度 %zu。必须为 [8,63] 字节或者 64 位十六进制数字" + + #: src/wireless-security/ws-wpa-psk.c:69 + msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" +@@ -4624,7 +4489,6 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ "EAP authentication." + #~ msgstr "将此项设为 true 以禁用在 EAP 验证第 2 阶段中关于 CA 证书的警告。" + +-#, c-format + #~ msgid "%s (default)" + #~ msgstr "%s(默认)" + +@@ -4640,7 +4504,6 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "Cannot import VPN connection" + #~ msgstr "无法导入 VPN 连接" + +-#, c-format + #~ msgid "" + #~ "The file “%s” could not be read or does not contain recognized VPN " + #~ "connection information\n" +@@ -4663,19 +4526,15 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "No key set" + #~ msgstr "未设定密钥" + +-#, c-format + #~ msgid "Choose a key for %s Certificate" + #~ msgstr "选择用于 %s 的密钥" + +-#, c-format + #~ msgid "%s key _password:" + #~ msgstr "%s 密钥密码(_P):" + +-#, c-format + #~ msgid "Choose %s Certificate" + #~ msgstr "选择 %s 证书" + +-#, c-format + #~ msgid "%s _certificate:" + #~ msgstr "%s 证书(_C):" + +@@ -4804,11 +4663,9 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "(None)" + #~ msgstr "(无)" + +-#, c-format + #~ msgid "Key in %s" + #~ msgstr "%s 中的密钥" + +-#, c-format + #~ msgid "Certificate in %s" + #~ msgstr "%s 中的证书" + +@@ -4824,11 +4681,9 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "Select from file…" + #~ msgstr "从文件选择…" + +-#, c-format + #~ msgid "Choose a %s Certificate" + #~ msgstr "选择 %s 证书" + +-#, c-format + #~ msgid "%s certificate _password:" + #~ msgstr "%s 证书密码(_P):" + +@@ -4844,7 +4699,6 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "Issued By" + #~ msgstr "发布者" + +-#, c-format + #~ msgid "Enter %s PIN" + #~ msgstr "输入 %s PIN" + +@@ -4898,7 +4752,6 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "C_reate" + #~ msgstr "创建(_R)" + +-#, c-format + #~ msgid "" + #~ "Passwords or encryption keys are required to access the Wi-Fi network " + #~ "“%s”." +@@ -4951,7 +4804,6 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "USB" + #~ msgstr "USB" + +-#, c-format + #~ msgctxt "long device name" + #~ msgid "%s %s" + #~ msgstr "%s %s" +@@ -5568,5 +5420,3 @@ msgstr "无效的 wep-psk:无法以 64 位十六进制数字解析密钥" + #~ msgid "Apply..." + #~ msgstr "应用..." + +-#~ msgid "Save this connection for all users of this machine." +-#~ msgstr "为本机全部用户保存此连接。" +-- +2.26.2 + diff --git a/SOURCES/0001-nm-applet-no-notifications.patch b/SOURCES/0001-nm-applet-no-notifications.patch deleted file mode 100644 index be6b6bf..0000000 --- a/SOURCES/0001-nm-applet-no-notifications.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in -index 9e2887e..4f8c16a 100644 ---- a/org.gnome.nm-applet.gschema.xml.in -+++ b/org.gnome.nm-applet.gschema.xml.in -@@ -17,7 +17,7 @@ - Set this to true to disable notifications when connecting to or disconnecting from a VPN. - - -- false -+ true - Suppress networks available notifications - Set this to true to disable notifications when Wi-Fi networks are available. - diff --git a/SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch b/SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch deleted file mode 100644 index ecb2057..0000000 --- a/SOURCES/0001-po-RHEL-8.1-translations-rh1690001.patch +++ /dev/null @@ -1,3232 +0,0 @@ -From 2fd244bc10d213f929faee4d257bbf897c5ed0ba Mon Sep 17 00:00:00 2001 -From: Ludek Janda -Date: Thu, 15 Aug 2019 11:54:25 +0200 -Subject: [PATCH] po: RHEL 8.1 translations - -https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/57 ---- - po/fr.po | 45 ++--- - po/ja.po | 546 ++++++++++++++++++---------------------------------- - po/ko.po | 51 +---- - po/zh_CN.po | 532 ++++++++++++++++++-------------------------------- - 4 files changed, 389 insertions(+), 785 deletions(-) - -diff --git a/po/fr.po b/po/fr.po -index 7937895a..b5fa1bc9 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -12,21 +12,23 @@ - # Bruno Brouard , 2010-2012. - # Alain Lojewski , 2013-2014. - # Yvan Masson , 2017. --# -+# croe , 2019. #zanata -+# ljanda , 2019. #zanata - msgid "" - msgstr "" --"Project-Id-Version: fr\n" -+"Project-Id-Version: network-manager-applet 1.8.22\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-" - "applet/\n" --"POT-Creation-Date: 2019-05-29 11:09+0200\n" --"PO-Revision-Date: 2019-01-15 14:51+0100\n" --"Last-Translator: Claude Paroz \n" -+"POT-Creation-Date: 2019-08-15 18:52+0200\n" -+"PO-Revision-Date: 2019-08-14 11:37+0000\n" -+"Last-Translator: croe \n" - "Language-Team: GNOME French TEAM \n" - "Language: fr\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n>1;\n" -+"X-Generator: Zanata 4.6.2\n" - - #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 - #: src/libnma/nma-bar-code-widget.c:144 -@@ -39,7 +41,7 @@ msgstr "Gérer vos connexions réseau" - - #: nm-applet.desktop.in:5 - msgid "nm-device-wireless" --msgstr "" -+msgstr "nm-device-wireless" - - #: nm-connection-editor.desktop.in:3 - msgid "Advanced Network Configuration" -@@ -51,7 +53,7 @@ msgstr "Gérer et modifier les paramètres des connexions réseau" - - #: nm-connection-editor.desktop.in:5 - msgid "preferences-system-network" --msgstr "" -+msgstr "preferences-system-network" - - #: org.gnome.nm-applet.gschema.xml.in:6 - msgid "Disable connected notifications" -@@ -108,7 +110,6 @@ msgstr "" - "version." - - #: org.gnome.nm-applet.gschema.xml.in:31 --#, fuzzy - msgid "Disable WiFi Create" - msgstr "Désactiver la création Wi-Fi" - -@@ -889,18 +890,16 @@ msgid "Subnet Mask" - msgstr "Masque de sous-réseau " - - #: src/applet-dialogs.c:440 --#, fuzzy - msgid "Primary DNS" --msgstr "_Principal" -+msgstr "DNS Principal" - - #: src/applet-dialogs.c:440 --#, fuzzy - msgid "Secondary DNS" --msgstr "Mot de passe _secondaire :" -+msgstr "DNS Secondaire" - - #: src/applet-dialogs.c:440 - msgid "Tertiary DNS" --msgstr "" -+msgstr "DNS Tertiaire" - - #: src/applet-dialogs.c:519 - #, c-format -@@ -948,9 +947,8 @@ msgid "Speed" - msgstr "Vitesse " - - #: src/applet-dialogs.c:616 --#, fuzzy - msgid "Security" --msgstr "Sécurité :" -+msgstr "Sécurité" - - #. --- IPv4 --- - #: src/applet-dialogs.c:641 src/applet-dialogs.c:904 -@@ -972,9 +970,8 @@ msgid "Hotspot" - msgstr "Hotspot" - - #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161 --#, fuzzy - msgid "Password" --msgstr "Mot de passe :" -+msgstr "Mot de passe" - - #: src/applet-dialogs.c:878 - msgid "VPN Type" -@@ -4222,7 +4219,7 @@ msgstr "_Fermer" - - #: src/libnma/nma-bar-code-widget.ui:36 - msgid "Scan with your phone or Print" --msgstr "" -+msgstr "Scanner avec votre portable ou Print" - - #: src/libnma/nma-file-cert-chooser.c:108 - #: src/libnma/nma-pkcs11-cert-chooser.c:152 -@@ -4331,9 +4328,8 @@ msgid "Set up a Mobile Broadband Connection" - msgstr "Configuration d'une connexion mobile" - - #: src/libnma/nma-mobile-wizard.ui:189 --#, fuzzy - msgid "Country or region:" --msgstr "Pays ou région" -+msgstr "Pays ou région :" - - #: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127 - msgid "Choose your Provider’s Country or Region" -@@ -5099,12 +5095,3 @@ msgstr "" - #: src/wireless-security/ws-wpa-psk.ui:48 - msgid "_Type" - msgstr "_Type" -- --#~ msgid "%s (default)" --#~ msgstr "%s (par défaut)" -- --#~ msgid "Ignored" --#~ msgstr "Ignoré" -- --#~ msgid "Active Network Connections" --#~ msgstr "Connexions réseau actives" -diff --git a/po/ja.po b/po/ja.po -index 995fc0be..d6d5106c 100644 ---- a/po/ja.po -+++ b/po/ja.po -@@ -11,24 +11,23 @@ - # Takayoshi OKANO , 2011. - # Jiro Matsuzawa , 2013. - # Hajime Taira , 2013. --# amoewaki , 2017. #zanata --# lrintel , 2017. #zanata --# amoewaki , 2018. #zanata -+# kemorigu , 2019. #zanata -+# ljanda , 2019. #zanata - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: network-manager-applet 1.8.22\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-" - "applet/\n" --"POT-Creation-Date: 2019-05-29 11:09+0200\n" --"PO-Revision-Date: 2018-01-30 12:06+0000\n" --"Last-Translator: amoewaki \n" -+"POT-Creation-Date: 2019-08-15 18:52+0200\n" -+"PO-Revision-Date: 2019-08-15 04:55+0000\n" -+"Last-Translator: kemorigu \n" - "Language-Team: Japanese \n" - "Language: ja\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.3.2\n" -+"X-Generator: Zanata 4.6.2\n" - - #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 - #: src/libnma/nma-bar-code-widget.c:144 -@@ -41,12 +40,11 @@ msgstr "ネットワーク接続を管理" - - #: nm-applet.desktop.in:5 - msgid "nm-device-wireless" --msgstr "" -+msgstr "nm-device-wireless" - - #: nm-connection-editor.desktop.in:3 --#, fuzzy - msgid "Advanced Network Configuration" --msgstr "Raw 設定" -+msgstr "高度なネットワーク設定" - - #: nm-connection-editor.desktop.in:4 - msgid "Manage and change your network connection settings" -@@ -54,7 +52,7 @@ msgstr "ネットワーク接続セッティングの管理と変更" - - #: nm-connection-editor.desktop.in:5 - msgid "preferences-system-network" --msgstr "" -+msgstr "preferences-system-network" - - #: org.gnome.nm-applet.gschema.xml.in:6 - msgid "Disable connected notifications" -@@ -105,7 +103,6 @@ msgid "Used to determine whether settings should be migrated to a new version." - msgstr "設定を、新規バージョンに移行すべきかどうかの判定に使用されます。" - - #: org.gnome.nm-applet.gschema.xml.in:31 --#, fuzzy - msgid "Disable WiFi Create" - msgstr "Wi-Fi の作成を無効にする" - -@@ -245,9 +242,8 @@ msgid "C_onnect" - msgstr "接続(_O)" - - #: src/8021x.ui:122 src/libnma/wifi.ui:129 --#, fuzzy - msgid "_Network name" --msgstr "ネットワーク名(_N):" -+msgstr "ネットワーク名(_N)" - - #: src/ap-menu-item.c:82 - msgid "ad-hoc" -@@ -877,18 +873,16 @@ msgid "Subnet Mask" - msgstr "サブネットマスク" - - #: src/applet-dialogs.c:440 --#, fuzzy - msgid "Primary DNS" --msgstr "プライマリー(_P):" -+msgstr "プライマリー DNS" - - #: src/applet-dialogs.c:440 --#, fuzzy - msgid "Secondary DNS" --msgstr "セカンダリーパスワード(_S):" -+msgstr "セカンダリー DNS" - - #: src/applet-dialogs.c:440 - msgid "Tertiary DNS" --msgstr "" -+msgstr "ターシャリー DNS" - - #: src/applet-dialogs.c:519 - #, c-format -@@ -936,9 +930,8 @@ msgid "Speed" - msgstr "速度" - - #: src/applet-dialogs.c:616 --#, fuzzy - msgid "Security" --msgstr "セキュリティー:" -+msgstr "セキュリティー" - - #. --- IPv4 --- - #: src/applet-dialogs.c:641 src/applet-dialogs.c:904 -@@ -960,9 +953,8 @@ msgid "Hotspot" - msgstr "ホットスポット" - - #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161 --#, fuzzy - msgid "Password" --msgstr "パスワード:" -+msgstr "パスワード" - - #: src/applet-dialogs.c:878 - msgid "VPN Type" -@@ -1193,9 +1185,8 @@ msgstr "" - #: src/connection-editor/ce-page-ethernet.ui:129 - #: src/connection-editor/ce-page-infiniband.ui:50 - #: src/connection-editor/ce-page-wifi.ui:139 --#, fuzzy - msgid "_Device" --msgstr "デバイス(_D):" -+msgstr "デバイス(_D)" - - #: src/connection-editor/ce-page-bond.ui:24 - #: src/connection-editor/ce-page-team.ui:433 -@@ -1237,15 +1228,13 @@ msgid "ARP" - msgstr "ARP" - - #: src/connection-editor/ce-page-bond.ui:91 --#, fuzzy - msgid "Bonded _connections" --msgstr "Bond 接続(_C):" -+msgstr "Bond 接続(_C)" - - #: src/connection-editor/ce-page-bond.ui:105 - #: src/connection-editor/ce-page-wifi.ui:400 --#, fuzzy - msgid "M_ode" --msgstr "モード(_O):" -+msgstr "モード(_O)" - - #: src/connection-editor/ce-page-bond.ui:194 - #: src/connection-editor/ce-page-bridge.ui:134 -@@ -1255,9 +1244,8 @@ msgid "_Edit" - msgstr "編集(_E)" - - #: src/connection-editor/ce-page-bond.ui:238 --#, fuzzy - msgid "Monitoring _frequency" --msgstr "監視周期(_F):" -+msgstr "監視周期(_F)" - - #: src/connection-editor/ce-page-bond.ui:272 - #: src/connection-editor/ce-page-bond.ui:422 -@@ -1268,19 +1256,16 @@ msgstr "ms" - #: src/connection-editor/ce-page-bond.ui:291 - #: src/connection-editor/ce-page-bridge.ui:192 - #: src/connection-editor/ce-page-team.ui:292 --#, fuzzy - msgid "_Interface name" --msgstr "インターフェース名(_I):" -+msgstr "インターフェース名(_I)" - - #: src/connection-editor/ce-page-bond.ui:316 --#, fuzzy - msgid "_Link Monitoring" - msgstr "リンク監視(_L)" - - #: src/connection-editor/ce-page-bond.ui:347 --#, fuzzy - msgid "ARP _targets" --msgstr "ARP 対象(_T):" -+msgstr "ARP 対象(_T)" - - #: src/connection-editor/ce-page-bond.ui:361 - msgid "" -@@ -1291,19 +1276,16 @@ msgstr "" - "のリスト。" - - #: src/connection-editor/ce-page-bond.ui:373 --#, fuzzy - msgid "Link _up delay" --msgstr "接続遅延(_U):" -+msgstr "接続遅延(_U)" - - #: src/connection-editor/ce-page-bond.ui:387 --#, fuzzy - msgid "Link _down delay" --msgstr "接断遅延(_D):" -+msgstr "接断遅延(_D)" - - #: src/connection-editor/ce-page-bond.ui:481 --#, fuzzy - msgid "_Primary" --msgstr "プライマリー(_P):" -+msgstr "プライマリー(_P)" - - #: src/connection-editor/ce-page-bond.ui:495 - msgid "" -@@ -1319,9 +1301,8 @@ msgstr "" - #: src/connection-editor/ce-page-team.ui:319 - #: src/connection-editor/ce-page-vlan.ui:87 - #: src/connection-editor/ce-page-wifi.ui:111 --#, fuzzy - msgid "_MTU" --msgstr "MTU(_M):" -+msgstr "MTU(_M)" - - #: src/connection-editor/ce-page-bond.ui:540 - #: src/connection-editor/ce-page-ethernet.ui:223 -@@ -1333,35 +1314,29 @@ msgid "bytes" - msgstr "バイト" - - #: src/connection-editor/ce-page-bridge-port.ui:42 --#, fuzzy - msgid "Path _cost" --msgstr "経路のコスト(_C):" -+msgstr "経路のコスト(_C)" - - #: src/connection-editor/ce-page-bridge-port.ui:55 - #: src/connection-editor/ce-page-bridge.ui:178 --#, fuzzy - msgid "_Priority" --msgstr "優先度(_P):" -+msgstr "優先度(_P)" - - #: src/connection-editor/ce-page-bridge-port.ui:97 --#, fuzzy - msgid "_Hairpin mode" --msgstr "ヘアピンモード(_H):" -+msgstr "ヘアピンモード(_H)" - - #: src/connection-editor/ce-page-bridge.ui:62 --#, fuzzy - msgid "Bridged _connections" --msgstr "ブリッジ接続(_C):" -+msgstr "ブリッジ接続(_C)" - - #: src/connection-editor/ce-page-bridge.ui:218 --#, fuzzy - msgid "_Forward delay" --msgstr "転送遅延(_F):" -+msgstr "転送遅延(_F)" - - #: src/connection-editor/ce-page-bridge.ui:232 --#, fuzzy - msgid "_Hello time" --msgstr "Hello タイム(_H):" -+msgstr "Hello タイム(_H)" - - #: src/connection-editor/ce-page-bridge.ui:252 - msgid "STP forwarding delay, in seconds" -@@ -1412,27 +1387,24 @@ msgstr "" - "が一番低いブリッジが root ブリッジに選択されます。" - - #: src/connection-editor/ce-page-bridge.ui:378 --#, fuzzy - msgid "_Max age" --msgstr "最大エイジ(_M):" -+msgstr "最大エイジ(_M)" - - #: src/connection-editor/ce-page-bridge.ui:398 - msgid "STP maximum message age, in seconds" - msgstr "STP メッセージの最大エイジ (秒単位)" - - #: src/connection-editor/ce-page-bridge.ui:434 --#, fuzzy - msgid "_Aging time" --msgstr "エージング時間(_A):" -+msgstr "エージング時間(_A)" - - #: src/connection-editor/ce-page-bridge.ui:454 - msgid "The Ethernet MAC address aging time, in seconds" - msgstr "イーサネット MAC アドレスのエージングタイム (秒単位)" - - #: src/connection-editor/ce-page-bridge.ui:490 --#, fuzzy - msgid "Group _forward mask" --msgstr "グループの転送マスク(_F):" -+msgstr "グループの転送マスク(_F)" - - #: src/connection-editor/ce-page-bridge.ui:504 - msgid "" -@@ -1614,9 +1586,8 @@ msgstr "各ユーザー優先度の優先ポーズ転送を、有効もしくは - #: src/connection-editor/ce-page-dcb.ui:1822 - #: src/connection-editor/ce-page-dcb.ui:2154 - #: src/connection-editor/ce-page-dcb.ui:2486 --#, fuzzy - msgid "0" --msgstr "0:" -+msgstr "0" - - #: src/connection-editor/ce-page-dcb.ui:694 - #: src/connection-editor/ce-page-dcb.ui:1135 -@@ -1624,9 +1595,8 @@ msgstr "0:" - #: src/connection-editor/ce-page-dcb.ui:1862 - #: src/connection-editor/ce-page-dcb.ui:2194 - #: src/connection-editor/ce-page-dcb.ui:2536 --#, fuzzy - msgid "1" --msgstr "1:" -+msgstr "1" - - #: src/connection-editor/ce-page-dcb.ui:735 - #: src/connection-editor/ce-page-dcb.ui:1184 -@@ -1634,9 +1604,8 @@ msgstr "1:" - #: src/connection-editor/ce-page-dcb.ui:1902 - #: src/connection-editor/ce-page-dcb.ui:2234 - #: src/connection-editor/ce-page-dcb.ui:2586 --#, fuzzy - msgid "2" --msgstr "2:" -+msgstr "2" - - #: src/connection-editor/ce-page-dcb.ui:776 - #: src/connection-editor/ce-page-dcb.ui:1233 -@@ -1644,9 +1613,8 @@ msgstr "2:" - #: src/connection-editor/ce-page-dcb.ui:1942 - #: src/connection-editor/ce-page-dcb.ui:2274 - #: src/connection-editor/ce-page-dcb.ui:2636 --#, fuzzy - msgid "3" --msgstr "3:" -+msgstr "3" - - #: src/connection-editor/ce-page-dcb.ui:817 - #: src/connection-editor/ce-page-dcb.ui:1282 -@@ -1654,9 +1622,8 @@ msgstr "3:" - #: src/connection-editor/ce-page-dcb.ui:1982 - #: src/connection-editor/ce-page-dcb.ui:2314 - #: src/connection-editor/ce-page-dcb.ui:2686 --#, fuzzy - msgid "4" --msgstr "4:" -+msgstr "4" - - #: src/connection-editor/ce-page-dcb.ui:858 - #: src/connection-editor/ce-page-dcb.ui:1331 -@@ -1664,9 +1631,8 @@ msgstr "4:" - #: src/connection-editor/ce-page-dcb.ui:2022 - #: src/connection-editor/ce-page-dcb.ui:2354 - #: src/connection-editor/ce-page-dcb.ui:2736 --#, fuzzy - msgid "5" --msgstr "5:" -+msgstr "5" - - #: src/connection-editor/ce-page-dcb.ui:899 - #: src/connection-editor/ce-page-dcb.ui:1380 -@@ -1674,9 +1640,8 @@ msgstr "5:" - #: src/connection-editor/ce-page-dcb.ui:2062 - #: src/connection-editor/ce-page-dcb.ui:2394 - #: src/connection-editor/ce-page-dcb.ui:2786 --#, fuzzy - msgid "6" --msgstr "6:" -+msgstr "6" - - #: src/connection-editor/ce-page-dcb.ui:940 - #: src/connection-editor/ce-page-dcb.ui:1429 -@@ -1684,34 +1649,28 @@ msgstr "6:" - #: src/connection-editor/ce-page-dcb.ui:2102 - #: src/connection-editor/ce-page-dcb.ui:2434 - #: src/connection-editor/ce-page-dcb.ui:2836 --#, fuzzy - msgid "7" --msgstr "7:" -+msgstr "7" - - #: src/connection-editor/ce-page-dcb.ui:1069 --#, fuzzy - msgid "Traffic Class" --msgstr "トラフィッククラス:" -+msgstr "トラフィッククラス" - - #: src/connection-editor/ce-page-dcb.ui:1473 --#, fuzzy - msgid "Strict Bandwidth" --msgstr "厳密な帯域幅:" -+msgstr "厳密な帯域幅" - - #: src/connection-editor/ce-page-dcb.ui:1805 --#, fuzzy - msgid "Priority Bandwidth" --msgstr "優先帯域幅:" -+msgstr "優先帯域幅" - - #: src/connection-editor/ce-page-dcb.ui:2137 --#, fuzzy - msgid "Group Bandwidth" --msgstr "グループ帯域幅:" -+msgstr "グループ帯域幅" - - #: src/connection-editor/ce-page-dcb.ui:2469 --#, fuzzy - msgid "Group ID" --msgstr "グループ ID:" -+msgstr "グループ ID" - - #: src/connection-editor/ce-page-dcb.ui:2881 - msgid "Enter the priority group ID for each User Priority." -@@ -1745,9 +1704,8 @@ msgstr "各ユーザー優先度にトラフィッククラスを入力してく - #: src/wireless-security/eap-method-leap.ui:21 - #: src/wireless-security/eap-method-simple.ui:21 - #: src/wireless-security/ws-leap.ui:21 --#, fuzzy - msgid "_Username" --msgstr "ユーザー名(_U):" -+msgstr "ユーザー名(_U)" - - #: src/connection-editor/ce-page-dsl.ui:33 - msgid "Username used to authenticate with the PPPoE service." -@@ -1762,9 +1720,8 @@ msgstr "" - "す。多くのプロバイダーでは、これを空白にする必要があります。" - - #: src/connection-editor/ce-page-dsl.ui:59 --#, fuzzy - msgid "_Service" --msgstr "サービス(_S):" -+msgstr "サービス(_S)" - - #: src/connection-editor/ce-page-dsl.ui:71 - #: src/libnma/nma-file-cert-chooser.c:347 -@@ -1783,19 +1740,16 @@ msgstr "PPPoE サービスでの認証に使用されるパスワード。" - #: src/wireless-security/eap-method-leap.ui:35 - #: src/wireless-security/eap-method-simple.ui:35 - #: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20 --#, fuzzy - msgid "_Password" --msgstr "パスワード(_P):" -+msgstr "パスワード(_P)" - - #: src/connection-editor/ce-page-dsl.ui:116 --#, fuzzy - msgid "PPP _interface" --msgstr "PPP インスタンス(_I):" -+msgstr "PPP インターフェース(_I)" - - #: src/connection-editor/ce-page-dsl.ui:130 --#, fuzzy - msgid "P_arent interface" --msgstr "親インスタンス(_A):" -+msgstr "親インターフェース(_A)" - - #: src/connection-editor/ce-page-dsl.ui:144 - msgid "An arbitrary name to assign to the newly created PPP interface." -@@ -1806,9 +1760,8 @@ msgid "The interface on which the PPP connection will be established." - msgstr "PPP 接続が確立されるインターフェース。" - - #: src/connection-editor/ce-page-dsl.ui:171 --#, fuzzy - msgid "C_laim interface" --msgstr "親インスタンス(_A):" -+msgstr "Claim インターフェース(_L)" - - #: src/connection-editor/ce-page-dsl.ui:175 - msgid "" -@@ -1817,6 +1770,10 @@ msgid "" - "option can only be used for Ethernet interfaces. nm-applet is able to " - "activate the connection only if this option is selected." - msgstr "" -+"選択された場合、接続はインターフェースを排他制御し、別の接続を有効化すること" -+"はできません。このオプションは、Ethernet のインターフェースでのみ使用可能で" -+"す。このオプションが選択されている場合に限り、nm-applet は接続を有効化できま" -+"す。" - - #: src/connection-editor/ce-page-ethernet.ui:17 - #: src/connection-editor/ce-page-ethernet.ui:77 -@@ -1883,20 +1840,17 @@ msgid "Manual" - msgstr "手動" - - #: src/connection-editor/ce-page-ethernet.ui:97 --#, fuzzy - msgid "_Port" --msgstr "ポート(_P):" -+msgstr "ポート(_P)" - - #: src/connection-editor/ce-page-ethernet.ui:156 - #: src/connection-editor/ce-page-wifi.ui:169 --#, fuzzy - msgid "C_loned MAC address" --msgstr "クローンした MAC アドレス(_L):" -+msgstr "クローンした MAC アドレス(_L)" - - #: src/connection-editor/ce-page-ethernet.ui:242 --#, fuzzy - msgid "Wake on LAN" --msgstr "Wake on LAN:" -+msgstr "Wake on LAN" - - #: src/connection-editor/ce-page-ethernet.ui:258 - msgid "De_fault" -@@ -1931,9 +1885,8 @@ msgid "Ma_gic" - msgstr "Magic(_G)" - - #: src/connection-editor/ce-page-ethernet.ui:388 --#, fuzzy - msgid "_Wake on LAN password" --msgstr "Wake on LAN パスワード(_W):" -+msgstr "Wake on LAN パスワード(_W)" - - #: src/connection-editor/ce-page-ethernet.ui:402 - msgid "" -@@ -1941,9 +1894,8 @@ msgid "" - msgstr "Wake-on-LAN パスワード (Ethernet MAC)。magic packet にのみ有効です。" - - #: src/connection-editor/ce-page-ethernet.ui:414 --#, fuzzy - msgid "Lin_k negotiation" --msgstr "リンクネゴシエーション(_K):" -+msgstr "リンクネゴシエーション(_K)" - - #: src/connection-editor/ce-page-ethernet.ui:428 - msgid "" -@@ -1956,9 +1908,8 @@ msgstr "" - "にしておくか「自動」を選択してください。" - - #: src/connection-editor/ce-page-ethernet.ui:448 --#, fuzzy - msgid "_Speed" --msgstr "スピード(_S):" -+msgstr "スピード(_S)" - - #: src/connection-editor/ce-page-ethernet.ui:462 - msgid "" -@@ -1971,9 +1922,8 @@ msgstr "" - "ポートしていることを確認してください。" - - #: src/connection-editor/ce-page-ethernet.ui:482 --#, fuzzy - msgid "Duple_x" --msgstr "二重(_X):" -+msgstr "二重(_X)" - - #: src/connection-editor/ce-page-ethernet.ui:496 - msgid "" -@@ -1987,31 +1937,27 @@ msgstr "" - - #: src/connection-editor/ce-page-general.ui:29 - msgid "Yes" --msgstr "" -+msgstr "はい" - - #: src/connection-editor/ce-page-general.ui:32 --#, fuzzy - msgid "No" --msgstr "なし" -+msgstr "いいえ" - - #: src/connection-editor/ce-page-general.ui:65 - msgid "All _users may connect to this network" - msgstr "全ユーザーがこのネットワークに接続可能とする(_U)" - - #: src/connection-editor/ce-page-general.ui:80 --#, fuzzy - msgid "Automatically connect to _VPN" --msgstr "この接続を使用したときは自動的に VPN に接続する(_V)" -+msgstr "自動的に VPN に接続する(_V)" - - #: src/connection-editor/ce-page-general.ui:96 --#, fuzzy - msgid "Firewall _zone" --msgstr "ファイアウォールゾーン(_Z):" -+msgstr "ファイアウォールゾーン(_Z)" - - #: src/connection-editor/ce-page-general.ui:121 --#, fuzzy - msgid "_Metered connection" --msgstr "チーム接続(_T):" -+msgstr "測定接続(_M)" - - #: src/connection-editor/ce-page-general.ui:134 - msgid "" -@@ -2020,11 +1966,14 @@ msgid "" - "“No”) to indicate to applications, or “Automatic” to use a default value " - "based on the connection type and other heuristics." - msgstr "" -+"NetworkManager は、接続が測定されているかどうかをアプリケーションに示すので、" -+"データの使用は制限されなければなりません。アプリケーションに示す値 (「はい」 " -+"または「いいえ」) がどちらなのかを選択するか、または「自動」を選択して接続の" -+"種類とその他のヒューリスティックをもとにデフォルトの値を使用します。" - - #: src/connection-editor/ce-page-general.ui:150 --#, fuzzy - msgid "Connect _automatically with priority" --msgstr "自動取得したルートを無視する(_N)" -+msgstr "優先的に自動接続する(_A)" - - #: src/connection-editor/ce-page-general.ui:167 - msgid "" -@@ -2077,9 +2026,8 @@ msgid "Connected" - msgstr "コネクション型" - - #: src/connection-editor/ce-page-infiniband.ui:37 --#, fuzzy - msgid "_Transport mode" --msgstr "転送モード(_T):" -+msgstr "転送モード(_T)" - - #: src/connection-editor/ce-page-ip-tunnel.ui:17 - msgid "IPIP" -@@ -2119,46 +2067,38 @@ msgstr "VTI6" - - #: src/connection-editor/ce-page-ip-tunnel.ui:61 - #: src/connection-editor/ce-page-macsec.ui:58 --#, fuzzy - msgid "Device name" --msgstr "デバイス名:" -+msgstr "デバイス名" - - #: src/connection-editor/ce-page-ip-tunnel.ui:85 - #: src/connection-editor/ce-page-macsec.ui:83 --#, fuzzy - msgid "Parent device" --msgstr "親デバイス:" -+msgstr "親デバイス" - - #: src/connection-editor/ce-page-ip-tunnel.ui:115 - #: src/connection-editor/ce-page-macsec.ui:180 --#, fuzzy - msgid "Mode" --msgstr "モード:" -+msgstr "モード" - - #: src/connection-editor/ce-page-ip-tunnel.ui:128 --#, fuzzy - msgid "Local IP" --msgstr "ローカル IP:" -+msgstr "ローカル IP" - - #: src/connection-editor/ce-page-ip-tunnel.ui:140 --#, fuzzy - msgid "Remote IP" --msgstr "リモート IP:" -+msgstr "リモート IP" - - #: src/connection-editor/ce-page-ip-tunnel.ui:152 --#, fuzzy - msgid "Input key" --msgstr "入力キー:" -+msgstr "入力キー" - - #: src/connection-editor/ce-page-ip-tunnel.ui:164 --#, fuzzy - msgid "Output key" --msgstr "出力キー:" -+msgstr "出力キー" - - #: src/connection-editor/ce-page-ip-tunnel.ui:245 --#, fuzzy - msgid "MTU" --msgstr "MTU:" -+msgstr "MTU" - - #: src/connection-editor/ce-page-ip4.ui:15 - #: src/connection-editor/ce-page-ip6.ui:15 -@@ -2178,9 +2118,8 @@ msgstr "他のコンピューターへ共有" - - #: src/connection-editor/ce-page-ip4.ui:47 - #: src/connection-editor/ce-page-ip6.ui:78 --#, fuzzy - msgid "_Method" --msgstr "方式(_M):" -+msgstr "メソッド(_M)" - - #: src/connection-editor/ce-page-ip4.ui:202 - msgid "" -@@ -2202,23 +2141,20 @@ msgstr "" - "使います。" - - #: src/connection-editor/ce-page-ip4.ui:228 --#, fuzzy - msgid "D_HCP client ID" --msgstr "DHCP クライアント ID(_H):" -+msgstr "DHCP クライアント ID(_H)" - - #: src/connection-editor/ce-page-ip4.ui:242 - #: src/connection-editor/ce-page-ip6.ui:246 - #: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347 --#, fuzzy - msgid "S_earch domains" --msgstr "ドメインを検索(_E):" -+msgstr "ドメインを検索(_E)" - - #: src/connection-editor/ce-page-ip4.ui:256 - #: src/connection-editor/ce-page-ip6.ui:260 - #: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338 --#, fuzzy - msgid "DNS ser_vers" --msgstr "DNS サーバー(_V):" -+msgstr "DNS サーバー(_V)" - - #: src/connection-editor/ce-page-ip4.ui:270 - msgid "" -@@ -2278,14 +2214,12 @@ msgstr "" - "ンクローカルアドレスは、接続中のインターフェースに自動的にスコープされます。" - - #: src/connection-editor/ce-page-ip6.ui:287 --#, fuzzy - msgid "IPv6 _privacy extensions" --msgstr "IPv6 のプライバシー拡張(_P):" -+msgstr "IPv6 のプライバシー拡張(_P)" - - #: src/connection-editor/ce-page-ip6.ui:319 --#, fuzzy - msgid "IPv6 address _generation mode" --msgstr "IPv6 アドレス生成モード(_G):" -+msgstr "IPv6 アドレス生成モード(_G)" - - #: src/connection-editor/ce-page-ip6.ui:356 - msgid "Require IPv_6 addressing for this connection to complete" -@@ -2353,34 +2287,28 @@ msgstr "" - "モードでは、802.1X セキュリティーページにパラメーターを追加します。" - - #: src/connection-editor/ce-page-macsec.ui:154 --#, fuzzy - msgid "CKN" --msgstr "CKN:" -+msgstr "CKN" - - #: src/connection-editor/ce-page-macsec.ui:167 --#, fuzzy - msgid "CAK" --msgstr "CAK:" -+msgstr "CAK" - - #: src/connection-editor/ce-page-macsec.ui:191 --#, fuzzy - msgid "Keys" --msgstr "キー:" -+msgstr "キー" - - #: src/connection-editor/ce-page-macsec.ui:207 --#, fuzzy - msgid "Parameters" --msgstr "パラメーター:" -+msgstr "パラメーター" - - #: src/connection-editor/ce-page-macsec.ui:224 --#, fuzzy - msgid "Validation" --msgstr "検証:" -+msgstr "検証" - - #: src/connection-editor/ce-page-macsec.ui:236 --#, fuzzy - msgid "SCI port" --msgstr "SCI ポート:" -+msgstr "SCI ポート" - - #: src/connection-editor/ce-page-macsec.ui:247 - msgid "Specifies the validation mode for incoming frames" -@@ -2404,32 +2332,28 @@ msgid "Basic" - msgstr "基本" - - #: src/connection-editor/ce-page-mobile.ui:48 --#, fuzzy - msgid "Nu_mber" --msgstr "番号(_M):" -+msgstr "番号(_M)" - - #: src/connection-editor/ce-page-mobile.ui:142 - msgid "Advanced" - msgstr "高度" - - #: src/connection-editor/ce-page-mobile.ui:165 --#, fuzzy - msgid "_APN" --msgstr "APN(_A):" -+msgstr "APN(_A)" - - #: src/connection-editor/ce-page-mobile.ui:179 --#, fuzzy - msgid "N_etwork ID" --msgstr "ネットワーク ID(_E):" -+msgstr "ネットワーク ID(_E)" - - #: src/connection-editor/ce-page-mobile.ui:221 - msgid "Change…" - msgstr "変更..." - - #: src/connection-editor/ce-page-mobile.ui:242 --#, fuzzy - msgid "P_IN" --msgstr "PIN 番号(_I):" -+msgstr "PIN (_I)" - - #: src/connection-editor/ce-page-mobile.ui:266 - msgid "Allow _roaming if home network is not available" -@@ -2445,9 +2369,8 @@ msgid "Authentication" - msgstr "認証" - - #: src/connection-editor/ce-page-ppp.ui:53 --#, fuzzy - msgid "Allowed methods" --msgstr "利用可能な認証方法:" -+msgstr "利用可能なメソッド" - - # "auth_methods_button"ボタンのラベル - #: src/connection-editor/ce-page-ppp.ui:89 -@@ -2505,14 +2428,12 @@ msgstr "" - "このプロキシ設定を、ブラウザーのクライアント/スキームにのみ使用します。" - - #: src/connection-editor/ce-page-proxy.ui:52 --#, fuzzy - msgid "PAC URL" --msgstr "PAC URL:" -+msgstr "PAC URL" - - #: src/connection-editor/ce-page-proxy.ui:64 --#, fuzzy - msgid "PAC script" --msgstr "PAC スクリプト:" -+msgstr "PAC スクリプト" - - #: src/connection-editor/ce-page-proxy.ui:76 - msgid "URL from where the PAC script is to be obtained." -@@ -2523,9 +2444,8 @@ msgid "Import script from a file…" - msgstr "ファイルからスクリプトをインポート..." - - #: src/connection-editor/ce-page-proxy.ui:101 --#, fuzzy - msgid "Method" --msgstr "方式:" -+msgstr "メソッド" - - #: src/connection-editor/ce-page-team-port.ui:47 - #: src/connection-editor/ce-page-team.ui:400 -@@ -2557,9 +2477,8 @@ msgid "Team Advanced Options" - msgstr "チームの高度なオプション" - - #: src/connection-editor/ce-page-team-port.ui:225 --#, fuzzy - msgid "_Queue ID" --msgstr "キュー ID(_ID):" -+msgstr "キュー ID(_Q)" - - #: src/connection-editor/ce-page-team-port.ui:239 - #: src/connection-editor/ce-page-team.ui:662 -@@ -2579,9 +2498,8 @@ msgid "Active-Backup runner options" - msgstr "Active-Backup ランナーオプション" - - #: src/connection-editor/ce-page-team-port.ui:271 --#, fuzzy - msgid "_Port priority" --msgstr "ポート優先度(_P):" -+msgstr "ポート優先度(_P)" - - #: src/connection-editor/ce-page-team-port.ui:284 - #: src/connection-editor/ce-page-team.ui:712 -@@ -2602,20 +2520,19 @@ msgstr "ポート付箋(_S)" - #: src/connection-editor/ce-page-team-port.ui:301 - msgid "Do not unselect the port if a better one becomes available." - msgstr "" -+"より良いポートが使用可能となった場合、ポートの選択を解除しないでください。" - - #: src/connection-editor/ce-page-team-port.ui:316 - msgid "LACP runner options" - msgstr "LACP ランナーオプション" - - #: src/connection-editor/ce-page-team-port.ui:332 --#, fuzzy - msgid "_LACP port priority" --msgstr "LACP ポート優先度(_L):" -+msgstr "LACP ポート優先度(_L)" - - #: src/connection-editor/ce-page-team-port.ui:346 --#, fuzzy - msgid "LACP port _key" --msgstr "LACP ポートキー(_K):" -+msgstr "LACP ポートキー(_K)" - - #: src/connection-editor/ce-page-team-port.ui:359 - #: src/connection-editor/ce-page-team.ui:675 -@@ -2650,51 +2567,43 @@ msgstr "LACP 標準に準拠したポートキー。同じキーのポートだ - - #: src/connection-editor/ce-page-team-port.ui:416 - #: src/connection-editor/ce-page-team.ui:1142 --#, fuzzy - msgid "_Link watcher" --msgstr "リンクウォッチャー(_L):" -+msgstr "リンクウォッチャー(_L)" - - #: src/connection-editor/ce-page-team-port.ui:431 - #: src/connection-editor/ce-page-team.ui:1157 --#, fuzzy - msgid "_Up delay" --msgstr "アップ遅延(_U):" -+msgstr "アップ遅延(_U)" - - #: src/connection-editor/ce-page-team-port.ui:446 - #: src/connection-editor/ce-page-team.ui:1172 --#, fuzzy - msgid "_Down delay" --msgstr "ダウン遅延(_D):" -+msgstr "ダウン遅延(_D)" - - #: src/connection-editor/ce-page-team-port.ui:461 - #: src/connection-editor/ce-page-team.ui:1187 --#, fuzzy - msgid "Send _interval" --msgstr "送信間隔(_I):" -+msgstr "送信間隔(_I)" - - #: src/connection-editor/ce-page-team-port.ui:476 - #: src/connection-editor/ce-page-team.ui:1202 --#, fuzzy - msgid "Delay _before first send" --msgstr "初回送信までの遅延(_B):" -+msgstr "初回送信までの遅延(_B)" - - #: src/connection-editor/ce-page-team-port.ui:491 - #: src/connection-editor/ce-page-team.ui:1217 --#, fuzzy - msgid "_Maximum missed replies" --msgstr "不在着信となった返信の最大数(_M):" -+msgstr "不在着信となった返信の最大数(_M)" - - #: src/connection-editor/ce-page-team-port.ui:506 - #: src/connection-editor/ce-page-team.ui:1232 --#, fuzzy - msgid "_Source host" --msgstr "ソースホスト(_S):" -+msgstr "ソースホスト(_S)" - - #: src/connection-editor/ce-page-team-port.ui:521 - #: src/connection-editor/ce-page-team.ui:1247 --#, fuzzy - msgid "_Target host" --msgstr "ターゲットホスト(_T):" -+msgstr "ターゲットホスト(_T)" - - #: src/connection-editor/ce-page-team-port.ui:535 - #: src/connection-editor/ce-page-team.ui:1261 -@@ -2805,9 +2714,8 @@ msgstr "ファイルからチーム設定をインポートする(_P)..." - - #: src/connection-editor/ce-page-team-port.ui:826 - #: src/connection-editor/ce-page-team.ui:1552 --#, fuzzy - msgid "Edit _JSON configuration" --msgstr "JSON 設定の編集(_J):" -+msgstr "JSON 設定の編集(_J)" - - #: src/connection-editor/ce-page-team-port.ui:845 - #: src/connection-editor/ce-page-team.ui:1571 -@@ -2847,9 +2755,8 @@ msgid "From active to team device" - msgstr "アクティブからチームデバイスへ" - - #: src/connection-editor/ce-page-team.ui:174 --#, fuzzy - msgid "_Teamed connections" --msgstr "チーム接続(_T):" -+msgstr "チーム接続(_T)" - - #: src/connection-editor/ce-page-team.ui:441 - msgid "Load balance" -@@ -2897,29 +2804,24 @@ msgid "Any L4 protocol" - msgstr "すべての L4 プロトコル" - - #: src/connection-editor/ce-page-team.ui:603 --#, fuzzy - msgid "_Peer notification count" --msgstr "ピア通知数(_P):" -+msgstr "ピア通知数(_P)" - - #: src/connection-editor/ce-page-team.ui:618 --#, fuzzy - msgid "Peer _notification interval" --msgstr "ピア通知間隔(_N):" -+msgstr "ピア通知間隔(_N)" - - #: src/connection-editor/ce-page-team.ui:633 --#, fuzzy - msgid "_Multicast rejoin count" --msgstr "マルチキャスト再参加数(_M):" -+msgstr "マルチキャスト再参加数(_M)" - - #: src/connection-editor/ce-page-team.ui:648 --#, fuzzy - msgid "Multicast _rejoin interval" --msgstr "マルチキャスト再参加間隔(_R):" -+msgstr "マルチキャスト再参加間隔(_R)" - - #: src/connection-editor/ce-page-team.ui:739 --#, fuzzy - msgid "_Hardware Address" --msgstr "ハードウェアアドレス(_H):" -+msgstr "ハードウェアアドレス(_H)" - - #: src/connection-editor/ce-page-team.ui:752 - msgid "" -@@ -2930,14 +2832,12 @@ msgstr "" - "す。" - - #: src/connection-editor/ce-page-team.ui:798 --#, fuzzy - msgid "_Runner" --msgstr "ランナー(_R):" -+msgstr "ランナー(_R)" - - #: src/connection-editor/ce-page-team.ui:813 --#, fuzzy - msgid "_Hardware address policy" --msgstr "ハードウェアアドレスポリシー(_H):" -+msgstr "ハードウェアアドレスポリシー(_H)" - - #: src/connection-editor/ce-page-team.ui:827 - msgid "Name of runner to be used." -@@ -2978,19 +2878,16 @@ msgstr "" - "入れない場合は、30 秒ごとに送信されます。" - - #: src/connection-editor/ce-page-team.ui:903 --#, fuzzy - msgid "_System priority" --msgstr "システム優先度(_S):" -+msgstr "システム優先度(_S)" - - #: src/connection-editor/ce-page-team.ui:918 --#, fuzzy - msgid "_Minimum ports" --msgstr "最小ポート数(_M):" -+msgstr "最小ポート数(_M)" - - #: src/connection-editor/ce-page-team.ui:933 --#, fuzzy - msgid "_Aggregator selection policy" --msgstr "アグリゲーター選択ポリシー(_A):" -+msgstr "アグリゲーター選択ポリシー(_A)" - - #: src/connection-editor/ce-page-team.ui:947 - msgid "System priority, value can be 0 – 65535." -@@ -3030,41 +2927,34 @@ msgstr "" - "効になっています。" - - #: src/connection-editor/ce-page-team.ui:1085 --#, fuzzy - msgid "Transmission _balancing interval" --msgstr "転送バランシングの間隔(_B):" -+msgstr "転送バランシングの間隔(_B)" - - #: src/connection-editor/ce-page-team.ui:1100 --#, fuzzy - msgid "_Transmission balancer" --msgstr "転送バランサー(_T):" -+msgstr "転送バランサー(_T)" - - #: src/connection-editor/ce-page-team.ui:1119 - msgid "Runner" - msgstr "ランナー" - - #: src/connection-editor/ce-page-vlan.ui:28 --#, fuzzy - msgid "_Parent interface" --msgstr "親インターフェース(_P):" -+msgstr "親インターフェース(_P)" - - #: src/connection-editor/ce-page-vlan.ui:41 --#, fuzzy - msgid "VLAN inter_face name" --msgstr "VLAN インターフェース名(_F):" -+msgstr "VLAN インターフェース名(_F)" - - #: src/connection-editor/ce-page-vlan.ui:55 --#, fuzzy - msgid "Cloned MAC _address" --msgstr "クローンの MAC アドレス(_A):" -+msgstr "クローンの MAC アドレス(_A)" - - #: src/connection-editor/ce-page-vlan.ui:140 --#, fuzzy - msgid "VLAN _id" --msgstr "VLAN ID(_I):" -+msgstr "VLAN ID(_I)" - - #: src/connection-editor/ce-page-vlan.ui:197 --#, fuzzy - msgid "Flags" - msgstr "フラグ" - -@@ -3095,9 +2985,8 @@ msgid "\"vlan\" + number" - msgstr "\"vlan\" + 番号" - - #: src/connection-editor/ce-page-wifi-security.ui:29 --#, fuzzy - msgid "S_ecurity" --msgstr "セキュリティー(_E):" -+msgstr "セキュリティー(_E)" - - #: src/connection-editor/ce-page-wifi.ui:35 - msgid "A (5 GHz)" -@@ -3120,38 +3009,32 @@ msgid "mW" - msgstr "mW" - - #: src/connection-editor/ce-page-wifi.ui:222 --#, fuzzy - msgid "Transmission po_wer" --msgstr "送信パワー(_W):" -+msgstr "送信パワー(_W)" - - #: src/connection-editor/ce-page-wifi.ui:256 - msgid "Mb/s" - msgstr "Mb/s" - - #: src/connection-editor/ce-page-wifi.ui:275 --#, fuzzy - msgid "_Rate" --msgstr "レート(_R):" -+msgstr "レート(_R)" - - #: src/connection-editor/ce-page-wifi.ui:311 --#, fuzzy - msgid "_BSSID" --msgstr "BSSID(_B):" -+msgstr "BSSID(_B)" - - #: src/connection-editor/ce-page-wifi.ui:336 --#, fuzzy - msgid "C_hannel" --msgstr "チャンネル(_H):" -+msgstr "チャンネル(_H)" - - #: src/connection-editor/ce-page-wifi.ui:368 --#, fuzzy - msgid "Ban_d" --msgstr "バンド(_D):" -+msgstr "バンド(_D)" - - #: src/connection-editor/ce-page-wifi.ui:414 --#, fuzzy - msgid "SS_ID" --msgstr "SSID(_I):" -+msgstr "SSID(_I)" - - #: src/connection-editor/ce-polkit.c:63 - #: src/connection-editor/ce-polkit-button.c:74 -@@ -3270,15 +3153,11 @@ msgstr "VPN" - - #: src/connection-editor/connection-helpers.c:204 - msgid "No VPN service type." --msgstr "" -+msgstr "VPN サービスの種類はありません。" - - #: src/connection-editor/connection-helpers.c:209 --#, fuzzy - msgid "The VPN plugin failed to import the VPN connection correctly: " --msgstr "" --"VPN プラグインは、VPN 接続の正常なインポートに失敗しました\n" --"\n" --"エラー: VPN サービスタイプがありません。" -+msgstr "VPN プラグインは、VPN 接続の正常なインポートに失敗しました:" - - #: src/connection-editor/connection-helpers.c:293 - #: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341 -@@ -3326,13 +3205,12 @@ msgid "Are you sure you wish to delete the connection %s?" - msgstr "接続 %s を削除してもよろしいですか?" - - #: src/connection-editor/gtk/menus.ui:6 --#, fuzzy - msgid "_New Connection" --msgstr "VPN 接続(_V)" -+msgstr "新しい接続(_N)" - - #: src/connection-editor/gtk/menus.ui:13 - msgid "_Quit" --msgstr "" -+msgstr "終了(_Q)" - - #: src/connection-editor/ip4-routes-dialog.c:697 - #: src/connection-editor/ip6-routes-dialog.c:718 -@@ -3451,9 +3329,8 @@ msgstr "" - "す。" - - #: src/connection-editor/nm-connection-editor.ui:110 --#, fuzzy - msgid "Connection _name" --msgstr "接続名(_N):" -+msgstr "接続名(_N)" - - #: src/connection-editor/nm-connection-editor.ui:170 - msgid "_Export…" -@@ -3561,19 +3438,17 @@ msgid "Authenticate to delete the selected connection" - msgstr "選択した接続の削除を認証する" - - #: src/connection-editor/nm-connection-list.c:1059 --#, fuzzy - msgid "Unrecognized connection type" --msgstr "サポートされていないモバイルブロードバンドの接続タイプ。" -+msgstr "認識されない接続タイプ" - - #: src/connection-editor/nm-connection-list.c:1064 --#, fuzzy, c-format -+#, c-format - msgid "Don’t know how to import “%s” connections" --msgstr "接続 '%s' の作成方法がわかりません" -+msgstr "接続 “%s” のインポート方法がわかりません" - - #: src/connection-editor/nm-connection-list.c:1068 --#, fuzzy - msgid "Error importing connection" --msgstr "接続の編集エラー" -+msgstr "接続のインポートエラー" - - #: src/connection-editor/nm-connection-list.c:1075 - #: src/connection-editor/nm-connection-list.c:1090 -@@ -3582,9 +3457,8 @@ msgid "Error creating connection" - msgstr "接続の作成中にエラー" - - #: src/connection-editor/nm-connection-list.c:1075 --#, fuzzy - msgid "Connection type not specified." --msgstr "接続を変更できません" -+msgstr "接続タイプは指定されていません。" - - #: src/connection-editor/nm-connection-list.c:1091 - msgid "No VPN plugins are installed." -@@ -3836,14 +3710,12 @@ msgid "Link-Local Only" - msgstr "ローカルへのリンク専用" - - #: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336 --#, fuzzy - msgid "Additional DNS ser_vers" --msgstr "追加の DNS サーバー(_V):" -+msgstr "追加の DNS サーバー(_V)" - - #: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345 --#, fuzzy - msgid "Additional s_earch domains" --msgstr "追加の検索ドメイン(_E):" -+msgstr "追加の検索ドメイン(_E)" - - #: src/connection-editor/page-ip4.c:1033 - #, c-format -@@ -4265,7 +4137,7 @@ msgstr "閉じる(_C)" - - #: src/libnma/nma-bar-code-widget.ui:36 - msgid "Scan with your phone or Print" --msgstr "" -+msgstr "電話でスキャンするか、印刷します" - - #: src/libnma/nma-file-cert-chooser.c:108 - #: src/libnma/nma-pkcs11-cert-chooser.c:152 -@@ -4285,15 +4157,15 @@ msgstr "%s 証明書のキーを選択する" - - #: src/libnma/nma-file-cert-chooser.c:250 - #: src/libnma/nma-pkcs11-cert-chooser.c:386 --#, fuzzy, c-format -+#, c-format - msgid "%s private _key" --msgstr "%s プライベートキー(_K):" -+msgstr "%s プライベートキー(_K)" - - #: src/libnma/nma-file-cert-chooser.c:254 - #: src/libnma/nma-pkcs11-cert-chooser.c:390 --#, fuzzy, c-format -+#, c-format - msgid "%s key _password" --msgstr "%s キーパスワード(_P):" -+msgstr "%s キーパスワード(_P)" - - #: src/libnma/nma-file-cert-chooser.c:258 - #, c-format -@@ -4302,9 +4174,9 @@ msgstr "%s 証明書を選択する" - - #: src/libnma/nma-file-cert-chooser.c:262 - #: src/libnma/nma-pkcs11-cert-chooser.c:398 --#, fuzzy, c-format -+#, c-format - msgid "%s _certificate" --msgstr "%s 証明書(_C):" -+msgstr "%s 証明書(_C)" - - #: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077 - msgid "My country is not listed" -@@ -4372,9 +4244,8 @@ msgid "Set up a Mobile Broadband Connection" - msgstr "モバイルブロードバンド接続のセットアップ" - - #: src/libnma/nma-mobile-wizard.ui:189 --#, fuzzy - msgid "Country or region:" --msgstr "国や地域" -+msgstr "国または地域:" - - #: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127 - msgid "Choose your Provider’s Country or Region" -@@ -4385,9 +4256,8 @@ msgid "Select your provider from a _list:" - msgstr "プロバイダーを一覧から選択(_L):" - - #: src/libnma/nma-mobile-wizard.ui:289 --#, fuzzy - msgid "I can’t find my provider and I wish to set up the connection _manually:" --msgstr "プロバイダーが見つからないので手動で入力します(_M):" -+msgstr "プロバイダーが見つからないので手動で接続を設定します(_M):" - - #: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779 - msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)" -@@ -4502,9 +4372,9 @@ msgid "Choose a %s Certificate" - msgstr "%s 証明書を選択する" - - #: src/libnma/nma-pkcs11-cert-chooser.c:402 --#, fuzzy, c-format -+#, c-format - msgid "%s certificate _password" --msgstr "%s 証明書のパスワード(_P):" -+msgstr "%s 証明書のパスワード(_P)" - - #: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255 - msgid "Error logging in: " -@@ -4636,19 +4506,16 @@ msgstr "" - "接続する Wi-Fi ネットワークの名前とセキュリティー詳細を入力してください。" - - #: src/libnma/wifi.ui:97 --#, fuzzy - msgid "Wi-Fi _security" --msgstr "Wi-Fi セキュリティー(_S):" -+msgstr "Wi-Fi セキュリティー(_S)" - - #: src/libnma/wifi.ui:154 --#, fuzzy - msgid "C_onnection" --msgstr "接続(_O):" -+msgstr "接続(_O)" - - #: src/libnma/wifi.ui:179 --#, fuzzy - msgid "Wi-Fi _adapter" --msgstr "Wi-Fi アダプター(_A):" -+msgstr "Wi-Fi アダプター(_A)" - - #: src/libnm-gtk/nm-mobile-wizard.c:749 - msgid "I can’t find my provider and I wish to enter it _manually:" -@@ -4907,21 +4774,18 @@ msgstr "両方" - #: src/wireless-security/eap-method-fast.ui:48 - #: src/wireless-security/eap-method-peap.ui:48 - #: src/wireless-security/eap-method-ttls.ui:118 --#, fuzzy - msgid "Anony_mous identity" --msgstr "匿名の識別子(_M):" -+msgstr "匿名の識別子(_M)" - - #: src/wireless-security/eap-method-fast.ui:74 --#, fuzzy - msgid "PAC _file" --msgstr "PAC ファイル(_F):" -+msgstr "PAC ファイル(_F)" - - #: src/wireless-security/eap-method-fast.ui:113 - #: src/wireless-security/eap-method-peap.ui:120 - #: src/wireless-security/eap-method-ttls.ui:77 --#, fuzzy - msgid "_Inner authentication" --msgstr "内部認証(_I):" -+msgstr "内部認証(_I)" - - # see http://www.cisco.com/cisco/web/support/JP/100/1005/1005630_eapfast-wlc-rad-config.html#PAC - #: src/wireless-security/eap-method-fast.ui:142 -@@ -4957,9 +4821,8 @@ msgid "No CA certificate is _required" - msgstr "CA 証明書は必要ありません(_R)" - - #: src/wireless-security/eap-method-peap.ui:89 --#, fuzzy - msgid "PEAP _version" --msgstr "PEAP バージョン(_V):" -+msgstr "PEAP バージョン(_V)" - - #: src/wireless-security/eap-method-peap.ui:166 - #: src/wireless-security/eap-method-tls.ui:62 -@@ -4970,9 +4833,8 @@ msgstr "サーバー証明書名のサフィックス" - #: src/wireless-security/eap-method-peap.ui:167 - #: src/wireless-security/eap-method-tls.ui:63 - #: src/wireless-security/eap-method-ttls.ui:133 --#, fuzzy - msgid "_Domain" --msgstr "ドメイン(_D):" -+msgstr "ドメイン(_D)" - - #: src/wireless-security/eap-method-simple.c:90 - msgid "missing EAP username" -@@ -4984,17 +4846,15 @@ msgstr "EAP パスワードがありません" - - #: src/wireless-security/eap-method-simple.c:120 - msgid "missing EAP client Private Key passphrase" --msgstr "" -+msgstr "EAP クライアントの秘密鍵のパスフレーズがありません" - - #: src/wireless-security/eap-method-simple.ui:103 --#, fuzzy - msgid "P_rivate Key Passphrase" --msgstr "WEP 128-bit パスフレーズ" -+msgstr "秘密鍵のパスフレーズ(_R)" - - #: src/wireless-security/eap-method-simple.ui:128 --#, fuzzy - msgid "Sh_ow passphrase" --msgstr "パスワードを表示(_O)" -+msgstr "パスフレーズの表示(_O)" - - #: src/wireless-security/eap-method-tls.c:64 - msgid "missing EAP-TLS identity" -@@ -5019,9 +4879,8 @@ msgstr "選択されたキーファイルは存在しません" - # とりあえずこのように訳しておくが "Identity" のままの方が適切かもしれない。 - # (WPA-EAP Identity 認証方式: ユーザ ID とパスワードの組で認証) - #: src/wireless-security/eap-method-tls.ui:20 --#, fuzzy - msgid "I_dentity" --msgstr "アイデンティティー(_D):" -+msgstr "ID(_D)" - - #: src/wireless-security/eap-method-ttls.c:337 - msgid "MSCHAPv2 (no EAP)" -@@ -5053,14 +4912,13 @@ msgstr "保護つき EAP (PEAP)" - - #: src/wireless-security/wireless-security.c:523 - msgid "Externally configured" --msgstr "" -+msgstr "外部で設定" - - #: src/wireless-security/ws-dynamic-wep.ui:31 - #: src/wireless-security/ws-wep-key.ui:97 - #: src/wireless-security/ws-wpa-eap.ui:31 --#, fuzzy - msgid "Au_thentication" --msgstr "認証(_T):" -+msgstr "認証(_T)" - - #: src/wireless-security/ws-leap.c:64 - msgid "missing leap-username" -@@ -5115,18 +4973,16 @@ msgid "1 (Default)" - msgstr "1 (デフォルト)" - - #: src/wireless-security/ws-wep-key.ui:54 --#, fuzzy - msgid "_Key" --msgstr "キー(_K):" -+msgstr "キー(_K)" - - #: src/wireless-security/ws-wep-key.ui:80 - msgid "Sho_w key" - msgstr "キーを表示(_W)" - - #: src/wireless-security/ws-wep-key.ui:129 --#, fuzzy - msgid "WEP inde_x" --msgstr "WEP インデックス(_X):" -+msgstr "WEP インデックス(_X)" - - #: src/wireless-security/ws-wpa-psk.c:76 - #, c-format -@@ -5142,43 +4998,5 @@ msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" - msgstr "無効な wpa-psk: 16 進数の 64 バイトでキーを解釈できません" - - #: src/wireless-security/ws-wpa-psk.ui:48 --#, fuzzy - msgid "_Type" --msgstr "タイプ(_T):" -- --#~ msgid "%s (default)" --#~ msgstr "%s (デフォルト)" -- --#~ msgid "Ignored" --#~ msgstr "無視" -- --#~ msgid "Active Network Connections" --#~ msgstr "有効なネットワーク接続" -- --#~ msgid "Failed to update connection secrets due to an unknown error." --#~ msgstr "不明なエラーのため、接続シークレットを更新できませんでした。" -- --#~ msgid "Priority:" --#~ msgstr "優先度:" -- --#~ msgid "_Automatically connect to this network when it is available" --#~ msgstr "この接続が利用可能になったときに自動的に接続する(_A)" -- --#~ msgid "Connection _priority for auto-activation:" --#~ msgstr "自動アクティベーションの接続優先度(_P)" -- --#~ msgid "Cannot import VPN connection" --#~ msgstr "VPN 接続をインポートできません" -- --#~ msgid "" --#~ "The file “%s” could not be read or does not contain recognized VPN " --#~ "connection information\n" --#~ "\n" --#~ "Error: %s." --#~ msgstr "" --#~ "ファイル '%s' が読み込めなかったか、認識される VPN 接続情報がありません\n" --#~ "\n" --#~ "エラー: %s" -- --#~ msgid "unknown error" --#~ msgstr "不明なエラー" -+msgstr "種類(_T)" -diff --git a/po/ko.po b/po/ko.po -index 505e6402..b89dd452 100644 ---- a/po/ko.po -+++ b/po/ko.po -@@ -17,14 +17,14 @@ - # - VPN은 "가상 사설망"으로 풀어서 번역 - # - bond는 "본딩"으로 번역 (여러 네트워크를 묶어서 사용) - # - bridged network는 "브릿지 네트워크"로 번역 --# lrintel , 2017. #zanata -+# ljanda , 2019. #zanata - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: network-manager-applet 1.8.22\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-" - "applet/\n" --"POT-Creation-Date: 2019-05-29 11:09+0200\n" --"PO-Revision-Date: 2017-11-07 06:44+0000\n" -+"POT-Creation-Date: 2019-08-15 18:52+0200\n" -+"PO-Revision-Date: 2019-08-13 10:26+0000\n" - "Last-Translator: Copied by Zanata \n" - "Language-Team: GNOME Korea \n" - "Language: ko\n" -@@ -32,7 +32,7 @@ msgstr "" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" --"X-Generator: Zanata 4.3.2\n" -+"X-Generator: Zanata 4.6.2\n" - - #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 - #: src/libnma/nma-bar-code-widget.c:144 -@@ -5159,44 +5159,3 @@ msgstr "" - #, fuzzy - msgid "_Type" - msgstr "형식(_T):" -- --#~ msgid "%s (default)" --#~ msgstr "%s (기본값)" -- --#~ msgid "Ignored" --#~ msgstr "무시함" -- --#~ msgid "Active Network Connections" --#~ msgstr "사용 중인 네트워크 연결" -- --#~ msgid "Failed to update connection secrets due to an unknown error." --#~ msgstr "알려지지 않은 오류로 비밀 정보를 업데이트하는 데 실패했습니다." -- --#~ msgid "Priority:" --#~ msgstr "우선 순위:" -- --#~ msgid "_Automatically connect to this network when it is available" --#~ msgstr "사용 가능하면 자동으로 이 네트워크에 연결(_A)" -- --#, fuzzy --#~ msgid "Connection _priority for auto-activation:" --#~ msgstr "연결 정보(_I)" -- --#~ msgid "Cannot import VPN connection" --#~ msgstr "가상 사설망 연결을 가져올 수 없음" -- --#, fuzzy --#~ msgid "" --#~ "The file “%s” could not be read or does not contain recognized VPN " --#~ "connection information\n" --#~ "\n" --#~ "Error: %s." --#~ msgstr "" --#~ "'%s' 파일을 읽을 수 없거나, 파일안에 알아볼 수 있는 가상 사설망 연결 정보" --#~ "가 없습니다.\n" --#~ "\n" --#~ "오류: %s." -- --#, fuzzy --#~ msgid "unknown error" --#~ msgstr "알 수 없는 오류" -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 58b48b07..b297e0d0 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -12,15 +12,16 @@ - # Edison Zhao , 2011. - # EL8LatSPQ , 2012. - # YunQiang Su , 2012. --# lrintel , 2017. #zanata -+# ljanda , 2019. #zanata -+# tfu , 2019. #zanata - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" -+"Project-Id-Version: network-manager-applet 1.8.22\n" - "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/network-manager-" - "applet/\n" --"POT-Creation-Date: 2019-05-29 11:09+0200\n" --"PO-Revision-Date: 2017-11-07 06:44+0000\n" --"Last-Translator: Copied by Zanata \n" -+"POT-Creation-Date: 2019-08-15 18:52+0200\n" -+"PO-Revision-Date: 2019-08-15 01:36+0000\n" -+"Last-Translator: tfu \n" - "Language-Team: Chinese (simplified) \n" - "Language: zh_CN\n" - "MIME-Version: 1.0\n" -@@ -28,7 +29,7 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" - "X-Launchpad-Export-Date: 2016-03-22 13:39+0000\n" --"X-Generator: Zanata 4.3.2\n" -+"X-Generator: Zanata 4.6.2\n" - - #: nm-applet.desktop.in:3 src/applet.c:3196 src/applet-dialogs.c:737 - #: src/libnma/nma-bar-code-widget.c:144 -@@ -41,12 +42,11 @@ msgstr "管理网络连接" - - #: nm-applet.desktop.in:5 - msgid "nm-device-wireless" --msgstr "" -+msgstr "nm-device-wireless" - - #: nm-connection-editor.desktop.in:3 --#, fuzzy - msgid "Advanced Network Configuration" --msgstr "活动的网络连接" -+msgstr "高级网络配置" - - #: nm-connection-editor.desktop.in:4 - msgid "Manage and change your network connection settings" -@@ -54,7 +54,7 @@ msgstr "管理或更改您的网络连接设置" - - #: nm-connection-editor.desktop.in:5 - msgid "preferences-system-network" --msgstr "" -+msgstr "preferences-system-network" - - #: org.gnome.nm-applet.gschema.xml.in:6 - msgid "Disable connected notifications" -@@ -101,9 +101,8 @@ msgid "Used to determine whether settings should be migrated to a new version." - msgstr "用于决定设置是否应被迁移至一个新版本。" - - #: org.gnome.nm-applet.gschema.xml.in:31 --#, fuzzy - msgid "Disable WiFi Create" --msgstr "禁用 Wi-Fi 建立" -+msgstr "禁用 Wi-Fi 创建" - - #: org.gnome.nm-applet.gschema.xml.in:32 - msgid "" -@@ -223,9 +222,8 @@ msgid "C_onnect" - msgstr "连接(_O)" - - #: src/8021x.ui:122 src/libnma/wifi.ui:129 --#, fuzzy - msgid "_Network name" --msgstr "网络名称(_N):" -+msgstr "网络名称(_N)" - - #: src/ap-menu-item.c:82 - msgid "ad-hoc" -@@ -856,18 +854,16 @@ msgid "Subnet Mask" - msgstr "子网掩码" - - #: src/applet-dialogs.c:440 --#, fuzzy - msgid "Primary DNS" --msgstr "主要(_P):" -+msgstr "主 DNS" - - #: src/applet-dialogs.c:440 --#, fuzzy - msgid "Secondary DNS" --msgstr "次要密码(_S):" -+msgstr "二级 DNS" - - #: src/applet-dialogs.c:440 - msgid "Tertiary DNS" --msgstr "" -+msgstr "三级 DNS" - - #: src/applet-dialogs.c:519 - #, c-format -@@ -915,9 +911,8 @@ msgid "Speed" - msgstr "速度" - - #: src/applet-dialogs.c:616 --#, fuzzy - msgid "Security" --msgstr "安全性:" -+msgstr "安全性" - - #. --- IPv4 --- - #: src/applet-dialogs.c:641 src/applet-dialogs.c:904 -@@ -939,9 +934,8 @@ msgid "Hotspot" - msgstr "热点" - - #: src/applet-dialogs.c:748 src/libnma/nma-bar-code-widget.c:161 --#, fuzzy - msgid "Password" --msgstr "密码:" -+msgstr "密码" - - #: src/applet-dialogs.c:878 - msgid "VPN Type" -@@ -1175,9 +1169,8 @@ msgstr "" - #: src/connection-editor/ce-page-ethernet.ui:129 - #: src/connection-editor/ce-page-infiniband.ui:50 - #: src/connection-editor/ce-page-wifi.ui:139 --#, fuzzy - msgid "_Device" --msgstr "设备(_D):" -+msgstr "设备(_D)" - - #: src/connection-editor/ce-page-bond.ui:24 - #: src/connection-editor/ce-page-team.ui:433 -@@ -1219,15 +1212,13 @@ msgid "ARP" - msgstr "ARP" - - #: src/connection-editor/ce-page-bond.ui:91 --#, fuzzy - msgid "Bonded _connections" --msgstr "已绑定连接(_C):" -+msgstr "绑定的连接(_c):" - - #: src/connection-editor/ce-page-bond.ui:105 - #: src/connection-editor/ce-page-wifi.ui:400 --#, fuzzy - msgid "M_ode" --msgstr "模式(_O):" -+msgstr "模式(_o):" - - #: src/connection-editor/ce-page-bond.ui:194 - #: src/connection-editor/ce-page-bridge.ui:134 -@@ -1237,9 +1228,8 @@ msgid "_Edit" - msgstr "编辑(_E)" - - #: src/connection-editor/ce-page-bond.ui:238 --#, fuzzy - msgid "Monitoring _frequency" --msgstr "监控频率(_F):" -+msgstr "监控频率(_f):" - - #: src/connection-editor/ce-page-bond.ui:272 - #: src/connection-editor/ce-page-bond.ui:422 -@@ -1250,19 +1240,16 @@ msgstr "毫秒" - #: src/connection-editor/ce-page-bond.ui:291 - #: src/connection-editor/ce-page-bridge.ui:192 - #: src/connection-editor/ce-page-team.ui:292 --#, fuzzy - msgid "_Interface name" - msgstr "接口名称(_I):" - - #: src/connection-editor/ce-page-bond.ui:316 --#, fuzzy - msgid "_Link Monitoring" - msgstr "链路监视(_L):" - - #: src/connection-editor/ce-page-bond.ui:347 --#, fuzzy - msgid "ARP _targets" --msgstr "ARP 目标(_T):" -+msgstr "ARP 目标(_t):" - - #: src/connection-editor/ce-page-bond.ui:361 - msgid "" -@@ -1271,19 +1258,16 @@ msgid "" - msgstr "检测连接状态时使用的 IP 地址,或以逗号分隔的 IP 地址列表。" - - #: src/connection-editor/ce-page-bond.ui:373 --#, fuzzy - msgid "Link _up delay" --msgstr "链接建立延时(_U):" -+msgstr "链接建立延时(_u)" - - #: src/connection-editor/ce-page-bond.ui:387 --#, fuzzy - msgid "Link _down delay" --msgstr "链接断开延时(_D):" -+msgstr "链接断开延时(_d)" - - #: src/connection-editor/ce-page-bond.ui:481 --#, fuzzy - msgid "_Primary" --msgstr "主要(_P):" -+msgstr "主要(_P)" - - #: src/connection-editor/ce-page-bond.ui:495 - msgid "" -@@ -1297,9 +1281,8 @@ msgstr "主设备的接口名称。如果设置,在此设备可用时将一直 - #: src/connection-editor/ce-page-team.ui:319 - #: src/connection-editor/ce-page-vlan.ui:87 - #: src/connection-editor/ce-page-wifi.ui:111 --#, fuzzy - msgid "_MTU" --msgstr "_MTU:" -+msgstr "_MTU" - - #: src/connection-editor/ce-page-bond.ui:540 - #: src/connection-editor/ce-page-ethernet.ui:223 -@@ -1311,35 +1294,29 @@ msgid "bytes" - msgstr "字节" - - #: src/connection-editor/ce-page-bridge-port.ui:42 --#, fuzzy - msgid "Path _cost" --msgstr "路径成本(_C):" -+msgstr "路径成本(_c)" - - #: src/connection-editor/ce-page-bridge-port.ui:55 - #: src/connection-editor/ce-page-bridge.ui:178 --#, fuzzy - msgid "_Priority" --msgstr "优先级(_P):" -+msgstr "优先级(_P)" - - #: src/connection-editor/ce-page-bridge-port.ui:97 --#, fuzzy - msgid "_Hairpin mode" --msgstr "_Hairpin 模式:" -+msgstr "_Hairpin 模式" - - #: src/connection-editor/ce-page-bridge.ui:62 --#, fuzzy - msgid "Bridged _connections" --msgstr "桥接连接(_C):" -+msgstr "桥接连接(_c)" - - #: src/connection-editor/ce-page-bridge.ui:218 --#, fuzzy - msgid "_Forward delay" --msgstr "转发延时(_F):" -+msgstr "转发延时(_F)" - - #: src/connection-editor/ce-page-bridge.ui:232 --#, fuzzy - msgid "_Hello time" --msgstr "问候时间(_H):" -+msgstr "问候时间(_H)" - - #: src/connection-editor/ce-page-bridge.ui:252 - msgid "STP forwarding delay, in seconds" -@@ -1385,18 +1362,16 @@ msgid "" - msgstr "STP优先这座桥。较低的值是“更好”;优先级最低的桥将被选为根桥。" - - #: src/connection-editor/ce-page-bridge.ui:378 --#, fuzzy - msgid "_Max age" --msgstr "最大老化时间(_M):" -+msgstr "最大老化时间(_M)" - - #: src/connection-editor/ce-page-bridge.ui:398 - msgid "STP maximum message age, in seconds" - msgstr "STP最大消息年龄,单位为秒" - - #: src/connection-editor/ce-page-bridge.ui:434 --#, fuzzy - msgid "_Aging time" --msgstr "老化时间(_A):" -+msgstr "老化时间(_A)" - - #: src/connection-editor/ce-page-bridge.ui:454 - msgid "The Ethernet MAC address aging time, in seconds" -@@ -1404,7 +1379,7 @@ msgstr "以太网MAC地址老化时间,以秒" - - #: src/connection-editor/ce-page-bridge.ui:490 - msgid "Group _forward mask" --msgstr "" -+msgstr "组转发掩码( _f)" - - #: src/connection-editor/ce-page-bridge.ui:504 - msgid "" -@@ -1585,9 +1560,8 @@ msgstr "对每个用户优先级启用或禁用按优先级暂停传输。" - #: src/connection-editor/ce-page-dcb.ui:1822 - #: src/connection-editor/ce-page-dcb.ui:2154 - #: src/connection-editor/ce-page-dcb.ui:2486 --#, fuzzy - msgid "0" --msgstr "0:" -+msgstr "0" - - #: src/connection-editor/ce-page-dcb.ui:694 - #: src/connection-editor/ce-page-dcb.ui:1135 -@@ -1595,9 +1569,8 @@ msgstr "0:" - #: src/connection-editor/ce-page-dcb.ui:1862 - #: src/connection-editor/ce-page-dcb.ui:2194 - #: src/connection-editor/ce-page-dcb.ui:2536 --#, fuzzy - msgid "1" --msgstr "1:" -+msgstr "1" - - #: src/connection-editor/ce-page-dcb.ui:735 - #: src/connection-editor/ce-page-dcb.ui:1184 -@@ -1605,9 +1578,8 @@ msgstr "1:" - #: src/connection-editor/ce-page-dcb.ui:1902 - #: src/connection-editor/ce-page-dcb.ui:2234 - #: src/connection-editor/ce-page-dcb.ui:2586 --#, fuzzy - msgid "2" --msgstr "2:" -+msgstr "2" - - #: src/connection-editor/ce-page-dcb.ui:776 - #: src/connection-editor/ce-page-dcb.ui:1233 -@@ -1615,9 +1587,8 @@ msgstr "2:" - #: src/connection-editor/ce-page-dcb.ui:1942 - #: src/connection-editor/ce-page-dcb.ui:2274 - #: src/connection-editor/ce-page-dcb.ui:2636 --#, fuzzy - msgid "3" --msgstr "3:" -+msgstr "3" - - #: src/connection-editor/ce-page-dcb.ui:817 - #: src/connection-editor/ce-page-dcb.ui:1282 -@@ -1625,9 +1596,8 @@ msgstr "3:" - #: src/connection-editor/ce-page-dcb.ui:1982 - #: src/connection-editor/ce-page-dcb.ui:2314 - #: src/connection-editor/ce-page-dcb.ui:2686 --#, fuzzy - msgid "4" --msgstr "4:" -+msgstr "4" - - #: src/connection-editor/ce-page-dcb.ui:858 - #: src/connection-editor/ce-page-dcb.ui:1331 -@@ -1635,9 +1605,8 @@ msgstr "4:" - #: src/connection-editor/ce-page-dcb.ui:2022 - #: src/connection-editor/ce-page-dcb.ui:2354 - #: src/connection-editor/ce-page-dcb.ui:2736 --#, fuzzy - msgid "5" --msgstr "5:" -+msgstr "5" - - #: src/connection-editor/ce-page-dcb.ui:899 - #: src/connection-editor/ce-page-dcb.ui:1380 -@@ -1645,9 +1614,8 @@ msgstr "5:" - #: src/connection-editor/ce-page-dcb.ui:2062 - #: src/connection-editor/ce-page-dcb.ui:2394 - #: src/connection-editor/ce-page-dcb.ui:2786 --#, fuzzy - msgid "6" --msgstr "6:" -+msgstr "6" - - #: src/connection-editor/ce-page-dcb.ui:940 - #: src/connection-editor/ce-page-dcb.ui:1429 -@@ -1655,34 +1623,28 @@ msgstr "6:" - #: src/connection-editor/ce-page-dcb.ui:2102 - #: src/connection-editor/ce-page-dcb.ui:2434 - #: src/connection-editor/ce-page-dcb.ui:2836 --#, fuzzy - msgid "7" --msgstr "7:" -+msgstr "7" - - #: src/connection-editor/ce-page-dcb.ui:1069 --#, fuzzy - msgid "Traffic Class" --msgstr "流量等级:" -+msgstr "流量等级" - - #: src/connection-editor/ce-page-dcb.ui:1473 --#, fuzzy - msgid "Strict Bandwidth" --msgstr "严格带宽:" -+msgstr "严格带宽" - - #: src/connection-editor/ce-page-dcb.ui:1805 --#, fuzzy - msgid "Priority Bandwidth" --msgstr "优先级带宽:" -+msgstr "优先级带宽" - - #: src/connection-editor/ce-page-dcb.ui:2137 --#, fuzzy - msgid "Group Bandwidth" --msgstr "组带宽:" -+msgstr "组带宽" - - #: src/connection-editor/ce-page-dcb.ui:2469 --#, fuzzy - msgid "Group ID" --msgstr "组标识:" -+msgstr "组 ID" - - #: src/connection-editor/ce-page-dcb.ui:2881 - msgid "Enter the priority group ID for each User Priority." -@@ -1713,9 +1675,8 @@ msgstr "为各个 用户优先级 输入流量等级。" - #: src/wireless-security/eap-method-leap.ui:21 - #: src/wireless-security/eap-method-simple.ui:21 - #: src/wireless-security/ws-leap.ui:21 --#, fuzzy - msgid "_Username" --msgstr "用户名(_U):" -+msgstr "用户名(_U)" - - #: src/connection-editor/ce-page-dsl.ui:33 - msgid "Username used to authenticate with the PPPoE service." -@@ -1728,9 +1689,8 @@ msgid "" - msgstr "只有启动与接入集中器可提供指定服务会话。对于大多数供应商这应该是空白。" - - #: src/connection-editor/ce-page-dsl.ui:59 --#, fuzzy - msgid "_Service" --msgstr "服务(_S):" -+msgstr "服务(_S)" - - #: src/connection-editor/ce-page-dsl.ui:71 - #: src/libnma/nma-file-cert-chooser.c:347 -@@ -1749,32 +1709,28 @@ msgstr "用于 PPPoE 服务验证的密码。" - #: src/wireless-security/eap-method-leap.ui:35 - #: src/wireless-security/eap-method-simple.ui:35 - #: src/wireless-security/ws-leap.ui:35 src/wireless-security/ws-wpa-psk.ui:20 --#, fuzzy - msgid "_Password" --msgstr "密码(_P):" -+msgstr "密码(_P)" - - #: src/connection-editor/ce-page-dsl.ui:116 --#, fuzzy - msgid "PPP _interface" --msgstr "上级接口(_P):" -+msgstr "PPP 接口(_i):" - - #: src/connection-editor/ce-page-dsl.ui:130 --#, fuzzy - msgid "P_arent interface" --msgstr "上级接口(_P):" -+msgstr "上级接口(_P)" - - #: src/connection-editor/ce-page-dsl.ui:144 - msgid "An arbitrary name to assign to the newly created PPP interface." --msgstr "的任意名称分配给新创建的PPP接口。" -+msgstr "分配给新创建的PPP接口的任意名称。" - - #: src/connection-editor/ce-page-dsl.ui:160 - msgid "The interface on which the PPP connection will be established." - msgstr "在其上PPP连接将被建立的接口。" - - #: src/connection-editor/ce-page-dsl.ui:171 --#, fuzzy - msgid "C_laim interface" --msgstr "上级接口(_P):" -+msgstr "声明接口(_l)" - - #: src/connection-editor/ce-page-dsl.ui:175 - msgid "" -@@ -1783,6 +1739,8 @@ msgid "" - "option can only be used for Ethernet interfaces. nm-applet is able to " - "activate the connection only if this option is selected." - msgstr "" -+"如果选择,连接将会完全控制此端口,其他连接不会在这个端口上被激活。请注意,这" -+"个选择只适用于以太网接口。只有在选择了这个选项时 nm-applet 才可以激活连接。" - - #: src/connection-editor/ce-page-ethernet.ui:17 - #: src/connection-editor/ce-page-ethernet.ui:77 -@@ -1849,20 +1807,17 @@ msgid "Manual" - msgstr "手动" - - #: src/connection-editor/ce-page-ethernet.ui:97 --#, fuzzy - msgid "_Port" --msgstr "端口(_P):" -+msgstr "端口(_P)" - - #: src/connection-editor/ce-page-ethernet.ui:156 - #: src/connection-editor/ce-page-wifi.ui:169 --#, fuzzy - msgid "C_loned MAC address" --msgstr "克隆 MAC 地址(_L):" -+msgstr "克隆 MAC 地址(_L)" - - #: src/connection-editor/ce-page-ethernet.ui:242 --#, fuzzy - msgid "Wake on LAN" --msgstr "私钥密码(_P):" -+msgstr "LAN 唤醒" - - #: src/connection-editor/ce-page-ethernet.ui:258 - msgid "De_fault" -@@ -1897,9 +1852,8 @@ msgid "Ma_gic" - msgstr "Ma_gic" - - #: src/connection-editor/ce-page-ethernet.ui:388 --#, fuzzy - msgid "_Wake on LAN password" --msgstr "私钥密码(_P):" -+msgstr "LAN 唤醒密码(_W)" - - #: src/connection-editor/ce-page-ethernet.ui:402 - msgid "" -@@ -1908,7 +1862,7 @@ msgstr "网络唤醒密码(以太网MAC)。它仅适用于魔术包。" - - #: src/connection-editor/ce-page-ethernet.ui:414 - msgid "Lin_k negotiation" --msgstr "" -+msgstr "连接谈判(_k)" - - #: src/connection-editor/ce-page-ethernet.ui:428 - msgid "" -@@ -1920,9 +1874,8 @@ msgstr "" - "制。如果不确定,离开这里“忽略”或选择“自动”。" - - #: src/connection-editor/ce-page-ethernet.ui:448 --#, fuzzy - msgid "_Speed" --msgstr "速度(_S):" -+msgstr "速度(_S)" - - #: src/connection-editor/ce-page-ethernet.ui:462 - msgid "" -@@ -1934,9 +1887,8 @@ msgstr "" - "在你的设备支持它。" - - #: src/connection-editor/ce-page-ethernet.ui:482 --#, fuzzy - msgid "Duple_x" --msgstr "全双工(_X)" -+msgstr "双工(_X)" - - #: src/connection-editor/ce-page-ethernet.ui:496 - msgid "" -@@ -1949,31 +1901,27 @@ msgstr "" - - #: src/connection-editor/ce-page-general.ui:29 - msgid "Yes" --msgstr "" -+msgstr "是" - - #: src/connection-editor/ce-page-general.ui:32 --#, fuzzy - msgid "No" --msgstr "无" -+msgstr "否" - - #: src/connection-editor/ce-page-general.ui:65 - msgid "All _users may connect to this network" --msgstr "所有用户都可以连接这个网络(_U)" -+msgstr "所有用户都可以连接这个网络(_u)" - - #: src/connection-editor/ce-page-general.ui:80 --#, fuzzy - msgid "Automatically connect to _VPN" --msgstr "使用此连接时自动连接 _VPN" -+msgstr "自动连接到 VPN(_V)" - - #: src/connection-editor/ce-page-general.ui:96 --#, fuzzy - msgid "Firewall _zone" --msgstr "防火墙区(_Z):" -+msgstr "防火墙区(_z)" - - #: src/connection-editor/ce-page-general.ui:121 --#, fuzzy - msgid "_Metered connection" --msgstr "已组队的连接(_T):" -+msgstr "记费的连接(_M)" - - #: src/connection-editor/ce-page-general.ui:134 - msgid "" -@@ -1982,11 +1930,12 @@ msgid "" - "“No”) to indicate to applications, or “Automatic” to use a default value " - "based on the connection type and other heuristics." - msgstr "" -+"NetworkManager 向应用程序指示连接是否被记费,数据的使用应该被限制。选择 " -+"“Yes” 或 “No”,或选择 “Automatic” 来根据连接类型及其他情况使用默认设置。" - - #: src/connection-editor/ce-page-general.ui:150 --#, fuzzy - msgid "Connect _automatically with priority" --msgstr "忽略自动获取的路由(_N)" -+msgstr "根据优先级自动连接(_a)" - - #: src/connection-editor/ce-page-general.ui:167 - msgid "" -@@ -2038,9 +1987,8 @@ msgid "Connected" - msgstr "已连接" - - #: src/connection-editor/ce-page-infiniband.ui:37 --#, fuzzy - msgid "_Transport mode" --msgstr "传输模式(_T):" -+msgstr "传输模式(_T)" - - #: src/connection-editor/ce-page-ip-tunnel.ui:17 - msgid "IPIP" -@@ -2080,41 +2028,38 @@ msgstr "VTI6" - - #: src/connection-editor/ce-page-ip-tunnel.ui:61 - #: src/connection-editor/ce-page-macsec.ui:58 --#, fuzzy - msgid "Device name" --msgstr "设备名称 + 编号" -+msgstr "设备名称" - - #: src/connection-editor/ce-page-ip-tunnel.ui:85 - #: src/connection-editor/ce-page-macsec.ui:83 --#, fuzzy - msgid "Parent device" --msgstr "以太网设备" -+msgstr "上级设备" - - #: src/connection-editor/ce-page-ip-tunnel.ui:115 - #: src/connection-editor/ce-page-macsec.ui:180 - msgid "Mode" --msgstr "" -+msgstr "模式" - - #: src/connection-editor/ce-page-ip-tunnel.ui:128 - msgid "Local IP" --msgstr "" -+msgstr "本地 IP" - - #: src/connection-editor/ce-page-ip-tunnel.ui:140 - msgid "Remote IP" --msgstr "" -+msgstr "远程 IP" - - #: src/connection-editor/ce-page-ip-tunnel.ui:152 - msgid "Input key" --msgstr "" -+msgstr "输入密钥" - - #: src/connection-editor/ce-page-ip-tunnel.ui:164 - msgid "Output key" --msgstr "" -+msgstr "输出密钥" - - #: src/connection-editor/ce-page-ip-tunnel.ui:245 --#, fuzzy - msgid "MTU" --msgstr "_MTU:" -+msgstr "MTU" - - #: src/connection-editor/ce-page-ip4.ui:15 - #: src/connection-editor/ce-page-ip6.ui:15 -@@ -2134,9 +2079,8 @@ msgstr "与其它计算机共享" - - #: src/connection-editor/ce-page-ip4.ui:47 - #: src/connection-editor/ce-page-ip6.ui:78 --#, fuzzy - msgid "_Method" --msgstr "方法(_M):" -+msgstr "方法(_M)" - - #: src/connection-editor/ce-page-ip4.ui:202 - msgid "" -@@ -2155,23 +2099,20 @@ msgid "" - msgstr "解析主机名时使用的域。用逗号分隔多个域。" - - #: src/connection-editor/ce-page-ip4.ui:228 --#, fuzzy - msgid "D_HCP client ID" --msgstr "D_HCP 客户端 ID:" -+msgstr "D_HCP 客户端 ID" - - #: src/connection-editor/ce-page-ip4.ui:242 - #: src/connection-editor/ce-page-ip6.ui:246 - #: src/connection-editor/page-ip4.c:373 src/connection-editor/page-ip6.c:347 --#, fuzzy - msgid "S_earch domains" --msgstr "搜索域(_E):" -+msgstr "搜索域(_e)" - - #: src/connection-editor/ce-page-ip4.ui:256 - #: src/connection-editor/ce-page-ip6.ui:260 - #: src/connection-editor/page-ip4.c:364 src/connection-editor/page-ip6.c:338 --#, fuzzy - msgid "DNS ser_vers" --msgstr "_DNS 服务器:" -+msgstr "_DNS 服务器" - - #: src/connection-editor/ce-page-ip4.ui:270 - msgid "" -@@ -2228,13 +2169,12 @@ msgstr "" - "地址会自动配置到连接中的接口。" - - #: src/connection-editor/ce-page-ip6.ui:287 --#, fuzzy - msgid "IPv6 _privacy extensions" --msgstr "IPv6 隐私扩展(_P):" -+msgstr "IPv6 隐私扩展(_p)" - - #: src/connection-editor/ce-page-ip6.ui:319 - msgid "IPv6 address _generation mode" --msgstr "" -+msgstr "IPv6 地址产生模式(_g)" - - #: src/connection-editor/ce-page-ip6.ui:356 - msgid "Require IPv_6 addressing for this connection to complete" -@@ -2300,27 +2240,27 @@ msgstr "" - - #: src/connection-editor/ce-page-macsec.ui:154 - msgid "CKN" --msgstr "" -+msgstr "CKN" - - #: src/connection-editor/ce-page-macsec.ui:167 - msgid "CAK" --msgstr "" -+msgstr "CAK" - - #: src/connection-editor/ce-page-macsec.ui:191 - msgid "Keys" --msgstr "" -+msgstr "Key" - - #: src/connection-editor/ce-page-macsec.ui:207 - msgid "Parameters" --msgstr "" -+msgstr "参数" - - #: src/connection-editor/ce-page-macsec.ui:224 - msgid "Validation" --msgstr "" -+msgstr "验证" - - #: src/connection-editor/ce-page-macsec.ui:236 - msgid "SCI port" --msgstr "" -+msgstr "SCI 端口" - - #: src/connection-editor/ce-page-macsec.ui:247 - msgid "Specifies the validation mode for incoming frames" -@@ -2344,50 +2284,45 @@ msgid "Basic" - msgstr "基本" - - #: src/connection-editor/ce-page-mobile.ui:48 --#, fuzzy - msgid "Nu_mber" --msgstr "编号(_M):" -+msgstr "编号(_m)" - - #: src/connection-editor/ce-page-mobile.ui:142 - msgid "Advanced" - msgstr "高级" - - #: src/connection-editor/ce-page-mobile.ui:165 --#, fuzzy - msgid "_APN" --msgstr "_APN:" -+msgstr "_APN" - - #: src/connection-editor/ce-page-mobile.ui:179 --#, fuzzy - msgid "N_etwork ID" --msgstr "网络 ID (_E):" -+msgstr "网络 ID (_e)" - - #: src/connection-editor/ce-page-mobile.ui:221 - msgid "Change…" - msgstr "更改..." - - #: src/connection-editor/ce-page-mobile.ui:242 --#, fuzzy - msgid "P_IN" - msgstr "P_IN:" - - #: src/connection-editor/ce-page-mobile.ui:266 - msgid "Allow _roaming if home network is not available" --msgstr "如果主网络不可用则允许漫游(_R)" -+msgstr "如果主网络不可用则允许漫游(_r)" - - #: src/connection-editor/ce-page-mobile.ui:303 - #: src/libnma/nma-pkcs11-cert-chooser.c:454 - msgid "Sho_w passwords" --msgstr "显示密码(_W)" -+msgstr "显示密码(_w)" - - #: src/connection-editor/ce-page-ppp.ui:24 - msgid "Authentication" - msgstr "认证" - - #: src/connection-editor/ce-page-ppp.ui:53 --#, fuzzy - msgid "Allowed methods" --msgstr "允许的方法:" -+msgstr "允许的方法" - - #: src/connection-editor/ce-page-ppp.ui:89 - msgid "Configure _Methods…" -@@ -2444,11 +2379,11 @@ msgstr "使用仅用于浏览器客户端/方案此代理配置。" - - #: src/connection-editor/ce-page-proxy.ui:52 - msgid "PAC URL" --msgstr "" -+msgstr "PAC URL" - - #: src/connection-editor/ce-page-proxy.ui:64 - msgid "PAC script" --msgstr "" -+msgstr "PAC 脚本" - - #: src/connection-editor/ce-page-proxy.ui:76 - msgid "URL from where the PAC script is to be obtained." -@@ -2459,9 +2394,8 @@ msgid "Import script from a file…" - msgstr "从一个文件中导入脚本..." - - #: src/connection-editor/ce-page-proxy.ui:101 --#, fuzzy - msgid "Method" --msgstr "方法(_M):" -+msgstr "方法" - - #: src/connection-editor/ce-page-team-port.ui:47 - #: src/connection-editor/ce-page-team.ui:400 -@@ -2494,14 +2428,14 @@ msgstr "管理团队高级选项" - - #: src/connection-editor/ce-page-team-port.ui:225 - msgid "_Queue ID" --msgstr "" -+msgstr "队列 ID(_Q)" - - #: src/connection-editor/ce-page-team-port.ui:239 - #: src/connection-editor/ce-page-team.ui:662 - msgid "" - "Number of bursts of unsolicited NAs and gratuitous ARP packets sent after " - "port is enabled or disabled." --msgstr "不请自来的港定居人士及港后发送免费ARP报文的突发数启用或禁用。" -+msgstr "在端口被启用或禁用后,发送的未请求的 NA 和免费ARP数据包的数量。" - - #: src/connection-editor/ce-page-team-port.ui:241 - msgid "ID of queue which this port should be mapped to." -@@ -2512,9 +2446,8 @@ msgid "Active-Backup runner options" - msgstr "有源备份选项亚军" - - #: src/connection-editor/ce-page-team-port.ui:271 --#, fuzzy - msgid "_Port priority" --msgstr "优先级(_P):" -+msgstr "优先级(_P)" - - #: src/connection-editor/ce-page-team-port.ui:284 - #: src/connection-editor/ce-page-team.ui:712 -@@ -2529,25 +2462,23 @@ msgstr "端口优先级。该数字越大,意味着更高的优先级。" - - #: src/connection-editor/ce-page-team-port.ui:297 - msgid "Port _sticky" --msgstr "端口_sticky" -+msgstr "端口粘连 (_s)" - - #: src/connection-editor/ce-page-team-port.ui:301 - msgid "Do not unselect the port if a better one becomes available." --msgstr "" -+msgstr "在一个更好的可用时不取消选择端口" - - #: src/connection-editor/ce-page-team-port.ui:316 - msgid "LACP runner options" --msgstr "LACP亚军选项" -+msgstr "LACP runner 选项" - - #: src/connection-editor/ce-page-team-port.ui:332 --#, fuzzy - msgid "_LACP port priority" --msgstr "优先级(_P):" -+msgstr "_LACP 端口优先级" - - #: src/connection-editor/ce-page-team-port.ui:346 --#, fuzzy - msgid "LACP port _key" --msgstr "私钥(_K):" -+msgstr "LACP 端口 _key" - - #: src/connection-editor/ce-page-team-port.ui:359 - #: src/connection-editor/ce-page-team.ui:675 -@@ -2578,47 +2509,42 @@ msgstr "根据LACP标准端口关键。它只能使用相同的密钥来聚合 - #: src/connection-editor/ce-page-team-port.ui:416 - #: src/connection-editor/ce-page-team.ui:1142 - msgid "_Link watcher" --msgstr "" -+msgstr "_Link watcher" - - #: src/connection-editor/ce-page-team-port.ui:431 - #: src/connection-editor/ce-page-team.ui:1157 --#, fuzzy - msgid "_Up delay" --msgstr "链接建立延时(_U):" -+msgstr "建立延时(_U)" - - #: src/connection-editor/ce-page-team-port.ui:446 - #: src/connection-editor/ce-page-team.ui:1172 --#, fuzzy - msgid "_Down delay" --msgstr "链接断开延时(_D):" -+msgstr "断开延时(_D)" - - #: src/connection-editor/ce-page-team-port.ui:461 - #: src/connection-editor/ce-page-team.ui:1187 --#, fuzzy - msgid "Send _interval" --msgstr "上级接口(_P):" -+msgstr "发送间隔(_i)" - - #: src/connection-editor/ce-page-team-port.ui:476 - #: src/connection-editor/ce-page-team.ui:1202 - msgid "Delay _before first send" --msgstr "" -+msgstr "第一次发送前延迟(_b)" - - #: src/connection-editor/ce-page-team-port.ui:491 - #: src/connection-editor/ce-page-team.ui:1217 - msgid "_Maximum missed replies" --msgstr "" -+msgstr "最多错过的回复(_M)" - - #: src/connection-editor/ce-page-team-port.ui:506 - #: src/connection-editor/ce-page-team.ui:1232 --#, fuzzy - msgid "_Source host" --msgstr "ARP 目标(_T):" -+msgstr "源主机(_S)" - - #: src/connection-editor/ce-page-team-port.ui:521 - #: src/connection-editor/ce-page-team.ui:1247 --#, fuzzy - msgid "_Target host" --msgstr "ARP 目标(_T):" -+msgstr "目标主机(_T)" - - #: src/connection-editor/ce-page-team-port.ui:535 - #: src/connection-editor/ce-page-team.ui:1261 -@@ -2721,9 +2647,8 @@ msgstr "从文件导入组配置(_p)..." - - #: src/connection-editor/ce-page-team-port.ui:826 - #: src/connection-editor/ce-page-team.ui:1552 --#, fuzzy - msgid "Edit _JSON configuration" --msgstr "_JSON 配置:" -+msgstr "编辑_JSON 配置" - - #: src/connection-editor/ce-page-team-port.ui:845 - #: src/connection-editor/ce-page-team.ui:1571 -@@ -2763,9 +2688,8 @@ msgid "From active to team device" - msgstr "从活动端口到组设备" - - #: src/connection-editor/ce-page-team.ui:174 --#, fuzzy - msgid "_Teamed connections" --msgstr "已组队的连接(_T):" -+msgstr "已组队的连接(_T)" - - #: src/connection-editor/ce-page-team.ui:441 - msgid "Load balance" -@@ -2814,24 +2738,23 @@ msgstr "任何L4协议" - - #: src/connection-editor/ce-page-team.ui:603 - msgid "_Peer notification count" --msgstr "" -+msgstr "_Peer通知计数" - - #: src/connection-editor/ce-page-team.ui:618 - msgid "Peer _notification interval" --msgstr "" -+msgstr "Peer 通知间隔(_n)" - - #: src/connection-editor/ce-page-team.ui:633 - msgid "_Multicast rejoin count" --msgstr "" -+msgstr "多播重新加入计数(_M)" - - #: src/connection-editor/ce-page-team.ui:648 - msgid "Multicast _rejoin interval" --msgstr "" -+msgstr "多播重新加入间隔(_r)" - - #: src/connection-editor/ce-page-team.ui:739 --#, fuzzy - msgid "_Hardware Address" --msgstr "硬件地址:" -+msgstr "硬件地址(_H)" - - #: src/connection-editor/ce-page-team.ui:752 - msgid "" -@@ -2841,16 +2764,15 @@ msgstr "新的团队所需的设备的硬件地址。通常MAC地址的格式被 - - #: src/connection-editor/ce-page-team.ui:798 - msgid "_Runner" --msgstr "" -+msgstr "_Runner" - - #: src/connection-editor/ce-page-team.ui:813 --#, fuzzy - msgid "_Hardware address policy" --msgstr "硬件地址:" -+msgstr "硬件地址策略(_H)" - - #: src/connection-editor/ce-page-team.ui:827 - msgid "Name of runner to be used." --msgstr "使用亚军的名称。" -+msgstr "使用的 runner 的名称。" - - #: src/connection-editor/ce-page-team.ui:848 - msgid "" -@@ -2885,17 +2807,16 @@ msgstr "" - "次发送。否则,他们将每隔30秒发送。" - - #: src/connection-editor/ce-page-team.ui:903 --#, fuzzy - msgid "_System priority" --msgstr "优先级(_P):" -+msgstr "系统优先级(_S)" - - #: src/connection-editor/ce-page-team.ui:918 - msgid "_Minimum ports" --msgstr "" -+msgstr "最少端口(_M)" - - #: src/connection-editor/ce-page-team.ui:933 - msgid "_Aggregator selection policy" --msgstr "" -+msgstr "_Aggregator 选择策略" - - #: src/connection-editor/ce-page-team.ui:947 - msgid "System priority, value can be 0 – 65535." -@@ -2930,43 +2851,36 @@ msgid "Name of active Tx balancer. Active Tx balancing is disabled by default." - msgstr "活跃的Tx平衡器的名称。活动的Tx平衡默认情况下禁用。" - - #: src/connection-editor/ce-page-team.ui:1085 --#, fuzzy - msgid "Transmission _balancing interval" --msgstr "传输功率(_W):" -+msgstr "传输均衡间隔(_b)" - - #: src/connection-editor/ce-page-team.ui:1100 --#, fuzzy - msgid "_Transmission balancer" --msgstr "传输功率(_W):" -+msgstr "传输均衡器(_T):" - - #: src/connection-editor/ce-page-team.ui:1119 - msgid "Runner" - msgstr "运行者" - - #: src/connection-editor/ce-page-vlan.ui:28 --#, fuzzy - msgid "_Parent interface" --msgstr "上级接口(_P):" -+msgstr "上级接口(_P)" - - #: src/connection-editor/ce-page-vlan.ui:41 --#, fuzzy - msgid "VLAN inter_face name" --msgstr "VLAN 接口名称(_N):" -+msgstr "VLAN 接口名称(_f)" - - #: src/connection-editor/ce-page-vlan.ui:55 --#, fuzzy - msgid "Cloned MAC _address" --msgstr "克隆 MAC 地址(_C):" -+msgstr "克隆 MAC 地址(_a)" - - #: src/connection-editor/ce-page-vlan.ui:140 --#, fuzzy - msgid "VLAN _id" --msgstr "VLAN 标签(_I):" -+msgstr "VLAN ID(_i)" - - #: src/connection-editor/ce-page-vlan.ui:197 --#, fuzzy - msgid "Flags" --msgstr "标志:" -+msgstr "标志" - - #: src/connection-editor/ce-page-vlan.ui:213 - msgid "_Reorder headers" -@@ -2995,9 +2909,8 @@ msgid "\"vlan\" + number" - msgstr "vlan + 数字" - - #: src/connection-editor/ce-page-wifi-security.ui:29 --#, fuzzy - msgid "S_ecurity" --msgstr "安全(_E):" -+msgstr "安全(_e)" - - #: src/connection-editor/ce-page-wifi.ui:35 - msgid "A (5 GHz)" -@@ -3020,38 +2933,32 @@ msgid "mW" - msgstr "mW" - - #: src/connection-editor/ce-page-wifi.ui:222 --#, fuzzy - msgid "Transmission po_wer" --msgstr "传输功率(_W):" -+msgstr "传输功率(_w)" - - #: src/connection-editor/ce-page-wifi.ui:256 - msgid "Mb/s" - msgstr "Mb/秒" - - #: src/connection-editor/ce-page-wifi.ui:275 --#, fuzzy - msgid "_Rate" --msgstr "速率(_R):" -+msgstr "速率(_R)" - - #: src/connection-editor/ce-page-wifi.ui:311 --#, fuzzy - msgid "_BSSID" --msgstr "_BSSID:" -+msgstr "_BSSID" - - #: src/connection-editor/ce-page-wifi.ui:336 --#, fuzzy - msgid "C_hannel" --msgstr "频道(_H):" -+msgstr "频道(_H)" - - #: src/connection-editor/ce-page-wifi.ui:368 --#, fuzzy - msgid "Ban_d" --msgstr "波段(_D):" -+msgstr "波段(_d)" - - #: src/connection-editor/ce-page-wifi.ui:414 --#, fuzzy - msgid "SS_ID" --msgstr "SS_ID:" -+msgstr "SS_ID" - - #: src/connection-editor/ce-polkit.c:63 - #: src/connection-editor/ce-polkit-button.c:74 -@@ -3166,15 +3073,11 @@ msgstr "VPN" - - #: src/connection-editor/connection-helpers.c:204 - msgid "No VPN service type." --msgstr "" -+msgstr "没有 VPN 服务类型。" - - #: src/connection-editor/connection-helpers.c:209 --#, fuzzy - msgid "The VPN plugin failed to import the VPN connection correctly: " --msgstr "" --"VPN 插件无法正确导入 VPN 连接。\n" --"\n" --"错误:没有 VPN 服务类型。" -+msgstr "VPN 插件无法正确导入 VPN 连接:" - - #: src/connection-editor/connection-helpers.c:293 - #: src/connection-editor/page-proxy.c:118 src/connection-editor/page-team.c:341 -@@ -3221,13 +3124,12 @@ msgid "Are you sure you wish to delete the connection %s?" - msgstr "是否确认删除连接 %s?" - - #: src/connection-editor/gtk/menus.ui:6 --#, fuzzy - msgid "_New Connection" --msgstr "_VPN 连接" -+msgstr "新连接(_N)" - - #: src/connection-editor/gtk/menus.ui:13 - msgid "_Quit" --msgstr "" -+msgstr "退出(_Q)" - - #: src/connection-editor/ip4-routes-dialog.c:697 - #: src/connection-editor/ip6-routes-dialog.c:718 -@@ -3339,9 +3241,8 @@ msgid "" - msgstr "安全标签可能会阻止一些文件和证书认证一起使用。" - - #: src/connection-editor/nm-connection-editor.ui:110 --#, fuzzy - msgid "Connection _name" --msgstr "连接名称(_N):" -+msgstr "连接名称(_n)" - - #: src/connection-editor/nm-connection-editor.ui:170 - msgid "_Export…" -@@ -3447,19 +3348,17 @@ msgid "Authenticate to delete the selected connection" - msgstr "进行认证以删除选中的连接" - - #: src/connection-editor/nm-connection-list.c:1059 --#, fuzzy - msgid "Unrecognized connection type" --msgstr "不支持的移动宽带连接类型。" -+msgstr "不支持的连接类型" - - #: src/connection-editor/nm-connection-list.c:1064 --#, fuzzy, c-format -+#, c-format - msgid "Don’t know how to import “%s” connections" --msgstr "不知道如何创建“%s”连接" -+msgstr "不知道如何导入“%s”连接" - - #: src/connection-editor/nm-connection-list.c:1068 --#, fuzzy - msgid "Error importing connection" --msgstr "编辑连接出错" -+msgstr "导入连接出错" - - #: src/connection-editor/nm-connection-list.c:1075 - #: src/connection-editor/nm-connection-list.c:1090 -@@ -3468,9 +3367,8 @@ msgid "Error creating connection" - msgstr "创建连接出错" - - #: src/connection-editor/nm-connection-list.c:1075 --#, fuzzy - msgid "Connection type not specified." --msgstr "连接不能被修改" -+msgstr "未指定连接类型。" - - #: src/connection-editor/nm-connection-list.c:1091 - msgid "No VPN plugins are installed." -@@ -3719,14 +3617,12 @@ msgid "Link-Local Only" - msgstr "仅本地连接" - - #: src/connection-editor/page-ip4.c:362 src/connection-editor/page-ip6.c:336 --#, fuzzy - msgid "Additional DNS ser_vers" --msgstr "附加 _DNS 服务器:" -+msgstr "额外的 DNS 服务器(_v)" - - #: src/connection-editor/page-ip4.c:371 src/connection-editor/page-ip6.c:345 --#, fuzzy - msgid "Additional s_earch domains" --msgstr "附加搜索域(_E):" -+msgstr "额外的搜索域(_e)" - - #: src/connection-editor/page-ip4.c:1033 - #, c-format -@@ -4136,7 +4032,7 @@ msgstr "关闭(_C)" - - #: src/libnma/nma-bar-code-widget.ui:36 - msgid "Scan with your phone or Print" --msgstr "" -+msgstr "使用手机扫描或 打印" - - #: src/libnma/nma-file-cert-chooser.c:108 - #: src/libnma/nma-pkcs11-cert-chooser.c:152 -@@ -4156,15 +4052,15 @@ msgstr "为 %s 证书选择一个密钥" - - #: src/libnma/nma-file-cert-chooser.c:250 - #: src/libnma/nma-pkcs11-cert-chooser.c:386 --#, fuzzy, c-format -+#, c-format - msgid "%s private _key" --msgstr "私钥(_K):" -+msgstr "%s 私钥(_k)" - - #: src/libnma/nma-file-cert-chooser.c:254 - #: src/libnma/nma-pkcs11-cert-chooser.c:390 --#, fuzzy, c-format -+#, c-format - msgid "%s key _password" --msgstr "私钥密码(_P):" -+msgstr "%s 密钥密码(_p)" - - #: src/libnma/nma-file-cert-chooser.c:258 - #, c-format -@@ -4173,9 +4069,9 @@ msgstr "选择 %s 证书" - - #: src/libnma/nma-file-cert-chooser.c:262 - #: src/libnma/nma-pkcs11-cert-chooser.c:398 --#, fuzzy, c-format -+#, c-format - msgid "%s _certificate" --msgstr "用户证书(_U):" -+msgstr "%s 证书(_c)" - - #: src/libnma/nma-mobile-providers.c:991 src/libnm-gtk/nm-mobile-wizard.c:1077 - msgid "My country is not listed" -@@ -4241,9 +4137,8 @@ msgid "Set up a Mobile Broadband Connection" - msgstr "设置一个移动宽带连接" - - #: src/libnma/nma-mobile-wizard.ui:189 --#, fuzzy - msgid "Country or region:" --msgstr "国家或地区" -+msgstr "国家或地区:" - - #: src/libnma/nma-mobile-wizard.ui:229 src/libnm-gtk/nm-mobile-wizard.c:1127 - msgid "Choose your Provider’s Country or Region" -@@ -4254,9 +4149,8 @@ msgid "Select your provider from a _list:" - msgstr "从列表中选择您的提供商(_L):" - - #: src/libnma/nma-mobile-wizard.ui:289 --#, fuzzy - msgid "I can’t find my provider and I wish to set up the connection _manually:" --msgstr "找不到我的提供商,希望手动输入(_M):" -+msgstr "找不到我的提供商,希望手动设置连接(_m):" - - #: src/libnma/nma-mobile-wizard.ui:310 src/libnm-gtk/nm-mobile-wizard.c:779 - msgid "My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)" -@@ -4368,9 +4262,9 @@ msgid "Choose a %s Certificate" - msgstr "选择一个 %s 证书" - - #: src/libnma/nma-pkcs11-cert-chooser.c:402 --#, fuzzy, c-format -+#, c-format - msgid "%s certificate _password" --msgstr "用户证书(_U):" -+msgstr "%s 证书密码(_p)" - - #: src/libnma/nma-pkcs11-cert-chooser-dialog.c:255 - msgid "Error logging in: " -@@ -4499,19 +4393,16 @@ msgid "" - msgstr "输入您要连接的隐藏的 Wi-Fi 网络的名称及安全性详细信息。" - - #: src/libnma/wifi.ui:97 --#, fuzzy - msgid "Wi-Fi _security" --msgstr "Wi-Fi 安全性(_S):" -+msgstr "Wi-Fi 安全性(_s)" - - #: src/libnma/wifi.ui:154 --#, fuzzy - msgid "C_onnection" --msgstr "连接(_O):" -+msgstr "连接(_o)" - - #: src/libnma/wifi.ui:179 --#, fuzzy - msgid "Wi-Fi _adapter" --msgstr "Wi-Fi 适配器(_A):" -+msgstr "Wi-Fi 适配器(_a)" - - #: src/libnm-gtk/nm-mobile-wizard.c:749 - msgid "I can’t find my provider and I wish to enter it _manually:" -@@ -4768,21 +4659,18 @@ msgstr "两者兼用" - #: src/wireless-security/eap-method-fast.ui:48 - #: src/wireless-security/eap-method-peap.ui:48 - #: src/wireless-security/eap-method-ttls.ui:118 --#, fuzzy - msgid "Anony_mous identity" --msgstr "匿名身份(_M):" -+msgstr "匿名身份(_m)" - - #: src/wireless-security/eap-method-fast.ui:74 --#, fuzzy - msgid "PAC _file" --msgstr "PAC 文件(_F):" -+msgstr "PAC 文件(_f)" - - #: src/wireless-security/eap-method-fast.ui:113 - #: src/wireless-security/eap-method-peap.ui:120 - #: src/wireless-security/eap-method-ttls.ui:77 --#, fuzzy - msgid "_Inner authentication" --msgstr "内部认证(_I):" -+msgstr "内部认证(_I)" - - #: src/wireless-security/eap-method-fast.ui:142 - msgid "Allow automatic PAC pro_visioning" -@@ -4817,9 +4705,8 @@ msgid "No CA certificate is _required" - msgstr "不需要 CA 证书(_R)" - - #: src/wireless-security/eap-method-peap.ui:89 --#, fuzzy - msgid "PEAP _version" --msgstr "PEAP 版本(_V):" -+msgstr "PEAP 版本(_v)" - - #: src/wireless-security/eap-method-peap.ui:166 - #: src/wireless-security/eap-method-tls.ui:62 -@@ -4831,7 +4718,7 @@ msgstr "服务器证书名称的后缀。" - #: src/wireless-security/eap-method-tls.ui:63 - #: src/wireless-security/eap-method-ttls.ui:133 - msgid "_Domain" --msgstr "" -+msgstr "域(_d)" - - #: src/wireless-security/eap-method-simple.c:90 - msgid "missing EAP username" -@@ -4843,17 +4730,15 @@ msgstr "缺少 EAP 密码" - - #: src/wireless-security/eap-method-simple.c:120 - msgid "missing EAP client Private Key passphrase" --msgstr "" -+msgstr "缺少 EAP 客户端私钥密码口令" - - #: src/wireless-security/eap-method-simple.ui:103 --#, fuzzy - msgid "P_rivate Key Passphrase" --msgstr "WEP 128 位密码句" -+msgstr "私钥密码口令(_r)" - - #: src/wireless-security/eap-method-simple.ui:128 --#, fuzzy - msgid "Sh_ow passphrase" --msgstr "显示密码(_O)" -+msgstr "显示密码(_o)" - - #: src/wireless-security/eap-method-tls.c:64 - msgid "missing EAP-TLS identity" -@@ -4876,9 +4761,8 @@ msgid "selected key file does not exist" - msgstr "选择的关键文件不存在" - - #: src/wireless-security/eap-method-tls.ui:20 --#, fuzzy - msgid "I_dentity" --msgstr "身份(_D):" -+msgstr "身份(_d)" - - #: src/wireless-security/eap-method-ttls.c:337 - msgid "MSCHAPv2 (no EAP)" -@@ -4910,14 +4794,13 @@ msgstr "受保护的 EAP (PEAP)" - - #: src/wireless-security/wireless-security.c:523 - msgid "Externally configured" --msgstr "" -+msgstr "外部配置" - - #: src/wireless-security/ws-dynamic-wep.ui:31 - #: src/wireless-security/ws-wep-key.ui:97 - #: src/wireless-security/ws-wpa-eap.ui:31 --#, fuzzy - msgid "Au_thentication" --msgstr "认证(_T):" -+msgstr "认证(_t)" - - #: src/wireless-security/ws-leap.c:64 - msgid "missing leap-username" -@@ -4972,18 +4855,16 @@ msgid "1 (Default)" - msgstr "1 (默认)" - - #: src/wireless-security/ws-wep-key.ui:54 --#, fuzzy - msgid "_Key" --msgstr "密钥(_K):" -+msgstr "密钥(_K)" - - #: src/wireless-security/ws-wep-key.ui:80 - msgid "Sho_w key" - msgstr "显示密钥(_W)" - - #: src/wireless-security/ws-wep-key.ui:129 --#, fuzzy - msgid "WEP inde_x" --msgstr "WEP 索引(_X):" -+msgstr "WEP 索引(_x)" - - #: src/wireless-security/ws-wpa-psk.c:76 - #, c-format -@@ -4998,46 +4879,5 @@ msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" - msgstr "无效的 wpa-psk:不能用 64 个字节作为十六进制解释密钥" - - #: src/wireless-security/ws-wpa-psk.ui:48 --#, fuzzy - msgid "_Type" --msgstr "类型(_T):" -- --#~ msgid "%s (default)" --#~ msgstr "%s (默认)" -- --#~ msgid "Ignored" --#~ msgstr "已忽略" -- --#~ msgid "Active Network Connections" --#~ msgstr "活动的网络连接" -- --#~ msgid "Failed to update connection secrets due to an unknown error." --#~ msgstr "由于一个未知错误,更新连接 secret 时失败。" -- --#~ msgid "Priority:" --#~ msgstr "优先级:" -- --#~ msgid "_Automatically connect to this network when it is available" --#~ msgstr "可用时自动链接到这个网络(_A)" -- --#, fuzzy --#~ msgid "Connection _priority for auto-activation:" --#~ msgstr "连接信息(_I)" -- --#~ msgid "Cannot import VPN connection" --#~ msgstr "无法导入 VPN 连接" -- --#, fuzzy --#~ msgid "" --#~ "The file “%s” could not be read or does not contain recognized VPN " --#~ "connection information\n" --#~ "\n" --#~ "Error: %s." --#~ msgstr "" --#~ "无法读取 %s 或文件中不包含可识别的 VPN 连接信息\n" --#~ "\n" --#~ "错误:%s。" -- --#, fuzzy --#~ msgid "unknown error" --#~ msgstr "未知错误" -+msgstr "类型(_T)" --- -2.21.0 - diff --git a/SPECS/network-manager-applet.spec b/SPECS/network-manager-applet.spec index 306a5a1..ab46185 100644 --- a/SPECS/network-manager-applet.spec +++ b/SPECS/network-manager-applet.spec @@ -1,18 +1,20 @@ %global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad) +%global gtk4_version %(pkg-config --modversion gtk4 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) -%global nm_version 1:1.1.0 +%global nm_version 1:1.16.0 +%global libnma_version 1.8.27 %global obsoletes_ver 1:0.9.7 -%global rpm_version 1.8.22 -%global real_version 1.8.22 +%global rpm_version 1.18.0 +%global real_version 1.18.0 %global release_version 2 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') -%if 0%{?fedora} > 28 || 0%{?rhel} > 7 -%bcond_with libnm_gtk +%if 0%{?fedora} > 31 || 0%{?rhel} > 7 +%bcond_with libnma_gtk4 %else -%bcond_without libnm_gtk +%bcond_without libnma_gtk4 %endif Name: network-manager-applet @@ -25,22 +27,21 @@ URL: http://www.gnome.org/projects/NetworkManager/ Obsoletes: NetworkManager-gnome < %{obsoletes_ver} Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz -Patch1: 0001-nm-applet-no-notifications.patch -Patch2: 0001-po-RHEL-8.1-translations-rh1690001.patch +Patch1: 0001-Import-translations-rh1820554.patch Requires: NetworkManager >= %{nm_version} Requires: libnotify >= 0.4.3 -Requires: nm-connection-editor = %{version}-%{release} +Requires: nm-connection-editor%{?_isa} = %{version}-%{release} +Requires: libnma%{?_isa} >= %{libnma_version} -%if %{with libnm_gtk} -BuildRequires: NetworkManager-devel >= %{nm_version} -BuildRequires: NetworkManager-glib-devel >= %{nm_version} -%endif BuildRequires: NetworkManager-libnm-devel >= %{nm_version} +BuildRequires: libnma-devel >= %{libnma_version} BuildRequires: ModemManager-glib-devel >= 1.0 BuildRequires: glib2-devel >= 2.32 BuildRequires: gtk3-devel >= 3.10 -BuildRequires: libsecret-devel +%if %{with libnma_gtk4} +BuildRequires: gtk4-devel >= 3.96 +%endif BuildRequires: gobject-introspection-devel >= 0.10.3 BuildRequires: gettext-devel BuildRequires: /usr/bin/autopoint @@ -57,6 +58,8 @@ BuildRequires: jansson-devel BuildRequires: gcr-devel BuildRequires: libselinux-devel BuildRequires: mobile-broadband-provider-info-devel +BuildRequires: libappindicator-gtk3-devel +BuildRequires: libdbusmenu-gtk3-devel %description This package contains a network control and status notification area applet @@ -64,81 +67,22 @@ for use with NetworkManager. %package -n nm-connection-editor Summary: A network connection configuration editor for NetworkManager +Requires: libnma%{?_isa} >= %{libnma_version} %description -n nm-connection-editor This package contains a network configuration editor and Bluetooth modem utility for use with NetworkManager. -%package -n libnm-gtk -Summary: Private libraries for NetworkManager GUI support -Group: Development/Libraries -Requires: gtk3 >= %{gtk3_version} -Requires: mobile-broadband-provider-info >= 0.20090602 -Obsoletes: NetworkManager-gtk < %{obsoletes_ver} - -%description -n libnm-gtk -This package contains private libraries to be used only by nm-applet, -nm-connection editor, and the GNOME Control Center. - -%package -n libnm-gtk-devel -Summary: Private header files for NetworkManager GUI support -Group: Development/Libraries -Requires: NetworkManager-devel >= %{nm_version} -Requires: NetworkManager-glib-devel >= %{nm_version} -Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver} -Requires: libnm-gtk = %{version}-%{release} -Requires: gtk3-devel -Requires: pkgconfig - -%description -n libnm-gtk-devel -This package contains private header and pkg-config files to be used only by -GNOME control center. - -This package is obsoleted by libnma. - - -%package -n libnma -Summary: Private libraries for NetworkManager GUI support -Group: Development/Libraries -Requires: gtk3 >= %{gtk3_version} -Requires: mobile-broadband-provider-info >= 0.20090602 -Obsoletes: NetworkManager-gtk < %{obsoletes_ver} - -%description -n libnma -This package contains private libraries to be used only by nm-applet, -nm-connection editor, and the GNOME Control Center. - -%package -n libnma-devel -Summary: Private header files for NetworkManager GUI support -Group: Development/Libraries -Requires: NetworkManager-libnm-devel >= %{nm_version} -Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver} -Requires: libnma = %{version}-%{release} -Requires: gtk3-devel -Requires: pkgconfig - -%description -n libnma-devel -This package contains private header and pkg-config files to be used only by -nm-applet, nm-connection-editor, and the GNOME control center. - -This package deprecates libnm-gtk. - %prep -%setup -q -n "%{name}-%{real_version}" -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 -n "%{name}-%{real_version}" %build %meson \ -Dgcr=true \ -Dselinux=true \ -Ddisable-static=true \ -%if %{with libnm_gtk} - -Dlibnm_gtk=true -%else - -Dlibnm_gtk=false -%endif + -Dappindicator=yes %meson_build %install @@ -155,11 +99,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %check %meson_test -%post -n libnma -p /sbin/ldconfig -%postun -n libnma -p /sbin/ldconfig - -%post -n libnm-gtk -p /sbin/ldconfig -%postun -n libnm-gtk -p /sbin/ldconfig %files %{_bindir}/nm-applet @@ -187,40 +126,21 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_datadir}/icons/hicolor/*/apps/nm-device-*.* %{_datadir}/icons/hicolor/*/apps/nm-no-connection.* %{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png -%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %{_datadir}/metainfo/nm-connection-editor.appdata.xml %{_mandir}/man1/nm-connection-editor* %dir %{_datadir}/gnome-vpn-properties -%if %{with libnm_gtk} -%files -n libnm-gtk -%{_libdir}/libnm-gtk.so.* -%{_libdir}/girepository-1.0/NMGtk-1.0.typelib -%endif - -%if %{with libnm_gtk} -%files -n libnm-gtk-devel -%dir %{_includedir}/libnm-gtk -%{_includedir}/libnm-gtk/*.h -%{_libdir}/pkgconfig/libnm-gtk.pc -%{_libdir}/libnm-gtk.so -%{_datadir}/gir-1.0/NMGtk-1.0.gir -%endif - -%files -n libnma -%{_libdir}/libnma.so.* -%{_libdir}/girepository-1.0/NMA-1.0.typelib - -%files -n libnma-devel -%dir %{_includedir}/libnma -%{_includedir}/libnma/*.h -%{_libdir}/pkgconfig/libnma.pc -%{_libdir}/libnma.so -%{_datadir}/gir-1.0/NMA-1.0.gir -%{_datadir}/gtk-doc - %changelog +* Mon Jul 20 2020 Beniamino Galvani - 1.18.0-2 +- Import translations (rh #1820554) + +* Mon Jun 22 2020 Beniamino Galvani - 1.18.0-1 +- Update to 1.18.0 release (rh #1814748) + +* Mon May 18 2020 Beniamino Galvani - 1.8.22-3 +- Drop gschema XML which conflicts with new libnma package + * Thu Aug 15 2019 Lubomir Rintel - 1.8.22-2 - Update translations (rh #1690001)