From d7e291dfb73aefa5252b2c62c9ba2375550cfd4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Thu, 23 Feb 2023 19:07:16 +0000
Subject: [PATCH] netcfg: restore upstream behavior and configuration features
from last release.
---
helpers/DATA/netcfg/01_ruc_1.142ubuntu1.patch | 7307 +++++++++++++++++
helpers/DATA/netcfg/02_ruc_1.142ubuntu2.patch | 521 ++
helpers/DATA/netcfg/03_ruc_1.142ubuntu3.patch | 30 +
helpers/DATA/netcfg/04_ruc_1.142ubuntu4.patch | 83 +
helpers/DATA/netcfg/05_ruc_1.142ubuntu5.patch | 188 +
helpers/DATA/netcfg/06_ruc_1.142ubuntu6.patch | 39 +
helpers/DATA/netcfg/07_ruc_1.142ubuntu7.patch | 33 +
helpers/DATA/netcfg/08_ruc_1.142ubuntu8.patch | 26 +
helpers/DATA/netcfg/ifupdown.patch | 45 -
.../restore_network-manager_management.patch | 18 -
helpers/make-netcfg | 13 +-
11 files changed, 8235 insertions(+), 68 deletions(-)
create mode 100644 helpers/DATA/netcfg/01_ruc_1.142ubuntu1.patch
create mode 100644 helpers/DATA/netcfg/02_ruc_1.142ubuntu2.patch
create mode 100644 helpers/DATA/netcfg/03_ruc_1.142ubuntu3.patch
create mode 100644 helpers/DATA/netcfg/04_ruc_1.142ubuntu4.patch
create mode 100644 helpers/DATA/netcfg/05_ruc_1.142ubuntu5.patch
create mode 100644 helpers/DATA/netcfg/06_ruc_1.142ubuntu6.patch
create mode 100644 helpers/DATA/netcfg/07_ruc_1.142ubuntu7.patch
create mode 100644 helpers/DATA/netcfg/08_ruc_1.142ubuntu8.patch
delete mode 100644 helpers/DATA/netcfg/ifupdown.patch
delete mode 100644 helpers/DATA/netcfg/restore_network-manager_management.patch
diff --git a/helpers/DATA/netcfg/01_ruc_1.142ubuntu1.patch b/helpers/DATA/netcfg/01_ruc_1.142ubuntu1.patch
new file mode 100644
index 00000000..a3c275b9
--- /dev/null
+++ b/helpers/DATA/netcfg/01_ruc_1.142ubuntu1.patch
@@ -0,0 +1,7307 @@
+From 6b88a524f4e0183106769e82f99d930634a11685 Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>
+Date: Fri, 26 May 2017 15:24:23 -0400
+Subject: 1.142ubuntu1 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ Makefile | 2 +-
+ autoconfig.c | 9 +-
+ base-installer.d/40netcfg | 18 +-
+ debian/changelog | 1244 +++++++++++++++++++++++++++++++++
+ debian/control | 8 +-
+ debian/netcfg-common.templates | 45 +-
+ debian/netcfg-dhcp.templates | 23 +-
+ debian/netcfg-static.dirs | 1 +
+ debian/netcfg-static.install | 1 +
+ debian/netcfg.dirs | 1 +
+ debian/netcfg.install | 1 +
+ debian/po/am.po | 73 ++
+ debian/po/ar.po | 73 ++
+ debian/po/ast.po | 73 ++
+ debian/po/be.po | 73 ++
+ debian/po/bg.po | 73 ++
+ debian/po/bn.po | 73 ++
+ debian/po/bo.po | 73 ++
+ debian/po/bs.po | 73 ++
+ debian/po/ca.po | 73 ++
+ debian/po/cs.po | 73 ++
+ debian/po/cy.po | 73 ++
+ debian/po/da.po | 73 ++
+ debian/po/de.po | 73 ++
+ debian/po/dz.po | 73 ++
+ debian/po/el.po | 73 ++
+ debian/po/eo.po | 73 ++
+ debian/po/es.po | 73 ++
+ debian/po/et.po | 73 ++
+ debian/po/eu.po | 73 ++
+ debian/po/fa.po | 73 ++
+ debian/po/fi.po | 73 ++
+ debian/po/fr.po | 73 ++
+ debian/po/ga.po | 73 ++
+ debian/po/gl.po | 73 ++
+ debian/po/gu.po | 73 ++
+ debian/po/he.po | 73 ++
+ debian/po/hi.po | 73 ++
+ debian/po/hr.po | 73 ++
+ debian/po/hu.po | 79 +++
+ debian/po/id.po | 73 ++
+ debian/po/is.po | 73 ++
+ debian/po/it.po | 73 ++
+ debian/po/ja.po | 73 ++
+ debian/po/ka.po | 73 ++
+ debian/po/kk.po | 73 ++
+ debian/po/km.po | 73 ++
+ debian/po/kn.po | 73 ++
+ debian/po/ko.po | 73 ++
+ debian/po/ku.po | 73 ++
+ debian/po/lo.po | 73 ++
+ debian/po/lt.po | 73 ++
+ debian/po/lv.po | 73 ++
+ debian/po/mk.po | 73 ++
+ debian/po/ml.po | 73 ++
+ debian/po/mr.po | 73 ++
+ debian/po/nb.po | 73 ++
+ debian/po/ne.po | 73 ++
+ debian/po/nl.po | 73 ++
+ debian/po/nn.po | 73 ++
+ debian/po/pa.po | 73 ++
+ debian/po/pl.po | 73 ++
+ debian/po/pt.po | 73 ++
+ debian/po/pt_BR.po | 73 ++
+ debian/po/ro.po | 73 ++
+ debian/po/ru.po | 73 ++
+ debian/po/se.po | 73 ++
+ debian/po/si.po | 73 ++
+ debian/po/sk.po | 73 ++
+ debian/po/sl.po | 73 ++
+ debian/po/sq.po | 73 ++
+ debian/po/sr.po | 73 ++
+ debian/po/sv.po | 73 ++
+ debian/po/ta.po | 73 ++
+ debian/po/te.po | 73 ++
+ debian/po/templates.pot | 71 ++
+ debian/po/tg.po | 73 ++
+ debian/po/th.po | 73 ++
+ debian/po/tl.po | 73 ++
+ debian/po/tr.po | 73 ++
+ debian/po/ug.po | 73 ++
+ debian/po/uk.po | 73 ++
+ debian/po/vi.po | 73 ++
+ debian/po/zh_CN.po | 73 ++
+ debian/po/zh_TW.po | 73 ++
+ dhcp.c | 15 +-
+ finish-install.d/55netcfg-copy-config | 14 +-
+ netcfg-common.c | 80 ++-
+ netcfg.c | 65 +-
+ netcfg.h | 15 +-
+ nm-conf.c | 49 +-
+ nm-conf.h | 10 +-
+ post-base-installer.d/40netcfg | 7 +
+ static.c | 18 +-
+ vlan.c | 106 +++
+ wireless.c | 4 +-
+ write_interface.c | 39 +-
+ 97 files changed, 7095 insertions(+), 86 deletions(-)
+ create mode 100755 post-base-installer.d/40netcfg
+ create mode 100644 vlan.c
+
+diff --git a/Makefile b/Makefile
+index a15d476..03343c9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@ TARGETS ?= netcfg-static netcfg
+
+ LDOPTS = -ldebconfclient -ldebian-installer
+ CFLAGS = -W -Wall -Werror -DNDEBUG -DNETCFG_VERSION="\"$(NETCFG_VERSION)\"" -I.
+-COMMON_OBJS = netcfg-common.o wireless.o write_interface.o ipv6.o
++COMMON_OBJS = netcfg-common.o wireless.o write_interface.o ipv6.o vlan.o
+ NETCFG_O = netcfg.o dhcp.o static.o ethtool-lite.o wpa.o wpa_ctrl.o rdnssd.o autoconfig.o
+ NETCFG_STATIC_O = netcfg-static.o static.o ethtool-lite.o
+
+diff --git a/autoconfig.c b/autoconfig.c
+index d607d5f..04f6202 100644
+--- a/autoconfig.c
++++ b/autoconfig.c
+@@ -61,6 +61,8 @@ void cleanup_dhcpv6_client(void)
+ */
+ int start_dhcpv6_client(struct debconfclient *client, const struct netcfg_interface *interface)
+ {
++ int dhcpv6_seconds = 0;
++
+ if (access("/sbin/dhclient", F_OK) == 0)
+ dhcpv6_client = DHCLIENT;
+ else if (access("/usr/sbin/dhcp6c", F_OK) == 0)
+@@ -89,6 +91,9 @@ int start_dhcpv6_client(struct debconfclient *client, const struct netcfg_interf
+ }
+ }
+
++ debconf_get(client, "netcfg/dhcpv6_timeout");
++ dhcpv6_seconds = atoi(client->value);
++
+ dhcpv6_pid = fork();
+ if (dhcpv6_pid == 0) { /* child */
+ FILE *dc;
+@@ -108,9 +113,10 @@ int start_dhcpv6_client(struct debconfclient *client, const struct netcfg_interf
+ if (!dc)
+ return 1;
+ fprintf(dc, "send vendor-class-identifier \"d-i\";\n");
++ fprintf(dc, "timeout %d;\n", dhcpv6_seconds);
+ fclose(dc);
+
+- arguments = malloc(9 * sizeof(*arguments));
++ arguments = malloc(10 * sizeof(*arguments));
+ i = 0;
+ arguments[i++] = "dhclient";
+ arguments[i++] = "-6";
+@@ -121,6 +127,7 @@ int start_dhcpv6_client(struct debconfclient *client, const struct netcfg_interf
+ arguments[i++] = "-sf";
+ arguments[i++] = "/lib/netcfg/print-dhcpv6-info";
+ arguments[i++] = interface->name;
++ arguments[i++] = "-1";
+ arguments[i] = NULL;
+ execvp("dhclient", (char **)arguments);
+ break;
+diff --git a/base-installer.d/40netcfg b/base-installer.d/40netcfg
+index f09b20a..0bbffd5 100755
+--- a/base-installer.d/40netcfg
++++ b/base-installer.d/40netcfg
+@@ -5,9 +5,25 @@ if [ ! -f /etc/network/interfaces ]; then
+ netcfg write_loopback
+ fi
+
+-for file in /etc/network/interfaces /etc/networks /etc/hostname /etc/resolv.conf /etc/hosts; do
++for file in /etc/network/interfaces /etc/networks /etc/hostname /etc/hosts; do
+ if [ -f "$file" ]; then
+ mkdir /target/$(dirname $file) -p
+ cp $file /target/$file
+ fi
+ done
++
++if [ -f /etc/resolv.conf ]; then
++ if [ -e /target/sbin/resolvconf ]; then
++ if [ -d /target/run/resolvconf ]; then
++ # resolvconf won't be running during installation,
++ # so make sure that we at least have basic
++ # configuration in place. If there's anything
++ # complicated that needs to persist, netcfg will
++ # have written that to /etc/network/interfaces.
++ cp /etc/resolv.conf /target/run/resolvconf/resolv.conf
++ fi
++ else
++ mkdir -p /target/etc
++ cp /etc/resolv.conf /target/etc/resolv.conf
++ fi
++fi
+diff --git a/debian/control b/debian/control
+index 66f0d05..cd6c584 100644
+--- a/debian/control
++++ b/debian/control
+@@ -14,13 +15,12 @@ Package-Type: udeb
+ Architecture: any
+ Depends: ${shlibs:Depends}, ${misc:Depends},
+ ethernet-card-detection,
+- isc-dhcp-client-udeb [kfreebsd-any hurd-any],
++ isc-dhcp-client-udeb,
+ freebsd-net-tools-udeb [kfreebsd-any],
+ wpasupplicant-udeb [!s390 !s390x !sparc !kfreebsd-any !hurd-any],
+ crypto-modules [!s390 !s390x !sparc !kfreebsd-any !hurd-any],
+ rdnssd-udeb,
+- ndisc6-udeb,
+- wide-dhcpv6-client-udeb [linux-any]
++ ndisc6-udeb
+ Provides: configured-network
+ XB-Installer-Menu-Item: 1800
+ Description: Configure the network
+diff --git a/debian/netcfg-common.templates b/debian/netcfg-common.templates
+index 2b77936..0ca1ec7 100644
+--- a/debian/netcfg-common.templates
++++ b/debian/netcfg-common.templates
+@@ -26,6 +26,34 @@ _Description: Domain name:
+ If you are setting up a home network, you can make something up, but make
+ sure you use the same domain name on all your computers.
+
++Template: netcfg/use_vlan
++Type: boolean
++Default: false
++# :sl6:
++_Description: Is this system connected to a VLAN trunk port?
++ IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical
++ network into distinct broadcast domains. Packets can be tagged with
++ different VLAN IDs so that a single "trunk" connection may be used to
++ transport data for various VLANs.
++ .
++ If the network interface is directly connected to a VLAN trunk port,
++ specifying a VLAN ID may be necessary to get a working connection.
++
++Template: netcfg/vlan_id
++Type: string
++# :sl6:
++_Description: VLAN ID (1-4094):
++ If the network interface is directly connected to a VLAN trunk port,
++ specifying a VLAN ID may be necessary to get a working connection.
++
++Template: netcfg/vlan_failed
++Type: error
++# :sl6:
++_Description: Error setting up VLAN
++ The command used to set up the VLAN during the installation returned
++ an error. Please check the installer logs, or go back and try another
++ configuration.
++
+ Template: netcfg/get_nameservers
+ Type: string
+ # :sl1:
+@@ -143,7 +171,7 @@ _Description: Failure of key exchange and association
+
+ Template: netcfg/get_hostname
+ Type: string
+-Default: debian
++Default: trisquel
+ # :sl1:
+ _Description: Hostname:
+ Please enter the hostname for this system.
+@@ -257,6 +285,21 @@ Type: text
+ # :sl2:
+ _Description: Ethernet
+
++Template: netcfg/internal-enc
++Type: text
++# :sl2:
++_Description: Ethernet CCW bus
++
++Template: netcfg/internal-enP
++Type: text
++# :sl2:
++_Description: Ethernet PCI
++
++Template: netcfg/internal-enp
++Type: text
++# :sl2:
++_Description: Ethernet PCI
++
+ Template: netcfg/internal-tr
+ Type: text
+ # :sl2:
+diff --git a/debian/netcfg-dhcp.templates b/debian/netcfg-dhcp.templates
+index f725ad1..4ee8397 100644
+--- a/debian/netcfg-dhcp.templates
++++ b/debian/netcfg-dhcp.templates
+@@ -33,11 +33,8 @@ _Description: No DHCP client found
+ Template: netcfg/dhcp_options
+ Type: select
+ # :sl1:
+-# Note to translators : Please keep your translation
+-# below a 65 columns limit (which means 65 characters
+-# in single-byte languages)
+-#flag:translate!:4
+-__Choices: Retry network autoconfiguration, Retry network autoconfiguration with a DHCP hostname, Configure network manually, ${wifireconf}, Do not configure the network at this time
++#flag:translate!:1
++__Choices: ${choices}
+ Default: Configure network manually
+ # :sl1:
+ _Description: Network configuration method:
+@@ -68,16 +65,24 @@ _Description: Continue without a default route?
+ If you are unsure, you should not continue without a default route:
+ contact your local network administrator about this problem.
+
++Template: netcfg/internal-nowifi
++Type: select
++# :sl1:
++__Choices: Retry network autoconfiguration, Retry network autoconfiguration with a DHCP hostname, Configure network manually, Do not configure the network at this time
++
+ Template: netcfg/internal-wifireconf
+-Type: text
++Type: select
+ # :sl1:
+-_Description: Reconfigure the wireless network
++# Note to translators : Please keep your translation
++# below a 65 columns limit (which means 65 characters
++# in single-byte languages)
++__Choices: Retry network autoconfiguration, Retry network autoconfiguration with a DHCP hostname, Configure network manually, Reconfigure the wireless network, Do not configure the network at this time
+
+ Template: netcfg/dhcp_timeout
+ Type: string
+ Description: for internal use; can be preseeded
+ Timeout for trying DHCP
+-Default: 25
++Default: 30
+
+ Template: netcfg/dhcp_ntp_servers
+ Type: text
+@@ -106,7 +111,7 @@ Template: netcfg/dhcpv6_timeout
+ Type: string
+ Description: for internal use; can be preseeded
+ Timeout for trying DHCPv6
+-Default: 15
++Default: 30
+
+ Template: netcfg/dhcpv6_progress
+ Type: text
+diff --git a/debian/netcfg-static.dirs b/debian/netcfg-static.dirs
+index 0213d94..149df96 100644
+--- a/debian/netcfg-static.dirs
++++ b/debian/netcfg-static.dirs
+@@ -1,3 +1,4 @@
+ bin
+ etc/network
+ usr/lib/base-installer.d
++usr/lib/post-base-installer.d
+diff --git a/debian/netcfg-static.install b/debian/netcfg-static.install
+index a7aec59..b5336e7 100644
+--- a/debian/netcfg-static.install
++++ b/debian/netcfg-static.install
+@@ -1,2 +1,3 @@
+ base-installer.d usr/lib
+ finish-install.d/55netcfg-copy-config usr/lib/finish-install.d
++post-base-installer.d usr/lib
+diff --git a/debian/netcfg.dirs b/debian/netcfg.dirs
+index 9454b4a..dad6088 100644
+--- a/debian/netcfg.dirs
++++ b/debian/netcfg.dirs
+@@ -1,5 +1,6 @@
+ bin
+ etc/network
+ usr/lib/base-installer.d
++usr/lib/post-base-installer.d
+ lib/netcfg
+ var/lib/netcfg
+diff --git a/debian/netcfg.install b/debian/netcfg.install
+index 4dd471c..ce349e2 100644
+--- a/debian/netcfg.install
++++ b/debian/netcfg.install
+@@ -4,3 +4,4 @@ print-dhcpv6-info lib/netcfg
+ netcfg bin
+ base-installer.d usr/lib
+ finish-install.d usr/lib
++post-base-installer.d usr/lib
+diff --git a/debian/po/am.po b/debian/po/am.po
+index 127b1ec..7b4ee34 100644
+--- a/debian/po/am.po
++++ b/debian/po/am.po
+@@ -1104,3 +1104,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ቋሚ አድራሻን በመጠቀሠአá‹á‰³áˆ አስተካáŠáˆ"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ኤተáˆáŠ”ት"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ኤተáˆáŠ”ት"
+diff --git a/debian/po/ar.po b/debian/po/ar.po
+index a6eba51..89bd151 100644
+--- a/debian/po/ar.po
++++ b/debian/po/ar.po
+@@ -1146,3 +1146,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "تهيئة الشبكة باستخدام العنونة ساكنة"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "إيثرنت"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "إيثرنت"
+diff --git a/debian/po/ast.po b/debian/po/ast.po
+index de269da..c1e5417 100644
+--- a/debian/po/ast.po
++++ b/debian/po/ast.po
+@@ -1165,3 +1165,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configurar una rede usando direiciones estátiques"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/be.po b/debian/po/be.po
+index 7f88df0..efda9b8 100644
+--- a/debian/po/be.po
++++ b/debian/po/be.po
+@@ -1167,3 +1167,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Ðаладка Ñеткі Ñа Ñтатычнай адраÑацыÑй."
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/bg.po b/debian/po/bg.po
+index 03c4d72..c1ad40c 100644
+--- a/debian/po/bg.po
++++ b/debian/po/bg.po
+@@ -1176,3 +1176,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ÐаÑтройване на мрежа чрез Ñтатично адреÑиране"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/bn.po b/debian/po/bn.po
+index 1a08ab7..f82d762 100644
+--- a/debian/po/bn.po
++++ b/debian/po/bn.po
+@@ -1177,3 +1177,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "সà§à¦Ÿà§à¦¯à¦¾à¦Ÿà¦¿à¦• অà§à¦¯à¦¾à¦¡à§à¦°à§‡à¦¸à¦¿à¦‚ বà§à¦¯à¦¬à¦¹à¦¾à¦° করে নেটওয়ারà§à¦• কনফিগার করো"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ইথারনেট"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ইথারনেট"
+diff --git a/debian/po/bo.po b/debian/po/bo.po
+index 38fa740..51e6670 100644
+--- a/debian/po/bo.po
++++ b/debian/po/bo.po
+@@ -1113,3 +1113,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "གà½à½“་འཛུགས་ཀྱི་à½à¼‹à½¡à½²à½‚་སྤྱོད་བཞིན་པའི་དྲ་ལམ་ཞིག་ལ་སྒྲིག་འགོད་བྱེད་པ"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "རྒྱུད་སà¾à½´à½‘་དྲ་བ"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "རྒྱུད་སà¾à½´à½‘་དྲ་བ"
+diff --git a/debian/po/bs.po b/debian/po/bs.po
+index 25fa454..0c3f79f 100644
+--- a/debian/po/bs.po
++++ b/debian/po/bs.po
+@@ -1163,3 +1163,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Podesi mrežu koristeći statiÄko adresiranje"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ca.po b/debian/po/ca.po
+index a701f97..dcdf345 100644
+--- a/debian/po/ca.po
++++ b/debian/po/ca.po
+@@ -1177,3 +1177,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configura una xarxa utilitzant adreçament està tic"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/cs.po b/debian/po/cs.po
+index 5fa3dc9..507f0c7 100644
+--- a/debian/po/cs.po
++++ b/debian/po/cs.po
+@@ -1144,3 +1144,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Nastavit sÃÅ¥ se statickými adresami"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/cy.po b/debian/po/cy.po
+index 7632791..416bd57 100644
+--- a/debian/po/cy.po
++++ b/debian/po/cy.po
+@@ -1170,3 +1170,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Cyflunio rhwydwaith gan ddefnyddio cyfeiriadaeth statig"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/da.po b/debian/po/da.po
+index d635131..21c2af3 100644
+--- a/debian/po/da.po
++++ b/debian/po/da.po
+@@ -1187,3 +1187,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Sæt netværket op med statisk adressering"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/de.po b/debian/po/de.po
+index 40ef88a..ea5d97f 100644
+--- a/debian/po/de.po
++++ b/debian/po/de.po
+@@ -1205,3 +1205,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Netzwerk unter Verwendung statischer Adressierung konfigurieren"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/dz.po b/debian/po/dz.po
+index 4eab1ea..3db4625 100644
+--- a/debian/po/dz.po
++++ b/debian/po/dz.po
+@@ -1152,3 +1152,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "རྟག་བརྟན་à½à¼‹à½–ྱང་བà½à½‚ས་ནི་ལག་ལེན་འà½à½–་འདི་ཡོངས་འབྲེལ་རིམ་སྒྲིག་འབད་ནིà¼"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ཨི་à½à½¢à¼‹à½“ེཊི་"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ཨི་à½à½¢à¼‹à½“ེཊི་"
+diff --git a/debian/po/el.po b/debian/po/el.po
+index 4b84864..01b9c38 100644
+--- a/debian/po/el.po
++++ b/debian/po/el.po
+@@ -1201,3 +1201,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ΡÏθμιση δικτÏου με απόδοση στατικής διεÏθυνης"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/eo.po b/debian/po/eo.po
+index 3677a3d..544195d 100644
+--- a/debian/po/eo.po
++++ b/debian/po/eo.po
+@@ -1160,3 +1160,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Memakomodu la reton per statika adresado"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Eterreto"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Eterreto"
+diff --git a/debian/po/es.po b/debian/po/es.po
+index bb0db5e..2d50733 100644
+--- a/debian/po/es.po
++++ b/debian/po/es.po
+@@ -1214,3 +1214,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configurar la red usando direccionamiento estático"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/et.po b/debian/po/et.po
+index d2ab3fa..29a9db2 100644
+--- a/debian/po/et.po
++++ b/debian/po/et.po
+@@ -1161,3 +1161,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Seadista võrk, kasutades staatilist adresseerimist"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/eu.po b/debian/po/eu.po
+index a530c0c..2bcf0d9 100644
+--- a/debian/po/eu.po
++++ b/debian/po/eu.po
+@@ -1164,3 +1164,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Konfiguratu sarea helbide estatikoa erabiliz"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/fa.po b/debian/po/fa.po
+index 47d5fa2..f6f4c1d 100644
+--- a/debian/po/fa.po
++++ b/debian/po/fa.po
+@@ -1154,3 +1154,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "تنظیم شبکه با آدرس‌های ثابت"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/fi.po b/debian/po/fi.po
+index 0dbe11a..a85d3ac 100644
+--- a/debian/po/fi.po
++++ b/debian/po/fi.po
+@@ -1163,3 +1163,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Tee verkkoasetukset kiinteälle osoitteelle"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/fr.po b/debian/po/fr.po
+index 2a3929a..a9da50f 100644
+--- a/debian/po/fr.po
++++ b/debian/po/fr.po
+@@ -1185,3 +1185,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configurer manuellement le réseau"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ga.po b/debian/po/ga.po
+index 90b156e..5496639 100644
+--- a/debian/po/ga.po
++++ b/debian/po/ga.po
+@@ -1164,3 +1164,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Cumraigh lÃonra le seolachán statach"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/gl.po b/debian/po/gl.po
+index c8ae43b..4657f8f 100644
+--- a/debian/po/gl.po
++++ b/debian/po/gl.po
+@@ -1166,3 +1166,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configurar unha rede empregando direccionamento estático"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/gu.po b/debian/po/gu.po
+index 49e04a7..e343481 100644
+--- a/debian/po/gu.po
++++ b/debian/po/gu.po
+@@ -1144,3 +1144,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "સà«àª¥àª¿àª¤ સરનામà«àª‚ ઉપયોગ કરી નેટવરà«àª• રૂપરેખાંકિત કરો"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ઇથરનેટ"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ઇથરનેટ"
+diff --git a/debian/po/he.po b/debian/po/he.po
+index 0d25c02..17e9796 100644
+--- a/debian/po/he.po
++++ b/debian/po/he.po
+@@ -1154,3 +1154,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "הגדרת רשת ב×מצעות כתובת קבועה"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "××ª×¨× ×˜"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "××ª×¨× ×˜"
+diff --git a/debian/po/hi.po b/debian/po/hi.po
+index 180d4e9..ef1bae2 100644
+--- a/debian/po/hi.po
++++ b/debian/po/hi.po
+@@ -1151,3 +1151,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "सà¥à¤¥à¥ˆà¤¤à¤¿à¤• à¤à¤¡à¥à¤°à¥‡à¤¸à¤¿à¤‚ग के उपयोग से नेटवरà¥à¤• कॉनà¥à¤«à¤¼à¤¿à¤—र करें"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ईथरनेटय"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ईथरनेटय"
+diff --git a/debian/po/hr.po b/debian/po/hr.po
+index bd3b830..79443fa 100644
+--- a/debian/po/hr.po
++++ b/debian/po/hr.po
+@@ -1165,3 +1165,76 @@
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Podesi mrežu koristeći nepromjenjivo adresiranje"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/hu.po b/debian/po/hu.po
+index da2315d..dee9ffb 100644
+--- a/debian/po/hu.po
++++ b/debian/po/hu.po
+@@ -1381,3 +1381,82 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Hálózat konfigurálása statikus cÃmzéssel"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++# Type: text
++# Description
++# :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++# Type: text
++# Description
++# :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/id.po b/debian/po/id.po
+index b3d3d6f..fd6b25b 100644
+--- a/debian/po/id.po
++++ b/debian/po/id.po
+@@ -1173,3 +1173,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Mengatur jaringan dengan alamat statis"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/is.po b/debian/po/is.po
+index 8f8c871..89fac4e 100644
+--- a/debian/po/is.po
++++ b/debian/po/is.po
+@@ -1160,3 +1160,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Stilla net með fastri ávörpun (static addressing)"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet (Ãðnet)"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet (Ãðnet)"
+diff --git a/debian/po/it.po b/debian/po/it.po
+index 8175bc0..9cb164f 100644
+--- a/debian/po/it.po
++++ b/debian/po/it.po
+@@ -1190,3 +1190,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configura la rete con indirizzamento statico"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ja.po b/debian/po/ja.po
+index a6a26ae..8a5fc62 100644
+--- a/debian/po/ja.po
++++ b/debian/po/ja.po
+@@ -1167,3 +1167,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "é™çš„アドレスを使ã£ã¦ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’è¨å®š"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "イーサãƒãƒƒãƒˆ"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "イーサãƒãƒƒãƒˆ"
+diff --git a/debian/po/ka.po b/debian/po/ka.po
+index 2a31a80..be4b356 100644
+--- a/debian/po/ka.po
++++ b/debian/po/ka.po
+@@ -1157,3 +1157,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ქსელის სტáƒáƒ¢áƒ˜áƒ™áƒ£áƒ ი áƒáƒ“რესáƒáƒªáƒ˜áƒ˜áƒ— კáƒáƒœáƒ¤áƒ˜áƒ’ურირებáƒ"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/kk.po b/debian/po/kk.po
+index 5acdac5..f463c0c 100644
+--- a/debian/po/kk.po
++++ b/debian/po/kk.po
+@@ -1157,3 +1157,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Желіні Ñтатикалық адреÑтеу арқылы баптау"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/km.po b/debian/po/km.po
+index 0fa6ae7..14634f3 100644
+--- a/debian/po/km.po
++++ b/debian/po/km.po
+@@ -1129,3 +1129,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​បណ្ដាញ​ដោយ​ប្រើ​អាសយដ្ឋាន​ážáŸážš"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "អ៊ីសឺណិáž"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "អ៊ីសឺណិáž"
+diff --git a/debian/po/kn.po b/debian/po/kn.po
+index eaa4e8f..e7c4b8c 100644
+--- a/debian/po/kn.po
++++ b/debian/po/kn.po
+@@ -1150,3 +1150,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ಜಾಲಬಂಧವನà³à²¨à³ ಸà³à²Ÿà³‡à²Ÿà²¿à²•à³ ವಿಳಾಸದ ಮà³à²–ಾಂತರ ಸಂಯೋಜಿಸಲಾಗà³à²¤à³à²¤à²¿à²¦à³† "
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ಎಥರà³à²¨à³†à²Ÿà³"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ಎಥರà³à²¨à³†à²Ÿà³"
+diff --git a/debian/po/ko.po b/debian/po/ko.po
+index a5566d7..dd9b4f8 100644
+--- a/debian/po/ko.po
++++ b/debian/po/ko.po
+@@ -1151,3 +1151,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ê³ ì • 주소를 사용해 네트워í¬ë¥¼ ì„¤ì •í•©ë‹ˆë‹¤"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ì´ë”ë„·"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ì´ë”ë„·"
+diff --git a/debian/po/ku.po b/debian/po/ku.po
+index 2bc6d5c..ac79911 100644
+--- a/debian/po/ku.po
++++ b/debian/po/ku.po
+@@ -1153,3 +1153,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Toreyê bi navnîşankirina statîk veava bike"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/lo.po b/debian/po/lo.po
+index e6c5252..6377c81 100644
+--- a/debian/po/lo.po
++++ b/debian/po/lo.po
+@@ -1117,3 +1117,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ຕັ້ງຄ່າເຄືàºàº‚່າàºà»‚ດàºà»ƒàºªà»ˆàº—ີ່ຢູ່ຖາວàºàº™"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "àºàºµà»€àº—ີເນັດ"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "àºàºµà»€àº—ີເນັດ"
+diff --git a/debian/po/lt.po b/debian/po/lt.po
+index ec4d6bd..b6631bc 100644
+--- a/debian/po/lt.po
++++ b/debian/po/lt.po
+@@ -1163,3 +1163,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Tinklo konfigūravimas naudojant statinį adresavimą"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/lv.po b/debian/po/lv.po
+index ef3e80f..56f33e1 100644
+--- a/debian/po/lv.po
++++ b/debian/po/lv.po
+@@ -1164,3 +1164,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "KonfigurÄ“t tÄ«klu, izmantojot statisko adresÄciju"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/mk.po b/debian/po/mk.po
+index 13c66da..9fbbb9e 100644
+--- a/debian/po/mk.po
++++ b/debian/po/mk.po
+@@ -1159,3 +1159,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Конфигурирај мрежа кориÑтејќи Ñтатични адреÑи"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Етернет"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Етернет"
+diff --git a/debian/po/ml.po b/debian/po/ml.po
+index 16a14e2..fa0db26 100644
+--- a/debian/po/ml.po
++++ b/debian/po/ml.po
+@@ -1167,3 +1167,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "à´¸àµà´¥à´¿à´° വിലാസമàµà´ªà´¯àµ‹à´—à´¿à´šàµà´šàµ ഒരൠശൃഖല à´•àµà´°à´®àµ€à´•à´°à´¿à´¯àµà´•àµà´•àµà´•"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ഈഥരàµâ€à´¨àµ†à´±àµà´±àµ"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ഈഥരàµâ€à´¨àµ†à´±àµà´±àµ"
+diff --git a/debian/po/mr.po b/debian/po/mr.po
+index a60ee7d..29a3a2f 100644
+--- a/debian/po/mr.po
++++ b/debian/po/mr.po
+@@ -1151,3 +1151,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "सà¥à¤¥à¤¾à¤¯à¥€ पतà¥à¤¤à¤¾ वापरणाऱà¥à¤¯à¤¾ नेटवरà¥à¤•à¤šà¥€ संरचना करा"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ईथरनेट"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ईथरनेट"
+diff --git a/debian/po/nb.po b/debian/po/nb.po
+index fde88e3..8c7bb2f 100644
+--- a/debian/po/nb.po
++++ b/debian/po/nb.po
+@@ -1167,3 +1167,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Sett opp et nettverk ved hjelp av statisk adressering"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ne.po b/debian/po/ne.po
+index 6184877..9d8b886 100644
+--- a/debian/po/ne.po
++++ b/debian/po/ne.po
+@@ -1153,3 +1153,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "सà¥à¤¥à¤¿à¤° ठेगाना पà¥à¤°à¤¯à¥‹à¤— गरेर à¤à¤‰à¤Ÿà¤¾ सञà¥à¤œà¤¾à¤² कनà¥à¤«à¤¿à¤—र गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "इथरनेट"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "इथरनेट"
+diff --git a/debian/po/nl.po b/debian/po/nl.po
+index ee9d465..725a0ed 100644
+--- a/debian/po/nl.po
++++ b/debian/po/nl.po
+@@ -1175,3 +1175,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Netwerk instellen met statische adressen"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/nn.po b/debian/po/nn.po
+index a635994..91e7743 100644
+--- a/debian/po/nn.po
++++ b/debian/po/nn.po
+@@ -1167,3 +1167,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Set opp eit nettverk ved hjelp av statisk adressering"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/pa.po b/debian/po/pa.po
+index 95c91f6..9b6d0e9 100644
+--- a/debian/po/pa.po
++++ b/debian/po/pa.po
+@@ -1142,3 +1142,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ਸਥਿਰ à¨à¨¡à¨°à©ˆà©±à¨¸ ਵਰਤ ਕੇ ਨੈੱਟਵਰਕ ਸੰਰਚਿਤ ਕਰੋ"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ਈਥਰਨੈੱਟ"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ਈਥਰਨੈੱਟ"
+diff --git a/debian/po/pl.po b/debian/po/pl.po
+index 522406f..5bd3335 100644
+--- a/debian/po/pl.po
++++ b/debian/po/pl.po
+@@ -1176,3 +1176,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Konfiguruj sieć opartą na adresach statycznych"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/pt.po b/debian/po/pt.po
+index 5c1d964..fdda3b2 100644
+--- a/debian/po/pt.po
++++ b/debian/po/pt.po
+@@ -1183,3 +1183,76 @@
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configurar a rede com endereçamento estático"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
+index dec8740..61a814e 100644
+--- a/debian/po/pt_BR.po
++++ b/debian/po/pt_BR.po
+@@ -1180,3 +1180,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configurar a rede usando endereçamento estático"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ro.po b/debian/po/ro.po
+index c42e6cc..e1d8675 100644
+--- a/debian/po/ro.po
++++ b/debian/po/ro.po
+@@ -1186,3 +1186,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Configurează rețeaua folosind adresare statică"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ru.po b/debian/po/ru.po
+index 2e2001d..f23bae4 100644
+--- a/debian/po/ru.po
++++ b/debian/po/ru.po
+@@ -1176,3 +1176,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ÐаÑтройка Ñети Ñо ÑтатичеÑкой адреÑацией."
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/se.po b/debian/po/se.po
+index d19698a..a26b93c 100644
+--- a/debian/po/se.po
++++ b/debian/po/se.po
+@@ -1128,3 +1128,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Heivet fierpmádaga mas lea statalaÅ¡ Äujuhusat"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/si.po b/debian/po/si.po
+index 8b45c9c..c122bdb 100644
+--- a/debian/po/si.po
++++ b/debian/po/si.po
+@@ -1133,3 +1133,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ස්ථිà¶à·’ක යොමු කිරීම භà·à·€à·’à¶à· කරමින් ජà·à¶½à¶ºà¶šà·Š වින්â€à¶ºà·à·ƒà¶œà¶ කරමින්"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ඊදර්නෙට්"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ඊදර්නෙට්"
+diff --git a/debian/po/sk.po b/debian/po/sk.po
+index e711a09..8d3dd1e 100644
+--- a/debian/po/sk.po
++++ b/debian/po/sk.po
+@@ -1164,3 +1164,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Nastavenie siete so statickými adresami"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/sl.po b/debian/po/sl.po
+index f821b6b..cac5b53 100644
+--- a/debian/po/sl.po
++++ b/debian/po/sl.po
+@@ -1174,3 +1174,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Nastavi omrežje z uporabo statiÄnega naslavljanja"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ethernet"
+diff --git a/debian/po/sq.po b/debian/po/sq.po
+index 9478d53..0ae7483 100644
+--- a/debian/po/sq.po
++++ b/debian/po/sq.po
+@@ -1155,3 +1155,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Konfiguro një rrjet duke përdorur adresimin static"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/sr.po b/debian/po/sr.po
+index 6633365..186cb14 100644
+--- a/debian/po/sr.po
++++ b/debian/po/sr.po
+@@ -1162,3 +1162,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Подешавање мреже Ñа Ñтатичким адреÑирањем"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Етернет"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Етернет"
+diff --git a/debian/po/sv.po b/debian/po/sv.po
+index d4470ca..e041f8e 100644
+--- a/debian/po/sv.po
++++ b/debian/po/sv.po
+@@ -1167,3 +1167,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Konfigurera ett nätverk genom statisk adressering"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ta.po b/debian/po/ta.po
+index bffd4b1..9745ca2 100644
+--- a/debian/po/ta.po
++++ b/debian/po/ta.po
+@@ -1158,3 +1158,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "வலையமைபà¯à®ªà¯ˆ நிலையான à®®à¯à®•à®µà®°à®¿ கொணà¯à®Ÿà¯ வடிவமை"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ஈதரà¯à®¨à¯†à®Ÿà¯"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ஈதரà¯à®¨à¯†à®Ÿà¯"
+diff --git a/debian/po/te.po b/debian/po/te.po
+index 3a327fe..68d2f64 100644
+--- a/debian/po/te.po
++++ b/debian/po/te.po
+@@ -1124,3 +1124,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "నెటà±à°µà°°à±à°•à± ని à°¸à±à°¥à°¿à°° à°šà°¿à°°à±à°¨à°¾à°®à°¾ పదà±à°§à°¤à°¿ వాడి అమరికచేయà±"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ఈథరà±à°¨à±†à°Ÿà±"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ఈథరà±à°¨à±†à°Ÿà±"
+diff --git a/debian/po/templates.pot b/debian/po/templates.pot
+index 865649d..94f9bab 100644
+--- a/debian/po/templates.pot
++++ b/debian/po/templates.pot
+@@ -1036,3 +1036,74 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++msgid "Ethernet CCW bus"
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++msgid "Ethernet PCI"
++msgstr ""
+diff --git a/debian/po/tg.po b/debian/po/tg.po
+index 7ee3985..a244d6d 100644
+--- a/debian/po/tg.po
++++ b/debian/po/tg.po
+@@ -1178,3 +1178,15 @@
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Танзим кардани шабака бо иÑтифодаи нишониҳои Ñтатикӣ"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/th.po b/debian/po/th.po
+index a1cb89f..f928dab 100644
+--- a/debian/po/th.po
++++ b/debian/po/th.po
+@@ -1138,3 +1138,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "ตั้งค่าเครืà¸à¸‚่ายโดยระบุที่à¸à¸¢à¸¹à¹ˆà¸•à¸²à¸¢à¸•à¸±à¸§"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "à¸à¸µà¹€à¸—à¸à¸£à¹Œà¹€à¸™à¹‡à¸•"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "à¸à¸µà¹€à¸—à¸à¸£à¹Œà¹€à¸™à¹‡à¸•"
+diff --git a/debian/po/tl.po b/debian/po/tl.po
+index 242cd24..22076f8 100644
+--- a/debian/po/tl.po
++++ b/debian/po/tl.po
+@@ -1179,3 +1179,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Isaayos ang network sa pamamagitan ng static address"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/tr.po b/debian/po/tr.po
+index 730ba72..9e2eeb6 100644
+--- a/debian/po/tr.po
++++ b/debian/po/tr.po
+@@ -1180,3 +1180,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Ağı statik adresleme ile yapılandır"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/ug.po b/debian/po/ug.po
+index 64594ab..83ae12b 100644
+--- a/debian/po/ug.po
++++ b/debian/po/ug.po
+@@ -1156,3 +1156,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "مۇقىم ئادرÛس ئىشلىتىپ تور تەÚØ´Û•Ø´"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "ئÛÙىر تورى"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "ئÛÙىر تورى"
+diff --git a/debian/po/uk.po b/debian/po/uk.po
+index 28a6b5b..47f159e 100644
+--- a/debian/po/uk.po
++++ b/debian/po/uk.po
+@@ -1173,3 +1173,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Ðалаштувати мережу із Ñтатичним адреÑуваннÑм"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/vi.po b/debian/po/vi.po
+index b845d75..ca5e611 100644
+--- a/debian/po/vi.po
++++ b/debian/po/vi.po
+@@ -1169,3 +1169,10 @@
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "Cấu hình mạng bằng cách gán địa chỉ cố định"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "Ethernet"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "Ethernet"
+diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
+index 9e27e3b..f705f2b 100644
+--- a/debian/po/zh_CN.po
++++ b/debian/po/zh_CN.po
+@@ -1130,3 +1130,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "使用é™æ€åœ°å€é…置网络"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "以太网"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "以太网"
+diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
+index ed8b3b4..85883ee 100644
+--- a/debian/po/zh_TW.po
++++ b/debian/po/zh_TW.po
+@@ -1128,3 +1128,76 @@ msgstr ""
+ #: ../netcfg-static.templates:9001
+ msgid "Configure a network using static addressing"
+ msgstr "使用éœæ…‹ä½å€ä¾†è¨å®šç¶²è·¯"
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid "Is this system connected to a VLAN trunk port?"
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001
++msgid ""
++"IEEE 802.1Q Virtual LANs (VLANs) are a way of partitioning a physical "
++"network into distinct broadcast domains. Packets can be tagged with "
++"different VLAN IDs so that a single \"trunk\" connection may be used to "
++"transport data for various VLANs."
++msgstr ""
++
++#. Type: boolean
++#. Description
++#. :sl6:
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:4001 ../netcfg-common.templates:5001
++msgid ""
++"If the network interface is directly connected to a VLAN trunk port, "
++"specifying a VLAN ID may be necessary to get a working connection."
++msgstr ""
++
++#. Type: string
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:5001
++msgid "VLAN ID (1-4094):"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid "Error setting up VLAN"
++msgstr ""
++
++#. Type: error
++#. Description
++#. :sl6:
++#: ../netcfg-common.templates:6001
++msgid ""
++"The command used to set up the VLAN during the installation returned an "
++"error. Please check the installer logs, or go back and try another "
++"configuration."
++msgstr ""
++
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:37001
++#, fuzzy
++msgid "Ethernet CCW bus"
++msgstr "網路å¡"
++
++#. Type: text
++#. Description
++#. :sl2:
++#. Type: text
++#. Description
++#. :sl2:
++#: ../netcfg-common.templates:38001 ../netcfg-common.templates:39001
++#, fuzzy
++msgid "Ethernet PCI"
++msgstr "網路å¡"
+diff --git a/dhcp.c b/dhcp.c
+index fe06950..b72a805 100644
+--- a/dhcp.c
++++ b/dhcp.c
+@@ -272,7 +272,7 @@ static int kill_dhcp_client(void)
+ }
+
+ /*
+- * Poll the started DHCP client for netcfg/dhcp_timeout seconds (def. 15)
++ * Poll the started DHCP client for netcfg/dhcp_timeout seconds (def. 30)
+ * and return true if a lease is known to have been acquired, 0 otherwise.
+ *
+ * The client should be run such that it exits once a lease is acquired
+@@ -344,12 +344,11 @@ int poll_dhcp_client (struct debconfclient *client)
+
+ int ask_dhcp_options (struct debconfclient *client, const char *if_name)
+ {
+- if (is_wireless_iface(if_name)) {
+- debconf_metaget(client, "netcfg/internal-wifireconf", "description");
+- debconf_subst(client, "netcfg/dhcp_options", "wifireconf", client->value);
+- }
++ if (is_wireless_iface(if_name))
++ debconf_metaget(client, "netcfg/internal-wifireconf", "Choices");
+ else /* blank from last time */
+- debconf_subst(client, "netcfg/dhcp_options", "wifireconf", "");
++ debconf_metaget(client, "netcfg/internal-nowifi", "Choices");
++ debconf_subst(client, "netcfg/dhcp_options", "choices", client->value);
+
+ /* critical, we don't want to enter a loop */
+ debconf_input(client, "critical", "netcfg/dhcp_options");
+@@ -459,7 +458,7 @@ int netcfg_activate_dhcp (struct debconfclient *client, struct netcfg_interface
+ kill_dhcp_client();
+ loop_setup();
+
+- interface_up(interface->name);
++ netcfg_interface_up(interface);
+
+ for (;;) {
+ di_debug("State is now %i", state);
+@@ -606,7 +605,7 @@ int netcfg_activate_dhcp (struct debconfclient *client, struct netcfg_interface
+ break;
+
+ case DOMAIN:
+- if (!have_domain && netcfg_get_domain (client, domain))
++ if (!have_domain && netcfg_get_domain (client, domain, "medium"))
+ state = HOSTNAME;
+ else {
+ di_debug("Network config complete");
+diff --git a/finish-install.d/55netcfg-copy-config b/finish-install.d/55netcfg-copy-config
+index 74e96a3..ab7cf51 100755
+--- a/finish-install.d/55netcfg-copy-config
++++ b/finish-install.d/55netcfg-copy-config
+@@ -43,10 +43,10 @@ if [ -z "$RET" ]; then
+ if $NM_IS_INSTALLED; then
+ db_set netcfg/target_network_config $CONFIG_NM
+ else
+- if [ "$NETCFG_CONNECTION_TYPE" = "wired" ]; then
+- db_set netcfg/target_network_config $CONFIG_INTERFACES
+- else # wireless
++ if [ "$NETCFG_CONNECTION_TYPE" = "wireless" ]; then
+ db_set netcfg/target_network_config $CONFIG_LOOPBACK
++ else # vlan/wired
++ db_set netcfg/target_network_config $CONFIG_INTERFACES
+ fi
+ fi
+ fi
+@@ -59,6 +59,14 @@ case $RET in
+ mkdir -p /target/$FILE_PATH_NM_CONFIG
+ cp /$FILE_PATH_NM_CONFIG/* /target/$FILE_PATH_NM_CONFIG/
+
++ # Write netplan config file to hand over management to NM
++ cat <<EOF > /target/etc/netplan/01-network-manager-all.yaml
++# Let NetworkManager manage all devices on this system
++network:
++ version: 2
++ renderer: NetworkManager
++EOF
++
+ # Rewrite /etc/network/interfaces to contain only loopback
+ netcfg write_loopback
+ ;;
+diff --git a/netcfg-common.c b/netcfg-common.c
+index c6d1d8d..dafbf1a 100644
+--- a/netcfg-common.c
++++ b/netcfg-common.c
+@@ -34,6 +34,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <string.h>
++#include <limits.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
+@@ -267,7 +268,7 @@ int is_raw_80211(const char *iface)
+
+ #if defined(__s390__)
+ // Layer 3 qeth on s390(x) cannot do arping to test gateway reachability.
+-int is_layer3_qeth(const char *iface)
++int is_layer3_qeth(const struct netcfg_interface *interface)
+ {
+ const int bufsize = 1024;
+ int retval = 0;
+@@ -277,6 +278,12 @@ int is_layer3_qeth(const char *iface)
+ ssize_t slen;
+ char* driver;
+ int fd;
++ char* iface;
++
++ if (interface->parentif)
++ iface = interface->parentif;
++ else
++ iface = interface->name;
+
+ // This is sufficient for both /driver and /layer2.
+ len = strlen(SYSCLASSNET) + strlen(iface) + strlen("/device/driver") + 1;
+@@ -329,7 +336,7 @@ out:
+ return retval;
+ }
+ #else
+-int is_layer3_qeth(const char *iface __attribute__((unused)))
++int is_layer3_qeth(const struct netcfg_interface *interface __attribute__((unused)))
+ {
+ return 0;
+ }
+@@ -558,6 +565,16 @@ char *get_ifdsc(struct debconfclient *client, const char *if_name)
+ CMD_SUCCESS && client->value != NULL) {
+ return strdup(client->value);
+ }
++ /* If using systemd-udevd stable names try that as well
++ Those have two character prefix, then one character for
++ subtype. */
++ if (strlen(template) > 19) {
++ template[19] = '\0';
++ if (debconf_metaget(client, template, "description") ==
++ CMD_SUCCESS && client->value != NULL) {
++ return strdup(client->value);
++ }
++ }
+ } else {
+ strcpy(template, "netcfg/internal-wifi");
+ debconf_metaget(client, template, "description");
+@@ -1038,7 +1055,7 @@ int netcfg_get_hostname(struct debconfclient *client, char *template, char *host
+ "maxhostnamelen", buf);
+ debconf_input(client, "high", "netcfg/invalid_hostname");
+ debconf_go(client);
+- debconf_set(client, template, "debian");
++ debconf_set(client, template, "trisquel");
+ *hostname = '\0';
+ continue;
+ }
+@@ -1064,7 +1081,7 @@ int netcfg_get_hostname(struct debconfclient *client, char *template, char *host
+ "maxhostnamelen", buf);
+ debconf_input(client, "high", "netcfg/invalid_hostname");
+ debconf_go(client);
+- debconf_set(client, template, "debian");
++ debconf_set(client, template, "trisquel");
+ *hostname = '\0';
+ } else {
+ break;
+@@ -1077,7 +1094,7 @@ int netcfg_get_hostname(struct debconfclient *client, char *template, char *host
+ /* @brief Get the domainname.
+ * @return 0 for success, with *domain = domain, GO_BACK for 'goback',
+ */
+-int netcfg_get_domain(struct debconfclient *client, char domain[])
++int netcfg_get_domain(struct debconfclient *client, char domain[], const char *priority)
+ {
+ int ret;
+
+@@ -1089,7 +1106,7 @@ int netcfg_get_domain(struct debconfclient *client, char domain[])
+ return 0;
+ }
+
+- debconf_input (client, "high", "netcfg/get_domain");
++ debconf_input (client, priority, "netcfg/get_domain");
+ ret = debconf_go(client);
+
+ if (ret)
+@@ -1338,6 +1355,24 @@ void interface_down (const char *if_name)
+ }
+ }
+
++void netcfg_interface_up (const struct netcfg_interface *iface)
++{
++ if (iface->parentif)
++ interface_up (iface->parentif);
++
++ if (iface->name)
++ interface_up (iface->name);
++}
++
++void netcfg_interface_down (const struct netcfg_interface *iface)
++{
++ if (iface->name)
++ interface_down (iface->name);
++
++ if (iface->parentif)
++ interface_down (iface->parentif);
++}
++
+ void parse_args (int argc, char ** argv)
+ {
+ if (argc == 2) {
+@@ -1361,11 +1396,14 @@ void reap_old_files (void)
+ {
+ static char* remove[] =
+ { INTERFACES_FILE, HOSTS_FILE, HOSTNAME_FILE, NETWORKS_FILE,
+- RESOLV_FILE, DHCLIENT_CONF, DOMAIN_FILE, 0 };
++ DHCLIENT_CONF, DOMAIN_FILE, 0 };
+ char **ptr = remove;
+
+ while (*ptr)
+ unlink(*ptr++);
++
++ if (!is_resolvconf_used())
++ unlink(RESOLV_FILE);
+ }
+
+ /* Convert a space-separated list of nameservers in a single string (as might
+@@ -1528,7 +1566,7 @@ int netcfg_detect_link(struct debconfclient *client, const struct netcfg_interfa
+ if (ethtool_lite(if_name) == 1) /* ethtool-lite's CONNECTED */ {
+ di_info("Found link on %s", if_name);
+
+- if (!empty_str(gateway) && !is_wireless_iface(if_name) && !is_layer3_qeth(if_name)) {
++ if (!empty_str(gateway) && !is_wireless_iface(if_name) && !is_layer3_qeth(interface)) {
+ for (count = 0; count < gw_tries; count++) {
+ if (di_exec_shell_log(arping) == 0)
+ break;
+@@ -1564,6 +1602,8 @@ void netcfg_interface_init(struct netcfg_interface *iface)
+ iface->v6_stateless_config = -1;
+ iface->loopback = -1;
+ iface->mode = MANAGED;
++ iface->parentif = NULL;
++ iface->vlanid = -1;
+ }
+
+ /* Parse an IP address (v4 or v6), with optional CIDR netmask, into
+@@ -1679,6 +1719,15 @@ int netcfg_gateway_reachable(const struct netcfg_interface *interface)
+ } else if (interface->address_family == AF_INET6) {
+ int i;
+
++ /* Check if the gateway is a link-local address (fe80::/64) */
++ if (gw_addr.in6.s6_addr16[0] == htons(0xFE80) &&
++ gw_addr.in6.s6_addr16[1] == 0 &&
++ gw_addr.in6.s6_addr16[2] == 0 &&
++ gw_addr.in6.s6_addr16[3] == 0) {
++ return 1;
++ }
++
++ /* Check if the gateway is on the same subnet */
+ for (i = 0; i < 4; i++) {
+ if ((gw_addr.in6.s6_addr32[i] & mask.in6.s6_addr32[i]) != net.in6.s6_addr32[i]) {
+ return 0;
+@@ -1752,3 +1801,18 @@ char *strtrim(char *s)
+
+ return s;
+ }
++
++/* Check if /etc/resolv.conf symlinks to /run/resolvconf/resolv.conf. */
++int is_resolvconf_used()
++{
++ int resolvconf_used = 0;
++
++ char *path = realpath(RESOLV_FILE, NULL);
++
++ if (path) {
++ resolvconf_used = !strcmp(path, RESOLVCONF_FILE);
++ free(path);
++ }
++
++ return resolvconf_used;
++}
+diff --git a/netcfg.c b/netcfg.c
+index 195681b..0627134 100644
+--- a/netcfg.c
++++ b/netcfg.c
+@@ -40,7 +40,11 @@ response_t netcfg_get_method(struct debconfclient *client)
+ {
+ int iret;
+
++#ifdef __s390__
++ iret = debconf_input(client, "high", "netcfg/use_autoconfig");
++#else
+ iret = debconf_input(client, "medium", "netcfg/use_autoconfig");
++#endif
+
+ if (debconf_go(client) == CMD_GOBACK)
+ return GO_BACK;
+@@ -67,6 +71,7 @@ int main(int argc, char *argv[])
+ GET_METHOD,
+ GET_DHCP,
+ GET_STATIC,
++ GET_VLAN,
+ WCONFIG,
+ WCONFIG_ESSID,
+ WCONFIG_SECURITY_TYPE,
+@@ -80,6 +85,9 @@ int main(int argc, char *argv[])
+ char **ifaces;
+ char *defiface = NULL, *defwireless = NULL;
+ response_t res;
++ int num_ifaces;
++ char buf[256];
++ int rv = 0;
+ struct netcfg_interface interface;
+ #ifdef NM
+ struct nm_config_info nmconf;
+@@ -117,11 +125,19 @@ int main(int argc, char *argv[])
+ else
+ debconf_set(client, "netcfg/use_autoconfig", "true");
+
++ /* Don't ask use_autoconfig question on s390x when
++ * disable_autoconfig was preseeded */
++ debconf_fget(client, "netcfg/disable_autoconfig", "seen");
++ if (!strcmp(client->value, "true"))
++ debconf_fset(client, "netcfg/use_autoconfig", "seen", "true");
++
+ /* also support disable_dhcp for compatibility */
+ debconf_get(client, "netcfg/disable_dhcp");
+
+- if (!strcmp(client->value, "true"))
++ if (!strcmp(client->value, "true")) {
+ debconf_set(client, "netcfg/use_autoconfig", "false");
++ debconf_fset(client, "netcfg/use_autoconfig", "seen", "true");
++ }
+
+ for (;;) {
+ switch(state) {
+@@ -135,8 +151,34 @@ int main(int argc, char *argv[])
+ * leave it in an inconsistant state */
+ kill_wpa_supplicant();
+
++ /* Reset all interfaces first */
++ num_ifaces = get_all_ifs(1, &ifaces);
++ if (num_ifaces > 0) {
++ while (*ifaces) {
++ di_debug("Flushing addresses and routes on interface: %s\n", *ifaces);
++
++ /* Flush all IPv4 addresses */
++ snprintf(buf, sizeof(buf), "ip -f inet addr flush dev %s", *ifaces);
++ rv |= di_exec_shell_log(buf);
++
++ /* Flush all IPv6 addresses */
++ snprintf(buf, sizeof(buf), "ip -f inet6 addr flush dev %s", *ifaces);
++ rv |= di_exec_shell_log(buf);
++
++ /* Flush all IPv4 routes */
++ snprintf(buf, sizeof(buf), "ip -f inet route flush dev %s", *ifaces);
++ rv |= di_exec_shell_log(buf);
++
++ /* Flush all IPv6 routes */
++ snprintf(buf, sizeof(buf), "ip -f inet6 route flush dev %s", *ifaces);
++ rv |= di_exec_shell_log(buf);
++
++ ifaces++;
++ }
++ }
++
+ /* Choose a default by looking for link */
+- if (get_all_ifs(1, &ifaces) > 1) {
++ if (num_ifaces > 1) {
+ while (*ifaces) {
+ struct netcfg_interface link_interface;
+
+@@ -216,13 +258,19 @@ int main(int argc, char *argv[])
+ state = BACKUP;
+ else if (! interface.name || ! num_interfaces)
+ state = GET_HOSTNAME_ONLY;
+- else {
+- if (is_wireless_iface (interface.name))
+- state = WCONFIG;
+- else
+- state = GET_METHOD;
+- }
++ else if (is_wireless_iface (interface.name))
++ state = WCONFIG;
++ else
++ state = GET_VLAN;
+ break;
++
++ case GET_VLAN:
++ if (netcfg_set_vlan(client, &interface) == GO_BACK)
++ state = BACKUP;
++ else
++ state = GET_METHOD;
++ break;
++
+ case GET_HOSTNAME_ONLY:
+ if(netcfg_get_hostname(client, "netcfg/get_hostname", hostname, 0))
+ state = BACKUP;
+@@ -231,6 +279,7 @@ int main(int argc, char *argv[])
+ state = QUIT;
+ }
+ break;
++
+ case GET_METHOD:
+ if ((res = netcfg_get_method(client)) == GO_BACK)
+ state = (num_interfaces == 1) ? BACKUP : GET_INTERFACE;
+diff --git a/netcfg.h b/netcfg.h
+index 00a2cea..19fe710 100644
+--- a/netcfg.h
++++ b/netcfg.h
+@@ -6,6 +6,7 @@
+ #define HOSTNAME_FILE "/etc/hostname"
+ #define NETWORKS_FILE "/etc/networks"
+ #define RESOLV_FILE "/etc/resolv.conf"
++#define RESOLVCONF_FILE "/run/resolvconf/resolv.conf"
+ #define DHCLIENT_CONF "/etc/dhclient.conf"
+ #define DOMAIN_FILE "/tmp/domain_name"
+ #define NTP_SERVER_FILE "/tmp/dhcp-ntp-servers"
+@@ -151,6 +152,11 @@ struct netcfg_interface {
+ /* WPA */
+ wpa_t wpa_supplicant_status;
+ char *passphrase;
++
++ /* VLAN */
++ char *parentif;
++ int vlanid;
++
+ };
+
+ /* Somewhere we can store both in_addr and in6_addr; convenient for all those
+@@ -186,7 +192,7 @@ extern int netcfg_get_hostname(struct debconfclient *client, char *template, cha
+
+ extern int netcfg_get_nameservers (struct debconfclient *client, char **nameservers, char *default_nameservers);
+
+-extern int netcfg_get_domain(struct debconfclient *client, char domain[]);
++extern int netcfg_get_domain(struct debconfclient *client, char domain[], const char *priority);
+
+ extern int netcfg_get_static(struct debconfclient *client, struct netcfg_interface *interface);
+
+@@ -195,6 +201,7 @@ extern int netcfg_activate_dhcp(struct debconfclient *client, struct netcfg_inte
+ extern int nameserver_count (const struct netcfg_interface *interface);
+
+ extern int read_resolv_conf_nameservers (char *resolv_conf_file, struct netcfg_interface *interface);
++extern int is_resolvconf_used();
+
+ extern void sigchld_handler (int sig __attribute__ ((unused)));
+
+@@ -221,6 +228,9 @@ extern void deconfigure_network(struct netcfg_interface *iface);
+ extern void interface_up (const char *if_name);
+ extern void interface_down (const char *if_name);
+
++extern void netcfg_interface_up (const struct netcfg_interface *iface);
++extern void netcfg_interface_down (const struct netcfg_interface *iface);
++
+ extern void loop_setup(void);
+ extern int get_hostname_from_dns(const struct netcfg_interface *interface, char *hostname, const size_t max_hostname_len);
+
+@@ -270,4 +280,7 @@ extern void cleanup_dhcpv6_client(void);
+ extern int start_dhcpv6_client(struct debconfclient *client, const struct netcfg_interface *interface);
+ extern int netcfg_autoconfig(struct debconfclient *client, struct netcfg_interface *interface);
+
++/* vlan.c */
++extern int netcfg_set_vlan(struct debconfclient *client, struct netcfg_interface *interface);
++
+ #endif /* _NETCFG_H_ */
+diff --git a/nm-conf.c b/nm-conf.c
+index aeab031..83834b0 100644
+--- a/nm-conf.c
++++ b/nm-conf.c
+@@ -32,11 +32,17 @@ static void get_uuid(char* target)
+
+ static void nm_write_connection(FILE *config_file, nm_connection connection)
+ {
++ static char *type = NM_DEFAULT_WIRED;
++ if (connection.type == WIFI) {
++ type = NM_DEFAULT_WIRELESS;
++ }
++ if (connection.type == VLAN) {
++ type = NM_DEFAULT_VLAN;
++ }
+ fprintf(config_file, "\n%s\n", NM_SETTINGS_CONNECTION);
+ fprintf(config_file, "id=%s\n", connection.id);
+ fprintf(config_file, "uuid=%s\n", connection.uuid);
+- fprintf(config_file, "type=%s\n", (connection.type == WIFI) ?
+- NM_DEFAULT_WIRELESS : NM_DEFAULT_WIRED);
++ fprintf(config_file, "type=%s\n", type);
+ }
+
+ #ifdef WIRELESS
+@@ -71,6 +77,15 @@ static void nm_write_wired_specific_options(FILE *config_file,
+ }
+ }
+
++static void nm_write_vlan_specific_options(FILE *config_file,
++ struct nm_config_info *nmconf)
++{
++ nm_vlan vlan = nmconf->vlan;
++ fprintf(config_file, "\n%s\n", NM_SETTINGS_VLAN);
++ fprintf(config_file, "parent=%s\n", vlan.parent);
++ fprintf(config_file, "parent=%i\n", vlan.id);
++}
++
+ #ifdef WIRELESS
+ static void nm_write_wireless_security(FILE *config_file, nm_wireless_security
+ wireless_security)
+@@ -115,26 +130,20 @@ static void nm_write_static_ipvX(FILE *config_file, nm_ipvX ipvx)
+
+ /* Write IP address to the buffer. */
+ strcat(buffer, ipvx.ip_address);
+- strcat(buffer, ";");
++ strcat(buffer, "/");
+
+ /* Write netmask to the buffer. */
+ sprintf(addr, "%d", ipvx.masklen);
+ strcat(buffer, addr);
+- strcat(buffer, ";");
+
+ /* Write gateway address to the buffer. */
+- memset(addr, 0, NM_MAX_LEN_IPV4);
+ if (!empty_str(ipvx.gateway)) {
+- strncpy(addr, ipvx.gateway, NM_MAX_LEN_IPV4 - 1);
+- }
+- else {
+- strcpy(addr, "0");
++ strcat(buffer, ",");
++ strcat(buffer, ipvx.gateway);
+ }
+- strcat(buffer, addr);
+- strcat(buffer, ";");
+
+ /* Write config to the configuration file. */
+- fprintf(config_file, "addresses1=%s\n", buffer);
++ fprintf(config_file, "address1=%s\n", buffer);
+ }
+
+ static void nm_write_ipv4(FILE *config_file, nm_ipvX ipv4)
+@@ -176,6 +185,9 @@ static void nm_write_connection_type(struct nm_config_info nmconf)
+ if (nmconf.connection.type == WIFI) {
+ fprintf(f, "connection type: wireless\n");
+ }
++ else if (nmconf.connection.type == VLAN) {
++ fprintf(f, "connection type: vlan\n");
++ }
+ else {
+ fprintf(f, "connection type: wired\n");
+ }
+@@ -229,6 +241,9 @@ void nm_write_configuration(struct nm_config_info nmconf)
+ if (nmconf.connection.type == WIRED) {
+ nm_write_wired_specific_options(config_file, &nmconf);
+ }
++ else if (nmconf.connection.type == VLAN) {
++ nm_write_vlan_specific_options(config_file, &nmconf);
++ }
+ #ifdef WIRELESS
+ else {
+ nm_write_wireless_specific_options(config_file, &nmconf);
+@@ -420,6 +435,15 @@ static void nm_get_ipv6(struct netcfg_interface *niface, nm_ipvX *ipv6)
+
+ }
+
++static void nm_get_vlan(struct netcfg_interface *niface, nm_connection *connection, nm_vlan *nmvlan)
++{
++ if (niface->vlanid > 0) {
++ connection->type = VLAN;
++ nmvlan->id = niface->vlanid;
++ nmvlan->parent = niface->parentif;
++ }
++}
++
+ /* Extract all configs for a wireless interface, from both global netcfg
+ * values and other resources. */
+ #ifdef WIRELESS
+@@ -444,6 +468,7 @@ static void nm_get_wired_config(struct netcfg_interface *niface, struct nm_confi
+ nm_get_wired_specific_options(niface, &(nmconf->wired));
+ nm_get_ipv4(niface, &(nmconf->ipv4));
+ nm_get_ipv6(niface, &(nmconf->ipv6));
++ nm_get_vlan(niface, &(nmconf->connection), &(nmconf->vlan));
+ }
+
+ /* Getting configurations for NM relies on netcfrg global variables. */
+diff --git a/nm-conf.h b/nm-conf.h
+index 6340222..9a6b695 100644
+--- a/nm-conf.h
++++ b/nm-conf.h
+@@ -20,6 +20,7 @@
+ #define NM_DEFAULT_WIRED_NAME "Wired connection 1"
+ #define NM_DEFAULT_WIRELESS "802-11-wireless"
+ #define NM_DEFAULT_WIRELESS_SECURITY "802-11-wireless-security"
++#define NM_DEFAULT_VLAN "vlan"
+ #define NM_DEFAULT_PATH_FOR_MAC "/sys/class/net/%s/address"
+ #define NM_CONFIG_FILE_PATH "/etc/NetworkManager/system-connections"
+ #define NM_CONNECTION_FILE "/tmp/connection_type"
+@@ -30,6 +31,7 @@
+ #define NM_SETTINGS_WIRELESS_SECURITY "["NM_DEFAULT_WIRELESS_SECURITY"]"
+ #define NM_SETTINGS_IPV4 "[ipv4]"
+ #define NM_SETTINGS_IPV6 "[ipv6]"
++#define NM_SETTINGS_VLAN "[vlan]"
+
+ /* Minimalist structures for storing basic elements in order to write a Network
+ * Manager format config file.
+@@ -43,7 +45,7 @@ typedef struct nm_connection
+ {
+ char id[NM_MAX_LEN_ID];
+ char uuid[NM_MAX_LEN_UUID];
+- enum {WIRED, WIFI} type;
++ enum {WIRED, WIFI, VLAN} type;
+ int manual; /* 1 = true, 0 = false */
+ } nm_connection;
+
+@@ -86,6 +88,11 @@ typedef struct nm_ipvX
+ unsigned int masklen;
+ } nm_ipvX;
+
++typedef struct nm_vlan
++{
++ char * parent;
++ int id;
++} nm_vlan;
+
+ typedef struct nm_config_info
+ {
+@@ -95,6 +102,7 @@ typedef struct nm_config_info
+ nm_wireless_security wireless_security;
+ nm_ipvX ipv4;
+ nm_ipvX ipv6;
++ nm_vlan vlan;
+ } nm_config_info;
+
+ /* Public functions */
+diff --git a/post-base-installer.d/40netcfg b/post-base-installer.d/40netcfg
+new file mode 100755
+index 0000000..9d19e33
+--- /dev/null
++++ b/post-base-installer.d/40netcfg
+@@ -0,0 +1,7 @@
++#!/bin/sh -e
++# Make sure resolvconf will still work with bind-mounted /run
++
++if [ -L /target/etc/resolv.conf ] && [ -f /target/run/resolvconf/resolv.conf ]; then
++ mkdir -p /run/resolvconf
++ cp /target/run/resolvconf/resolv.conf /run/resolvconf/resolv.conf
++fi
+diff --git a/static.c b/static.c
+index ea12fba..e375dd4 100644
+--- a/static.c
++++ b/static.c
+@@ -310,7 +310,7 @@ static int netcfg_activate_static_ipv4(struct debconfclient *client,
+ deconfigure_network(NULL);
+
+ loop_setup();
+- interface_up(interface->name);
++ netcfg_interface_up(interface);
+
+ /* Flush all previous addresses, routes */
+ snprintf(buf, sizeof(buf), "ifconfig %s inet 0 down", interface->name);
+@@ -345,7 +345,7 @@ static int netcfg_activate_static_ipv4(struct debconfclient *client,
+ deconfigure_network(NULL);
+
+ loop_setup();
+- interface_up(interface->name);
++ netcfg_interface_up(interface);
+
+ /* Flush all previous addresses, routes */
+ snprintf(buf, sizeof(buf), "ip -f inet addr flush dev %s", interface->name);
+@@ -372,7 +372,7 @@ static int netcfg_activate_static_ipv4(struct debconfclient *client,
+ rv |= di_exec_shell_log(buf);
+ }
+ else if (!empty_str(interface->gateway)) {
+- snprintf(buf, sizeof(buf), "ip route add default via %s", interface->gateway);
++ snprintf(buf, sizeof(buf), "ip route add default via %s dev %s", interface->gateway, interface->name);
+ rv |= di_exec_shell_log(buf);
+ }
+ #endif
+@@ -426,7 +426,7 @@ static int netcfg_activate_static_ipv6(struct debconfclient *client,
+ deconfigure_network(NULL);
+
+ loop_setup();
+- interface_up(interface->name);
++ netcfg_interface_up(interface);
+
+ /* Flush all previous addresses, routes */
+ snprintf(buf, sizeof(buf), "ifconfig %s inet 0 down", interface->name);
+@@ -449,7 +449,7 @@ static int netcfg_activate_static_ipv6(struct debconfclient *client,
+ deconfigure_network(NULL);
+
+ loop_setup();
+- interface_up(interface->name);
++ netcfg_interface_up(interface);
+
+ /* Flush all previous addresses, routes */
+ snprintf(buf, sizeof(buf), "ip -f inet6 addr flush dev %s", interface->name);
+@@ -461,8 +461,8 @@ static int netcfg_activate_static_ipv6(struct debconfclient *client,
+ /* Now down and up the interface, to get LL and SLAAC addresses back,
+ * since flushing the addresses and routes gets rid of all that
+ * sort of thing. */
+- interface_down(interface->name);
+- interface_up(interface->name);
++ netcfg_interface_down(interface);
++ netcfg_interface_up(interface);
+
+ /* Add the new IP address and netmask */
+ snprintf(buf, sizeof(buf), "ip addr add %s/%d dev %s",
+@@ -474,7 +474,7 @@ static int netcfg_activate_static_ipv6(struct debconfclient *client,
+ rv |= di_exec_shell_log(buf);
+
+ if (!empty_str(interface->gateway)) {
+- snprintf(buf, sizeof(buf), "ip route add default via %s", interface->gateway);
++ snprintf(buf, sizeof(buf), "ip route add default via %s dev %s", interface->gateway, interface->name);
+ rv |= di_exec_shell_log(buf);
+ }
+ #endif
+@@ -629,7 +629,7 @@ int netcfg_get_static(struct debconfclient *client, struct netcfg_interface *ifa
+ break;
+ case GET_DOMAIN:
+ if (!have_domain) {
+- state = (netcfg_get_domain (client, domain)) ?
++ state = (netcfg_get_domain (client, domain, "high")) ?
+ GET_HOSTNAME : QUIT;
+ } else {
+ di_info("domain = %s", domain);
+diff --git a/vlan.c b/vlan.c
+new file mode 100644
+index 0000000..93247ab
+--- /dev/null
++++ b/vlan.c
+@@ -0,0 +1,106 @@
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <cdebconf/debconfclient.h>
++#include <debian-installer.h>
++#include "netcfg.h"
++
++static char* get_vlan_command(const char* parentif, const char* vlanif, int vlanid) {
++#if defined(__linux__)
++ const char* vlan_command = "ip link add link %s name %s type vlan id %d";
++ int len = strlen(vlan_command) + strlen(parentif) + strlen(vlanif) + 4 + 1;
++ char* buf = malloc(len);
++ snprintf(buf, len, vlan_command, parentif, vlanif, vlanid);
++ return buf;
++#elif defined(__FreeBSD_kernel__)
++ const char* vlan_command = "ifconfig %s vlan %d vlandev %s";
++ int len = strlen(vlan_command) + strlen(parentif) + strlen(vlanif) + 4 + 1;
++ char* buf = malloc(len);
++ snprintf(buf, len, vlan_command, vlanif, vlanid, parentif);
++ return buf;
++#endif
++}
++
++/* Create a new VLAN interface attached to the currently selected
++ * network interface.
++ */
++int netcfg_set_vlan (struct debconfclient *client, struct netcfg_interface *interface) {
++#if defined(__linux__) || defined(__FreeBSD_kernel__)
++ int vlanid;
++
++ debconf_get(client, "netcfg/vlan_id");
++ /* Empty string: no VLAN preseeded, ask if we should configure VLAN */
++ if (strlen(client->value) == 0) {
++ debconf_input (client, "medium", "netcfg/use_vlan");
++ if (debconf_go(client) == CMD_GOBACK) {
++ debconf_fset(client, "netcfg/use_vlan", "seen", "false");
++ return GO_BACK;
++ }
++
++ debconf_get(client, "netcfg/use_vlan");
++
++ if (!strcmp(client->value, "false")) {
++ return 0;
++ }
++
++ debconf_input(client, "critical", "netcfg/vlan_id");
++ if (debconf_go(client) == CMD_GOBACK) {
++ debconf_fset(client, "netcfg/use_vlan", "seen", "false");
++ debconf_fset(client, "netcfg/vlan_id", "seen", "false");
++ return GO_BACK;
++ }
++ debconf_get(client, "netcfg/vlan_id");
++ }
++
++ for (;;) {
++ vlanid = strtol(client->value, NULL, 10);
++ /* Valid range: 1-4094 (0 and 4095 are reserved.)
++ * 0 will be returned by strtol if the value cannot be parsed.
++ */
++ if (vlanid < 1 || vlanid > 4094) {
++ di_error("VLAN ID \"%s\" is invalid.", client->value);
++ debconf_fset(client, "netcfg/vlan_failed", "seen", "false");
++ debconf_input(client, "critical", "netcfg/vlan_failed");
++ debconf_capb(client);
++ debconf_go(client);
++
++ debconf_capb(client, "backup");
++ debconf_fset(client, "netcfg/vlan_id", "seen", "false");
++ debconf_input(client, "critical", "netcfg/vlan_id");
++ if (debconf_go(client) == CMD_GOBACK) {
++ return GO_BACK;
++ }
++ } else {
++ break;
++ }
++ }
++
++ int vlaniflen = strlen(interface->name) + 1 + 4 + 1;
++ char* vlanif = malloc(vlaniflen);
++ snprintf(vlanif, vlaniflen, "%s.%d", interface->name, vlanid);
++
++ char *vlan_command = get_vlan_command(interface->name, vlanif, vlanid);
++ int rc = di_exec_shell_log(vlan_command);
++ if (rc != 0) {
++ di_error("\"%s\" failed to create VLAN interface; return code = %d", vlan_command, rc);
++ free(vlan_command);
++ debconf_fset(client, "netcfg/vlan_failed", "seen", "false");
++ debconf_input(client, "critical", "netcfg/vlan_failed");
++ debconf_go(client);
++ return GO_BACK;
++ }
++ free(vlan_command);
++
++ interface->parentif = interface->name;
++ interface->name = vlanif;
++ interface->vlanid = vlanid;
++ di_exec_shell_log("apt-install vlan");
++#else
++ /* This platform does not support VLANs. */
++ debconf_get(client, "netcfg/vlan_id");
++ if (strlen(client->value) > 0) {
++ di_error("netcfg/vlan_id specified, yet VLAN is not supported on this platfrom");
++ }
++#endif
++ return 0;
++}
+diff --git a/wireless.c b/wireless.c
+index 566b032..83b1d1d 100644
+--- a/wireless.c
++++ b/wireless.c
+@@ -121,7 +121,7 @@ int netcfg_wireless_show_essids(struct debconfclient *client, struct netcfg_inte
+ int essid_list_len = 1;
+
+ iw_get_basic_config (wfd, interface->name, &wconf);
+- interface_up(interface->name);
++ netcfg_interface_up(interface);
+
+ if (iw_scan(wfd, interface->name, iw_get_kernel_we_version(),
+ &network_list) >= 0 ) {
+@@ -205,7 +205,7 @@ int netcfg_wireless_show_essids(struct debconfclient *client, struct netcfg_inte
+ }
+
+ iw_set_basic_config(wfd, interface->name, &wconf);
+- interface_down(interface->name);
++ netcfg_interface_down(interface);
+
+ di_info("Network chosen: %s. Proceeding to connect.", interface->essid);
+
+diff --git a/write_interface.c b/write_interface.c
+index 1f683b2..012ffb7 100644
+--- a/write_interface.c
++++ b/write_interface.c
+@@ -44,6 +44,20 @@ static int nc_wi_loopback(const struct netcfg_interface *interface, FILE *fd)
+ return 1;
+ }
+
++/* Write VLAN settings, such as: vlan_raw_device eth0
++*/
++static int nc_wi_vlan(const struct netcfg_interface *interface, FILE *fd)
++{
++ int rv;
++ rv = 1;
++ if (interface && interface->parentif &&
++ (fprintf(fd, "\tvlan_raw_device %s\n", interface->parentif) < 0)) {
++ rv = 0;
++ }
++ return rv;
++}
++
++
+ static int nc_wi_wireless_options(const struct netcfg_interface *interface, FILE *fd)
+ {
+ /*
+@@ -74,10 +88,7 @@ static int nc_wi_wireless_options(const struct netcfg_interface *interface, FILE
+ static int nc_wi_dhcp(const struct netcfg_interface *interface, FILE *fd)
+ {
+ fprintf(fd, "\n# The primary network interface\n");
+- if (!iface_is_hotpluggable(interface->name) && !find_in_stab(interface->name))
+- fprintf(fd, "auto %s\n", interface->name);
+- else
+- fprintf(fd, "allow-hotplug %s\n", interface->name);
++ fprintf(fd, "auto %s\n", interface->name);
+ fprintf(fd, "iface %s inet dhcp\n", interface->name);
+ if (!empty_str(interface->dhcp_hostname)) {
+ fprintf(fd, "\thostname %s\n", interface->dhcp_hostname);
+@@ -94,10 +105,7 @@ static int nc_wi_slaac(const struct netcfg_interface *interface, FILE *fd)
+ fprintf(fd, "\n# The primary network interface\n");
+ fprintf(fd, "# This is an autoconfigured IPv6 interface\n");
+ if (interface->dhcp == 0) {
+- if (!iface_is_hotpluggable(interface->name) && !find_in_stab(interface->name))
+- fprintf(fd, "auto %s\n", interface->name);
+- else
+- fprintf(fd, "allow-hotplug %s\n", interface->name);
++ fprintf(fd, "auto %s\n", interface->name);
+ }
+
+ fprintf(fd, "iface %s inet6 auto\n", interface->name);
+@@ -113,10 +121,7 @@ static int nc_wi_slaac(const struct netcfg_interface *interface, FILE *fd)
+ static int nc_wi_static_ipv4(const struct netcfg_interface *interface, FILE *fd)
+ {
+ fprintf(fd, "\n# The primary network interface\n");
+- if (!iface_is_hotpluggable(interface->name) && !find_in_stab(interface->name))
+- fprintf(fd, "auto %s\n", interface->name);
+- else
+- fprintf(fd, "allow-hotplug %s\n", interface->name);
++ fprintf(fd, "auto %s\n", interface->name);
+ fprintf(fd, "iface %s inet static\n", interface->name);
+ fprintf(fd, "\taddress %s/%i\n", interface->ipaddress,
+ empty_str(interface->pointopoint) ? interface->masklen : 32);
+@@ -134,10 +139,7 @@ static int nc_wi_static_ipv4(const struct netcfg_interface *interface, FILE *fd)
+ static int nc_wi_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
+ {
+ fprintf(fd, "\n# The primary network interface\n");
+- if (!iface_is_hotpluggable(interface->name) && !find_in_stab(interface->name))
+- fprintf(fd, "auto %s\n", interface->name);
+- else
+- fprintf(fd, "allow-hotplug %s\n", interface->name);
++ fprintf(fd, "auto %s\n", interface->name);
+ fprintf(fd, "iface %s inet6 static\n", interface->name);
+ fprintf(fd, "\taddress %s/%i\n", interface->ipaddress, interface->masklen);
+ if (!empty_str(interface->gateway))
+@@ -260,7 +262,10 @@ int netcfg_write_interface(const struct netcfg_interface *interface)
+ di_debug("Writing static IPv6 stanza for %s", interface->name);
+ rv = nc_wi_static_ipv6(interface, fd);
+ }
+-
++ if (rv && interface && interface->parentif) {
++ di_debug("Writing VLAN: %s", interface->name);
++ rv = nc_wi_vlan(interface, fd);
++ }
+ if (rv && interface && is_wireless_iface(interface->name)) {
+ di_debug("Writing wireless options for %s", interface->name);
+ rv = nc_wi_wireless_options(interface, fd);
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/02_ruc_1.142ubuntu2.patch b/helpers/DATA/netcfg/02_ruc_1.142ubuntu2.patch
new file mode 100644
index 00000000..7a6a1db5
--- /dev/null
+++ b/helpers/DATA/netcfg/02_ruc_1.142ubuntu2.patch
@@ -0,0 +1,521 @@
+From 54942477d5d0066b7d37650420e2d7f834dd1d9e Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>
+Date: Fri, 26 May 2017 15:29:16 -0400
+Subject: 1.142ubuntu2 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ base-installer.d/40netcfg | 4 +-
+ debian/changelog | 8 ++
+ debian/netcfg-common.templates | 6 +
+ debian/netcfg.dirs | 1 +
+ dhcp.c | 2 +-
+ netcfg-common.c | 4 +-
+ netcfg.h | 3 +-
+ static.c | 2 +-
+ write_interface.c | 290 +++++++++++++++++++++++++++++++++--------
+ 9 files changed, 262 insertions(+), 58 deletions(-)
+
+diff --git a/base-installer.d/40netcfg b/base-installer.d/40netcfg
+index 0bbffd5..6ce418a 100755
+--- a/base-installer.d/40netcfg
++++ b/base-installer.d/40netcfg
+@@ -1,11 +1,11 @@
+ #!/bin/sh -e
+ # Copy all relevant networking-related files to /target.
+
+-if [ ! -f /etc/network/interfaces ]; then
++if [ ! -f /etc/network/interfaces ] && [ ! -f /etc/netplan/*.yaml ]; then
+ netcfg write_loopback
+ fi
+
+-for file in /etc/network/interfaces /etc/networks /etc/hostname /etc/hosts; do
++for file in /etc/network/interfaces /etc/networks /etc/hostname /etc/hosts /etc/netplan/*.yaml; do
+ if [ -f "$file" ]; then
+ mkdir /target/$(dirname $file) -p
+ cp $file /target/$file
+diff --git a/debian/netcfg-common.templates b/debian/netcfg-common.templates
+index 0ca1ec7..6e42847 100644
+--- a/debian/netcfg-common.templates
++++ b/debian/netcfg-common.templates
+@@ -415,3 +415,9 @@ _Choices: ${essid_list} Enter ESSID manually
+ _Description: Wireless network:
+ Select the wireless network to use during the installation process.
+
++Template: netcfg/do_not_use_netplan
++Type: boolean
++Default: false
++Description: for internal use; can be preseeded
++ Set to false to fallback to ifupdown.
++
+diff --git a/debian/netcfg.dirs b/debian/netcfg.dirs
+index dad6088..d548c6e 100644
+--- a/debian/netcfg.dirs
++++ b/debian/netcfg.dirs
+@@ -1,5 +1,6 @@
+ bin
+ etc/network
++etc/netplan
+ usr/lib/base-installer.d
+ usr/lib/post-base-installer.d
+ lib/netcfg
+diff --git a/dhcp.c b/dhcp.c
+index b72a805..8824580 100644
+--- a/dhcp.c
++++ b/dhcp.c
+@@ -611,7 +611,7 @@ int netcfg_activate_dhcp (struct debconfclient *client, struct netcfg_interface
+ di_debug("Network config complete");
+ netcfg_write_common("", hostname, domain);
+ netcfg_write_loopback();
+- netcfg_write_interface(interface);
++ netcfg_write_interface(client, interface);
+ netcfg_write_resolv(domain, interface);
+ #if !defined(__FreeBSD_kernel__)
+ kill_dhcp_client();
+diff --git a/netcfg-common.c b/netcfg-common.c
+index dafbf1a..d747450 100644
+--- a/netcfg-common.c
++++ b/netcfg-common.c
+@@ -1133,8 +1133,8 @@ void netcfg_write_loopback (void)
+ lo.name = LO_IF;
+ lo.loopback = 1;
+
+- netcfg_write_interface(NULL);
+- netcfg_write_interface(&lo);
++ netcfg_write_interface(NULL, NULL);
++ netcfg_write_interface(NULL, &lo);
+ }
+
+ /*
+diff --git a/netcfg.h b/netcfg.h
+index 19fe710..ae3f34c 100644
+--- a/netcfg.h
++++ b/netcfg.h
+@@ -2,6 +2,7 @@
+ #define _NETCFG_H_
+
+ #define INTERFACES_FILE "/etc/network/interfaces"
++#define NETPLAN_YAML "/etc/netplan/01-netcfg.yaml"
+ #define HOSTS_FILE "/etc/hosts"
+ #define HOSTNAME_FILE "/etc/hostname"
+ #define NETWORKS_FILE "/etc/networks"
+@@ -267,7 +268,7 @@ extern int nc_v6_interface_configured(const struct netcfg_interface *interface,
+ extern int nc_v6_get_config_flags(struct debconfclient *client, struct netcfg_interface *interface);
+
+ /* write_interfaces.c */
+-extern int netcfg_write_interface(const struct netcfg_interface *interface);
++extern int netcfg_write_interface(struct debconfclient *client, const struct netcfg_interface *interface);
+
+ /* rdnssd.c */
+ extern int start_rdnssd(struct debconfclient *client);
+diff --git a/static.c b/static.c
+index e375dd4..b73b785 100644
+--- a/static.c
++++ b/static.c
+@@ -680,7 +680,7 @@ int netcfg_get_static(struct debconfclient *client, struct netcfg_interface *ifa
+ }
+ netcfg_write_common(iface->ipaddress, hostname, domain);
+ netcfg_write_loopback();
+- netcfg_write_interface(iface);
++ netcfg_write_interface(client, iface);
+ netcfg_write_resolvconf_options(domain, iface);
+ netcfg_write_resolv(domain, iface);
+ }
+diff --git a/write_interface.c b/write_interface.c
+index 012ffb7..14d36e1 100644
+--- a/write_interface.c
++++ b/write_interface.c
+@@ -24,8 +24,20 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <cdebconf/debconfclient.h>
+ #include <debian-installer.h>
+
++static int nc_wi_netplan_header(FILE *fd)
++{
++ fprintf(fd, "# This file describes the network interfaces available on your system\n");
++ fprintf(fd, "# For more information, see netplan(5).\n");
++ fprintf(fd, "network:\n");
++ fprintf(fd, " version: 2\n");
++ fprintf(fd, " renderer: networkd\n");
++
++ return 1;
++}
++
+ static int nc_wi_header(FILE *fd)
+ {
+ fprintf(fd, "# This file describes the network interfaces available on your system\n");
+@@ -57,6 +69,19 @@ static int nc_wi_vlan(const struct netcfg_interface *interface, FILE *fd)
+ return rv;
+ }
+
++static int nc_wi_netplan_vlan(const struct netcfg_interface *interface, FILE *fd)
++{
++ int rv;
++ rv = 1;
++
++ fprintf(fd, " vlans:\n");
++ fprintf(fd, " %s:\n", interface->name);
++ fprintf(fd, " link: %s\n", interface->parentif);
++ fprintf(fd, " id: %d\n", interface->vlanid);
++
++ return rv;
++}
++
+
+ static int nc_wi_wireless_options(const struct netcfg_interface *interface, FILE *fd)
+ {
+@@ -83,6 +108,29 @@ static int nc_wi_wireless_options(const struct netcfg_interface *interface, FILE
+ return 1;
+ }
+
++static int nc_wi_netplan_wireless_aps(const struct netcfg_interface *interface, FILE *fd)
++{
++ fprintf(fd, " access-points:\n");
++
++ if (interface->essid && *interface->essid) {
++ fprintf(fd, " %s:\n", interface->essid);
++ } else {
++ fprintf(fd, " any:\n");
++ }
++
++ if (interface->wpa_supplicant_status == WPA_QUEUED) {
++ fprintf(fd, " password: %s\n", interface->passphrase);
++ } else {
++ fprintf(fd, " mode: %s\n",
++ (interface->mode == MANAGED) ? "infrastructure" : "adhoc");
++
++ if (interface->wepkey != NULL)
++ fprintf(fd, " password: %s\n", interface->wepkey);
++ }
++
++ return 1;
++}
++
+ /* Write out a DHCP stanza for the given interface
+ */
+ static int nc_wi_dhcp(const struct netcfg_interface *interface, FILE *fd)
+@@ -134,6 +182,17 @@ static int nc_wi_static_ipv4(const struct netcfg_interface *interface, FILE *fd)
+ return 1;
+ }
+
++static int nc_wi_netplan_static_ipv4(const struct netcfg_interface *interface, FILE *fd)
++{
++ fprintf(fd, " addresses: [ %s/%i ]\n", interface->ipaddress,
++ empty_str(interface->pointopoint) ? interface->masklen : 32);
++ if (!empty_str(interface->gateway))
++ fprintf(fd, " gateway4: %s\n",
++ empty_str(interface->pointopoint) ? interface->gateway : interface->pointopoint);
++
++ return 1;
++}
++
+ /* Write out a static IPv6 config stanza for the given interface
+ */
+ static int nc_wi_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
+@@ -148,6 +207,131 @@ static int nc_wi_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
+ return 1;
+ }
+
++static int nc_wi_netplan_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
++{
++ fprintf(fd, " addresses: [ %s/%i ]\n", interface->ipaddress, interface->masklen);
++ if (!empty_str(interface->gateway))
++ fprintf(fd, " gateway6: %s\n", interface->gateway);
++
++ return 1;
++}
++
++static int nc_wi_write_eni(const struct netcfg_interface *interface, FILE *fd)
++{
++ int rv;
++
++ rv = 1;
++
++ di_debug("Using /etc/network/interfaces for network config");
++
++ if (!interface) {
++ di_debug("Writing informative header");
++ rv = nc_wi_header(fd);
++ } else if (interface->loopback == 1) {
++ di_debug("Writing loopback interface");
++ rv = nc_wi_loopback(interface, fd);
++ } else if (interface->dhcp == 1 || interface->slaac == 1) {
++ if (interface->dhcp == 1) {
++ di_debug("Writing DHCP stanza for %s", interface->name);
++ rv = nc_wi_dhcp(interface, fd);
++ }
++ if (interface->slaac == 1) {
++ di_debug("Writing SLAAC stanza for %s", interface->name);
++ rv = nc_wi_slaac(interface, fd);
++ }
++ } else if (interface->address_family == AF_INET) {
++ di_debug("Writing static IPv4 stanza for %s", interface->name);
++ rv = nc_wi_static_ipv4(interface, fd);
++ } else if (interface->address_family == AF_INET6) {
++ di_debug("Writing static IPv6 stanza for %s", interface->name);
++ rv = nc_wi_static_ipv6(interface, fd);
++ }
++ if (rv && interface && interface->parentif) {
++ di_debug("Writing VLAN: %s", interface->name);
++ rv = nc_wi_vlan(interface, fd);
++ }
++ if (rv && interface && is_wireless_iface(interface->name)) {
++ di_debug("Writing wireless options for %s", interface->name);
++ rv = nc_wi_wireless_options(interface, fd);
++ }
++
++ return rv;
++}
++
++static int nc_wi_write_netplan_yaml(const struct netcfg_interface *interface, FILE *fd, off_t size)
++{
++ int rv;
++
++ rv = 1;
++
++ di_warning("Using netplan for network config");
++
++ if (size <= 0)
++ rv = nc_wi_netplan_header(fd);
++
++ /* No interface given, just clear the file */
++ if (!interface)
++ return rv;
++
++ /* With netplan, let loopback alone */
++ if (interface->loopback == 1)
++ return rv;
++
++ if (is_wireless_iface(interface->name)) {
++ fprintf(fd, " wifis:\n");
++ } else {
++ fprintf(fd, " ethernets:\n");
++ }
++
++ /* Take care of handling VLANs correctly */
++ fprintf(fd, " %s:\n", interface->parentif ? interface->parentif : interface->name);
++
++ if (rv && interface && interface->parentif) {
++ /* Make sure our parent doesn't get an IP */
++ fprintf(fd, " dhcp4: no\n");
++ fprintf(fd, " dhcp6: no\n");
++
++ di_debug("Writing VLAN: %s", interface->name);
++ rv = nc_wi_netplan_vlan(interface, fd);
++ }
++
++ if (interface->dhcp == 1 || interface->slaac == 1) {
++ if (interface->dhcp == 1) {
++ di_debug("Writing DHCP stanza for %s", interface->name);
++ fprintf(fd, " dhcp4: yes\n");
++ }
++ if (interface->slaac == 1) {
++ di_debug("Writing SLAAC stanza for %s", interface->name);
++ fprintf(fd, " dhcp6: yes\n");
++ }
++
++ }
++
++ /* Write all other static addresses */
++ if (interface->address_family == AF_INET) {
++ di_debug("Writing static IPv4 stanza for %s", interface->name);
++ rv = nc_wi_netplan_static_ipv4(interface, fd);
++ } else if (interface->address_family == AF_INET) {
++ di_debug("Writing static IPv6 stanza for %s", interface->name);
++ rv = nc_wi_netplan_static_ipv6(interface, fd);
++ }
++
++ if (rv && interface && is_wireless_iface(interface->name)) {
++ di_debug("Writing wireless options for %s", interface->name);
++ rv = nc_wi_netplan_wireless_aps(interface, fd);
++ }
++
++ return rv;
++}
++
++void unlink_config_tmp_file(int use_netplan)
++{
++ if (use_netplan)
++ unlink(NETPLAN_YAML ".tmp");
++ else
++ unlink(INTERFACES_FILE ".tmp");
++}
++
+ /* The main function for writing things to INTERFACES_FILE (aka
+ * /etc/network/interfaces).
+ *
+@@ -162,24 +346,48 @@ static int nc_wi_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
+ * returned, the interfaces file will not have been modified, and errno will
+ * contain the details.
+ */
+-int netcfg_write_interface(const struct netcfg_interface *interface)
++int netcfg_write_interface(struct debconfclient *client, const struct netcfg_interface *interface)
+ {
+ FILE *fd;
+ int rv;
+ struct stat stat_buf;
+-
++ int use_netplan;
++ char *config_file_path;
++
++ use_netplan = 1;
++
++ if (client) {
++ debconf_get(client,"netcfg/do_not_use_netplan");
++ }
++
++ /* If this undocumented debconf key is set to true, skip netplan
++ * and fallback to /e/n/i as before.
++ */
++ if (!client || !strcmp(client->value, "false")) {
++ config_file_path = NETPLAN_YAML;
++ } else {
++ use_netplan = 0;
++ config_file_path = INTERFACES_FILE;
++ }
++
++ di_warning("Using %s", config_file_path);
++
+ if (!interface) {
+- di_debug("No interface given; clearing " INTERFACES_FILE);
+- rv = unlink(INTERFACES_FILE);
++ di_debug("No interface given; clearing %s", config_file_path);
++ rv = unlink(config_file_path);
+ if (rv < 0 && errno != ENOENT) {
+- di_info("Error clearing %s: %s", INTERFACES_FILE, strerror(errno));
++ di_info("Error clearing %s: %s", config_file_path, strerror(errno));
+ return 0;
+ }
+ }
+
+- fd = file_open(INTERFACES_FILE ".tmp", "w");
++ if (use_netplan)
++ fd = file_open(NETPLAN_YAML ".tmp", "w");
++ else
++ fd = file_open(INTERFACES_FILE ".tmp", "w");
++
+ if (!fd) {
+- di_warning("Failed to open %s.tmp: %s", INTERFACES_FILE, strerror(errno));
++ di_warning("Failed to open %s.tmp: %s", config_file_path, strerror(errno));
+ return 0;
+ }
+
+@@ -188,45 +396,45 @@ int netcfg_write_interface(const struct netcfg_interface *interface)
+ * so we can add our new stuff to it. Bloody longwinded way of doing
+ * it, I'm sure you'll agree.
+ */
+- rv = stat(INTERFACES_FILE, &stat_buf);
++ rv = stat(config_file_path, &stat_buf);
+ if (rv < 0 && errno != ENOENT) {
+- di_warning("Failed to stat %s: %s", INTERFACES_FILE, strerror(errno));
+- unlink(INTERFACES_FILE ".tmp");
++ di_warning("Failed to stat %s: %s", config_file_path, strerror(errno));
++ unlink_config_tmp_file(use_netplan);
+ return 0;
+ }
+ if (rv == 0) {
+ char *tmpbuf = malloc(stat_buf.st_size + 1);
+ int origfd;
+- origfd = open(INTERFACES_FILE, O_RDONLY);
++ origfd = open(config_file_path, O_RDONLY);
+ if (origfd < 0) {
+- di_warning("Failed to open %s: %s", INTERFACES_FILE, strerror(errno));
++ di_warning("Failed to open %s: %s", config_file_path, strerror(errno));
+ fclose(fd);
+- unlink(INTERFACES_FILE ".tmp");
++ unlink_config_tmp_file(use_netplan);
+ free(tmpbuf);
+ return 0;
+ }
+ rv = read(origfd, tmpbuf, stat_buf.st_size);
+ if (rv < 0) {
+- di_warning("Failed to read %s: %s", INTERFACES_FILE, strerror(errno));
++ di_warning("Failed to read %s: %s", config_file_path, strerror(errno));
+ fclose(fd);
+- unlink(INTERFACES_FILE ".tmp");
++ unlink_config_tmp_file(use_netplan);
+ free(tmpbuf);
+ close(origfd);
+ return 0;
+ }
+ if (rv != stat_buf.st_size) {
+- di_warning("Short read on %s", INTERFACES_FILE);
++ di_warning("Short read on %s", config_file_path);
+ fclose(fd);
+- unlink(INTERFACES_FILE ".tmp");
++ unlink_config_tmp_file(use_netplan);
+ free(tmpbuf);
+ close(origfd);
+ return 0;
+ }
+ rv = fwrite(tmpbuf, sizeof(char), stat_buf.st_size, fd);
+ if (rv != (int)stat_buf.st_size) {
+- di_warning("Short write on %s.tmp", INTERFACES_FILE);
++ di_warning("Short write on %s.tmp", config_file_path);
+ fclose(fd);
+- unlink(INTERFACES_FILE ".tmp");
++ unlink_config_tmp_file(use_netplan);
+ free(tmpbuf);
+ close(origfd);
+ return 0;
+@@ -240,43 +448,23 @@ int netcfg_write_interface(const struct netcfg_interface *interface)
+ * freaking interfaces file entry */
+ rv = 1;
+
+- if (!interface) {
+- di_debug("Writing informative header");
+- rv = nc_wi_header(fd);
+- } else if (interface->loopback == 1) {
+- di_debug("Writing loopback interface");
+- rv = nc_wi_loopback(interface, fd);
+- } else if (interface->dhcp == 1 || interface->slaac == 1) {
+- if (interface->dhcp == 1) {
+- di_debug("Writing DHCP stanza for %s", interface->name);
+- rv = nc_wi_dhcp(interface, fd);
+- }
+- if (interface->slaac == 1) {
+- di_debug("Writing SLAAC stanza for %s", interface->name);
+- rv = nc_wi_slaac(interface, fd);
+- }
+- } else if (interface->address_family == AF_INET) {
+- di_debug("Writing static IPv4 stanza for %s", interface->name);
+- rv = nc_wi_static_ipv4(interface, fd);
+- } else if (interface->address_family == AF_INET6) {
+- di_debug("Writing static IPv6 stanza for %s", interface->name);
+- rv = nc_wi_static_ipv6(interface, fd);
+- }
+- if (rv && interface && interface->parentif) {
+- di_debug("Writing VLAN: %s", interface->name);
+- rv = nc_wi_vlan(interface, fd);
+- }
+- if (rv && interface && is_wireless_iface(interface->name)) {
+- di_debug("Writing wireless options for %s", interface->name);
+- rv = nc_wi_wireless_options(interface, fd);
++ if (use_netplan) {
++ rv = nc_wi_write_netplan_yaml(interface, fd, stat_buf.st_size);
++ } else {
++ rv = nc_wi_write_eni(interface, fd);
+ }
+
+- if (rv) {
++ if (rv)
+ di_debug("Success!");
++
++ if (use_netplan)
++ rename(NETPLAN_YAML ".tmp", NETPLAN_YAML);
++ else
+ rename(INTERFACES_FILE ".tmp", INTERFACES_FILE);
+- }
+
+ fclose(fd);
+- unlink(INTERFACES_FILE ".tmp");
++
++ unlink_config_tmp_file(use_netplan);
++
+ return rv;
+ }
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/03_ruc_1.142ubuntu3.patch b/helpers/DATA/netcfg/03_ruc_1.142ubuntu3.patch
new file mode 100644
index 00000000..702302f7
--- /dev/null
+++ b/helpers/DATA/netcfg/03_ruc_1.142ubuntu3.patch
@@ -0,0 +1,30 @@
+From b5ec27c44aec207a84f49ab8a0bf700ef89ad175 Mon Sep 17 00:00:00 2001
+From: dann frazier <dannf@ubuntu.com>
+Date: Wed, 19 Jul 2017 13:09:36 -0400
+Subject: 1.142ubuntu3 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ debian/changelog | 6 ++++++
+ debian/netcfg-common.templates | 5 +++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/debian/netcfg-common.templates b/debian/netcfg-common.templates
+index 6e42847..f508422 100644
+--- a/debian/netcfg-common.templates
++++ b/debian/netcfg-common.templates
+@@ -290,6 +290,11 @@ Type: text
+ # :sl2:
+ _Description: Ethernet CCW bus
+
++Template: netcfg/internal-ena
++Type: text
++# :sl2:
++_Description: Ethernet Onboard
++
+ Template: netcfg/internal-enP
+ Type: text
+ # :sl2:
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/04_ruc_1.142ubuntu4.patch b/helpers/DATA/netcfg/04_ruc_1.142ubuntu4.patch
new file mode 100644
index 00000000..3bd832c3
--- /dev/null
+++ b/helpers/DATA/netcfg/04_ruc_1.142ubuntu4.patch
@@ -0,0 +1,83 @@
+From a015330a3b16ec2c79c06b65f449c7f367b6599f Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <xnox@ubuntu.com>
+Date: Wed, 20 Sep 2017 09:52:03 +0100
+Subject: 1.142ubuntu4 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ debian/changelog | 6 ++++++
+ netcfg-common.c | 18 +++++++++++++++++-
+ netcfg.h | 2 ++
+ post-base-installer.d/40netcfg | 6 ++++++
+ 4 files changed, 31 insertions(+), 1 deletion(-)
+
+diff --git a/netcfg-common.c b/netcfg-common.c
+index d747450..8afe70d 100644
+--- a/netcfg-common.c
++++ b/netcfg-common.c
+@@ -1403,7 +1403,8 @@ void reap_old_files (void)
+ unlink(*ptr++);
+
+ if (!is_resolvconf_used())
+- unlink(RESOLV_FILE);
++ if (!is_resolved_used())
++ unlink(RESOLV_FILE);
+ }
+
+ /* Convert a space-separated list of nameservers in a single string (as might
+@@ -1816,3 +1817,18 @@ int is_resolvconf_used()
+
+ return resolvconf_used;
+ }
++
++/* Check if /etc/resolv.conf symlinks to /run/systemd/resolve/stub-resolv.conf. */
++int is_resolved_used()
++{
++ int resolved_used = 0;
++
++ char *path = realpath(RESOLV_FILE, NULL);
++
++ if (path) {
++ resolved_used = !strcmp(path, RESOLVED_FILE);
++ free(path);
++ }
++
++ return resolved_used;
++}
+diff --git a/netcfg.h b/netcfg.h
+index ae3f34c..437c87e 100644
+--- a/netcfg.h
++++ b/netcfg.h
+@@ -8,6 +8,7 @@
+ #define NETWORKS_FILE "/etc/networks"
+ #define RESOLV_FILE "/etc/resolv.conf"
+ #define RESOLVCONF_FILE "/run/resolvconf/resolv.conf"
++#define RESOLVED_FILE "/run/systemd/resolve/stub-resolv.conf"
+ #define DHCLIENT_CONF "/etc/dhclient.conf"
+ #define DOMAIN_FILE "/tmp/domain_name"
+ #define NTP_SERVER_FILE "/tmp/dhcp-ntp-servers"
+@@ -203,6 +204,7 @@ extern int nameserver_count (const struct netcfg_interface *interface);
+
+ extern int read_resolv_conf_nameservers (char *resolv_conf_file, struct netcfg_interface *interface);
+ extern int is_resolvconf_used();
++extern int is_resolved_used();
+
+ extern void sigchld_handler (int sig __attribute__ ((unused)));
+
+diff --git a/post-base-installer.d/40netcfg b/post-base-installer.d/40netcfg
+index 9d19e33..ee717c2 100755
+--- a/post-base-installer.d/40netcfg
++++ b/post-base-installer.d/40netcfg
+@@ -5,3 +5,9 @@ if [ -L /target/etc/resolv.conf ] && [ -f /target/run/resolvconf/resolv.conf ];
+ mkdir -p /run/resolvconf
+ cp /target/run/resolvconf/resolv.conf /run/resolvconf/resolv.conf
+ fi
++
++# Make sure resolved will still work with bind-mounted /run
++if [ -L /target/etc/resolv.conf ] && [ -f /target/run/systemd/resolve/stub-resolv.conf ]; then
++ mkdir -p /run/systemd/resolve/
++ cp /target/run/systemd/resolve/stub-resolv.conf /run/systemd/resolve/stub-resolv.conf
++fi
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/05_ruc_1.142ubuntu5.patch b/helpers/DATA/netcfg/05_ruc_1.142ubuntu5.patch
new file mode 100644
index 00000000..a3906789
--- /dev/null
+++ b/helpers/DATA/netcfg/05_ruc_1.142ubuntu5.patch
@@ -0,0 +1,188 @@
+From 6bbc857030b27f59d660674dd3795595f5caa9a7 Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>
+Date: Thu, 12 Oct 2017 09:31:02 -0400
+Subject: 1.142ubuntu5 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ debian/changelog | 8 ++++++++
+ dhcp.c | 2 +-
+ netcfg-common.c | 4 ++--
+ netcfg.h | 2 +-
+ static.c | 11 +++++++++--
+ write_interface.c | 41 +++++++++++++++++++++++++++++++----------
+ 6 files changed, 52 insertions(+), 16 deletions(-)
+
+diff --git a/dhcp.c b/dhcp.c
+index 8824580..baaa820 100644
+--- a/dhcp.c
++++ b/dhcp.c
+@@ -611,7 +611,7 @@ int netcfg_activate_dhcp (struct debconfclient *client, struct netcfg_interface
+ di_debug("Network config complete");
+ netcfg_write_common("", hostname, domain);
+ netcfg_write_loopback();
+- netcfg_write_interface(client, interface);
++ netcfg_write_interface(client, interface, domain);
+ netcfg_write_resolv(domain, interface);
+ #if !defined(__FreeBSD_kernel__)
+ kill_dhcp_client();
+diff --git a/netcfg-common.c b/netcfg-common.c
+index 8afe70d..378a873 100644
+--- a/netcfg-common.c
++++ b/netcfg-common.c
+@@ -1133,8 +1133,8 @@ void netcfg_write_loopback (void)
+ lo.name = LO_IF;
+ lo.loopback = 1;
+
+- netcfg_write_interface(NULL, NULL);
+- netcfg_write_interface(NULL, &lo);
++ netcfg_write_interface(NULL, NULL, NULL);
++ netcfg_write_interface(NULL, &lo, NULL);
+ }
+
+ /*
+diff --git a/netcfg.h b/netcfg.h
+index 437c87e..3588886 100644
+--- a/netcfg.h
++++ b/netcfg.h
+@@ -270,7 +270,7 @@ extern int nc_v6_interface_configured(const struct netcfg_interface *interface,
+ extern int nc_v6_get_config_flags(struct debconfclient *client, struct netcfg_interface *interface);
+
+ /* write_interfaces.c */
+-extern int netcfg_write_interface(struct debconfclient *client, const struct netcfg_interface *interface);
++extern int netcfg_write_interface(struct debconfclient *client, const struct netcfg_interface *interface, const char *domain);
+
+ /* rdnssd.c */
+ extern int start_rdnssd(struct debconfclient *client);
+diff --git a/static.c b/static.c
+index b73b785..ab7bd52 100644
+--- a/static.c
++++ b/static.c
+@@ -680,8 +680,15 @@ int netcfg_get_static(struct debconfclient *client, struct netcfg_interface *ifa
+ }
+ netcfg_write_common(iface->ipaddress, hostname, domain);
+ netcfg_write_loopback();
+- netcfg_write_interface(client, iface);
+- netcfg_write_resolvconf_options(domain, iface);
++ netcfg_write_interface(client, iface, domain);
++
++ debconf_get(client,"netcfg/do_not_use_netplan");
++ /* If this undocumented debconf key is set to true, skip netplan
++ * and fallback to /e/n/i as before. Otherwise we're done.
++ */
++ if (!empty_str(client->value) && strcmp(client->value, "true") == 0) {
++ netcfg_write_resolvconf_options(domain, iface);
++ }
+ netcfg_write_resolv(domain, iface);
+ }
+ return 0;
+diff --git a/write_interface.c b/write_interface.c
+index 14d36e1..d261f76 100644
+--- a/write_interface.c
++++ b/write_interface.c
+@@ -164,6 +164,27 @@ static int nc_wi_slaac(const struct netcfg_interface *interface, FILE *fd)
+ return 1;
+ }
+
++/* Write nameservers for netplan
++ */
++static int nc_wi_netplan_write_nameservers(const struct netcfg_interface *interface, FILE *fd, const char *domain)
++{
++ int i;
++
++ if (empty_str(domain))
++ return 1;
++
++ fprintf(fd, " nameservers:\n");
++ fprintf(fd, " search: [ %s ]\n", domain);
++ fprintf(fd, " addresses:\n");
++ for (i = 0; i < NETCFG_NAMESERVERS_MAX; i++) {
++ if (!empty_str(interface->nameservers[i])) {
++ fprintf(fd, " - %s\n", interface->nameservers[i]);
++ }
++ }
++
++ return 1;
++}
++
+ /* Write out a static IPv4 config stanza for the given interface
+ */
+ static int nc_wi_static_ipv4(const struct netcfg_interface *interface, FILE *fd)
+@@ -182,7 +203,7 @@ static int nc_wi_static_ipv4(const struct netcfg_interface *interface, FILE *fd)
+ return 1;
+ }
+
+-static int nc_wi_netplan_static_ipv4(const struct netcfg_interface *interface, FILE *fd)
++static int nc_wi_netplan_static_ipv4(const struct netcfg_interface *interface, FILE *fd, const char *domain)
+ {
+ fprintf(fd, " addresses: [ %s/%i ]\n", interface->ipaddress,
+ empty_str(interface->pointopoint) ? interface->masklen : 32);
+@@ -190,7 +211,7 @@ static int nc_wi_netplan_static_ipv4(const struct netcfg_interface *interface, F
+ fprintf(fd, " gateway4: %s\n",
+ empty_str(interface->pointopoint) ? interface->gateway : interface->pointopoint);
+
+- return 1;
++ return nc_wi_netplan_write_nameservers(interface, fd, domain);
+ }
+
+ /* Write out a static IPv6 config stanza for the given interface
+@@ -207,13 +228,13 @@ static int nc_wi_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
+ return 1;
+ }
+
+-static int nc_wi_netplan_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
++static int nc_wi_netplan_static_ipv6(const struct netcfg_interface *interface, FILE *fd, const char *domain)
+ {
+ fprintf(fd, " addresses: [ %s/%i ]\n", interface->ipaddress, interface->masklen);
+ if (!empty_str(interface->gateway))
+ fprintf(fd, " gateway6: %s\n", interface->gateway);
+
+- return 1;
++ return nc_wi_netplan_write_nameservers(interface, fd, domain);
+ }
+
+ static int nc_wi_write_eni(const struct netcfg_interface *interface, FILE *fd)
+@@ -258,7 +279,7 @@ static int nc_wi_write_eni(const struct netcfg_interface *interface, FILE *fd)
+ return rv;
+ }
+
+-static int nc_wi_write_netplan_yaml(const struct netcfg_interface *interface, FILE *fd, off_t size)
++static int nc_wi_write_netplan_yaml(const struct netcfg_interface *interface, FILE *fd, off_t size, const char *domain)
+ {
+ int rv;
+
+@@ -310,10 +331,10 @@ static int nc_wi_write_netplan_yaml(const struct netcfg_interface *interface, FI
+ /* Write all other static addresses */
+ if (interface->address_family == AF_INET) {
+ di_debug("Writing static IPv4 stanza for %s", interface->name);
+- rv = nc_wi_netplan_static_ipv4(interface, fd);
+- } else if (interface->address_family == AF_INET) {
++ rv = nc_wi_netplan_static_ipv4(interface, fd, domain);
++ } else if (interface->address_family == AF_INET6) {
+ di_debug("Writing static IPv6 stanza for %s", interface->name);
+- rv = nc_wi_netplan_static_ipv6(interface, fd);
++ rv = nc_wi_netplan_static_ipv6(interface, fd, domain);
+ }
+
+ if (rv && interface && is_wireless_iface(interface->name)) {
+@@ -346,7 +367,7 @@ void unlink_config_tmp_file(int use_netplan)
+ * returned, the interfaces file will not have been modified, and errno will
+ * contain the details.
+ */
+-int netcfg_write_interface(struct debconfclient *client, const struct netcfg_interface *interface)
++int netcfg_write_interface(struct debconfclient *client, const struct netcfg_interface *interface, const char *domain)
+ {
+ FILE *fd;
+ int rv;
+@@ -449,7 +470,7 @@ int netcfg_write_interface(struct debconfclient *client, const struct netcfg_int
+ rv = 1;
+
+ if (use_netplan) {
+- rv = nc_wi_write_netplan_yaml(interface, fd, stat_buf.st_size);
++ rv = nc_wi_write_netplan_yaml(interface, fd, stat_buf.st_size, domain);
+ } else {
+ rv = nc_wi_write_eni(interface, fd);
+ }
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/06_ruc_1.142ubuntu6.patch b/helpers/DATA/netcfg/06_ruc_1.142ubuntu6.patch
new file mode 100644
index 00000000..453e2901
--- /dev/null
+++ b/helpers/DATA/netcfg/06_ruc_1.142ubuntu6.patch
@@ -0,0 +1,39 @@
+From d3e289ae492c744eabc1db189fbecce8f2de1d2d Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>
+Date: Sun, 18 Mar 2018 21:24:47 -0400
+Subject: 1.142ubuntu6 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ debian/changelog | 7 +++++++
+ write_interface.c | 6 +++---
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/write_interface.c b/write_interface.c
+index d261f76..5ca1cc0 100644
+--- a/write_interface.c
++++ b/write_interface.c
+@@ -178,7 +178,7 @@ static int nc_wi_netplan_write_nameservers(const struct netcfg_interface *interf
+ fprintf(fd, " addresses:\n");
+ for (i = 0; i < NETCFG_NAMESERVERS_MAX; i++) {
+ if (!empty_str(interface->nameservers[i])) {
+- fprintf(fd, " - %s\n", interface->nameservers[i]);
++ fprintf(fd, " - \"%s\"\n", interface->nameservers[i]);
+ }
+ }
+
+@@ -230,9 +230,9 @@ static int nc_wi_static_ipv6(const struct netcfg_interface *interface, FILE *fd)
+
+ static int nc_wi_netplan_static_ipv6(const struct netcfg_interface *interface, FILE *fd, const char *domain)
+ {
+- fprintf(fd, " addresses: [ %s/%i ]\n", interface->ipaddress, interface->masklen);
++ fprintf(fd, " addresses: [ \"%s/%i\" ]\n", interface->ipaddress, interface->masklen);
+ if (!empty_str(interface->gateway))
+- fprintf(fd, " gateway6: %s\n", interface->gateway);
++ fprintf(fd, " gateway6: \"%s\"\n", interface->gateway);
+
+ return nc_wi_netplan_write_nameservers(interface, fd, domain);
+ }
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/07_ruc_1.142ubuntu7.patch b/helpers/DATA/netcfg/07_ruc_1.142ubuntu7.patch
new file mode 100644
index 00000000..816efc15
--- /dev/null
+++ b/helpers/DATA/netcfg/07_ruc_1.142ubuntu7.patch
@@ -0,0 +1,33 @@
+From ad4fc74f5ad7b5195f3cf23c7943c4736702ae72 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <xnox@ubuntu.com>
+Date: Wed, 25 Apr 2018 13:25:45 +0100
+Subject: 1.142ubuntu7 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ debian/changelog | 7 +++++++
+ write_interface.c | 5 +++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/write_interface.c b/write_interface.c
+index 5ca1cc0..67d2977 100644
+--- a/write_interface.c
++++ b/write_interface.c
+@@ -170,11 +170,12 @@ static int nc_wi_netplan_write_nameservers(const struct netcfg_interface *interf
+ {
+ int i;
+
+- if (empty_str(domain))
++ if (empty_str(domain) && empty_str(interface->nameservers[0]))
+ return 1;
+
+ fprintf(fd, " nameservers:\n");
+- fprintf(fd, " search: [ %s ]\n", domain);
++ if (!empty_str(domain))
++ fprintf(fd, " search: [ %s ]\n", domain);
+ fprintf(fd, " addresses:\n");
+ for (i = 0; i < NETCFG_NAMESERVERS_MAX; i++) {
+ if (!empty_str(interface->nameservers[i])) {
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/08_ruc_1.142ubuntu8.patch b/helpers/DATA/netcfg/08_ruc_1.142ubuntu8.patch
new file mode 100644
index 00000000..9c901e7c
--- /dev/null
+++ b/helpers/DATA/netcfg/08_ruc_1.142ubuntu8.patch
@@ -0,0 +1,26 @@
+From 79924426783a58228102737ce9e2f22c631e5a09 Mon Sep 17 00:00:00 2001
+From: Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>
+Date: Fri, 15 Feb 2019 14:35:12 -0500
+Subject: 1.142ubuntu8 (patches unapplied)
+
+Imported using git-ubuntu import.
+---
+ debian/changelog | 8 ++++++++
+ write_interface.c | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/write_interface.c b/write_interface.c
+index 67d2977..344b419 100644
+--- a/write_interface.c
++++ b/write_interface.c
+@@ -390,6 +390,7 @@ int netcfg_write_interface(struct debconfclient *client, const struct netcfg_int
+ } else {
+ use_netplan = 0;
+ config_file_path = INTERFACES_FILE;
++ di_exec_shell_log("apt-install ifupdown");
+ }
+
+ di_warning("Using %s", config_file_path);
+--
+cgit v1.1
+
diff --git a/helpers/DATA/netcfg/ifupdown.patch b/helpers/DATA/netcfg/ifupdown.patch
deleted file mode 100644
index 4ad0b792..00000000
--- a/helpers/DATA/netcfg/ifupdown.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- netcfg-1.176+11.0trisquel2/finish-install.d/55netcfg-copy-config 2022-11-21 19:21:58.138150737 -0600
-+++ netcfg-1.176+11.0trisquel2/finish-install.d/55netcfg-copy-config__ 2022-11-21 19:21:50.646130993 -0600
-@@ -17,19 +17,23 @@
- exit 0
- fi
-
-+# The type of the connection used during installation
-+NETCFG_CONNECTION_TYPE=$(cat $FILE_NETCFG_CONNECTION_TYPE | \
-+ grep "connection type" | cut -d ':' -f2 | sed 's/ //g')
-+NETCFG_CONNECTION_SECURITY=$(cat $FILE_NETCFG_CONNECTION_TYPE | \
-+ grep "security" | cut -d ':' -f2 | sed 's/ //g')
-+
- # Flag to determine whether Network Manager is installed.
- if in-target sh -c "dpkg-query -s network-manager 2>/dev/null | grep -q '^Status: install ok installed'"; then
- NM_IS_INSTALLED=true
- else
- NM_IS_INSTALLED=false
-+ chroot /target apt-get -y install ifupdown
-+ if [ "$NETCFG_CONNECTION_TYPE" = "wireless" ]; then
-+ chroot /target apt-get -y install wireless-tools
-+ fi
- fi
-
--# The type of the connection used during installation
--NETCFG_CONNECTION_TYPE=$(cat $FILE_NETCFG_CONNECTION_TYPE | \
-- grep "connection type" | cut -d ':' -f2 | sed 's/ //g')
--NETCFG_CONNECTION_SECURITY=$(cat $FILE_NETCFG_CONNECTION_TYPE | \
-- grep "security" | cut -d ':' -f2 | sed 's/ //g')
--
- # netcfg/target_network_config question values
- CONFIG_NM="nm_config"
- CONFIG_INTERFACES="ifupdown"
-@@ -43,11 +47,7 @@
- if $NM_IS_INSTALLED; then
- db_set netcfg/target_network_config $CONFIG_NM
- else
-- if [ "$NETCFG_CONNECTION_TYPE" = "wired" ]; then
-- db_set netcfg/target_network_config $CONFIG_INTERFACES
-- else # wireless
-- db_set netcfg/target_network_config $CONFIG_LOOPBACK
-- fi
-+ db_set netcfg/target_network_config $CONFIG_INTERFACES
- fi
- fi
-
diff --git a/helpers/DATA/netcfg/restore_network-manager_management.patch b/helpers/DATA/netcfg/restore_network-manager_management.patch
deleted file mode 100644
index 645efc7f..00000000
--- a/helpers/DATA/netcfg/restore_network-manager_management.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru netcfg-1.176+11.0trisquel1/finish-install.d/55netcfg-copy-config netcfg-1.142ubuntu8+10.0trisquel1/finish-install.d/55netcfg-copy-config
---- netcfg-1.176+11.0trisquel1/finish-install.d/55netcfg-copy-config 2018-08-10 14:23:07.000000000 -0500
-+++ netcfg-1.142ubuntu8+10.0trisquel1/finish-install.d/55netcfg-copy-config 2017-05-16 23:21:18.000000000 -0500
-@@ -59,6 +59,14 @@
- mkdir -p /target/$FILE_PATH_NM_CONFIG
- cp /$FILE_PATH_NM_CONFIG/* /target/$FILE_PATH_NM_CONFIG/
-
-+ # Write netplan config file to hand over management to NM
-+ cat <<EOF > /target/etc/netplan/01-network-manager-all.yaml
-+# Let NetworkManager manage all devices on this system
-+network:
-+ version: 2
-+ renderer: NetworkManager
-+EOF
-+
- # Rewrite /etc/network/interfaces to contain only loopback
- netcfg write_loopback
- ;;
diff --git a/helpers/make-netcfg b/helpers/make-netcfg
index 74ca8ed2..d7062ac0 100644
--- a/helpers/make-netcfg
+++ b/helpers/make-netcfg
@@ -17,16 +17,19 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=3
+VERSION=4
EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
REPOKEY=648ACFD622F3D138
NETINST=true
. ./config
-rpl "Default: debian" "Default: trisquel" . -R
-sed -i '/client, template,/s/debian/trisquel/g' netcfg-common.c
-patch -p1 < $DATA/restore_network-manager_management.patch
-patch -p1 < $DATA/ifupdown.patch
+# Re apply upstream behavior and configuration features from last release (focal).
+# https://git.launchpad.net/ubuntu/+source/netcfg/log/?h=ubuntu/focal
+for patch in $(ls -v ${DATA}/*.patch)
+do
+echo "Applying $patch"
+patch -Np1 < $patch
+done
changelog "Rebranded and adapted for Trisquel"
compile
--
GitLab