diff options
author | Thomas Haller <thaller@redhat.com> | 2016-09-19 10:59:29 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2016-09-19 11:00:51 +0200 |
commit | 54a3d4181358231706296abfc53a203796ef8491 (patch) | |
tree | f54f5d7a7260264c9c35d38580dbe21a5afc2535 | |
parent | 8fea566f6de4851515942a6637a3300423ce90ce (diff) | |
parent | 2f784c419cc6aa369b4862db112ef7aae1ae39d4 (diff) | |
download | network-manager-applet-54a3d4181358231706296abfc53a203796ef8491.tar.gz |
all: merge branch 'master' into nm-1-4
Reset 'master' from 1.5.0 back to 1.4.1. For the moment,
'master' still works well with 1.3.0-or-newer API of
NetworkManager/libnm. There is no need for upstream
maintaining two separate versions of an applet which
targets the same API.
-rw-r--r-- | po/ca.po | 1037 | ||||
-rw-r--r-- | po/es.po | 87 | ||||
-rw-r--r-- | src/connection-editor/ce-page-general.ui | 2 | ||||
-rw-r--r-- | src/connection-editor/ce-page-ip4.ui | 3 | ||||
-rw-r--r-- | src/connection-editor/ce-page-ip6.ui | 3 | ||||
-rw-r--r-- | src/connection-editor/ce-page.h | 14 | ||||
-rw-r--r-- | src/connection-editor/page-general.c | 17 | ||||
-rw-r--r-- | src/connection-editor/page-ip4.c | 86 | ||||
-rw-r--r-- | src/connection-editor/page-ip6.c | 38 |
9 files changed, 941 insertions, 346 deletions
@@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-04-05 14:02+0200\n" -"PO-Revision-Date: 2016-03-20 07:35+0100\n" +"POT-Creation-Date: 2016-09-07 21:25+0200\n" +"PO-Revision-Date: 2016-09-06 17:31+0200\n" "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.esu>\n" "Language-Team: Catalan <tradgnome@softcatala.org>\n" "Language: ca\n" @@ -24,7 +24,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Gtranslator 2.91.6\n" -#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3105 +#: ../nm-applet.desktop.in.h:1 ../src/applet.c:3119 msgid "Network" msgstr "Xarxa" @@ -135,15 +135,15 @@ msgstr "" "Establiu-ho a «TRUE» (cert) per inhabilitar els avisos sobre els certificats " "de CA en la segona fase de l'autenticació EAP." -#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:1 +#: ../nm-connection-editor.appdata.xml.in.h:1 msgid "NetworkManager" msgstr "NetworkManager" -#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:2 -msgid "NetworkManager for GNOME" -msgstr "NetworkManager per al GNOME" +#: ../nm-connection-editor.appdata.xml.in.h:2 +msgid "NetworkManager connection editor" +msgstr "Editor de connexions del NetworkManager" -#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:3 +#: ../nm-connection-editor.appdata.xml.in.h:3 msgid "" "NetworkManager is a system service for managing and configuring your network " "connections and devices." @@ -151,7 +151,7 @@ msgstr "" "El NetworkManager és un servei de sistema per gestionar i configurar les " "vostres connexions de xarxa i els vostres dispositius." -#: ../org.gnome.nm-connection-editor.appdata.xml.in.h:4 +#: ../nm-connection-editor.appdata.xml.in.h:4 msgid "" "The nm-connection-editor program works with NetworkManager to create and " "edit existing connection profiles for NetworkManager." @@ -159,6 +159,10 @@ msgstr "" "El programa nm-connection-editor funciona amb el NetworkManager per crear i " "editar perfils existents de connexions per al NetworkManager." +#: ../nm-connection-editor.appdata.xml.in.h:5 +msgid "The NetworkManager Developers" +msgstr "Els desenvolupadors del NetworkManager" + #: ../src/8021x.ui.h:1 ../src/ethernet-dialog.c:99 msgid "802.1X authentication" msgstr "Autenticació 802.1X" @@ -389,144 +393,144 @@ msgstr "" "\n" "%s" -#: ../src/applet.c:1280 +#: ../src/applet.c:1285 msgid "device not ready (firmware missing)" msgstr "el dispositiu no està preparat (manca el microprogramari)" -#: ../src/applet.c:1282 +#: ../src/applet.c:1287 msgid "device not ready" msgstr "el dispositiu no està preparat" #. Notify user of unmanaged or unavailable device -#: ../src/applet.c:1292 ../src/applet-device-ethernet.c:109 +#: ../src/applet.c:1297 ../src/applet-device-ethernet.c:109 msgid "disconnected" msgstr "desconnectat" -#: ../src/applet.c:1308 +#: ../src/applet.c:1313 msgid "Disconnect" msgstr "Desconnecta" -#: ../src/applet.c:1322 +#: ../src/applet.c:1327 msgid "device not managed" msgstr "no es gestiona el dispositiu" -#: ../src/applet.c:1395 +#: ../src/applet.c:1400 msgid "No network devices available" msgstr "No hi ha cap dispositiu de xarxa disponible" -#: ../src/applet.c:1449 +#: ../src/applet.c:1454 msgid "_VPN Connections" msgstr "Connexions _VPN" -#: ../src/applet.c:1503 +#: ../src/applet.c:1498 msgid "_Configure VPN..." msgstr "_Configura la VPN..." -#: ../src/applet.c:1508 -msgid "_Disconnect VPN" -msgstr "_Desconnecta la VPN" +#: ../src/applet.c:1501 +msgid "_Add a VPN connection..." +msgstr "_Afegeix una connexió VPN..." -#: ../src/applet.c:1615 +#: ../src/applet.c:1607 msgid "NetworkManager is not running..." msgstr "No s'està executant el NetworkManager..." -#: ../src/applet.c:1620 ../src/applet.c:2612 +#: ../src/applet.c:1612 ../src/applet.c:2619 msgid "Networking disabled" msgstr "S'ha inhabilitat la gestió de xarxes" #. 'Enable Networking' item -#: ../src/applet.c:1830 +#: ../src/applet.c:1822 msgid "Enable _Networking" msgstr "Habilita la gestió de _xarxes" #. 'Enable Wi-Fi' item -#: ../src/applet.c:1839 +#: ../src/applet.c:1831 msgid "Enable _Wi-Fi" msgstr "Habilita el _sense fil" #. 'Enable Mobile Broadband' item -#: ../src/applet.c:1848 +#: ../src/applet.c:1840 msgid "Enable _Mobile Broadband" msgstr "Habilita la banda ampla _mòbil" #. Toggle notifications item -#: ../src/applet.c:1860 +#: ../src/applet.c:1852 msgid "Enable N_otifications" msgstr "Habilita les n_otificacions" #. 'Connection Information' item -#: ../src/applet.c:1872 +#: ../src/applet.c:1864 msgid "Connection _Information" msgstr "_Informació de la connexió" #. 'Edit Connections...' item -#: ../src/applet.c:1880 +#: ../src/applet.c:1872 msgid "Edit Connections..." msgstr "Edita les connexions..." -#: ../src/applet.c:1894 +#: ../src/applet.c:1886 msgid "_About" msgstr "_Quant a" -#: ../src/applet.c:2179 +#: ../src/applet.c:2171 #, c-format msgid "You are now connected to '%s'." msgstr "Esteu connectat a «%s»." -#: ../src/applet.c:2222 +#: ../src/applet.c:2214 msgid "Disconnected" msgstr "Desconnectat" -#: ../src/applet.c:2223 +#: ../src/applet.c:2215 msgid "The network connection has been disconnected." msgstr "S'ha desconnectat la connexió de xarxa." -#: ../src/applet.c:2474 +#: ../src/applet.c:2481 #, c-format msgid "Preparing network connection '%s'..." msgstr "S'està preparant la connexió de xarxa «%s»..." -#: ../src/applet.c:2477 +#: ../src/applet.c:2484 #, c-format msgid "User authentication required for network connection '%s'..." msgstr "Cal l'autenticació d'usuari per a la connexió de xarxa «%s»..." -#: ../src/applet.c:2480 ../src/applet-device-bt.c:125 +#: ../src/applet.c:2487 ../src/applet-device-bt.c:125 #: ../src/mobile-helpers.c:608 #, c-format msgid "Requesting a network address for '%s'..." msgstr "S'està sol·licitant una adreça de xarxa per a «%s»..." -#: ../src/applet.c:2483 +#: ../src/applet.c:2490 #, c-format msgid "Network connection '%s' active" msgstr "La connexió de xarxa «%s» és activa" -#: ../src/applet.c:2557 +#: ../src/applet.c:2564 #, c-format msgid "Starting VPN connection '%s'..." msgstr "S'està iniciant la connexió VPN «%s»..." -#: ../src/applet.c:2560 +#: ../src/applet.c:2567 #, c-format msgid "User authentication required for VPN connection '%s'..." msgstr "Cal l'autenticació d'usuari per a la connexió VPN «%s»..." -#: ../src/applet.c:2563 +#: ../src/applet.c:2570 #, c-format msgid "Requesting a VPN address for '%s'..." msgstr "S'està sol·licitant una adreça de xarxa per a la xarxa VPN «%s»..." -#: ../src/applet.c:2566 +#: ../src/applet.c:2573 #, c-format -msgid "VPN connection '%s' active" -msgstr "La connexió VPN «%s» és activa" +msgid "VPN connection active" +msgstr "La connexió VPN és activa" -#: ../src/applet.c:2616 +#: ../src/applet.c:2623 msgid "No network connection" msgstr "No hi ha cap connexió de xarxa" -#: ../src/applet.c:3204 +#: ../src/applet.c:3218 msgid "NetworkManager Applet" msgstr "Miniaplicació NetworkManager" @@ -549,7 +553,7 @@ msgid "Mobile Broadband (%s)" msgstr "Banda ampla mòbil (%s)" #: ../src/applet-device-broadband.c:736 -#: ../src/connection-editor/connection-helpers.c:100 +#: ../src/connection-editor/connection-helpers.c:106 #: ../src/connection-editor/page-mobile.c:308 #: ../src/libnm-gtk/nm-ui-utils.c:329 msgid "Mobile Broadband" @@ -606,7 +610,7 @@ msgid "User authentication required for mobile broadband connection '%s'..." msgstr "" "Cal l'autenticació d'usuari per a la connexió de banda ampla mòbil «%s»..." -#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:624 +#: ../src/applet-device-bt.c:129 ../src/mobile-helpers.c:627 #, c-format msgid "Mobile broadband connection '%s' active" msgstr "La connexió de banda ampla mòbil «%s» és activa" @@ -763,7 +767,7 @@ msgid "Error displaying connection information:" msgstr "S'ha produït un error en mostrar la informació de la connexió:" #: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332 -#: ../src/libnma/nma-wifi-dialog.c:932 ../src/libnm-gtk/nm-wifi-dialog.c:948 +#: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948 #: ../src/wireless-security/wireless-security.c:448 msgid "LEAP" msgstr "LEAP" @@ -853,6 +857,8 @@ msgstr "CDMA (%s)" #. --- General --- #: ../src/applet-dialogs.c:512 ../src/applet-dialogs.c:810 +#: ../src/connection-editor/ce-page-team-port.ui.h:23 +#: ../src/connection-editor/ce-page-team.ui.h:48 #: ../src/connection-editor/page-general.c:347 msgid "General" msgstr "General" @@ -880,6 +886,7 @@ msgstr "Seguretat:" #. --- IPv4 --- #: ../src/applet-dialogs.c:618 ../src/applet-dialogs.c:851 +#: ../src/connection-editor/ce-page-team.ui.h:29 msgid "IPv4" msgstr "IPv4" @@ -889,6 +896,7 @@ msgstr "Ruta predeterminada:" #. --- IPv6 --- #: ../src/applet-dialogs.c:658 ../src/applet-dialogs.c:873 +#: ../src/connection-editor/ce-page-team.ui.h:30 msgid "IPv6" msgstr "IPv6" @@ -946,33 +954,41 @@ msgstr "" msgid "NetworkManager Website" msgstr "Lloc web del NetworkManager" -#: ../src/applet-dialogs.c:1005 +#: ../src/applet-dialogs.c:1001 +msgid "" +"The NetworkManager Applet could not find some required resources (the .ui " +"file was not found)." +msgstr "" +"La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos " +"necessaris (no s'ha trobat el fitxer d'interfície d'usuari)." + +#: ../src/applet-dialogs.c:1006 msgid "Missing resources" msgstr "Recursos que manquen" -#: ../src/applet-dialogs.c:1030 +#: ../src/applet-dialogs.c:1031 msgid "Mobile broadband network password" msgstr "Contrasenya de la xarxa de banda ampla mòbil" -#: ../src/applet-dialogs.c:1039 +#: ../src/applet-dialogs.c:1040 #, c-format msgid "A password is required to connect to '%s'." msgstr "Cal que introduïu una contrasenya per connectar-vos a «%s»." -#: ../src/applet-dialogs.c:1054 +#: ../src/applet-dialogs.c:1055 msgid "Password:" msgstr "Contrasenya:" -#: ../src/applet-dialogs.c:1336 +#: ../src/applet-dialogs.c:1337 msgid "SIM PIN unlock required" msgstr "Cal el codi PIN de desbloqueig de la SIM" -#: ../src/applet-dialogs.c:1337 +#: ../src/applet-dialogs.c:1338 msgid "SIM PIN Unlock Required" msgstr "Cal el codi PIN de desbloqueig de la SIM" #. FIXME: some warning about # of times you can enter incorrect PIN -#: ../src/applet-dialogs.c:1339 +#: ../src/applet-dialogs.c:1340 #, c-format msgid "" "The mobile broadband device '%s' requires a SIM PIN code before it can be " @@ -982,25 +998,25 @@ msgstr "" "mòbil «%s»." #. Translators: PIN code entry label -#: ../src/applet-dialogs.c:1341 +#: ../src/applet-dialogs.c:1342 msgid "PIN code:" msgstr "Codi PIN:" #. Translators: Show/obscure PIN checkbox label -#: ../src/applet-dialogs.c:1345 +#: ../src/applet-dialogs.c:1346 msgid "Show PIN code" msgstr "Mostra el codi PIN" -#: ../src/applet-dialogs.c:1347 +#: ../src/applet-dialogs.c:1348 msgid "SIM PUK unlock required" msgstr "Cal el codi PUK de desbloqueig de la SIM" -#: ../src/applet-dialogs.c:1348 +#: ../src/applet-dialogs.c:1349 msgid "SIM PUK Unlock Required" msgstr "Cal el codi PUK de desbloqueig de la SIM" #. FIXME: some warning about # of times you can enter incorrect PUK -#: ../src/applet-dialogs.c:1350 +#: ../src/applet-dialogs.c:1351 #, c-format msgid "" "The mobile broadband device '%s' requires a SIM PUK code before it can be " @@ -1010,22 +1026,22 @@ msgstr "" "mòbil «%s»." #. Translators: PUK code entry label -#: ../src/applet-dialogs.c:1352 +#: ../src/applet-dialogs.c:1353 msgid "PUK code:" msgstr "Codi PUK:" #. Translators: New PIN entry label -#: ../src/applet-dialogs.c:1355 +#: ../src/applet-dialogs.c:1356 msgid "New PIN code:" msgstr "Codi PIN nou:" #. Translators: New PIN verification entry label -#: ../src/applet-dialogs.c:1357 +#: ../src/applet-dialogs.c:1358 msgid "Re-enter new PIN code:" msgstr "Torneu a introduir el codi PIN nou:" #. Translators: Show/obscure PIN/PUK checkbox label -#: ../src/applet-dialogs.c:1362 +#: ../src/applet-dialogs.c:1363 msgid "Show PIN/PUK codes" msgstr "Mostra els codis PIN/PUK" @@ -1053,7 +1069,7 @@ msgstr "" #: ../src/connection-editor/ce-page-bridge.ui.h:2 #: ../src/connection-editor/ce-page-ip4.ui.h:9 #: ../src/connection-editor/ce-page-ip6.ui.h:12 -#: ../src/connection-editor/ce-page-team.ui.h:4 +#: ../src/connection-editor/ce-page-team.ui.h:13 #: ../src/connection-editor/nm-connection-editor.ui.h:3 msgid "_Add" msgstr "_Afegeix" @@ -1065,7 +1081,7 @@ msgstr "_Afegeix" #: ../src/connection-editor/ce-page-bridge.ui.h:4 #: ../src/connection-editor/ce-page-ip4.ui.h:10 #: ../src/connection-editor/ce-page-ip6.ui.h:13 -#: ../src/connection-editor/ce-page-team.ui.h:6 +#: ../src/connection-editor/ce-page-team.ui.h:15 #: ../src/connection-editor/nm-connection-list.c:699 msgid "_Delete" msgstr "_Suprimeix" @@ -1119,10 +1135,12 @@ msgstr "" "llista, és probable que no tingueu el connector VPN adequat instal·lat." #: ../src/connection-editor/ce-page-bond.ui.h:1 +#: ../src/connection-editor/ce-page-team.ui.h:21 msgid "Round-robin" msgstr "Round-robin" #: ../src/connection-editor/ce-page-bond.ui.h:2 +#: ../src/connection-editor/ce-page-team.ui.h:22 msgid "Active backup" msgstr "Reserva activa" @@ -1131,6 +1149,7 @@ msgid "XOR" msgstr "XOR" #: ../src/connection-editor/ce-page-bond.ui.h:4 +#: ../src/connection-editor/ce-page-team.ui.h:20 msgid "Broadcast" msgstr "Difusió" @@ -1166,7 +1185,7 @@ msgstr "M_ode:" #. Edit #: ../src/connection-editor/ce-page-bond.ui.h:13 #: ../src/connection-editor/ce-page-bridge.ui.h:3 -#: ../src/connection-editor/ce-page-team.ui.h:5 +#: ../src/connection-editor/ce-page-team.ui.h:14 #: ../src/connection-editor/nm-connection-list.c:683 msgid "_Edit" msgstr "_Edita" @@ -1181,7 +1200,7 @@ msgstr "ms" #: ../src/connection-editor/ce-page-bond.ui.h:17 #: ../src/connection-editor/ce-page-bridge.ui.h:6 -#: ../src/connection-editor/ce-page-team.ui.h:7 +#: ../src/connection-editor/ce-page-team.ui.h:16 msgid "_Interface name:" msgstr "Nom de la _interfície:" @@ -1224,7 +1243,7 @@ msgstr "" #: ../src/connection-editor/ce-page-bond.ui.h:25 #: ../src/connection-editor/ce-page-ethernet.ui.h:17 #: ../src/connection-editor/ce-page-infiniband.ui.h:4 -#: ../src/connection-editor/ce-page-team.ui.h:8 +#: ../src/connection-editor/ce-page-team.ui.h:17 #: ../src/connection-editor/ce-page-vlan.ui.h:4 #: ../src/connection-editor/ce-page-wifi.ui.h:8 msgid "_MTU:" @@ -1233,7 +1252,7 @@ msgstr "_MTU:" #: ../src/connection-editor/ce-page-bond.ui.h:26 #: ../src/connection-editor/ce-page-ethernet.ui.h:18 #: ../src/connection-editor/ce-page-infiniband.ui.h:3 -#: ../src/connection-editor/ce-page-team.ui.h:9 +#: ../src/connection-editor/ce-page-team.ui.h:18 #: ../src/connection-editor/ce-page-vlan.ui.h:5 #: ../src/connection-editor/ce-page-wifi.ui.h:7 msgid "bytes" @@ -1284,11 +1303,11 @@ msgstr "Edat _màxima:" msgid "_Aging time:" msgstr "Temps d'_envelliment:" -#: ../src/connection-editor/ce-page.c:78 +#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 msgid "automatic" msgstr "automàtic" -#: ../src/connection-editor/ce-page.c:86 +#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121 #: ../src/connection-editor/ce-page-dcb.ui.h:13 #: ../src/connection-editor/page-wifi.c:168 #: ../src/connection-editor/page-wifi.c:172 @@ -1297,44 +1316,44 @@ msgstr "automàtic" msgid "default" msgstr "predeterminat" -#: ../src/connection-editor/ce-page.c:132 +#: ../src/connection-editor/ce-page.c:189 msgid "unspecified error" msgstr "error no especificat" -#: ../src/connection-editor/ce-page.c:245 +#: ../src/connection-editor/ce-page.c:302 msgid "MAC address" msgstr "Adreça MAC" -#: ../src/connection-editor/ce-page.c:245 +#: ../src/connection-editor/ce-page.c:302 msgid "HW address" msgstr "Adreça HW" -#: ../src/connection-editor/ce-page.c:248 +#: ../src/connection-editor/ce-page.c:305 #, c-format msgid "invalid %s for %s (%s)" msgstr "%s no vàlid per a %s (%s)" -#: ../src/connection-editor/ce-page.c:252 -#: ../src/connection-editor/ce-page.c:484 +#: ../src/connection-editor/ce-page.c:309 +#: ../src/connection-editor/ce-page.c:541 #, c-format msgid "invalid %s (%s)" msgstr "%s no vàlid (%s)" -#: ../src/connection-editor/ce-page.c:268 +#: ../src/connection-editor/ce-page.c:325 #, c-format msgid "invalid interface-name for %s (%s)" msgstr "nom no vàlid d'interfície per a %s (%s)" -#: ../src/connection-editor/ce-page.c:272 +#: ../src/connection-editor/ce-page.c:329 #, c-format msgid "invalid interface-name (%s)" msgstr "nom no vàlid d'interfície (%s)" -#: ../src/connection-editor/ce-page.c:485 +#: ../src/connection-editor/ce-page.c:542 msgid "device" msgstr "dispositiu" -#: ../src/connection-editor/ce-page.c:591 +#: ../src/connection-editor/ce-page.c:650 msgid "Failed to update connection secrets due to an unknown error." msgstr "" "No s'han pogut actualitzar els secrets de la connexió per un error " @@ -1654,9 +1673,8 @@ msgid "De_fault" msgstr "Per de_fecte" #: ../src/connection-editor/ce-page-ethernet.ui.h:21 -#, fuzzy msgid "_Ignore" -msgstr "Ignora" +msgstr "_Ignora" #: ../src/connection-editor/ce-page-ethernet.ui.h:22 msgid "_Phy" @@ -1862,6 +1880,7 @@ msgstr "" "que la configuració IPv6 falli." #: ../src/connection-editor/ce-page-mobile.ui.h:1 +#: ../src/connection-editor/ce-page-team.ui.h:26 msgid "Basic" msgstr "Bàsic" @@ -1947,21 +1966,505 @@ msgid "Send PPP _echo packets" msgstr "Envia paquets d'_eco de PPP" #: ../src/connection-editor/ce-page-team-port.ui.h:1 -#: ../src/connection-editor/ce-page-team.ui.h:2 -msgid "_JSON config:" -msgstr "Configuració _JSON:" +#: ../src/connection-editor/ce-page-team.ui.h:19 +msgid "Ad_vanced..." +msgstr "A_vançat" #: ../src/connection-editor/ce-page-team-port.ui.h:2 -msgid "_Import team configuration from a file..." +msgid "Set by master" +msgstr "Establert pel mestre" + +#: ../src/connection-editor/ce-page-team-port.ui.h:3 +#: ../src/connection-editor/ce-page-team.ui.h:9 +msgid "Ethernet port state" +msgstr "Estat del port Ethernet" + +#: ../src/connection-editor/ce-page-team-port.ui.h:4 +#: ../src/connection-editor/ce-page-team.ui.h:10 +msgid "ARP (IPv4)" +msgstr "ARP (IPv4)" + +#: ../src/connection-editor/ce-page-team-port.ui.h:5 +#: ../src/connection-editor/ce-page-team.ui.h:11 +msgid "NDP (IPv6)" +msgstr "NDP (IPv6)" + +#: ../src/connection-editor/ce-page-team-port.ui.h:6 +#: ../src/connection-editor/ce-page-team.ui.h:37 +msgid "Team Advanced Options" +msgstr "Opcions avançades d'equip" + +#: ../src/connection-editor/ce-page-team-port.ui.h:7 +msgid "_Queue ID:" +msgstr "ID de la _cua:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:8 +#: ../src/connection-editor/ce-page-team.ui.h:42 +msgid "" +"Number of bursts of unsolicited NAs and gratuitous ARP packets sent after " +"port is enabled or disabled." +msgstr "" +"Nombre d'esclats de NAs no sol·licitats i paquets ARP no necessaris enviats " +"després que el port s'habilita o deshabilita." + +#: ../src/connection-editor/ce-page-team-port.ui.h:9 +msgid "ID of queue which this port should be mapped to." +msgstr "ID de la cua a la qual s'hauria de mapar aquest port." + +#: ../src/connection-editor/ce-page-team-port.ui.h:10 +msgid "_Port priority:" +msgstr "_Prioritat del port:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:11 +msgid "Port _sticky" +msgstr "Port _fixat" + +#: ../src/connection-editor/ce-page-team-port.ui.h:12 +#: ../src/connection-editor/ce-page-team.ui.h:82 +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 "" +"Valida els paquets ARP rebuts usant els ports actius. Si no es marca això, " +"tots els paquets ARP entrants es consideraran una resposta bona." + +#: ../src/connection-editor/ce-page-team-port.ui.h:13 +#: ../src/connection-editor/ce-page-team.ui.h:44 +msgid "" +"Value is positive number in milliseconds. Specifies an interval between " +"bursts of notify-peer packets." +msgstr "" +"El valor és un nombre positiu en mil·lisegons. Especifica un interval entre " +"esclats de paquets de notificació de parells." + +#: ../src/connection-editor/ce-page-team-port.ui.h:14 +msgid "Port priority. The higher number means higher priority." +msgstr "Prioritat del port. El número més gran vol dir una prioritat més gran." + +#: ../src/connection-editor/ce-page-team-port.ui.h:15 +msgid "Active-Backup runner options" +msgstr "Opcions del runner de la còpia de seguretat activa" + +#: ../src/connection-editor/ce-page-team-port.ui.h:16 +msgid "_LACP port priority:" +msgstr "Prioritat del port _LACP:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:17 +msgid "LACP port _key:" +msgstr "_Clau del port LACP:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:18 +#: ../src/connection-editor/ce-page-team.ui.h:43 +msgid "" +"Number of bursts of multicast group rejoin requests sent after port is " +"enabled or disabled." +msgstr "" +"Nombre d'esclats de demandes de tornar a unir-se al grup de multidifusió " +"enviades després de que el port s'habilita o deshabilita." + +#: ../src/connection-editor/ce-page-team-port.ui.h:19 +msgid "" +"Port priority according to LACP standard. The lower number means higher " +"priority." +msgstr "" +"Prioritat del port d'acord amb l'estàndard LACP. El número més baix vol dir " +"una prioritat més baixa." + +#: ../src/connection-editor/ce-page-team-port.ui.h:20 +#: ../src/connection-editor/ce-page-team.ui.h:45 +msgid "" +"Value is positive number in milliseconds. Specifies an interval between " +"bursts of multicast group rejoin requests." +msgstr "" +"El valor el número de posició en mil·lisegons. Especifica un interval entre " +"esclats de demandes de tornar a unir-se al grup de multidifusió." + +#: ../src/connection-editor/ce-page-team-port.ui.h:21 +msgid "" +"Port key according to LACP standard. It is only possible to aggregate ports " +"with the same key." +msgstr "" +"Clau del port d'acord amb l'estàndard LACP. Sols és possible agregar ports " +"amb la mateixa clau." + +#: ../src/connection-editor/ce-page-team-port.ui.h:22 +msgid "LACP runner options" +msgstr "Opcions del runner LACP" + +#: ../src/connection-editor/ce-page-team-port.ui.h:24 +#: ../src/connection-editor/ce-page-team.ui.h:70 +msgid "_Link watcher:" +msgstr "Monitor de l'en_llaç:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:25 +#: ../src/connection-editor/ce-page-team.ui.h:71 +msgid "_Up delay:" +msgstr "Retard de p_ujada:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:26 +#: ../src/connection-editor/ce-page-team.ui.h:72 +msgid "_Down delay:" +msgstr "Retard de baixa_da:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:27 +#: ../src/connection-editor/ce-page-team.ui.h:73 +msgid "Send _interval:" +msgstr "_Interval d'enviament:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:28 +#: ../src/connection-editor/ce-page-team.ui.h:74 +msgid "Delay _before first send:" +msgstr "Retard a_bans del primer enviament:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:29 +#: ../src/connection-editor/ce-page-team.ui.h:75 +msgid "_Maximum missed replies:" +msgstr "_Màxim de les respostes absents:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:30 +#: ../src/connection-editor/ce-page-team.ui.h:76 +msgid "_Source host:" +msgstr "_Amfitrió origen:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:31 +#: ../src/connection-editor/ce-page-team.ui.h:77 +msgid "_Target host:" +msgstr "Amfi_trió destí:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:32 +#: ../src/connection-editor/ce-page-team.ui.h:78 +msgid "" +"Maximum number of missed replies. If this number is exceeded, link is " +"reported as down." +msgstr "" +"Nombre màxim de respostes absents. Si s'excedeix aquest valor, es reporta " +"l'enllaç com caigut." + +#: ../src/connection-editor/ce-page-team-port.ui.h:33 +#: ../src/connection-editor/ce-page-team.ui.h:79 +msgid "" +"Hostname to be converted to IP address which will be filled into ARP request " +"as source address." +msgstr "" +"Nom d'amfitrió que es convertirà en una adreça IP que s'omplirà a la demanda " +"ARP com a adreça origen." + +#: ../src/connection-editor/ce-page-team-port.ui.h:34 +#: ../src/connection-editor/ce-page-team.ui.h:80 +msgid "" +"Hostname to be converted to IP address which will be filled into request as " +"destination address." +msgstr "" +"Nom d'amfitrió que es convertirà en una adreça IP que s'omplirà a la demanda " +"com a adreça destí." + +#: ../src/connection-editor/ce-page-team-port.ui.h:35 +#: ../src/connection-editor/ce-page-team.ui.h:81 +msgid "Ignore invalid packets from _active ports" +msgstr "Ignora els paquets no vàlids dels ports _actius" + +#: ../src/connection-editor/ce-page-team-port.ui.h:36 +#: ../src/connection-editor/ce-page-team.ui.h:83 +msgid "Ignore invalid packets from i_nactive ports" +msgstr "Ignora els paquets no vàlids dels ports i_nactius" + +#: ../src/connection-editor/ce-page-team-port.ui.h:37 +#: ../src/connection-editor/ce-page-team.ui.h:84 +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 "" +"Valida els paquets ARP rebuts usant els ports inactius. Si no es marca això, " +"tots els paquets ARP entrants es consideraran com una resposta bona." + +#: ../src/connection-editor/ce-page-team-port.ui.h:38 +#: ../src/connection-editor/ce-page-team.ui.h:85 +msgid "S_end on inactive ports" +msgstr "_Envia usant els ports inactius" + +#: ../src/connection-editor/ce-page-team-port.ui.h:39 +#: ../src/connection-editor/ce-page-team.ui.h:86 +msgid "" +"By default, ARP requests are sent on active ports only. This option allows " +"sending even on inactive ports." +msgstr "" +"Per defecte, les demandes ARP s'envien usant els ports actius solament. " +"Aquesta opció permet l'enviament fins i tot usant els ports inactius." + +#: ../src/connection-editor/ce-page-team-port.ui.h:40 +#: ../src/connection-editor/ce-page-team.ui.h:87 +msgid "" +"The delay between the link coming up and the runner being notified about it." +msgstr "" +"El retard entre l'aixecament de l'enllaç i la notificació d'això al runner." + +#: ../src/connection-editor/ce-page-team-port.ui.h:41 +#: ../src/connection-editor/ce-page-team.ui.h:88 +msgid "" +"The delay between the link going down and the runner being notified about it." +msgstr "" +"El retard entre la caiguda de l'enllaç i la notificació d'això al runner." + +#: ../src/connection-editor/ce-page-team-port.ui.h:42 +#: ../src/connection-editor/ce-page-team.ui.h:89 +msgid "The interval between requests being sent." +msgstr "L'interval entre enviaments de demandes." + +#: ../src/connection-editor/ce-page-team-port.ui.h:43 +#: ../src/connection-editor/ce-page-team.ui.h:90 +msgid "" +"The delay between link watch initialization and the first request being sent." +msgstr "" +"El retard entre la inicialització del monitor d'enllaços i l'enviament de la " +"primera demanda." + +#: ../src/connection-editor/ce-page-team-port.ui.h:44 +#: ../src/connection-editor/ce-page-team.ui.h:91 +msgid "The link watcher to be used." +msgstr "El monitor d'enllaços a usar." + +#: ../src/connection-editor/ce-page-team-port.ui.h:45 +#: ../src/connection-editor/ce-page-team.ui.h:92 +msgid "Link Watcher" +msgstr "Monitor d'enllaços" + +#: ../src/connection-editor/ce-page-team-port.ui.h:46 +#: ../src/connection-editor/ce-page-team.ui.h:93 +msgid "Im_port team configuration from a file..." msgstr "_Importa una configuració en equip des d'un fitxer..." +#: ../src/connection-editor/ce-page-team-port.ui.h:47 +#: ../src/connection-editor/ce-page-team.ui.h:94 +msgid "Edit _JSON configuration:" +msgstr "Edita la configuració _JSON:" + +#: ../src/connection-editor/ce-page-team-port.ui.h:48 +#: ../src/connection-editor/ce-page-team.ui.h:95 +msgid "Raw Configuration" +msgstr "Configuració crua" + #: ../src/connection-editor/ce-page-team.ui.h:1 +msgid "Highest priority" +msgstr "Prioritat més alta" + +#: ../src/connection-editor/ce-page-team.ui.h:2 +msgid "Highest priority (stable)" +msgstr "Prioritat més alta (estable)" + +#: ../src/connection-editor/ce-page-team.ui.h:3 +msgid "Bandwidth" +msgstr "Amplada de banda" + +#: ../src/connection-editor/ce-page-team.ui.h:4 +msgid "Highest number of ports" +msgstr "Nombre màxim de ports" + +#: ../src/connection-editor/ce-page-team.ui.h:5 +msgid "Port priority" +msgstr "Prioritat del port" + +#: ../src/connection-editor/ce-page-team.ui.h:6 +msgid "From the team device" +msgstr "Del dispositiu equip" + +#: ../src/connection-editor/ce-page-team.ui.h:7 +msgid "From the active port" +msgstr "Des del port actiu" + +#: ../src/connection-editor/ce-page-team.ui.h:8 +msgid "From active to team device" +msgstr "Des del dispositiu actiu al dispositiu equip" + +#: ../src/connection-editor/ce-page-team.ui.h:12 msgid "_Teamed connections:" msgstr "Connexions en _equip:" -#: ../src/connection-editor/ce-page-team.ui.h:3 -msgid "Im_port team configuration from a file..." -msgstr "_Importa una configuració en equip des d'un fitxer..." +#: ../src/connection-editor/ce-page-team.ui.h:23 +msgid "Load balance" +msgstr "Balanç de la càrrega" + +#: ../src/connection-editor/ce-page-team.ui.h:24 +msgid "LACP" +msgstr "LACP" + +#: ../src/connection-editor/ce-page-team.ui.h:25 +msgid "None" +msgstr "Cap" + +#: ../src/connection-editor/ce-page-team.ui.h:27 +#: ../src/connection-editor/connection-helpers.c:103 +#: ../src/connection-editor/page-ethernet.c:324 +#: ../src/libnm-gtk/nm-ui-utils.c:321 +msgid "Ethernet" +msgstr "Cable" + +#: ../src/connection-editor/ce-page-team.ui.h:28 +#: ../src/connection-editor/connection-helpers.c:118 +#: ../src/connection-editor/page-vlan.c:592 ../src/libnm-gtk/nm-ui-utils.c:339 +#: ../src/libnm-gtk/nm-ui-utils.c:583 +msgid "VLAN" +msgstr "VLAN" + +#: ../src/connection-editor/ce-page-team.ui.h:31 +msgid "IP" +msgstr "IP" + +#: ../src/connection-editor/ce-page-team.ui.h:32 +msgid "Any L3 protocol" +msgstr "Qualsevol protocol L3" + +#: ../src/connection-editor/ce-page-team.ui.h:33 +msgid "TCP" +msgstr "TCP" + +#: ../src/connection-editor/ce-page-team.ui.h:34 +msgid "UDP" +msgstr "UDP" + +#: ../src/connection-editor/ce-page-team.ui.h:35 +msgid "SCTP" +msgstr "SCTP" + +#: ../src/connection-editor/ce-page-team.ui.h:36 +msgid "Any L4 protocol" +msgstr "Qualsevol protocol L4" + +#: ../src/connection-editor/ce-page-team.ui.h:38 +msgid "_Peer notification count:" +msgstr "Nombre de notificacions de _parells:" + +#: ../src/connection-editor/ce-page-team.ui.h:39 +msgid "Peer _notification interval:" +msgstr "Interval de _notificacions de parells:" + +#: ../src/connection-editor/ce-page-team.ui.h:40 +msgid "_Multicast rejoin count:" +msgstr "Nombre de reincorporacions de _multidifusió:" + +#: ../src/connection-editor/ce-page-team.ui.h:41 +msgid "Multicast _rejoin interval:" +msgstr "Interval de _reincorporacions de _multidifusió:<" + +#: ../src/connection-editor/ce-page-team.ui.h:46 +msgid "_Hardware Address:" +msgstr "_Adreça del maquinari:" + +#: ../src/connection-editor/ce-page-team.ui.h:47 +msgid "" +"Desired hardware address of new team device. Usual MAC address format is " +"accepted." +msgstr "" +"Adreça desitjada de maquinari del nou dispositiu d'equip. S'accepta el " +"format habitual d'adreça MAC." + +#: ../src/connection-editor/ce-page-team.ui.h:49 +msgid "_Runner:" +msgstr "_Runner:" + +#: ../src/connection-editor/ce-page-team.ui.h:50 +msgid "_Hardware address policy:" +msgstr "Política d'_adreça del maquinari:" + +#: ../src/connection-editor/ce-page-team.ui.h:51 +msgid "Name of runner to be used." +msgstr "Nom del runner a usar." + +#: ../src/connection-editor/ce-page-team.ui.h:52 +msgid "" +"This defines the policy of how hardware addresses of team device and port " +"devices should be set during the team lifetime." +msgstr "" +"Això defineix la política sobre com les adreces de maquinari dels " +"dispositius d'equip i de port haurien d'establir-se durant el temps de vida " +"de l'equip." + +#: ../src/connection-editor/ce-page-team.ui.h:53 +msgid "Send LACPDU frames _periodically" +msgstr "Envia marcs LACPDU _periòdicament" + +#: ../src/connection-editor/ce-page-team.ui.h:54 +msgid "" +"If checked, LACPDU frames are sent along the configured links periodically. " +"If not, it acts as \"speak when spoken to\"." +msgstr "" +"Si està marcat, els marcs LACPDU s'envien periòdicament junt amb els " +"enllaços configurats. Si no està marcat, actua com «parla quan et parlin»." + +#: ../src/connection-editor/ce-page-team.ui.h:55 +msgid "Send a LACPDU frame _every second" +msgstr "Envia un marc LACPDU cada s_egon" + +#: ../src/connection-editor/ce-page-team.ui.h:56 +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'opció especifica la velocitat a la qual se li demana al nostre soci " +"d'enllaç de transmetre paquets LACPDU. Si està marcat, s'enviarà paquets un " +"cop per segon. En cas contrari, s'enviaran cada 30 segons." + +#: ../src/connection-editor/ce-page-team.ui.h:57 +msgid "_System priority:" +msgstr "Prioritat del _sistema:" + +#: ../src/connection-editor/ce-page-team.ui.h:58 +msgid "_Minimum ports:" +msgstr "Ports _mínims:" + +#: ../src/connection-editor/ce-page-team.ui.h:59 +msgid "_Aggregator selection policy:" +msgstr "Política de selecció d'_agregador:" + +#: ../src/connection-editor/ce-page-team.ui.h:60 +msgid "System priority, value can be 0 – 65535." +msgstr "Prioritat de sistema, el valor pot ser 0-65535." + +#: ../src/connection-editor/ce-page-team.ui.h:61 +msgid "" +"Specifies the minimum number of ports that must be active before asserting " +"carrier in the master interface, value can be 1 – 255." +msgstr "" +"Especifica el nombre mínim de ports que han d'estar actius abans de declarar " +"l'operador a la interfície mestra, el valor pot ser 1-255." + +#: ../src/connection-editor/ce-page-team.ui.h:62 +msgid "This selects the policy of how the aggregators will be selected." +msgstr "Això selecciona la política de com se seleccionaran els agregadors." + +#: ../src/connection-editor/ce-page-team.ui.h:63 +msgid "" +"List of fragment types (strings) which should be used for packet Tx hash " +"computation." +msgstr "" +"La llista de tipus de fragments (cadenes de text) que s'haurien d'usar per a " +"la computació del resum Tx." + +#: ../src/connection-editor/ce-page-team.ui.h:64 +msgid "_Fields for tramsmission hash" +msgstr "_Camps per al resum de transmissió" + +#: ../src/connection-editor/ce-page-team.ui.h:65 +msgid "In tenths of a second. Periodic interval between rebalancing." +msgstr "En dècims de segon. Intervals periòdics entre rebalancejos." + +#: ../src/connection-editor/ce-page-team.ui.h:66 +msgid "Name of active Tx balancer. Active Tx balancing is disabled by default." +msgstr "" +"Nom del balancejador Tx actiu. El balanceig Tx actiu es deshabilita per " +"defecte." + +#: ../src/connection-editor/ce-page-team.ui.h:67 +msgid "Transmission _balancing interval:" +msgstr "Interval de _balanceig de la transmissió:" + +#: ../src/connection-editor/ce-page-team.ui.h:68 +msgid "_Transmission balancer:" +msgstr "Balancí de la _transmissió:" + +#: ../src/connection-editor/ce-page-team.ui.h:69 +msgid "Runner" +msgstr "Runner" #: ../src/connection-editor/ce-page-vlan.ui.h:1 msgid "_Parent interface:" @@ -2122,78 +2625,66 @@ msgstr "" "mètodes d'autenticació. En cas que fallin les connexions, intenteu " "inhabilitar-ne alguns." -#: ../src/connection-editor/connection-helpers.c:97 -#: ../src/connection-editor/page-ethernet.c:326 -#: ../src/libnm-gtk/nm-ui-utils.c:321 -msgid "Ethernet" -msgstr "Cable" - -#: ../src/connection-editor/connection-helpers.c:98 -#: ../src/connection-editor/page-wifi.c:448 ../src/libnm-gtk/nm-ui-utils.c:323 +#: ../src/connection-editor/connection-helpers.c:104 +#: ../src/connection-editor/page-wifi.c:441 ../src/libnm-gtk/nm-ui-utils.c:323 msgid "Wi-Fi" msgstr "Sense fil" -#: ../src/connection-editor/connection-helpers.c:106 +#: ../src/connection-editor/connection-helpers.c:112 #: ../src/connection-editor/page-bluetooth.c:123 #: ../src/libnm-gtk/nm-ui-utils.c:325 msgid "Bluetooth" msgstr "Bluetooth" -#: ../src/connection-editor/connection-helpers.c:107 +#: ../src/connection-editor/connection-helpers.c:113 #: ../src/connection-editor/page-dsl.c:127 msgid "DSL" msgstr "DSL" -#: ../src/connection-editor/connection-helpers.c:108 -#: ../src/connection-editor/page-infiniband.c:150 +#: ../src/connection-editor/connection-helpers.c:114 +#: ../src/connection-editor/page-infiniband.c:148 #: ../src/libnm-gtk/nm-ui-utils.c:331 msgid "InfiniBand" msgstr "InfiniBand" -#: ../src/connection-editor/connection-helpers.c:109 -#: ../src/connection-editor/page-bond.c:444 ../src/libnm-gtk/nm-ui-utils.c:333 +#: ../src/connection-editor/connection-helpers.c:115 +#: ../src/connection-editor/page-bond.c:443 ../src/libnm-gtk/nm-ui-utils.c:333 #: ../src/libnm-gtk/nm-ui-utils.c:577 msgid "Bond" msgstr "Vinculada" -#: ../src/connection-editor/connection-helpers.c:110 -#: ../src/connection-editor/page-team.c:267 ../src/libnm-gtk/nm-ui-utils.c:335 +#: ../src/connection-editor/connection-helpers.c:116 +#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335 #: ../src/libnm-gtk/nm-ui-utils.c:579 msgid "Team" msgstr "Equip" -#: ../src/connection-editor/connection-helpers.c:111 +#: ../src/connection-editor/connection-helpers.c:117 #: ../src/connection-editor/page-bridge.c:210 #: ../src/libnm-gtk/nm-ui-utils.c:337 ../src/libnm-gtk/nm-ui-utils.c:581 msgid "Bridge" msgstr "Pont" -#: ../src/connection-editor/connection-helpers.c:112 -#: ../src/connection-editor/page-vlan.c:594 ../src/libnm-gtk/nm-ui-utils.c:339 -#: ../src/libnm-gtk/nm-ui-utils.c:583 -msgid "VLAN" -msgstr "VLAN" - -#: ../src/connection-editor/connection-helpers.c:116 -#: ../src/connection-editor/connection-helpers.c:254 -#: ../src/connection-editor/page-vpn.c:101 +#: ../src/connection-editor/connection-helpers.c:120 +#: ../src/connection-editor/connection-helpers.c:252 +#: ../src/connection-editor/page-vpn.c:96 msgid "VPN" msgstr "VPN" -#: ../src/connection-editor/connection-helpers.c:196 +#: ../src/connection-editor/connection-helpers.c:194 msgid "Hardware" msgstr "Maquinari" -#: ../src/connection-editor/connection-helpers.c:223 +#: ../src/connection-editor/connection-helpers.c:221 msgid "Virtual" msgstr "Virtual" -#: ../src/connection-editor/connection-helpers.c:292 -#: ../src/connection-editor/connection-helpers.c:294 +#: ../src/connection-editor/connection-helpers.c:370 +#: ../src/connection-editor/connection-helpers.c:372 msgid "Import a saved VPN configuration..." msgstr "Importa una configuració VPN..." -#: ../src/connection-editor/connection-helpers.c:323 +#: ../src/connection-editor/connection-helpers.c:401 msgid "" "The connection editor dialog could not be initialized due to an unknown " "error." @@ -2201,15 +2692,15 @@ msgstr "" "No s'ha pogut inicialitzar el diàleg d'edició de les connexions a causa d'un " "error desconegut." -#: ../src/connection-editor/connection-helpers.c:332 +#: ../src/connection-editor/connection-helpers.c:410 msgid "Could not create new connection" msgstr "No s'ha pogut crear la connexió nova" -#: ../src/connection-editor/connection-helpers.c:469 +#: ../src/connection-editor/connection-helpers.c:556 msgid "Connection delete failed" msgstr "No s'ha pogut suprimir la connexió" -#: ../src/connection-editor/connection-helpers.c:517 +#: ../src/connection-editor/connection-helpers.c:604 #, c-format msgid "Are you sure you wish to delete the connection %s?" msgstr "Segur que voleu suprimir la connexió %s?" @@ -2394,24 +2885,25 @@ msgstr "Suprimeix la connexió seleccionada" msgid "Authenticate to delete the selected connection" msgstr "Autentiqueu-vos per suprimir la connexió seleccionada" -#: ../src/connection-editor/nm-connection-list.c:929 +#: ../src/connection-editor/nm-connection-list.c:914 +#: ../src/connection-editor/nm-connection-list.c:917 +msgid "Error creating connection" +msgstr "S'ha produït un error en crear la connexió" + +#: ../src/connection-editor/nm-connection-list.c:915 msgid "No VPN plugins are installed." msgstr "No hi ha cap connector VPN instal·lat." -#: ../src/connection-editor/nm-connection-list.c:931 +#: ../src/connection-editor/nm-connection-list.c:918 #, c-format msgid "Don't know how to create '%s' connections" msgstr "Es desconeix com crear connexions «%s»" -#: ../src/connection-editor/nm-connection-list.c:933 -msgid "Error creating connection" -msgstr "S'ha produït un error en crear la connexió" - -#: ../src/connection-editor/nm-connection-list.c:955 +#: ../src/connection-editor/nm-connection-list.c:941 msgid "Error editing connection" msgstr "S'ha produït un error en editar la connexió" -#: ../src/connection-editor/nm-connection-list.c:956 +#: ../src/connection-editor/nm-connection-list.c:942 #, c-format msgid "Did not find a connection with UUID '%s'" msgstr "No s'ha pogut trobar cap connexió amb UUID «%s»" @@ -2435,7 +2927,7 @@ msgstr "Adreça MAC del dispositiu Bluetooh. Per exemple: 00:11:22:33:44:55" #: ../src/connection-editor/page-bluetooth.c:125 msgid "Could not load Bluetooth user interface." -msgstr "No s'ha pogut carregar la interfície d'usuari Bluetooth " +msgstr "No s'ha pogut carregar la interfície d'usuari Bluetooth." #: ../src/connection-editor/page-bluetooth.c:175 #, c-format @@ -2447,28 +2939,28 @@ msgstr "dispositiu Bluetooth no vàlid (%s)" msgid "Bluetooth connection %d" msgstr "Connexió Bluetooth %d" -#: ../src/connection-editor/page-bluetooth.c:302 +#: ../src/connection-editor/page-bluetooth.c:303 msgid "Bluetooth Type" msgstr "Tipus de Bluetooth" -#: ../src/connection-editor/page-bluetooth.c:320 +#: ../src/connection-editor/page-bluetooth.c:321 msgid "Select the type of the Bluetooth connection profile." -msgstr "Selecciona el tipus del perfil de connexió Bluetooth" +msgstr "Selecciona el tipus del perfil de connexió Bluetooth." -#: ../src/connection-editor/page-bluetooth.c:325 +#: ../src/connection-editor/page-bluetooth.c:326 msgid "_Personal Area Network" msgstr "Xarxa d'àrea _personal" -#: ../src/connection-editor/page-bluetooth.c:330 +#: ../src/connection-editor/page-bluetooth.c:331 msgid "_Dial-Up Network" msgstr "Xarxa _de connexió telefònica" -#: ../src/connection-editor/page-bond.c:447 +#: ../src/connection-editor/page-bond.c:446 msgid "Could not load bond user interface." msgstr "" "No s'ha pogut carregar la interfície d'usuari per a la connexió vinculada." -#: ../src/connection-editor/page-bond.c:566 +#: ../src/connection-editor/page-bond.c:565 msgid "primary" msgstr "primària" @@ -2481,7 +2973,7 @@ msgstr "Connexió vinculada %d" msgid "Could not load bridge user interface." msgstr "No s'ha pogut carregar la interfície d'usuari per la connexió de pont." -#: ../src/connection-editor/page-bridge.c:310 +#: ../src/connection-editor/page-bridge.c:311 #, c-format msgid "Bridge connection %d" msgstr "Connexió de pont %d" @@ -2497,11 +2989,11 @@ msgstr "Port del pont" msgid "Could not load bridge port user interface." msgstr "No s'ha pogut carregar la interfície d'usuari de ponts de port." -#: ../src/connection-editor/page-dcb.c:603 +#: ../src/connection-editor/page-dcb.c:622 msgid "DCB" msgstr "DCB" -#: ../src/connection-editor/page-dcb.c:605 +#: ../src/connection-editor/page-dcb.c:624 msgid "Could not load DCB user interface." msgstr "No s'ha pogut carregar la interfície d'usuari DCB." @@ -2509,7 +3001,7 @@ msgstr "No s'ha pogut carregar la interfície d'usuari DCB." msgid "Could not load DSL user interface." msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió DSL." -#: ../src/connection-editor/page-dsl.c:214 +#: ../src/connection-editor/page-dsl.c:215 #, c-format msgid "DSL connection %d" msgstr "Connexió DSL %d" @@ -2524,26 +3016,26 @@ msgstr "" "bé pel seu nom d'interfície o per la MAC permanent o per ambdós. Exemples: " "«em1», «3C:97:0E:42:1A:19», «em1 (3C:97:0E:42:1A:19)»" -#: ../src/connection-editor/page-ethernet.c:328 +#: ../src/connection-editor/page-ethernet.c:326 msgid "Could not load ethernet user interface." msgstr "" "No s'ha pogut carregar la interfície d'usuari per a la connexió amb fil." -#: ../src/connection-editor/page-ethernet.c:457 +#: ../src/connection-editor/page-ethernet.c:455 msgid "Ethernet device" msgstr "Dispositiu Ethernet" -#: ../src/connection-editor/page-ethernet.c:461 -#: ../src/connection-editor/page-vlan.c:741 -#: ../src/connection-editor/page-wifi.c:581 +#: ../src/connection-editor/page-ethernet.c:459 +#: ../src/connection-editor/page-vlan.c:739 +#: ../src/connection-editor/page-wifi.c:574 msgid "cloned MAC" msgstr "MAC clonada" -#: ../src/connection-editor/page-ethernet.c:465 +#: ../src/connection-editor/page-ethernet.c:463 msgid "Wake-on-LAN password" msgstr "Contrasenya d'activació per LAN" -#: ../src/connection-editor/page-ethernet.c:500 +#: ../src/connection-editor/page-ethernet.c:499 #, c-format msgid "Ethernet connection %d" msgstr "Connexió de xarxa amb fil %d" @@ -2585,16 +3077,16 @@ msgstr "" "«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:153 +#: ../src/connection-editor/page-infiniband.c:151 msgid "Could not load InfiniBand user interface." msgstr "" "No s'ha pogut carregar la interfície d'usuari per a la connexió InfiniBand." -#: ../src/connection-editor/page-infiniband.c:216 +#: ../src/connection-editor/page-infiniband.c:214 msgid "infiniband device" msgstr "dispositiu infiniband" -#: ../src/connection-editor/page-infiniband.c:251 +#: ../src/connection-editor/page-infiniband.c:250 #, c-format msgid "InfiniBand connection %d" msgstr "Connexió InfiniBand %d" @@ -2757,11 +3249,11 @@ msgid "Unsupported mobile broadband connection type." msgstr "No s'admet el tipus de connexió de banda ampla mòbil." #. Fall back to just asking for GSM vs. CDMA -#: ../src/connection-editor/page-mobile.c:529 +#: ../src/connection-editor/page-mobile.c:530 msgid "Select Mobile Broadband Provider Type" msgstr "Seleccioneu el tipus de proveïdor de banda ampla mòbil" -#: ../src/connection-editor/page-mobile.c:556 +#: ../src/connection-editor/page-mobile.c:557 msgid "" "Select the technology your mobile broadband provider uses. If you are " "unsure, ask your provider." @@ -2769,23 +3261,23 @@ msgstr "" "Seleccioneu la tecnologia que utilitza el vostre proveïdor de banda ampla " "mòbil. Si no n'esteu segur, demaneu-ho al vostre proveïdor." -#: ../src/connection-editor/page-mobile.c:561 +#: ../src/connection-editor/page-mobile.c:562 msgid "My provider uses _GSM-based technology (i.e. GPRS, EDGE, UMTS, HSDPA)" msgstr "" "El meu proveïdor utilitza tecnologia basada en _GSM (és a dir, GPRS, EDGE, " "UMTS, HSDPA)" -#: ../src/connection-editor/page-mobile.c:568 +#: ../src/connection-editor/page-mobile.c:569 msgid "My provider uses C_DMA-based technology (i.e. 1xRTT, EVDO)" msgstr "" "El meu proveïdor utilitza tecnologia basada en C_DMA (és a dir, 1xRTT, EVDO)" -#: ../src/connection-editor/page-mobile.c:578 ../src/mb-menu-item.c:50 +#: ../src/connection-editor/page-mobile.c:579 ../src/mb-menu-item.c:50 #: ../src/mobile-helpers.c:283 msgid "CDMA" msgstr "CDMA" -#: ../src/connection-editor/page-mobile.c:581 ../src/mb-menu-item.c:54 +#: ../src/connection-editor/page-mobile.c:582 ../src/mb-menu-item.c:54 #: ../src/mobile-helpers.c:281 msgid "GSM" msgstr "GSM" @@ -2805,7 +3297,7 @@ msgid "CHAP" msgstr "CHAP" #: ../src/connection-editor/page-ppp.c:132 -#: ../src/wireless-security/eap-method-fast.c:280 +#: ../src/wireless-security/eap-method-fast.c:283 #: ../src/wireless-security/eap-method-peap.c:272 #: ../src/wireless-security/eap-method-ttls.c:288 msgid "MSCHAPv2" @@ -2834,22 +3326,22 @@ msgstr "Paràmetres PPP" msgid "Could not load PPP user interface." msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió PPP." -#: ../src/connection-editor/page-team.c:98 -#: ../src/connection-editor/page-team-port.c:71 -#: ../src/connection-editor/vpn-helpers.c:165 +#: ../src/connection-editor/page-team.c:341 +#: ../src/connection-editor/page-team-port.c:203 +#: ../src/connection-editor/vpn-helpers.c:168 msgid "Select file to import" msgstr "Seleccioneu el fitxer a importar" -#: ../src/connection-editor/page-team.c:118 -#: ../src/connection-editor/page-team-port.c:91 +#: ../src/connection-editor/page-team.c:361 +#: ../src/connection-editor/page-team-port.c:223 msgid "Error: file doesn't contain a valid JSON configuration" msgstr "Error: el fitxer no conté una configuració JSON vàlida" -#: ../src/connection-editor/page-team.c:270 +#: ../src/connection-editor/page-team.c:1031 msgid "Could not load team user interface." msgstr "No s'ha pogut carregar la interfície d'usuari de l'equip." -#: ../src/connection-editor/page-team.c:377 +#: ../src/connection-editor/page-team.c:1124 #, c-format msgid "Team connection %d" msgstr "Connexió en equip %d" @@ -2857,11 +3349,11 @@ msgstr "Connexió en equip %d" #. Translators: a "Team Port" is a network #. * device that is part of a team. #. -#: ../src/connection-editor/page-team-port.c:151 +#: ../src/connection-editor/page-team-port.c:655 msgid "Team Port" msgstr "Port de l'equip" -#: ../src/connection-editor/page-team-port.c:153 +#: ../src/connection-editor/page-team-port.c:657 msgid "Could not load team port user interface." msgstr "No s'ha pogut carregar la interfície d'usuari del port de l'equip." @@ -2878,35 +3370,44 @@ msgstr "%s (via «%s»)" msgid "New connection..." msgstr "Connexió nova..." -#: ../src/connection-editor/page-vlan.c:596 +#: ../src/connection-editor/page-vlan.c:594 msgid "Could not load vlan user interface." msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VLAN." -#: ../src/connection-editor/page-vlan.c:734 +#: ../src/connection-editor/page-vlan.c:732 msgid "vlan parent" msgstr "vlan arrel" -#: ../src/connection-editor/page-vlan.c:797 +#: ../src/connection-editor/page-vlan.c:796 #, c-format msgid "VLAN connection %d" msgstr "Connexió VLAN %d" -#: ../src/connection-editor/page-vpn.c:103 +#: ../src/connection-editor/page-vpn.c:98 msgid "Could not load VPN user interface." msgstr "No s'ha pogut carregar la interfície d'usuari per a la connexió VPN." -#: ../src/connection-editor/page-vpn.c:118 +#: ../src/connection-editor/page-vpn.c:113 #, c-format -msgid "Could not find VPN plugin service for '%s'." -msgstr "No s'ha trobat cap servei de connector VPN per a «%s»." +msgid "Could not find VPN plugin for '%s'." +msgstr "No s'ha pogut trobar el connector VPN per a «%s»." + +#: ../src/connection-editor/page-vpn.c:122 +#, c-format +msgid "Could not load editor VPN plugin for '%s' (%s)." +msgstr "No s'ha pogut carregar el connector de VPN d'editor per a «%s» (%s)." + +#: ../src/connection-editor/page-vpn.c:123 +msgid "unknown failure" +msgstr "fallada desconeguda" -#: ../src/connection-editor/page-vpn.c:205 -#: ../src/connection-editor/page-vpn.c:300 +#: ../src/connection-editor/page-vpn.c:216 +#: ../src/connection-editor/page-vpn.c:364 #, c-format msgid "VPN connection %d" msgstr "Connexió VPN %d" -#: ../src/connection-editor/page-vpn.c:229 +#: ../src/connection-editor/page-vpn.c:240 msgid "" "The VPN plugin failed to import the VPN connection correctly\n" "\n" @@ -2916,11 +3417,11 @@ msgstr "" "\n" "Error: no hi ha cap tipus de servei VPN." -#: ../src/connection-editor/page-vpn.c:254 +#: ../src/connection-editor/page-vpn.c:266 msgid "Choose a VPN Connection Type" msgstr "Seleccioneu un tipus de connexió VPN" -#: ../src/connection-editor/page-vpn.c:255 +#: ../src/connection-editor/page-vpn.c:267 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 " @@ -2953,46 +3454,45 @@ msgstr "" msgid "%u (%u MHz)" msgstr "%u (%u MHz)" -#: ../src/connection-editor/page-wifi.c:450 +#: ../src/connection-editor/page-wifi.c:443 msgid "Could not load Wi-Fi user interface." msgstr "" "No s'ha pogut carregar la interfície d'usuari per a la connexió sense fil." -#: ../src/connection-editor/page-wifi.c:571 +#: ../src/connection-editor/page-wifi.c:564 msgid "bssid" msgstr "bssid" -#: ../src/connection-editor/page-wifi.c:577 +#: ../src/connection-editor/page-wifi.c:570 msgid "Wi-Fi device" msgstr "Dispositiu Wi-Fi" -#: ../src/connection-editor/page-wifi.c:619 +#: ../src/connection-editor/page-wifi.c:613 #, c-format msgid "Wi-Fi connection %d" msgstr "Connexió de xarxa sense fil %d" #: ../src/connection-editor/page-wifi-security.c:309 -#: ../src/libnma/nma-wifi-dialog.c:906 ../src/libnm-gtk/nm-wifi-dialog.c:922 +#: ../src/libnma/nma-wifi-dialog.c:920 ../src/libnm-gtk/nm-wifi-dialog.c:922 msgid "WEP 40/128-bit Key (Hex or ASCII)" msgstr "Clau WEP de 40/128 bits (Hex o ASCII)" #: ../src/connection-editor/page-wifi-security.c:319 -#: ../src/libnma/nma-wifi-dialog.c:915 ../src/libnm-gtk/nm-wifi-dialog.c:931 +#: ../src/libnma/nma-wifi-dialog.c:929 ../src/libnm-gtk/nm-wifi-dialog.c:931 msgid "WEP 128-bit Passphrase" msgstr "Contrasenya WEP de 128 bits" #: ../src/connection-editor/page-wifi-security.c:345 -#: ../src/libnma/nma-wifi-dialog.c:945 ../src/libnm-gtk/nm-wifi-dialog.c:961 msgid "Dynamic WEP (802.1X)" msgstr "WEP dinàmic 802.1X" #: ../src/connection-editor/page-wifi-security.c:358 -#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:975 +#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:975 msgid "WPA & WPA2 Personal" msgstr "WPA i WPA2 Personal" #: ../src/connection-editor/page-wifi-security.c:371 -#: ../src/libnma/nma-wifi-dialog.c:973 ../src/libnm-gtk/nm-wifi-dialog.c:989 +#: ../src/libnma/nma-wifi-dialog.c:987 ../src/libnm-gtk/nm-wifi-dialog.c:989 msgid "WPA & WPA2 Enterprise" msgstr "WPA i WPA2 Enterprise" @@ -3022,11 +3522,11 @@ msgstr "falta el SSID" msgid "Security not compatible with Ad-Hoc mode" msgstr "La seguretat no és compatible amb el mode Ad-Hoc" -#: ../src/connection-editor/vpn-helpers.c:138 +#: ../src/connection-editor/vpn-helpers.c:141 msgid "Cannot import VPN connection" msgstr "No es pot importar la connexió VPN" -#: ../src/connection-editor/vpn-helpers.c:140 +#: ../src/connection-editor/vpn-helpers.c:143 #, c-format msgid "" "The file '%s' could not be read or does not contain recognized VPN " @@ -3039,29 +3539,29 @@ msgstr "" "\n" "Error: %s." -#: ../src/connection-editor/vpn-helpers.c:141 +#: ../src/connection-editor/vpn-helpers.c:144 msgid "unknown error" msgstr "error desconegut" -#: ../src/connection-editor/vpn-helpers.c:215 +#: ../src/connection-editor/vpn-helpers.c:218 #, c-format msgid "A file named \"%s\" already exists." msgstr "Ja existeix un fitxer anomenat «%s»." -#: ../src/connection-editor/vpn-helpers.c:217 +#: ../src/connection-editor/vpn-helpers.c:220 msgid "_Replace" msgstr "_Reemplaça" -#: ../src/connection-editor/vpn-helpers.c:219 +#: ../src/connection-editor/vpn-helpers.c:222 #, c-format msgid "Do you want to replace %s with the VPN connection you are saving?" msgstr "Voleu reemplaçar %s per la connexió VPN que esteu desant?" -#: ../src/connection-editor/vpn-helpers.c:255 +#: ../src/connection-editor/vpn-helpers.c:258 msgid "Cannot export VPN connection" msgstr "No es pot exportar la connexió VPN" -#: ../src/connection-editor/vpn-helpers.c:257 +#: ../src/connection-editor/vpn-helpers.c:260 #, c-format msgid "" "The VPN connection '%s' could not be exported to %s.\n" @@ -3072,18 +3572,10 @@ msgstr "" "\n" "Error: %s." -#: ../src/connection-editor/vpn-helpers.c:292 +#: ../src/connection-editor/vpn-helpers.c:295 msgid "Export VPN connection..." msgstr "Exporta una connexió VPN..." -#: ../src/ethernet-dialog.c:86 ../src/ethernet-dialog.c:94 -msgid "" -"The NetworkManager Applet could not find some required resources (the .ui " -"file was not found)." -msgstr "" -"La miniaplicació NetworkManager no ha pogut trobar alguns dels recursos " -"necessaris (no s'ha trobat el fitxer d'interfície d'usuari)." - #: ../src/gsm-unlock.ui.h:2 msgid "_Unlock" msgstr "_Desbloqueja" @@ -3344,20 +3836,24 @@ msgstr "" "O bé falta la contrasenya o la connexió no és vàlida. En el segon cas heu " "d'editar primer la connexió amb el nm-connection-editor" -#: ../src/libnma/nma-wifi-dialog.c:455 ../src/libnm-gtk/nm-wifi-dialog.c:465 +#: ../src/libnma/nma-wifi-dialog.c:465 ../src/libnm-gtk/nm-wifi-dialog.c:465 msgid "New..." msgstr "Nova..." -#: ../src/libnma/nma-wifi-dialog.c:889 ../src/libnm-gtk/nm-wifi-dialog.c:905 +#: ../src/libnma/nma-wifi-dialog.c:903 ../src/libnm-gtk/nm-wifi-dialog.c:905 msgctxt "Wifi/wired security" msgid "None" msgstr "Cap" -#: ../src/libnma/nma-wifi-dialog.c:1057 ../src/libnm-gtk/nm-wifi-dialog.c:1075 +#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961 +msgid "Dynamic WEP (802.1x)" +msgstr "WEP dinàmic (802.1X)" + +#: ../src/libnma/nma-wifi-dialog.c:1071 ../src/libnm-gtk/nm-wifi-dialog.c:1075 msgid "C_reate" msgstr "C_rea" -#: ../src/libnma/nma-wifi-dialog.c:1143 ../src/libnm-gtk/nm-wifi-dialog.c:1161 +#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1161 #, c-format msgid "" "Passwords or encryption keys are required to access the Wi-Fi network '%s'." @@ -3365,35 +3861,35 @@ msgstr "" "Cal una contrasenya o claus d'encriptació per accedir a la xarxa sense fil " "«%s»." -#: ../src/libnma/nma-wifi-dialog.c:1145 ../src/libnm-gtk/nm-wifi-dialog.c:1163 +#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1163 msgid "Wi-Fi Network Authentication Required" msgstr "Cal autenticació per a la xarxa sense fil" -#: ../src/libnma/nma-wifi-dialog.c:1147 ../src/libnm-gtk/nm-wifi-dialog.c:1165 +#: ../src/libnma/nma-wifi-dialog.c:1161 ../src/libnm-gtk/nm-wifi-dialog.c:1165 msgid "Authentication required by Wi-Fi network" msgstr "Cal autenticació per a la xarxa sense fil" -#: ../src/libnma/nma-wifi-dialog.c:1152 ../src/libnm-gtk/nm-wifi-dialog.c:1170 +#: ../src/libnma/nma-wifi-dialog.c:1166 ../src/libnm-gtk/nm-wifi-dialog.c:1170 msgid "Create New Wi-Fi Network" msgstr "Crea una xarxa sense fil nova" -#: ../src/libnma/nma-wifi-dialog.c:1154 ../src/libnm-gtk/nm-wifi-dialog.c:1172 +#: ../src/libnma/nma-wifi-dialog.c:1168 ../src/libnm-gtk/nm-wifi-dialog.c:1172 msgid "New Wi-Fi network" msgstr "Xarxa sense fil nova" -#: ../src/libnma/nma-wifi-dialog.c:1155 ../src/libnm-gtk/nm-wifi-dialog.c:1173 +#: ../src/libnma/nma-wifi-dialog.c:1169 ../src/libnm-gtk/nm-wifi-dialog.c:1173 msgid "Enter a name for the Wi-Fi network you wish to create." msgstr "Introduïu el nom de la xarxa sense fil que voleu crear." -#: ../src/libnma/nma-wifi-dialog.c:1157 ../src/libnm-gtk/nm-wifi-dialog.c:1175 +#: ../src/libnma/nma-wifi-dialog.c:1171 ../src/libnm-gtk/nm-wifi-dialog.c:1175 msgid "Connect to Hidden Wi-Fi Network" msgstr "Connecta't a la xarxa sense fil oculta" -#: ../src/libnma/nma-wifi-dialog.c:1159 ../src/libnm-gtk/nm-wifi-dialog.c:1177 +#: ../src/libnma/nma-wifi-dialog.c:1173 ../src/libnm-gtk/nm-wifi-dialog.c:1177 msgid "Hidden Wi-Fi network" msgstr "Xarxa sense fil oculta" -#: ../src/libnma/nma-wifi-dialog.c:1160 ../src/libnm-gtk/nm-wifi-dialog.c:1178 +#: ../src/libnma/nma-wifi-dialog.c:1174 ../src/libnm-gtk/nm-wifi-dialog.c:1178 msgid "" "Enter the name and security details of the hidden Wi-Fi network you wish to " "connect to." @@ -3560,12 +4056,12 @@ msgstr "Cal que introduïu el codi PIN" msgid "PIN code is needed for the mobile broadband device" msgstr "Cal que introduïu un codi PIN per al dispositiu de banda ampla mòbil" -#: ../src/mobile-helpers.c:619 +#: ../src/mobile-helpers.c:622 #, c-format msgid "Mobile broadband connection '%s' active: (%d%%%s%s)" msgstr "La connexió de banda ampla mòbil «%s» és activa: (%d%%%s%s)" -#: ../src/mobile-helpers.c:622 +#: ../src/mobile-helpers.c:625 msgid "roaming" msgstr "itinerància" @@ -3575,43 +4071,47 @@ msgstr "itinerància" msgid "%s connection" msgstr "connexió de %s" -#: ../src/wireless-security/eap-method.c:56 +#: ../src/wireless-security/eap-method.c:57 msgid "undefined error in 802.1X security (wpa-eap)" msgstr "error no definit a la seguretat 802.1X (wpa-eap)" -#: ../src/wireless-security/eap-method.c:255 +#: ../src/wireless-security/eap-method.c:233 +msgid "no file selected" +msgstr "no s'ha seleccionat cap fitxer" + +#: ../src/wireless-security/eap-method.c:264 msgid "unspecified error validating eap-method file" msgstr "" "s'ha produït un error no especificat quan s'estava validant el fitxer del " "mètode eap" -#: ../src/wireless-security/eap-method.c:452 +#: ../src/wireless-security/eap-method.c:468 msgid "DER, PEM, or PKCS#12 private keys (*.der, *.pem, *.p12, *.key)" msgstr "Claus privades DER, PEM o PKCS#12 (*.der, *.pem, *.p12, *.key)" -#: ../src/wireless-security/eap-method.c:455 +#: ../src/wireless-security/eap-method.c:471 msgid "DER or PEM certificates (*.der, *.pem, *.crt, *.cer)" msgstr "Certificats DER o PEM (*.der, *.pem, *.crt, *.cer)" -#: ../src/wireless-security/eap-method-fast.c:70 +#: ../src/wireless-security/eap-method-fast.c:72 msgid "missing EAP-FAST PAC file" msgstr "falta el fitxer EAP-FAST PAC" -#: ../src/wireless-security/eap-method-fast.c:265 +#: ../src/wireless-security/eap-method-fast.c:268 #: ../src/wireless-security/eap-method-peap.c:302 #: ../src/wireless-security/eap-method-ttls.c:333 msgid "GTC" msgstr "GTC" -#: ../src/wireless-security/eap-method-fast.c:403 -msgid "Choose a PAC file..." -msgstr "Seleccioneu un fitxer PAC..." +#: ../src/wireless-security/eap-method-fast.c:406 +msgid "Choose a PAC file" +msgstr "Seleccioneu un fitxer PAC" -#: ../src/wireless-security/eap-method-fast.c:410 +#: ../src/wireless-security/eap-method-fast.c:413 msgid "PAC files (*.pac)" msgstr "Fitxers PAC (*.pac)" -#: ../src/wireless-security/eap-method-fast.c:414 +#: ../src/wireless-security/eap-method-fast.c:417 msgid "All files" msgstr "Tots els fitxers" @@ -3648,11 +4148,11 @@ msgstr "Autenticació i_nterna:" msgid "Allow automatic PAC pro_visioning" msgstr "_Permet la provisió automàtica PAC" -#: ../src/wireless-security/eap-method-leap.c:63 +#: ../src/wireless-security/eap-method-leap.c:65 msgid "missing EAP-LEAP username" msgstr "falta el nom d'usuari EAP-LEAP" -#: ../src/wireless-security/eap-method-leap.c:69 +#: ../src/wireless-security/eap-method-leap.c:74 msgid "missing EAP-LEAP password" msgstr "falta la contrasenya EAP-LEAP" @@ -3672,10 +4172,10 @@ msgid "MD5" msgstr "MD5" #: ../src/wireless-security/eap-method-peap.c:381 -#: ../src/wireless-security/eap-method-tls.c:481 +#: ../src/wireless-security/eap-method-tls.c:501 #: ../src/wireless-security/eap-method-ttls.c:412 -msgid "Choose a Certificate Authority certificate..." -msgstr "Trieu un certificat d'autoritat de certificació (CA)..." +msgid "Choose a Certificate Authority certificate" +msgstr "Trieu un certificat d'autoritat de certificació" #: ../src/wireless-security/eap-method-peap.ui.h:3 msgid "Version 0" @@ -3701,46 +4201,46 @@ msgstr "No es _requereix cap certificat de CA" msgid "PEAP _version:" msgstr "Versió del _PEAP:" -#: ../src/wireless-security/eap-method-simple.c:72 +#: ../src/wireless-security/eap-method-simple.c:74 msgid "missing EAP username" msgstr "falta el nom d'usuari EAP" -#: ../src/wireless-security/eap-method-simple.c:82 +#: ../src/wireless-security/eap-method-simple.c:87 msgid "missing EAP password" msgstr "falta la clau EAP" -#: ../src/wireless-security/eap-method-tls.c:66 +#: ../src/wireless-security/eap-method-tls.c:68 msgid "missing EAP-TLS identity" msgstr "falta la identitat EAP-TLS" -#: ../src/wireless-security/eap-method-tls.c:71 +#: ../src/wireless-security/eap-method-tls.c:77 #, c-format msgid "invalid EAP-TLS CA certificate: %s" msgstr "certificat EAP-TLS CA no vàlid: %s" -#: ../src/wireless-security/eap-method-tls.c:76 +#: ../src/wireless-security/eap-method-tls.c:84 msgid "invalid EAP-TLS CA certificate: no certificate specified" msgstr "certificat EAP-TLS CA no vàlid: no s'ha especificat cap certificat" -#: ../src/wireless-security/eap-method-tls.c:84 +#: ../src/wireless-security/eap-method-tls.c:95 msgid "invalid EAP-TLS password: missing" msgstr "contrasenya EAP-TLS no vàlida: falta" -#: ../src/wireless-security/eap-method-tls.c:94 +#: ../src/wireless-security/eap-method-tls.c:109 #, c-format msgid "invalid EAP-TLS private-key: %s" msgstr "clau privada EAP-TLS no vàlida: %s" -#: ../src/wireless-security/eap-method-tls.c:101 +#: ../src/wireless-security/eap-method-tls.c:119 #, c-format msgid "invalid EAP-TLS user-certificate: %s" msgstr "certificat d'usuari EAP-TLS no vàlid: %s" -#: ../src/wireless-security/eap-method-tls.c:296 +#: ../src/wireless-security/eap-method-tls.c:316 msgid "Unencrypted private keys are insecure" msgstr "Les claus privades sense encriptar no són segures" -#: ../src/wireless-security/eap-method-tls.c:299 +#: ../src/wireless-security/eap-method-tls.c:319 msgid "" "The selected private key does not appear to be protected by a password. " "This could allow your security credentials to be compromised. Please select " @@ -3754,13 +4254,13 @@ msgstr "" "\n" "(Podeu utilitzar l'OpenSSL per protegir la vostra clau privada)" -#: ../src/wireless-security/eap-method-tls.c:475 -msgid "Choose your personal certificate..." -msgstr "Trieu el vostre certificat personal..." +#: ../src/wireless-security/eap-method-tls.c:495 +msgid "Choose your personal certificate" +msgstr "Trieu el vostre certificat personal" -#: ../src/wireless-security/eap-method-tls.c:487 -msgid "Choose your private key..." -msgstr "Trieu la vostra clau privada..." +#: ../src/wireless-security/eap-method-tls.c:507 +msgid "Choose your private key" +msgstr "Trieu la vostra clau privada" #: ../src/wireless-security/eap-method-tls.ui.h:1 msgid "I_dentity:" @@ -3817,26 +4317,26 @@ msgstr "EAP protegit (PEAP)" msgid "Au_thentication:" msgstr "_Autenticació:" -#: ../src/wireless-security/ws-leap.c:61 +#: ../src/wireless-security/ws-leap.c:63 msgid "missing leap-username" msgstr "falta el nom d'usuari leap" -#: ../src/wireless-security/ws-leap.c:69 +#: ../src/wireless-security/ws-leap.c:74 msgid "missing leap-password" msgstr "falta la contrasenya leap" -#: ../src/wireless-security/ws-wep-key.c:105 +#: ../src/wireless-security/ws-wep-key.c:107 msgid "missing wep-key" msgstr "falta la clau wep" -#: ../src/wireless-security/ws-wep-key.c:113 +#: ../src/wireless-security/ws-wep-key.c:116 #, c-format msgid "invalid wep-key: key with a length of %zu must contain only hex-digits" msgstr "" "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols dígits " "hexadecimals" -#: ../src/wireless-security/ws-wep-key.c:120 +#: ../src/wireless-security/ws-wep-key.c:124 #, c-format msgid "" "invalid wep-key: key with a length of %zu must contain only ascii characters" @@ -3844,7 +4344,7 @@ msgstr "" "clau wep no vàlida: una clau amb longitud %zu ha de contenir sols caràcters " "ascii" -#: ../src/wireless-security/ws-wep-key.c:125 +#: ../src/wireless-security/ws-wep-key.c:130 #, c-format msgid "" "invalid wep-key: wrong key length %zu. A key must be either of length 5/13 " @@ -3853,11 +4353,11 @@ msgstr "" "clau web no vàlida: la longitud %zu és incorrecta. Una clau ha de tenir " "longitud 5/13 (ascii) o 10/26 (hex)" -#: ../src/wireless-security/ws-wep-key.c:131 +#: ../src/wireless-security/ws-wep-key.c:137 msgid "invalid wep-key: passphrase must be non-empty" msgstr "clau web no vàlida: la frase de contrasenya no pot estar buida" -#: ../src/wireless-security/ws-wep-key.c:133 +#: ../src/wireless-security/ws-wep-key.c:139 msgid "invalid wep-key: passphrase must be shorter than 64 characters" msgstr "" "clau web no vàlida: la frase de contrasenya ha de tenir una longitud " @@ -3887,7 +4387,7 @@ msgstr "Most_ra la clau" msgid "WEP inde_x:" msgstr "Índe_x WEP:" -#: ../src/wireless-security/ws-wpa-psk.c:69 +#: ../src/wireless-security/ws-wpa-psk.c:70 #, c-format msgid "" "invalid wpa-psk: invalid key-length %zu. Must be [8,63] bytes or 64 hex " @@ -3896,7 +4396,7 @@ msgstr "" "wpa-psk no vàlida: la longitud de la clau %zu no és vàlida. Ha de ser [8,63] " "bytes o 64 dígits hexadecimals" -#: ../src/wireless-security/ws-wpa-psk.c:77 +#: ../src/wireless-security/ws-wpa-psk.c:79 msgid "invalid wpa-psk: cannot interpret key with 64 bytes as hex" msgstr "" "wpa-psk no vàlida: no es pot interpretar una clau amb 64 bytes com a " @@ -3906,6 +4406,15 @@ msgstr "" msgid "_Type:" msgstr "_Tipus:" +#~ msgid "NetworkManager for GNOME" +#~ msgstr "NetworkManager per al GNOME" + +#~ msgid "_Disconnect VPN" +#~ msgstr "_Desconnecta la VPN" + +#~ msgid "_Import team configuration from a file..." +#~ msgstr "_Importa una configuració en equip des d'un fitxer..." + #~ msgid "_Help" #~ msgstr "A_juda" @@ -1,22 +1,22 @@ -# translation of networkmanager-applet.master.po to Spanish
-# Traducción de NetworkManager al español.
-# Copyright (C) Spanish translation for NetworkManager
-# This file is distributed under the same license as the NetworkManager package.
-#
-# Antonio Ognio <antonio@linux.org.pe>, 2004.
-# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
-# Lucas Vieites Fariña <lucas@asixinformatica.com>, 2005, 2006.
-# Gladys Guerrero <gguerrer@redhat.com>, 2010.
-# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-#
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015.
, 2016. +# translation of networkmanager-applet.master.po to Spanish +# Traducción de NetworkManager al español. +# Copyright (C) Spanish translation for NetworkManager +# This file is distributed under the same license as the NetworkManager package. +# +# Antonio Ognio <antonio@linux.org.pe>, 2004. +# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006. +# Lucas Vieites Fariña <lucas@asixinformatica.com>, 2005, 2006. +# Gladys Guerrero <gguerrer@redhat.com>, 2010. +# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011. +# +# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: networkmanager-applet.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=NetworkManager&keywords=I18N+L10N&component=nm-applet\n" -"POT-Creation-Date: 2016-07-26 09:21+0000\n" +"POT-Creation-Date: 2016-08-23 12:32+0000\n" "PO-Revision-Date: 2016-07-26 13:28+0200\n" "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n" "Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n" @@ -763,8 +763,7 @@ msgstr "Falló al añadir la conexión nueva" msgid "Error displaying connection information:" msgstr "Ha ocurrido un error al mostrar información de la conexión:" -#: ../src/applet-dialogs.c:72 -#: ../src/connection-editor/page-wifi-security.c:332 +#: ../src/applet-dialogs.c:72 ../src/connection-editor/page-wifi-security.c:332 #: ../src/libnma/nma-wifi-dialog.c:946 ../src/libnm-gtk/nm-wifi-dialog.c:948 #: ../src/wireless-security/wireless-security.c:448 msgid "LEAP" @@ -1104,8 +1103,7 @@ msgstr "" "predeterminada." #: ../src/connection-editor/ce-new-connection.ui.h:1 ../src/libnma/wifi.ui.h:1 -#: ../src/libnm-gtk/wifi.ui.h:1 -#: ../src/wireless-security/eap-method-fast.ui.h:1 +#: ../src/libnm-gtk/wifi.ui.h:1 ../src/wireless-security/eap-method-fast.ui.h:1 #: ../src/wireless-security/eap-method-peap.ui.h:1 #: ../src/wireless-security/eap-method-ttls.ui.h:1 #: ../src/wireless-security/ws-dynamic-wep.ui.h:1 @@ -1302,13 +1300,11 @@ msgstr "Edad _máxima:" msgid "_Aging time:" msgstr "_Tiempo de de caducidad:" -#: ../src/connection-editor/ce-page.c:78 -#: ../src/connection-editor/ce-page.c:112 +#: ../src/connection-editor/ce-page.c:78 ../src/connection-editor/ce-page.c:112 msgid "automatic" msgstr "automático" -#: ../src/connection-editor/ce-page.c:86 -#: ../src/connection-editor/ce-page.c:121 +#: ../src/connection-editor/ce-page.c:86 ../src/connection-editor/ce-page.c:121 #: ../src/connection-editor/ce-page-dcb.ui.h:13 #: ../src/connection-editor/page-wifi.c:168 #: ../src/connection-editor/page-wifi.c:172 @@ -1965,7 +1961,6 @@ msgstr "Enviar paquetes _echo PPP" #: ../src/connection-editor/ce-page-team-port.ui.h:1 #: ../src/connection-editor/ce-page-team.ui.h:19 -#| msgid "Advanced" msgid "Ad_vanced..." msgstr "Avanzada…" @@ -1975,7 +1970,6 @@ msgstr "" #: ../src/connection-editor/ce-page-team-port.ui.h:3 #: ../src/connection-editor/ce-page-team.ui.h:9 -#| msgid "Ethernet Networks" msgid "Ethernet port state" msgstr "Estado del puerto Ethernet" @@ -2010,7 +2004,6 @@ msgid "ID of queue which this port should be mapped to." msgstr "" #: ../src/connection-editor/ce-page-team-port.ui.h:10 -#| msgid "_Priority:" msgid "_Port priority:" msgstr "_Prioridad del puerto:" @@ -2041,12 +2034,10 @@ msgid "Active-Backup runner options" msgstr "" #: ../src/connection-editor/ce-page-team-port.ui.h:16 -#| msgid "_Priority:" msgid "_LACP port priority:" msgstr "Prioridad del puerto _LACP:" #: ../src/connection-editor/ce-page-team-port.ui.h:17 -#| msgid "Private _key:" msgid "LACP port _key:" msgstr "Cla_ve del puerto LACP:" @@ -2087,19 +2078,16 @@ msgstr "" #: ../src/connection-editor/ce-page-team-port.ui.h:25 #: ../src/connection-editor/ce-page-team.ui.h:71 -#| msgid "Link _up delay:" msgid "_Up delay:" msgstr "_Retardo al levantar el enlace:" #: ../src/connection-editor/ce-page-team-port.ui.h:26 #: ../src/connection-editor/ce-page-team.ui.h:72 -#| msgid "Link _down delay:" msgid "_Down delay:" msgstr "Retardo al _desconectar el enlace:" #: ../src/connection-editor/ce-page-team-port.ui.h:27 #: ../src/connection-editor/ce-page-team.ui.h:73 -#| msgid "_Parent interface:" msgid "Send _interval:" msgstr "_Intervalo de envío:" @@ -2215,7 +2203,6 @@ msgstr "I_mportar configuración redundada desde un archivo…" #: ../src/connection-editor/ce-page-team-port.ui.h:47 #: ../src/connection-editor/ce-page-team.ui.h:94 -#| msgid "_JSON config:" msgid "Edit _JSON configuration:" msgstr "Editar configuración de _JSON:" @@ -2233,7 +2220,6 @@ msgid "Highest priority (stable)" msgstr "Prioridad más alta (estable)" #: ../src/connection-editor/ce-page-team.ui.h:3 -#| msgid "Group Bandwidth:" msgid "Bandwidth" msgstr "Ancho de banda" @@ -2242,7 +2228,6 @@ msgid "Highest number of ports" msgstr "Número de puertos más alto" #: ../src/connection-editor/ce-page-team.ui.h:5 -#| msgid "Priority" msgid "Port priority" msgstr "Prioridad del puerto" @@ -2273,8 +2258,6 @@ msgid "LACP" msgstr "LACP" #: ../src/connection-editor/ce-page-team.ui.h:25 -#| msgctxt "Wi-Fi/Ethernet security" -#| msgid "None" msgid "None" msgstr "Ninguna" @@ -2293,7 +2276,6 @@ msgid "VLAN" msgstr "VLAN" #: ../src/connection-editor/ce-page-team.ui.h:31 -#| msgid "FIP" msgid "IP" msgstr "IP" @@ -2302,7 +2284,6 @@ msgid "Any L3 protocol" msgstr "Cualquier protocolo L3" #: ../src/connection-editor/ce-page-team.ui.h:33 -#| msgid "GTC" msgid "TCP" msgstr "TCP" @@ -2335,7 +2316,6 @@ msgid "Multicast _rejoin interval:" msgstr "" #: ../src/connection-editor/ce-page-team.ui.h:46 -#| msgid "Hardware Address:" msgid "_Hardware Address:" msgstr "Dirección _hardware:" @@ -2350,7 +2330,6 @@ msgid "_Runner:" msgstr "" #: ../src/connection-editor/ce-page-team.ui.h:50 -#| msgid "Hardware Address:" msgid "_Hardware address policy:" msgstr "Política de dirección _hardware:" @@ -2386,7 +2365,6 @@ msgid "" msgstr "" #: ../src/connection-editor/ce-page-team.ui.h:57 -#| msgid "_Priority:" msgid "_System priority:" msgstr "_Prioridad del sistema:" @@ -2431,12 +2409,10 @@ msgid "Name of active Tx balancer. Active Tx balancing is disabled by default." msgstr "" #: ../src/connection-editor/ce-page-team.ui.h:67 -#| msgid "Transmission po_wer:" msgid "Transmission _balancing interval:" msgstr "_Intervalo de _balanceo de la transmisión:" #: ../src/connection-editor/ce-page-team.ui.h:68 -#| msgid "Transmission po_wer:" msgid "_Transmission balancer:" msgstr "_Balanceador de la transmisión:" @@ -2633,8 +2609,8 @@ msgid "Bond" msgstr "Bond" #: ../src/connection-editor/connection-helpers.c:116 -#: ../src/connection-editor/page-team.c:1028 -#: ../src/libnm-gtk/nm-ui-utils.c:335 ../src/libnm-gtk/nm-ui-utils.c:579 +#: ../src/connection-editor/page-team.c:1028 ../src/libnm-gtk/nm-ui-utils.c:335 +#: ../src/libnm-gtk/nm-ui-utils.c:579 msgid "Team" msgstr "Unir" @@ -2885,11 +2861,15 @@ msgid "Did not find a connection with UUID '%s'" msgstr "No se encontró una conexión con UUID «%s»" #: ../src/connection-editor/page-8021x-security.c:109 -msgid "802.1x Security" +#, fuzzy +#| msgid "802.1x Security" +msgid "802.1X Security" msgstr "Seguridad 802.1x" #: ../src/connection-editor/page-8021x-security.c:111 -msgid "Could not load 802.1x Security user interface." +#, fuzzy +#| msgid "Could not load 802.1x Security user interface." +msgid "Could not load 802.1X Security user interface." msgstr "No se pudo cargar la interfaz de usuario de seguridad 802.1x." #: ../src/connection-editor/page-8021x-security.c:125 @@ -3450,8 +3430,9 @@ msgid "WEP 128-bit Passphrase" msgstr "Frase de paso WEP de 128 bits" #: ../src/connection-editor/page-wifi-security.c:345 -#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961 -msgid "Dynamic WEP (802.1x)" +#, fuzzy +#| msgid "Dynamic WEP (802.1x)" +msgid "Dynamic WEP (802.1X)" msgstr "WEP dinámica (802.1x)" #: ../src/connection-editor/page-wifi-security.c:358 @@ -3809,6 +3790,10 @@ msgctxt "Wifi/wired security" msgid "None" msgstr "Ninguna" +#: ../src/libnma/nma-wifi-dialog.c:959 ../src/libnm-gtk/nm-wifi-dialog.c:961 +msgid "Dynamic WEP (802.1x)" +msgstr "WEP dinámica (802.1x)" + #: ../src/libnma/nma-wifi-dialog.c:1071 ../src/libnm-gtk/nm-wifi-dialog.c:1075 msgid "C_reate" msgstr "C_rear" @@ -4032,7 +4017,9 @@ msgid "%s connection" msgstr "Conexión %s" #: ../src/wireless-security/eap-method.c:57 -msgid "undefined error in 802.1x security (wpa-eap)" +#, fuzzy +#| msgid "undefined error in 802.1x security (wpa-eap)" +msgid "undefined error in 802.1X security (wpa-eap)" msgstr "error no definido en la seguridad 802.1x (wpa-eap)" #: ../src/wireless-security/eap-method.c:233 @@ -4250,7 +4237,9 @@ msgstr "" "ningún certificado" #: ../src/wireless-security/wireless-security.c:72 -msgid "Unknown error validating 802.1x security" +#, fuzzy +#| msgid "Unknown error validating 802.1x security" +msgid "Unknown error validating 802.1X security" msgstr "Error desconocido al validar la seguridad 802.1x" #: ../src/wireless-security/wireless-security.c:436 diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui index fe49af58..ab0a453c 100644 --- a/src/connection-editor/ce-page-general.ui +++ b/src/connection-editor/ce-page-general.ui @@ -91,7 +91,7 @@ <property name="spacing">6</property> <child> <object class="GtkLabel" id="firewall_zone_label"> - <property name="visible">True</property> + <property name="visible">False</property> <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Firewall _zone:</property> diff --git a/src/connection-editor/ce-page-ip4.ui b/src/connection-editor/ce-page-ip4.ui index 7acaab56..11c077fe 100644 --- a/src/connection-editor/ce-page-ip4.ui +++ b/src/connection-editor/ce-page-ip4.ui @@ -84,7 +84,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Addresses</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -117,8 +116,6 @@ <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff --git a/src/connection-editor/ce-page-ip6.ui b/src/connection-editor/ce-page-ip6.ui index e3b94b06..511383b6 100644 --- a/src/connection-editor/ce-page-ip6.ui +++ b/src/connection-editor/ce-page-ip6.ui @@ -101,7 +101,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Addresses</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -134,8 +133,6 @@ <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">IP addresses identify your computer on the network. Click the "Add" button to add an IP address.</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h index 6fdb33cb..f1b0810f 100644 --- a/src/connection-editor/ce-page.h +++ b/src/connection-editor/ce-page.h @@ -99,6 +99,20 @@ typedef CEPage* (*CEPageNewFunc)(NMConnectionEditor *editor, const char **out_secrets_setting_name, GError **error); +#define CE_TOOLTIP_ADDR_AUTO _("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.") +#define CE_TOOLTIP_ADDR_MANUAL _("IP addresses identify your computer on the network. " \ + "Click the \"Add\" button to add an IP address.") +#define CE_TOOLTIP_ADDR_SHARED _("The IP address identify your computer on the network and " \ + "determines the address range distributed to other computers. " \ + "Click the \"Add\" button to add an IP address. "\ + "If no address is provided, one in the 10.42.x.x range will " \ + "be used.") + +#define CE_LABEL_ADDR_AUTO _("Additional static addresses") +#define CE_LABEL_ADDR_MANUAL _("Addresses") +#define CE_LABEL_ADDR_SHARED _("Address (optional)") GType ce_page_get_type (void); diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c index 3b8b0022..a0275647 100644 --- a/src/connection-editor/page-general.c +++ b/src/connection-editor/page-general.c @@ -34,6 +34,7 @@ typedef struct { GDBusProxy *fw_proxy; GCancellable *cancellable; GtkComboBoxText *firewall_zone; + GtkLabel *firewall_zone_label; char **zones; gboolean got_zones; @@ -49,8 +50,7 @@ typedef struct { /* TRANSLATORS: Default zone set for firewall, when no zone is selected */ #define FIREWALL_ZONE_DEFAULT _("Default") -#define FIREWALL_ZONE_TOOLTIP_AVAILBALE _("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.") -#define FIREWALL_ZONE_TOOLTIP_UNAVAILBALE _("FirewallD is not running.") +#define FIREWALL_ZONE_TOOLTIP _("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.") enum { COL_ID, @@ -132,7 +132,6 @@ general_private_init (CEPageGeneral *self) CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self); GtkBuilder *builder; GtkWidget *vbox; - GtkLabel *label; builder = CE_PAGE (self)->builder; @@ -141,7 +140,6 @@ general_private_init (CEPageGeneral *self) vbox = GTK_WIDGET (gtk_builder_get_object (builder, "firewall_zone_vbox")); gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (priv->firewall_zone)); - gtk_widget_show_all (GTK_WIDGET (priv->firewall_zone)); /* Get zones from FirewallD */ priv->cancellable = g_cancellable_new (); @@ -156,8 +154,8 @@ general_private_init (CEPageGeneral *self) self); /* Set mnemonic widget for device Firewall zone label */ - label = GTK_LABEL (gtk_builder_get_object (builder, "firewall_zone_label")); - gtk_label_set_mnemonic_widget (label, GTK_WIDGET (priv->firewall_zone)); + priv->firewall_zone_label = GTK_LABEL (gtk_builder_get_object (builder, "firewall_zone_label")); + gtk_label_set_mnemonic_widget (priv->firewall_zone_label, GTK_WIDGET (priv->firewall_zone)); /*-- Dependent VPN connection --*/ priv->dependent_vpn_checkbox = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "dependent_vpn_checkbox")); @@ -228,11 +226,10 @@ populate_firewall_zones_ui (CEPageGeneral *self) /* Zone tooltip and availability */ if (priv->zones) { - gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP_AVAILBALE); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP); gtk_widget_set_sensitive (GTK_WIDGET (priv->firewall_zone), TRUE); - } else { - gtk_widget_set_tooltip_text (GTK_WIDGET (priv->firewall_zone), FIREWALL_ZONE_TOOLTIP_UNAVAILBALE); - gtk_widget_set_sensitive (GTK_WIDGET (priv->firewall_zone), FALSE); + gtk_widget_show_all (GTK_WIDGET (priv->firewall_zone)); + gtk_widget_show (GTK_WIDGET (priv->firewall_zone_label)); } stuff_changed (NULL, self); diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c index b457448d..9f4dbc86 100644 --- a/src/connection-editor/page-ip4.c +++ b/src/connection-editor/page-ip4.c @@ -59,6 +59,8 @@ typedef struct { GtkButton *addr_delete; GtkTreeView *addr_list; GtkCellRenderer *addr_cells[COL_LAST + 1]; + GtkTreeModel *addr_saved; + guint32 addr_method; /* DNS servers */ GtkWidget *dns_servers_label; @@ -235,6 +237,22 @@ ip4_private_init (CEPageIP4 *self, NMConnection *connection) } static void +address_list_changed (CEPageIP4 *self) +{ + CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (self); + GtkTreeModel *model; + int num_rows; + + if (priv->addr_method != IP4_METHOD_SHARED) + return; + + /* Only one address is allowed in shared mode */ + model = gtk_tree_view_get_model (priv->addr_list); + num_rows = gtk_tree_model_iter_n_children (model, NULL); + gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_add), num_rows == 0); +} + +static void method_changed (GtkComboBox *combo, gpointer user_data) { CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (user_data); @@ -246,6 +264,8 @@ method_changed (GtkComboBox *combo, gpointer user_data) gboolean ip4_required_enabled = TRUE; gboolean method_auto = FALSE; GtkTreeIter iter; + GtkListStore *store; + const char *tooltip = NULL, *label = NULL; if (gtk_combo_box_get_active_iter (priv->method, &iter)) { gtk_tree_model_get (GTK_TREE_MODEL (priv->method_store), &iter, @@ -254,24 +274,40 @@ method_changed (GtkComboBox *combo, gpointer user_data) switch (method) { case IP4_METHOD_AUTO: - addr_enabled = FALSE; + addr_enabled = TRUE; dhcp_enabled = routes_enabled = TRUE; dns_enabled = TRUE; method_auto = TRUE; + tooltip = CE_TOOLTIP_ADDR_AUTO; + label = CE_LABEL_ADDR_AUTO; break; case IP4_METHOD_AUTO_ADDRESSES: - addr_enabled = FALSE; + addr_enabled = TRUE; dns_enabled = dhcp_enabled = routes_enabled = TRUE; + tooltip = CE_TOOLTIP_ADDR_AUTO; + label = CE_LABEL_ADDR_AUTO; break; case IP4_METHOD_MANUAL: addr_enabled = dns_enabled = routes_enabled = TRUE; + tooltip = CE_TOOLTIP_ADDR_MANUAL; + label = CE_LABEL_ADDR_MANUAL; + break; + case IP4_METHOD_SHARED: + addr_enabled = TRUE; + tooltip = CE_TOOLTIP_ADDR_SHARED; + label = CE_LABEL_ADDR_SHARED; break; case IP4_METHOD_DISABLED: addr_enabled = dns_enabled = dhcp_enabled = routes_enabled = ip4_required_enabled = FALSE; + break; default: break; } + priv->addr_method = method; + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->addr_list), tooltip); + gtk_label_set_text (GTK_LABEL (priv->addr_label), label); + /* Disable DHCP stuff for VPNs (though in the future we should support * DHCP over tap interfaces for OpenVPN and vpnc). */ @@ -285,13 +321,41 @@ method_changed (GtkComboBox *combo, gpointer user_data) gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_add), addr_enabled); gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_delete), addr_enabled); gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_list), addr_enabled); - if (!addr_enabled) { - GtkListStore *store; - store = GTK_LIST_STORE (gtk_tree_view_get_model (priv->addr_list)); - gtk_list_store_clear (store); + if (addr_enabled) { + if (priv->addr_saved) { + /* Restore old entries */ + gtk_tree_view_set_model (priv->addr_list, priv->addr_saved); + g_clear_object (&priv->addr_saved); + } + } else { + if (!priv->addr_saved) { + /* Save current entries, set empty list */ + priv->addr_saved = g_object_ref (gtk_tree_view_get_model (priv->addr_list)); + store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + gtk_tree_view_set_model (priv->addr_list, GTK_TREE_MODEL (store)); + g_object_unref (store); + } } + if (method == IP4_METHOD_SHARED) { + GtkTreeModel *model; + gboolean iter_valid; + int i; + + /* Remove all rows except first */ + model = gtk_tree_view_get_model (priv->addr_list); + iter_valid = gtk_tree_model_get_iter_first (model, &iter); + for (i = 0; iter_valid; i++) { + if (i > 0) + iter_valid = gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + else + iter_valid = gtk_tree_model_iter_next (model, &iter); + } + } + + address_list_changed (user_data); + gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled); if (method_auto) gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->dns_servers_label), _("Additional DNS ser_vers:")); @@ -470,12 +534,14 @@ addr_add_clicked (GtkButton *button, gpointer user_data) g_list_free (cells); gtk_tree_path_free (path); + address_list_changed (user_data); } static void addr_delete_clicked (GtkButton *button, gpointer user_data) { - GtkTreeView *treeview = GTK_TREE_VIEW (user_data); + CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (user_data); + GtkTreeView *treeview = priv->addr_list; GtkTreeSelection *selection; GList *selected_rows; GtkTreeModel *model = NULL; @@ -501,6 +567,8 @@ addr_delete_clicked (GtkButton *button, gpointer user_data) selection = gtk_tree_view_get_selection (treeview); gtk_tree_selection_select_iter (selection, &iter); } + + address_list_changed (user_data); } static void @@ -742,7 +810,7 @@ gateway_matches_address (const char *gw_str, const char *addr_str, guint32 prefi static gboolean possibly_wrong_gateway (GtkTreeModel *model, GtkTreeIter *iter, const char *gw_str) { - char *addr_str, *prefix_str; + gs_free char *addr_str = NULL, *prefix_str = NULL; gboolean addr_valid; guint32 prefix; @@ -1118,7 +1186,7 @@ finish_setup (CEPageIP4 *self, gpointer unused, GError *error, gpointer user_dat gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_delete), FALSE); g_signal_connect (priv->addr_add, "clicked", G_CALLBACK (addr_add_clicked), self); - g_signal_connect (priv->addr_delete, "clicked", G_CALLBACK (addr_delete_clicked), priv->addr_list); + g_signal_connect (priv->addr_delete, "clicked", G_CALLBACK (addr_delete_clicked), self); selection = gtk_tree_view_get_selection (priv->addr_list); g_signal_connect (selection, "changed", G_CALLBACK (list_selection_changed), priv->addr_delete); diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c index 124269ee..5bebf419 100644 --- a/src/connection-editor/page-ip6.c +++ b/src/connection-editor/page-ip6.c @@ -58,6 +58,7 @@ typedef struct { GtkButton *addr_delete; GtkTreeView *addr_list; GtkCellRenderer *addr_cells[COL_LAST + 1]; + GtkTreeModel *addr_saved; /* DNS servers */ GtkWidget *dns_servers_label; @@ -246,6 +247,8 @@ method_changed (GtkComboBox *combo, gpointer user_data) gboolean ip6_required_enabled = TRUE; gboolean method_auto = FALSE; GtkTreeIter iter; + GtkListStore *store; + const char *tooltip = NULL, *label = NULL; if (gtk_combo_box_get_active_iter (priv->method, &iter)) { gtk_tree_model_get (GTK_TREE_MODEL (priv->method_store), &iter, @@ -254,23 +257,31 @@ method_changed (GtkComboBox *combo, gpointer user_data) switch (method) { case IP6_METHOD_AUTO: - addr_enabled = FALSE; + addr_enabled = TRUE; routes_enabled = TRUE; dns_enabled = TRUE; method_auto = TRUE; ip6_privacy_enabled = TRUE; + tooltip = CE_TOOLTIP_ADDR_AUTO; + label = CE_LABEL_ADDR_AUTO; break; case IP6_METHOD_AUTO_ADDRESSES: - addr_enabled = FALSE; + addr_enabled = TRUE; dns_enabled = routes_enabled = TRUE; ip6_privacy_enabled = TRUE; + tooltip = CE_TOOLTIP_ADDR_AUTO; + label = CE_LABEL_ADDR_AUTO; break; case IP6_METHOD_AUTO_DHCP_ONLY: - addr_enabled = FALSE; + addr_enabled = TRUE; routes_enabled = TRUE; + tooltip = CE_TOOLTIP_ADDR_AUTO; + label = CE_LABEL_ADDR_AUTO; break; case IP6_METHOD_MANUAL: addr_enabled = dns_enabled = routes_enabled = TRUE; + tooltip = CE_TOOLTIP_ADDR_MANUAL; + label = CE_LABEL_ADDR_MANUAL; break; case IP6_METHOD_IGNORE: ip6_required_enabled = FALSE; @@ -279,15 +290,28 @@ method_changed (GtkComboBox *combo, gpointer user_data) break; } + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->addr_list), tooltip); + gtk_label_set_text (GTK_LABEL (priv->addr_label), label); + gtk_widget_set_sensitive (priv->addr_label, addr_enabled); gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_add), addr_enabled); gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_delete), addr_enabled); gtk_widget_set_sensitive (GTK_WIDGET (priv->addr_list), addr_enabled); - if (!addr_enabled) { - GtkListStore *store; - store = GTK_LIST_STORE (gtk_tree_view_get_model (priv->addr_list)); - gtk_list_store_clear (store); + if (addr_enabled) { + if (priv->addr_saved) { + /* Restore old entries */ + gtk_tree_view_set_model (priv->addr_list, priv->addr_saved); + g_clear_object (&priv->addr_saved); + } + } else { + if (!priv->addr_saved) { + /* Save current entries, set empty list */ + priv->addr_saved = g_object_ref (gtk_tree_view_get_model (priv->addr_list)); + store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + gtk_tree_view_set_model (priv->addr_list, GTK_TREE_MODEL (store)); + g_object_unref (store); + } } gtk_widget_set_sensitive (priv->dns_servers_label, dns_enabled); |