diff --git a/debian/changelog b/debian/changelog index 63ed902..7336260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +netcfg (1.179) unstable; urgency=medium + + * Team upload + + [ Updated translations ] + * Esperanto (eo.po) by Felipe Castro + * Galician (gl.po) by Jorge Teijeiro + * Norwegian Nynorsk (nn.po) by aujawindar + * Simplified Chinese (zh_CN.po) by Wenbin Lv + + [ Holger Wansing ] + * Add missing translation updates entries for changelog v1.177 + + [ Samuel Thibault ] + * netcfg-common.c: Fix endianness support in netcfg_gateway_reachable. + (Closes: #1007929). + + -- Holger Wansing Fri, 03 Jun 2022 20:32:39 +0200 + +netcfg (1.177) unstable; urgency=medium + + * Team upload + + [ Igor Scheller ] + * Add support for preseeded pointopoint. + * Added support for fe80 addresses as gateway. + + [ Samuel Thibault ] + * Make gbp produce the right tag format + + [ Updated translations ] + * Danish (da.po) by Joe Hansen + * Persian (fa.po) by Sina Aghighi + * Dutch (nl.po) by Frans Spiesschaert + * Ukrainian (uk.po) by Taras Panchenko + * Vietnamese (vi.po) by Tran Dinh Hai + + -- Holger Wansing Sat, 15 Jan 2022 21:43:50 +0100 + netcfg (1.176) unstable; urgency=medium * Team upload diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..e686a59 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[buildpackage] +debian-tag=%(version)s diff --git a/debian/po/da.po b/debian/po/da.po index 0aae819..4c6eb15 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -7,7 +7,7 @@ # Danish messages for debian-installer. # This file is distributed under the same license as debian-installer. # Michael Millet , 2021. -# Joe Hansen , 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Joe Hansen , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2021. # Ask Hjorth Larsen , 2010. # Mads Bille Lundby , 2008. @@ -40,8 +40,8 @@ "Project-Id-Version: debian-installer_packages_po_sublevel1_da\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2021-01-30 22:11+0000\n" -"Last-Translator: Michael Millet \n" +"PO-Revision-Date: 2021-12-28 22:11+0000\n" +"Last-Translator: Joe Hansen \n" "Language-Team: \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -816,6 +816,8 @@ "No DHCP client was found. Please make sure, that a DHCP installer component " "is installed." msgstr "" +"Ingen DHCP-klient blev fundet. Sikr dig venligst, at en DHCP-" +"installationskomponent er installeret." #. Type: error #. Description @@ -918,7 +920,6 @@ #. Description #. :sl2: #: ../netcfg-dhcp.templates:8001 -#, fuzzy msgid "" "The network autoconfiguration was successful. However, no default route was " "set: the system does not know how to communicate with hosts on the Internet. " @@ -927,10 +928,11 @@ "packages available on the local network." msgstr "" "Den automatiske netværksopsætning lykkedes. Der blev dog ikke angivet nogen " -"standardrute (\"default route\"), så dit system ved ikke, hvordan det skal " -"kommunikere med andre maskiner på internettet. Dette vil gøre det umuligt at " -"fortsætte installationen, medmindre du har den første installations-cd, en " -"\"Netinst\"-cd eller har de nødvendige pakker liggende på det lokale netværk." +"standardrute: Systemet ved ikke, hvordan det skal kommunikere med værter på " +"internettet. Dette vil gøre det umuligt at fortsætte installationen, " +"medmindre du har det første aftryk fra et sæt af installationsmedier, et " +"»Netinst«-aftryk eller har de nødvendige pakker liggende på det lokale " +"netværk." #. Type: boolean #. Description @@ -940,8 +942,8 @@ "If you are unsure, you should not continue without a default route: contact " "your local network administrator about this problem." msgstr "" -"Hvis du er usikker, bør du ikke fortsætte uden en standardrute (\"default " -"route\"). Kontakt din lokale netværksadministrator om problemet." +"Hvis du er usikker, bør du ikke fortsætte uden en standardrute (»default " +"route«). Kontakt din lokale netværksadministrator om problemet." #. Type: text #. Description @@ -1040,6 +1042,8 @@ "The value you provided is not a usable IPv4 or IPv6 address. Please consult " "your network administrator and try again." msgstr "" +"Værdien du angav er ikke en brugbar IPv4- eller IPv6-adresse. Kontakt " +"venligst din netværksadministrator og prøv igen." #. Type: string #. Description diff --git a/debian/po/dz.po b/debian/po/dz.po index 8afb88a..213f4b7 100644 --- a/debian/po/dz.po +++ b/debian/po/dz.po @@ -19,8 +19,8 @@ "Project-Id-Version: dDz.po\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2019-08-28 18:09+0000\n" -"Last-Translator: leela <53352@protonmail.com>\n" +"PO-Revision-Date: 2021-05-21 05:32+0000\n" +"Last-Translator: Jacque Fresco \n" "Language-Team: Dzongkha \n" "Language: dz\n" "MIME-Version: 1.0\n" @@ -176,7 +176,7 @@ #. :sl2: #: ../netcfg-common.templates:8001 msgid "WPA/WPA2 PSK" -msgstr "" +msgstr "WPA/WPA2 PSK" #. Type: select #. Description diff --git a/debian/po/eo.po b/debian/po/eo.po index 437e112..54d5336 100644 --- a/debian/po/eo.po +++ b/debian/po/eo.po @@ -9,20 +9,21 @@ # # Samuel Gimeno , 2005. # Serge Leblanc , 2005, 2006, 2007. -# Felipe Castro , 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2020. +# Felipe Castro , 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2020, 2022. # # Translations from iso-codes: # Alastair McKInstry , 2001,2002. # Copyright (C) 2001,2002,2003,2004 Free Software Foundation, Inc. # D. Dale Gulledge (translations from drakfw), 2001. # Edmund GRIMLEY EVANS , 2004-2011 +# phlostically , 2021. # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2020-11-17 04:48+0000\n" +"PO-Revision-Date: 2022-05-20 17:14+0000\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" "Language: eo\n" @@ -143,8 +144,8 @@ "use any available network, leave this field blank." msgstr "" "${iface} estas sendrata ret-interfaco. Bonvolu tajpi la nomon (ESSID) de la " -"sendratan ret-interfacon, kiu estos uzita de ${iface}. Se vi volos uzi iun " -"ajn disponigotan reton, lasu la kampon malplena." +"sendrata ret-interfaco, kiu estos uzita de ${iface}. Se vi volos uzi iun ajn " +"disponigotan reton, lasu la kampon malplena." #. Type: string #. Description @@ -248,8 +249,8 @@ "Of course, if there is no WEP key for your wireless network, leave this " "field blank." msgstr "" -"Kompreneble, se estas neniu ĉifro-ŝlosilo WEP por via sendrata reto, lasu " -"la kampon malplena." +"Kompreneble, se estas neniu ĉifro-ŝlosilo WEP por via sendrata reto, lasu la " +"kampon malplena." #. Type: error #. Description @@ -864,7 +865,7 @@ msgstr "" "De ĉi tie vi povas elekti reprovi la 'DHCP'-memakomodadon (eble sukcesos se " "via 'DHCP'-servilo malfrue respondas) aŭ vi mem akomodi la reton. Kelkaj " -"'DHCP'-serviloj bezonas 'DHCP'-gastnomon sendota de la kliento, do vi povas " +"'DHCP'-serviloj bezonas 'DHCP'-gastnomon sendota de la kliento, do vi povas " "reprovi mem-akomodadon uzante gastnomon, kiun vi provizu." #. Type: note diff --git a/debian/po/fa.po b/debian/po/fa.po index 7ca3e72..ddc11b2 100644 --- a/debian/po/fa.po +++ b/debian/po/fa.po @@ -26,8 +26,8 @@ "Project-Id-Version: fa sublevel1\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2021-04-25 05:03+0000\n" -"Last-Translator: Sina Carnelious \n" +"PO-Revision-Date: 2021-08-03 11:33+0000\n" +"Last-Translator: Sina Aghighi \n" "Language-Team: Debian-l10n-persian \n" "Language: fa\n" "MIME-Version: 1.0\n" @@ -187,7 +187,7 @@ #. :sl2: #: ../netcfg-common.templates:8002 msgid "Wireless network type for ${iface}:" -msgstr "نوع شبکه بی سیم برای درگاه ${iface}:" +msgstr "نوع شبکهٔ بی‌سیم برای ${iface}:" #. Type: select #. Description @@ -315,13 +315,13 @@ #. Description #. :sl2: #: ../netcfg-common.templates:13001 -#, fuzzy msgid "" "The ESSID \"${essid}\" is invalid. ESSIDs may only be up to ${max_essid_len} " "characters, but may contain all kinds of characters." msgstr "" -"ESSID «${essid}» نامتعبر است. ESSIDها فقط ممکن است حداکثر ۳۲ کاراکتر طول " -"داشته باشند،اما ممکن است حاوی انواع کاراکترها باشند ${max_essid_len}." +"شناسه مجموعه خدمات گستردهٔ \"${essid}\" نامعتبر است. شناسه مجموعه خدمات " +"گسترده باید نهایتا ${max_essid_len} کارکتر داشته باشد، اما می‌تواند شامل " +"کارکترهای مختلفی باشد." #. Type: text #. Description @@ -352,7 +352,7 @@ #. :sl2: #: ../netcfg-common.templates:17001 msgid "Failure of key exchange and association" -msgstr "تبادل کلید شکست خورد." +msgstr "شکست مبادله و ارتباطات کلید" #. Type: note #. Description @@ -417,9 +417,9 @@ "${maxhostnamelen} characters long, and may not begin or end with a minus " "sign." msgstr "" -"یک hostname معتبر می‌تواند شامل فقط اعداد 0-9، حروف کوچک و بزرگ (A-Z و a-z)، " -"و خط تیره باشد. باید باید حداکثر شامل ${maxhostnamelen} حرف باشد و با خط " -"تیره شروع و یا پایان نیابد." +"یک نام میزبان معتبر می‌تواند شامل اعداد ۰ تا ۹، حروف بزرگ و کوچیک (A-Z و a-z، " +"و خط تیره باشد. طول آن نهایتا باید ${maxhostnamelen} کارکتر باشد و در ابتدا " +"و انتهای آن خط تیره نباشد." #. Type: error #. Description @@ -473,7 +473,7 @@ #. :sl2: #: ../netcfg-common.templates:23001 msgid "Kill switch enabled on ${iface}" -msgstr "سوئیچ Kill روی ${iface} فعال شد." +msgstr "کلید کشدن برای ${iface} فعال شده است" #. Type: note #. Description @@ -486,8 +486,8 @@ "\". If you intend to use this interface, please switch it on before " "continuing." msgstr "" -"${iface} به نظر می‌آید به وسیلهٔ یک «kill switch» فیزیکی غیرفعال شده است. اگر " -"قصد دارید از این واسط استفاده نمائید، لطفاً قبل از ادامه آنرا فعال کنید." +"${iface} به نظر می‌آید به وسیلهٔ یک «کلید کشتن» فیزیکی غیرفعال شده است. اگر " +"قصد دارید از این واسط استفاده نمایید، لطفاً قبل از ادامه آن را فعال کنید." #. Type: select #. Choices diff --git a/debian/po/gl.po b/debian/po/gl.po index 4890e03..eb12da2 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -18,14 +18,15 @@ # Marce Villarino , 2009. # Jorge Barreiro , 2010, 2011, 2012, 2013, 2014, 2015, 2017. # mantinan , 2018, 2021. +# Jorge Teijeiro , 2022. # msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2021-01-06 18:53+0000\n" -"Last-Translator: mantinan \n" +"PO-Revision-Date: 2022-04-18 13:37+0000\n" +"Last-Translator: Jorge Teijeiro \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -199,7 +200,7 @@ "if the network is protected with WPA/WPA2 PSK (Pre-Shared Key)." msgstr "" "Escolla WEP/Rede aberta se a rede está aberta ou ten seguridade WEP. Escolla " -"WPA/WPA2 se a rede está protexida con WPA/WPA PSK (Clave compartida de " +"WPA/WPA2 se a rede está protexida con WPA/WPA2 PSK (Clave compartida de " "antemán)." #. Type: string @@ -323,7 +324,7 @@ "The ESSID \"${essid}\" is invalid. ESSIDs may only be up to ${max_essid_len} " "characters, but may contain all kinds of characters." msgstr "" -"O ESSID «${essid}» non é válido. Os ESSID só poden ter até ${max_essid_len} " +"O ESSID «${essid}» non é válido. Os ESSID só poden ter até ${max_essid_len} " "caracteres, pero poden ter todo tipo de caracteres." #. Type: text @@ -1109,8 +1110,8 @@ msgid "" "You may have made an error entering your IP address, netmask and/or gateway." msgstr "" -"Puido ter cometido un erro ao escribir o seu enderezo IP, máscara de rede " -"ou pasarela." +"Puido ter cometido un erro ao escribir o seu enderezo IP, máscara de rede ou " +"pasarela." #. Type: error #. Description diff --git a/debian/po/ka.po b/debian/po/ka.po index c113a70..ca4bc30 100644 --- a/debian/po/ka.po +++ b/debian/po/ka.po @@ -25,14 +25,14 @@ "Project-Id-Version: debian-installer.2006071\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2018-01-04 06:20+0000\n" -"Last-Translator: Taya \n" +"PO-Revision-Date: 2021-05-21 05:32+0000\n" +"Last-Translator: Jacque Fresco \n" "Language-Team: Georgian\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #. Type: boolean #. Description @@ -179,7 +179,7 @@ #. :sl2: #: ../netcfg-common.templates:8001 msgid "WPA/WPA2 PSK" -msgstr "" +msgstr "WPA/WPA2 PSK" #. Type: select #. Description @@ -890,12 +890,6 @@ #. :sl2: #: ../netcfg-dhcp.templates:8001 #, fuzzy -#| msgid "" -#| "The network autoconfiguration was successful. However, no default route " -#| "was set: the system does not know how to communicate with hosts on the " -#| "Internet. This will make it impossible to continue with the installation " -#| "unless you have the first installation CD-ROM, a 'Netinst' CD-ROM, or " -#| "packages available on the local network." msgid "" "The network autoconfiguration was successful. However, no default route was " "set: the system does not know how to communicate with hosts on the Internet. " diff --git a/debian/po/ku.po b/debian/po/ku.po index 10e2468..35eea4e 100644 --- a/debian/po/ku.po +++ b/debian/po/ku.po @@ -8,9 +8,8 @@ # Copyright (C) 2003 Software in the Public Interest, Inc. # This file is distributed under the same license as debian-installer. # Rizoyê Xerzî -# Erdal Ronahi , 2008. -# Erdal , 2010. -# Erdal Ronahî , 2010. +# Erdal Ronahî , 2008, 2010. +# Lecwan Munzur , 2020. # # Translations from iso-codes: # Erdal Ronahi , 2005. @@ -20,14 +19,14 @@ "Project-Id-Version: ku\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2010-08-16 00:19+0200\n" -"Last-Translator: Erdal Ronahi \n" +"PO-Revision-Date: 2021-05-21 05:32+0000\n" +"Last-Translator: Jacque Fresco \n" "Language-Team: Kurdish Team http://pckurd.net\n" "Language: ku\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!= 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #. Type: boolean #. Description @@ -175,7 +174,7 @@ #. :sl2: #: ../netcfg-common.templates:8001 msgid "WPA/WPA2 PSK" -msgstr "" +msgstr "WPA/WPA2 PSK" #. Type: select #. Description @@ -886,12 +885,6 @@ #. :sl2: #: ../netcfg-dhcp.templates:8001 #, fuzzy -#| msgid "" -#| "The network autoconfiguration was successful. However, no default route " -#| "was set: the system does not know how to communicate with hosts on the " -#| "Internet. This will make it impossible to continue with the installation " -#| "unless you have the first installation CD-ROM, a 'Netinst' CD-ROM, or " -#| "packages available on the local network." msgid "" "The network autoconfiguration was successful. However, no default route was " "set: the system does not know how to communicate with hosts on the Internet. " diff --git a/debian/po/nl.po b/debian/po/nl.po index f4c53cb..25569b2 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -21,14 +21,14 @@ # Freek de Kruijf , 2006, 2007, 2008, 2009, 2010, 2011. # Taco Witte , 2004. # Reinout van Schouwen , 2007. -# Frans Spiesschaert , 2014-2020. +# Frans Spiesschaert , 2014-2022. # msgid "" msgstr "" "Project-Id-Version: debian-installer/sublevel1\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2021-02-25 21:55+0100\n" +"PO-Revision-Date: 2022-01-08 21:43+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" "Language: nl\n" @@ -899,7 +899,7 @@ #. :sl2: #: ../netcfg-dhcp.templates:8001 msgid "Continue without a default route?" -msgstr "Doorgaan met geen standaard route?" +msgstr "Verdergaan zonder een standaard route?" #. Type: boolean #. Description @@ -914,7 +914,7 @@ msgstr "" "Automatische netwerkconfiguratie is gelukt. Er is echter geen standaard " "route ingesteld: het systeem weet bijgevolg niet hoe te communiceren met " -"computers op het Internet. Verder gaan met de installatie is niet mogelijk, " +"computers op het Internet. Verdergaan met de installatie is niet mogelijk, " "tenzij u beschikt over het eerste image van een collectie installatiemedia, " "een 'Netinst'-image, of pakketten welke beschikbaar zijn op het lokale " "netwerk." diff --git a/debian/po/nn.po b/debian/po/nn.po index 045dbac..0e2e1da 100644 --- a/debian/po/nn.po +++ b/debian/po/nn.po @@ -11,6 +11,7 @@ # Eirik U. Birkeland , 2010. # Allan Nordhøy , 2017. # Alexander Jansen , 2018. +# aujawindar , 2022. # # Translations from iso-codes: # Alastair McKinstry , 2001. @@ -26,8 +27,8 @@ "Project-Id-Version: nn\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2019-08-28 18:10+0000\n" -"Last-Translator: leela <53352@protonmail.com>\n" +"PO-Revision-Date: 2022-04-17 17:12+0000\n" +"Last-Translator: aujawindar \n" "Language-Team: Norwegian Nynorsk \n" "Language: nn\n" "MIME-Version: 1.0\n" @@ -40,16 +41,14 @@ #. IPv6 #. :sl1: #: ../netcfg-common.templates:2001 -#, fuzzy msgid "Auto-configure networking?" -msgstr "Vil du setja opp nettverket automatisk med DHCP?" +msgstr "Vil du setja opp nettverket automatisk?" #. Type: boolean #. Description #. IPv6 #. :sl1: #: ../netcfg-common.templates:2001 -#, fuzzy msgid "" "Networking can be configured either by entering all the information " "manually, or by using DHCP (or a variety of IPv6-specific methods) to detect " @@ -57,10 +56,11 @@ "the installer is unable to get a working configuration from the network, you " "will be given the opportunity to configure the network manually." msgstr "" -"Nettverk kan ein anten setja opp ved hjelp av DHCP, eller ved å skriva inn " -"all informasjon manuelt. Viss du vel DHCP og installasjonen ikkje klarer å " -"henta inn eit fungerande oppsett frå ein DHCP-tenar på nettverket ditt, vil " -"du få høve til å setja opp nettverket manuelt etterpå." +"Nettverk kan ein anten setja opp ved å skriva inn all informasjon manuelt, " +"eller ved hjelp av DHCP (eller ei rad IPv6-metodar) for å finna " +"nettverksinstillingar automatisk. Viss du vel automatisk og installasjonen " +"ikkje klarer å henta inn eit fungerande oppsett frå nettverket ditt, vil du " +"få høve til å setja opp nettverket manuelt etterpå." #. Type: string #. Description @@ -161,7 +161,6 @@ #. Description #. :sl1: #: ../netcfg-common.templates:7001 -#, fuzzy msgid "" "${iface} is a wireless network interface. Please enter the name (the ESSID) " "of the wireless network you would like ${iface} to use. To connect to any " @@ -189,9 +188,8 @@ #. Description #. :sl2: #: ../netcfg-common.templates:8002 -#, fuzzy msgid "Wireless network type for ${iface}:" -msgstr "Trådlaus ESSID for ${iface}:" +msgstr "Type trådlaust nettverk for ${iface}:" #. Type: select #. Description @@ -278,9 +276,8 @@ #. Description #. :sl2: #: ../netcfg-common.templates:11001 -#, fuzzy msgid "Invalid passphrase" -msgstr "Ugyldig brukarnamn" +msgstr "Ugyldig passord" #. Type: error #. Description @@ -297,9 +294,8 @@ #. Description #. :sl2: #: ../netcfg-common.templates:12001 -#, fuzzy msgid "WPA/WPA2 passphrase for wireless device ${iface}:" -msgstr "WEP-nøkkel for trådlaus eining ${iface}:" +msgstr "WPA/WPA2-passord for den trådlause eininga ${iface}:" #. Type: string #. Description @@ -309,8 +305,8 @@ "Enter the passphrase for WPA/WPA2 PSK authentication. This should be the " "passphrase defined for the wireless network you are trying to use." msgstr "" -"Skriv inn passfrasen for å verifisere med WPA/WPA2 PSK. Dette burde vera " -"passfrasen som er sett for det trådlause nettverket du prøver å bruke." +"Skriv inn passordet for WPA/WPA2 PSK- autentifisering. Dette må vera " +"passordet som er sett for det trådlause nettverket du prøver å bruka." #. Type: error #. Description @@ -323,13 +319,12 @@ #. Description #. :sl2: #: ../netcfg-common.templates:13001 -#, fuzzy msgid "" "The ESSID \"${essid}\" is invalid. ESSIDs may only be up to ${max_essid_len} " "characters, but may contain all kinds of characters." msgstr "" -"ESSIDen «${essid}» er ugyldig. ESSIDar kan vere opp til 32 teikn, og mange " -"inneheld alle typar teikn." +"ESSIDen «${essid}» er ugyldig. ESSID-ar kan vera opp til ${max_essid_len} " +"teikn og kan innehalda alle typar teikn." #. Type: text #. Description @@ -353,7 +348,7 @@ #. :sl2: #: ../netcfg-common.templates:16001 msgid "WPA/WPA2 connection succeeded" -msgstr "Vellukka WPA/WPA2-forbinding" +msgstr "Vellukka tilkopling til WPA/WPA2" #. Type: note #. Description @@ -407,7 +402,7 @@ #. :sl2: #: ../netcfg-common.templates:20001 msgid "Invalid hostname" -msgstr "Ugyldig vertsnamn." +msgstr "Ugyldig vertsnamn" #. Type: error #. Description @@ -420,16 +415,16 @@ #. Description #. :sl2: #: ../netcfg-common.templates:20001 -#, fuzzy msgid "" "A valid hostname may contain only the numbers 0-9, upper and lowercase " "letters (A-Z and a-z), and the minus sign. It must be at most " "${maxhostnamelen} characters long, and may not begin or end with a minus " "sign." msgstr "" -"Eit gyldig vertsnamn kan berre innehalda siffera 0-9, dei små bokstavane a-z " -"og minusteiknet. Det må vere mellom 2 og 63 teikn langt, og kan ikkje starte " -"eller slutte med eit minusteikn." +"Eit gyldig vertsnamn kan berre innehalda siffera 0-9, dei små og store " +"bokstavane a-z, A-Z og minusteiknet. Det kan ikkje vera lengre enn " +"${maxhostnamelen} teikn langt ,og kan ikkje byrja eller slutta med eit " +"minusteikn." #. Type: error #. Description @@ -670,7 +665,7 @@ #. :sl2: #: ../netcfg-common.templates:46001 msgid "Unknown interface" -msgstr "Ukjent grensesnitt." +msgstr "Ukjent grensesnitt" #. Type: text #. Description @@ -734,17 +729,15 @@ #. Description #. :sl1: #: ../netcfg-common.templates:52002 -#, fuzzy msgid "Wireless network:" -msgstr "Type trådlaust nettverk:" +msgstr "Trådlaust nettverk:" #. Type: select #. Description #. :sl1: #: ../netcfg-common.templates:52002 -#, fuzzy msgid "Select the wireless network to use during the installation process." -msgstr "Vel neste steg i installasjonen:" +msgstr "Vel det trådlause nettverket du vil bruka seinare i installasjonen." #. Type: string #. Description @@ -800,6 +793,8 @@ "No DHCP client was found. Please make sure, that a DHCP installer component " "is installed." msgstr "" +"Fann ingen DHCP-klient. Sjå til at ein DHCP-installasjonskomponent er " +"installert." #. Type: error #. Description @@ -903,7 +898,6 @@ #. Description #. :sl2: #: ../netcfg-dhcp.templates:8001 -#, fuzzy msgid "" "The network autoconfiguration was successful. However, no default route was " "set: the system does not know how to communicate with hosts on the Internet. " @@ -914,8 +908,9 @@ "Nettverket blei sett opp automatisk. Men det er ikkje sett nokon standard " "rute ut, så systemet ditt veit ikkje korleis det skal kommunisere med andre " "maskiner på internett. Dette vil gjere det umogeleg å halde fram med " -"installasjonen dersom du ikkje har den første installasjons-CDen, ein " -"«Netinst» CD eller pakkar tilgjengeleg på det lokale nettet." +"installasjonen dersom du ikkje har det fyrste filavtrykket frå " +"installasjonsmediet, eit 'Netinst'-avtrykk eller pakkar tilgjengeleg på det " +"lokale nettet." #. Type: boolean #. Description @@ -944,9 +939,8 @@ #. IPv6 #. :sl2: #: ../netcfg-dhcp.templates:12001 ../netcfg-dhcp.templates:14001 -#, fuzzy msgid "Attempting IPv6 autoconfiguration..." -msgstr "Lagar vmelilo-oppsettet ..." +msgstr "Prøver på IPv6-autokonfigurering …" #. Type: text #. Description @@ -960,9 +954,8 @@ #. Description #. :sl2: #: ../netcfg-dhcp.templates:16001 -#, fuzzy msgid "Configuring the network with DHCPv6" -msgstr "Set opp nettverket med DHCP" +msgstr "Set opp nettverket med DHCPv6" #. Type: string #. Description @@ -989,6 +982,8 @@ " * four numbers separated by periods (IPv4);\n" " * blocks of hexadecimal characters separated by colons (IPv6)." msgstr "" +" * fire tal med punktum mellom (IPv4);\n" +" * blokker med heksadesimale teikn med kolon mellom (IPv6)." #. Type: string #. Description @@ -996,18 +991,17 @@ #. :sl1: #: ../netcfg-static.templates:1001 msgid "You can also optionally append a CIDR netmask (such as \"/24\")." -msgstr "" +msgstr "Du kan eventuelt føya til ei CIDR-nettmaske (slik som \"/24\")." #. Type: string #. Description #. IPv6 #. :sl1: #: ../netcfg-static.templates:1001 -#, fuzzy msgid "If you don't know what to use here, consult your network administrator." msgstr "" -"Viss du ikkje veit kva du skal skrive inn, sjå etter i dokumentasjonen eller " -"så la det stå tomt." +"Viss du ikkje veit kva du skal skrive inn, bør du høyre med " +"nettverksansvarleg." #. Type: error #. Description @@ -1026,6 +1020,8 @@ "The value you provided is not a usable IPv4 or IPv6 address. Please consult " "your network administrator and try again." msgstr "" +"Det du skreiv inn, er ikkje ei brukbar IPv4- eller IPv6-adresse. Høyr med " +"nettverksstyraren din og prøv ein gong til." #. Type: string #. Description diff --git a/debian/po/se.po b/debian/po/se.po index 94f98b0..fb2ef30 100644 --- a/debian/po/se.po +++ b/debian/po/se.po @@ -16,14 +16,14 @@ "Project-Id-Version: se\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2010-12-31 02:09+0100\n" -"Last-Translator: Børre Gaup \n" +"PO-Revision-Date: 2021-05-21 05:32+0000\n" +"Last-Translator: Jacque Fresco \n" "Language-Team: Northern Sami \n" "Language: se\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n == 2) ? 1 : 2);\n" #. Type: boolean #. Description @@ -170,7 +170,7 @@ #. :sl2: #: ../netcfg-common.templates:8001 msgid "WPA/WPA2 PSK" -msgstr "" +msgstr "WPA/WPA2 PSK" #. Type: select #. Description diff --git a/debian/po/tl.po b/debian/po/tl.po index b6c26b0..3f0777a 100644 --- a/debian/po/tl.po +++ b/debian/po/tl.po @@ -21,8 +21,8 @@ "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2019-08-28 18:10+0000\n" -"Last-Translator: leela <53352@protonmail.com>\n" +"PO-Revision-Date: 2021-05-21 05:32+0000\n" +"Last-Translator: Jacque Fresco \n" "Language-Team: Tagalog \n" "Language: tl\n" "MIME-Version: 1.0\n" @@ -182,7 +182,7 @@ #. :sl2: #: ../netcfg-common.templates:8001 msgid "WPA/WPA2 PSK" -msgstr "" +msgstr "WPA/WPA2 PSK" #. Type: select #. Description diff --git a/debian/po/tr.po b/debian/po/tr.po index 65299f8..4eeac97 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -24,13 +24,15 @@ # Tobias Quathamer , 2007. # Translations taken from ICU SVN on 2007-09-09 # Ömer Fadıl USTA , 1999. +# Fatih Altun , 2021. +# msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2018-10-06 18:45+0300\n" -"Last-Translator: Mert Dirik \n" +"PO-Revision-Date: 2021-07-08 13:18+0300\n" +"Last-Translator: Fatih Altun \n" "Language-Team: Debian L10N Turkish\n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -802,6 +804,8 @@ "No DHCP client was found. Please make sure, that a DHCP installer component " "is installed." msgstr "" +"DHCP istemcisi bulunamadı. Lütfen bir DHCP yükleyici bileşeninin kurulu " +"olduğundan emin olun." #. Type: error #. Description @@ -905,7 +909,6 @@ #. Description #. :sl2: #: ../netcfg-dhcp.templates:8001 -#, fuzzy msgid "" "The network autoconfiguration was successful. However, no default route was " "set: the system does not know how to communicate with hosts on the Internet. " @@ -915,8 +918,8 @@ msgstr "" "Otomatik ağ yapılandırması başarıyla sonuçlandı. Bununla beraber herhangi " "bir öntanımlı yönlendirici ayarlanmamış; yani sistem İnternet üzerindeki " -"makinelerle nasıl haberleşeceğini bilmiyor. Bu durum, kurulum CD'lerinin " -"birincisine veya ağ üzerinden kurulum yapan bir 'Netinst' CD'sine sahip " +"makinelerle nasıl haberleşeceğini bilmiyor. Bu durum, kurulum medyalarının " +"birincisine veya ağ üzerinden kurulum yapan bir 'Netinst' görüntüsüne sahip " "değilseniz veya gerekli bütün paketleri yerel ağda bulundurmuyorsanız " "kuruluma devam etmenizi imkansız hale getirecektir." @@ -1029,6 +1032,8 @@ "The value you provided is not a usable IPv4 or IPv6 address. Please consult " "your network administrator and try again." msgstr "" +"Sağladığınız değer, kullanılabilir bir IPv4 veya IPv6 adresi değil. Lütfen " +"ağ yöneticinize danışın ve tekrar deneyin." #. Type: string #. Description diff --git a/debian/po/uk.po b/debian/po/uk.po index 45c39a2..831cb7c 100644 --- a/debian/po/uk.po +++ b/debian/po/uk.po @@ -17,20 +17,22 @@ # Maxim V. Dziumanenko , 2010. # Yuri Chornoivan , 2010, 2011, 2012, 2013. # Anton Gladky , 2011-2016 +# Taras Panchenko , 2021. +# msgid "" msgstr "" "Project-Id-Version: uk\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2021-01-02 22:03+0100\n" -"Last-Translator: Anton Gladky \n" +"PO-Revision-Date: 2021-12-03 23:44+0000\n" +"Last-Translator: Taras Panchenko \n" "Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. Type: boolean #. Description @@ -796,6 +798,8 @@ "No DHCP client was found. Please make sure, that a DHCP installer component " "is installed." msgstr "" +"Не знайдено клієнта DHCP. Будь ласка, переконайтеся, що DHCP компонент " +"встановлювача встановлено." #. Type: error #. Description @@ -897,7 +901,6 @@ #. Description #. :sl2: #: ../netcfg-dhcp.templates:8001 -#, fuzzy msgid "" "The network autoconfiguration was successful. However, no default route was " "set: the system does not know how to communicate with hosts on the Internet. " @@ -907,9 +910,9 @@ msgstr "" "Автоматичне налаштування мережі пройшло успішно. Однак, не був встановлений " "типовий маршрут: система не знає, як зв'язуватися з вузлами Інтернет. Ви не " -"зможете продовжити встановлення, якщо ви не маєте першого офіційного компакт-" -"диска Debian, диска „Netinst“ або пакунків, що доступні через локальну " -"мережу." +"зможете продовжити встановлення, якщо ви не маєте першого образу з набору " +"інсталяційних носіїв, образу 'Netinst', або пакунків, що доступні через " +"локальну мережу." #. Type: boolean #. Description @@ -1020,6 +1023,8 @@ "The value you provided is not a usable IPv4 or IPv6 address. Please consult " "your network administrator and try again." msgstr "" +"Надане вами значення не є придатною адресою IPv4 або IPv6. Зверніться до " +"адміністратора мережі та повторіть спробу." #. Type: string #. Description diff --git a/debian/po/vi.po b/debian/po/vi.po index 303a796..d7011ab 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -13,14 +13,15 @@ # Clytie Siddall , 2005-2010 # Hai-Nam Nguyen , 2012 # Trần Ngọc Quân , 2018, 2019. +# Tran Dinh Hai , 2021. # msgid "" msgstr "" "Project-Id-Version: debian-installer sublevel1\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2019-02-27 14:34+0700\n" -"Last-Translator: Trần Ngọc Quân \n" +"PO-Revision-Date: 2021-09-08 05:34+0000\n" +"Last-Translator: Tran Dinh Hai \n" "Language-Team: Vietnamese \n" "Language: vi\n" "MIME-Version: 1.0\n" @@ -71,15 +72,10 @@ "sure you use the same domain name on all your computers." msgstr "" "Tên miền (domain name) là phần của địa chỉ Mạng ở bên phải tên máy (host " -"name). Nó thường có phần cuối:\n" -" .com, .co\tcông ty\n" -" .net\t\t\tMạng\n" -" .edu\t\tgiao dục\n" -" .org\t\t\ttổ chức.\n" -" .info\t\t\tthông tin\n" -"Nếu bạn đang cài đặt một mạng ở nhà, vẫn có thể tạo tên miền (vì nó không " -"phải thuộc về Mạng bên ngoại), nhưng hãy chắc là bạn dùng cùng một tên miền " -"trên mọi máy vi tính trên mạng cục bộ." +"name). Nó thường có phần cuối là .com, .net, .edu hoặc .org. Nếu bạn đang " +"cài đặt một mạng ở nhà, vẫn có thể tạo tên miền (vì nó không phải thuộc về " +"Mạng bên ngoài), nhưng hãy chắc là bạn dùng cùng một tên miền trên mọi máy " +"vi tính trên mạng cục bộ." #. Type: string #. Description @@ -615,7 +611,7 @@ #. :sl2: #: ../netcfg-common.templates:38001 msgid "Parallel-port IP" -msgstr "IP cổng song song" +msgstr "Cổng-Parallel IP" #. Type: text #. Description diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index 62cd541..1a10346 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -31,14 +31,15 @@ # Boyuan Yang <073plan@gmail.com>, 2018, 2019, 2020. # 玉堂白鹤 , 2020. # TTT DEAL , 2021. +# Wenbin Lv , 2022. # msgid "" msgstr "" "Project-Id-Version: debian-installer\n" "Report-Msgid-Bugs-To: netcfg@packages.debian.org\n" "POT-Creation-Date: 2020-01-13 23:11+0100\n" -"PO-Revision-Date: 2021-02-26 00:50+0000\n" -"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" +"PO-Revision-Date: 2022-04-17 17:12+0000\n" +"Last-Translator: Wenbin Lv \n" "Language-Team: \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -66,9 +67,9 @@ "the installer is unable to get a working configuration from the network, you " "will be given the opportunity to configure the network manually." msgstr "" -"网络可以通过手动输入全部信息或者使用 DHCP (或针对 IPv6 的变种) 来进行配置。如" -"果您选择了自动配置，但安装程序无法从网络中获得有效的网络配置，您仍然可以手动" -"输入。" +"网络可以通过手动输入全部信息进行配置，也可以使用 DHCP (或者一系列 IPv6 专用的" +"方法) 来进行配置。如果您选择了自动配置，但安装程序无法从网络中获得有效的网络" +"配置，您仍然可以手动输入。" #. Type: string #. Description @@ -88,7 +89,7 @@ "sure you use the same domain name on all your computers." msgstr "" "域名是您的互联网地址的一部分，附加在主机名之后。它通常是以 .com、.net、.edu " -"或 .org 结尾。如果您正在设置一个内部网络，您可以随意写一个，但是要确保您所有" +"或 .org 结尾。如果您正在设置一个家庭网络，您可以随意写一个，但是要确保您所有" "计算机的域名都是一样的。" #. Type: string @@ -109,9 +110,9 @@ "first to be queried. If you don't want to use any name server, just leave " "this field blank." msgstr "" -"域名服务器将被用来在网络中查询主机名称。请输入至多三个域名服务器的 IP 地址 " -"(不是主机名)，以空格分隔，不要使用逗号。列表中的第一个服务器将首先被查询。如" -"果您不想用任何域名服务器，请将此栏置空。" +"域名服务器用于在网络中查找主机名。请输入至多三个域名服务器的 IP 地址 (不是主" +"机名)，以空格分隔，不要使用逗号。将首先查询列表中的第一个域名服务器。如果您不" +"想使用任何域名服务器，请将此栏置空。" #. Type: select #. Description @@ -129,8 +130,8 @@ "primary network interface during the installation. If possible, the first " "connected network interface found has been selected." msgstr "" -"您的系统有多个网络接口，请在安装过程中选择其中之一作为主网络接口。如果可能的" -"话，安装程序会选择第一个已连接的网络接口。" +"您的系统有多个网络接口，请选择其中一个作为安装过程中使用的主网络接口。如果可" +"能的话，安装程序已经选中了第一个已连接的网络接口。" #. Type: string #. Description @@ -171,7 +172,7 @@ "available network, leave this field blank." msgstr "" "${iface} 是一个无线网络接口。请输入 ${iface} 将要使用的无线网络的名称 " -"(ESSID)。如果您希望使用任意可用的网络，请将此处置空。" +"(ESSID)。如果您希望使用任何可用的网络，请将此处置空。" #. Type: select #. Choices @@ -202,8 +203,8 @@ "Choose WEP/Open if the network is open or secured with WEP. Choose WPA/WPA2 " "if the network is protected with WPA/WPA2 PSK (Pre-Shared Key)." msgstr "" -"如果网络是开放的或者使用 WEP 加密，请选择 WEP/Open。如果是由 WPA/WPA2 PSK (预" -"共享密钥) 保护，选择 WPA/WPA2。" +"如果网络是开放的或者使用 WEP 加密，请选择 WEP/开放。如果是由 WPA/WPA2 PSK (预" +"共享密钥) 保护，请选择 WPA/WPA2。" #. Type: string #. Description @@ -231,8 +232,8 @@ "If your WEP key is in the format 'nnnn-nnnn-nn', 'nn:nn:nn:nn:nn:nn:nn:nn', " "or 'nnnnnnnn', where n is a number, just enter it as it is into this field." msgstr "" -"如果您的 WEP 密钥的格式是“nnnn-nnnn-nn”、“nn:nn:nn:nn:nn:nn:nn:" -"nn”或“nnnnnnnn”(其中的 n 是数字)，请将它直接填写到输入框中。" +"如果您的 WEP 密钥的格式是 \"nnnn-nnnn-nn\"、\"nn:nn:nn:nn:nn:nn:nn:nn\" 或 " +"\"nnnnnnnn\" (其中的 n 是数字)，请将它直接填写到输入框中。" #. Type: string #. Description @@ -242,7 +243,7 @@ "If your WEP key is in the format of a passphrase, prefix it with " "'s:' (without quotes)." msgstr "" -"如果您的 WEP 密钥的格式是一个密码字符串，请在前面加上“s:”(不包括引号)。" +"如果您的 WEP 密钥的格式是一个密码字符串，请在前面加上 \"s:\" (不包括引号)。" #. Type: string #. Description @@ -268,8 +269,8 @@ "The WEP key '${wepkey}' is invalid. Please refer to the instructions on the " "next screen carefully on how to enter your WEP key correctly, and try again." msgstr "" -"此 WEP 密钥“${wepkey}”是无效的。请仔细阅读下一屏的指导信息，以了解如何正确地" -"输入您的 WEP 密钥，并重试。" +"此 WEP 密钥 \"${wepkey}\" 是无效的。请仔细阅读下一屏的指导信息，以了解如何正" +"确地输入您的 WEP 密钥，并重试。" #. Type: error #. Description @@ -302,7 +303,7 @@ "Enter the passphrase for WPA/WPA2 PSK authentication. This should be the " "passphrase defined for the wireless network you are trying to use." msgstr "" -"输入用于 WPA/WPA2 PSK 认证的密码。这应该是尝试连接到的无线网络中设置的密码。" +"输入用于 WPA/WPA2 PSK 认证的密码。这应该是您尝试连接的无线网络中设置的密码。" #. Type: error #. Description @@ -319,7 +320,7 @@ "The ESSID \"${essid}\" is invalid. ESSIDs may only be up to ${max_essid_len} " "characters, but may contain all kinds of characters." msgstr "" -"此 ESSID“${essid}”无效。ESSID 最大长度仅能为 ${max_essid_len} 个字符，但可以" +"此 ESSID \"${essid}\" 无效。ESSID 最大长度为 ${max_essid_len} 个字符，但可以" "包含所有类型的字符。" #. Type: text @@ -360,7 +361,7 @@ msgid "" "The exchange of keys and association with the access point failed. Please " "check the WPA/WPA2 parameters you provided." -msgstr "和接入点交换密钥与协商失败。请检查 WPA/WPA2 参数。" +msgstr "和接入点交换密钥与协商失败。请检查您提供的 WPA/WPA2 参数。" #. Type: string #. Description @@ -374,7 +375,7 @@ #. :sl1: #: ../netcfg-common.templates:18001 msgid "Please enter the hostname for this system." -msgstr "请输入系统的主机名。" +msgstr "请输入此系统的主机名。" #. Type: string #. Description @@ -386,8 +387,8 @@ "administrator. If you are setting up your own home network, you can make " "something up here." msgstr "" -"主机名是在网络中标示您的系统的一个单词。如果您不知道主机名是什么，请询问网络" -"管理员。如果您正在设置内部网络，那么可以随意写个名字。" +"主机名是在网络中识别您的系统的一个单词。如果您不知道主机名是什么，请询问网络" +"管理员。如果您正在设置家庭网络，那么可以随意写个名字。" #. Type: error #. Description @@ -401,7 +402,7 @@ #. :sl2: #: ../netcfg-common.templates:20001 msgid "The name \"${hostname}\" is invalid." -msgstr "名称“${hostname}”无效。" +msgstr "名称 \"${hostname}\" 无效。" #. Type: error #. Description @@ -414,7 +415,7 @@ "sign." msgstr "" "正确的主机名应当只包含数字 0-9、大小写字母 (A-Z 和 a-z) 和减号，最长不能超过 " -"${maxhostnamelen}，且不能以减号开始或结束。" +"${maxhostnamelen} 个字符，且不能以减号开始或结束。" #. Type: error #. Description @@ -430,7 +431,7 @@ msgid "" "An error occurred and the network configuration process has been aborted. " "You may retry it from the installation main menu." -msgstr "发生错误，网络配置过程已被中止。您可以从安装程序主菜单中重试。" +msgstr "发生错误，网络配置过程已中止。您可以从安装程序主菜单中重试。" #. Type: error #. Description @@ -456,8 +457,8 @@ "You may need to load a specific module for your network card, if you have " "one. For this, go back to the network hardware detection step." msgstr "" -"如果您的网卡使用其特有的模块，您可能还需要加载它。要完成此任务，请返回到网络" -"硬件探测步骤。" +"如果您的网卡使用特定的模块，您可能还需要加载它。要完成此任务，请返回到网络硬" +"件探测步骤。" #. Type: note #. Description @@ -479,8 +480,8 @@ "\". If you intend to use this interface, please switch it on before " "continuing." msgstr "" -"${iface} 似乎被物理的“禁用开关”所禁用。如果您想要使用此接口，请在继续安装前开" -"启之。" +"${iface} 似乎被物理的 \"禁用开关\" 所禁用。如果您想要使用此接口，请在继续安装" +"前开启它。" #. Type: select #. Choices @@ -492,7 +493,7 @@ #. You MUST NOT use commas inside choices #: ../netcfg-common.templates:24001 msgid "Infrastructure (Managed) network" -msgstr "共用 (Managed) 网络" +msgstr "Infrastructure (Managed) 网络" #. Type: select #. Choices @@ -522,9 +523,9 @@ "point of some sort, your network is Managed. If another computer is your " "'access point', then your network may be Ad-hoc." msgstr "" -"无线网络可以是客户端 (managed) 或对等式 (ad-hoc) 两种类型。如果您使用了某种实" +"无线网络可以是受管理 (managed) 或自组织 (ad-hoc) 两种类型。如果您使用了某种实" "体装置作为接入点 (access point)，您的网络就是 Managed。如果是以另一台计算机作" -"为您的“接入点”，那么您的网络就应该是 Ad-hoc。" +"为您的 \"接入点\"，那么您的网络就应该是 Ad-hoc。" #. Type: text #. Description @@ -658,7 +659,7 @@ #. :sl1: #: ../netcfg-common.templates:47001 msgid "Storing network settings..." -msgstr "正在存储网络设置..." +msgstr "正在保存网络设置..." #. Type: text #. Description @@ -674,7 +675,7 @@ #. :sl3: #: ../netcfg-common.templates:50001 msgid "Waiting time (in seconds) for link detection:" -msgstr "连接探测等待的时间 (秒)：" +msgstr "连接探测时的等待时间 (秒)：" #. Type: string #. Description @@ -683,7 +684,7 @@ msgid "" "Please enter the maximum time you would like to wait for network link " "detection." -msgstr "请输入等待网络连接的最大时间 (秒)。" +msgstr "请输入网络连接探测时的最大等待时间 (秒)。" #. Type: error #. Description @@ -699,7 +700,7 @@ msgid "" "The value you have provided is not valid. The maximum waiting time (in " "seconds) for network link detection must be a positive integer." -msgstr "您提供的值无效。网络连接探测的最大等待时间 (秒) 必须为正整数。" +msgstr "您提供的值无效。网络连接探测时的最大等待时间 (秒) 必须为正整数。" #. Type: select #. Choices @@ -738,7 +739,8 @@ "You may need to supply a DHCP host name. If you are using a cable modem, you " "might need to specify an account number here." msgstr "" -"您需要提供一个 DHCP 主机名。如果您用的是 cable modem，可能还得指定一个帐号。" +"您需要提供一个 DHCP 主机名。如果您使用的是同轴电缆调制解调器，可能还需要指定" +"一个帐号。" #. Type: string #. Description @@ -752,14 +754,14 @@ #. :sl1: #: ../netcfg-dhcp.templates:2001 msgid "Configuring the network with DHCP" -msgstr "使用 DHCP 来配置网络" +msgstr "正在使用 DHCP 配置网络" #. Type: text #. Description #. :sl1: #: ../netcfg-dhcp.templates:4001 msgid "Network autoconfiguration has succeeded" -msgstr "网络自动设置成功" +msgstr "网络自动配置成功" #. Type: error #. Description @@ -775,7 +777,7 @@ msgid "" "No DHCP client was found. Please make sure, that a DHCP installer component " "is installed." -msgstr "未找到 DHCP 客户端。请再次确认安装器的 DHCP 组件是否存在。" +msgstr "未找到 DHCP 客户端。请再次确认安装程序的 DHCP 组件是否存在。" #. Type: error #. Description @@ -792,7 +794,7 @@ #. in single-byte languages) #: ../netcfg-dhcp.templates:6001 msgid "Retry network autoconfiguration" -msgstr "重新尝试网络自动设置" +msgstr "重新尝试网络自动配置" #. Type: select #. Choices @@ -802,7 +804,7 @@ #. in single-byte languages) #: ../netcfg-dhcp.templates:6001 msgid "Retry network autoconfiguration with a DHCP hostname" -msgstr "使用 DHCP 主机名重试网络自动设置" +msgstr "使用 DHCP 主机名重新尝试网络自动配置" #. Type: select #. Choices @@ -812,7 +814,7 @@ #. in single-byte languages) #: ../netcfg-dhcp.templates:6001 msgid "Configure network manually" -msgstr "手动进行网络设置" +msgstr "手动配置网络" #. Type: select #. Choices @@ -822,7 +824,7 @@ #. in single-byte languages) #: ../netcfg-dhcp.templates:6001 msgid "Do not configure the network at this time" -msgstr "现在不进行网络设置" +msgstr "暂时不配置网络" #. Type: select #. Description @@ -842,17 +844,16 @@ "by the client, so you can also choose to retry DHCP network " "autoconfiguration with a hostname that you provide." msgstr "" -"在这里，您可以选择重新尝试 DHCP 网络自动配置 (如果您的 DHCP 服务器响应延时很" -"长，重新设置一遍可能就会成功) 或者手动配置网络。另外，某些 DHCP 服务器要求客" -"户端发送 DHCP 主机名，因此您可以在重试 DHCP 网络自动配置时提供这样一个主机" -"名。" +"现在，您可以选择重新尝试 DHCP 网络自动配置 (如果您的 DHCP 服务器响应延时很" +"长，重新配置一遍可能就会成功) 或者手动配置网络。另外，某些 DHCP 服务器要求客" +"户端发送 DHCP 主机名，因此您可以在重试 DHCP 网络自动配置时提供一个主机名。" #. Type: note #. Description #. :sl1: #: ../netcfg-dhcp.templates:7001 msgid "Network autoconfiguration failed" -msgstr "网络自动设置失败" +msgstr "网络自动配置失败" #. Type: note #. Description @@ -862,8 +863,8 @@ "Your network is probably not using the DHCP protocol. Alternatively, the " "DHCP server may be slow or some network hardware is not working properly." msgstr "" -"您的网络可能并未使用 DHCP 协议，也有可能是 DHCP 服务器速度过于缓慢或网络设备" -"未能正常工作。" +"您的网络可能并未使用 DHCP 协议，也有可能是 DHCP 服务器速度过于缓慢或者某些网" +"络设备未能正常工作。" #. Type: boolean #. Description @@ -884,7 +885,7 @@ "packages available on the local network." msgstr "" "网络自动配置成功。但是由于未设置默认路由，系统将无法连接互联网上的主机。除非" -"您拥有一组安装介质中的第一个镜像、“Netinst” 镜像或在本地局域网上存有所需的软" +"您拥有一组安装介质中的第一个镜像、\"Netinst\" 镜像或在本地网络上存有所需的软" "件包，否则将无法继续进行安装。" #. Type: boolean @@ -895,15 +896,15 @@ "If you are unsure, you should not continue without a default route: contact " "your local network administrator about this problem." msgstr "" -"如果您不确定原因，请不要在未设定默认路由的情况下继续安装：请向网络管理员咨询" -"相关问题。" +"如果您有疑问，请不要在未设定默认路由的情况下继续安装：请向网络管理员咨询相关" +"问题。" #. Type: text #. Description #. :sl1: #: ../netcfg-dhcp.templates:9001 msgid "Reconfigure the wireless network" -msgstr "重新设置无线网络" +msgstr "重新配置无线网络" #. Type: text #. Description @@ -946,7 +947,7 @@ #. :sl1: #: ../netcfg-static.templates:1001 msgid "The IP address is unique to your computer and may be:" -msgstr "IP 对计算机是唯一的，其可能是：" +msgstr "IP 地址与您的计算机相关联，其可能是：" #. Type: string #. Description @@ -957,7 +958,7 @@ " * four numbers separated by periods (IPv4);\n" " * blocks of hexadecimal characters separated by colons (IPv6)." msgstr "" -" * 句号分隔的四个数字 (IPv4);\n" +" * 句点分隔的四个数字 (IPv4);\n" " * 冒号分隔的十六进制字符 (IPv6)。" #. Type: string @@ -966,7 +967,7 @@ #. :sl1: #: ../netcfg-static.templates:1001 msgid "You can also optionally append a CIDR netmask (such as \"/24\")." -msgstr "您也可以在后附加一个 CIDR 掩码 (如“/24”)。" +msgstr "您也可以在后面附加一个 CIDR 网络掩码 (如 \"/24\")。" #. Type: string #. Description @@ -982,7 +983,7 @@ #. :sl2: #: ../netcfg-static.templates:2001 msgid "Malformed IP address" -msgstr "格式错误的 IP 地址" +msgstr "IP 地址格式有误" #. Type: error #. Description @@ -1030,8 +1031,8 @@ "Consult your network administrator if you do not know the value. The " "netmask should be entered as four numbers separated by periods." msgstr "" -"网络掩码是用来确定哪些机器位于您的网络中。如果您不知道掩码值，请咨询网络管理" -"员。掩码应该是由四个用句点分隔的数字组成。" +"网络掩码用于确定哪些机器位于您的网络中。如果您不知道掩码值，请咨询网络管理" +"员。掩码应该由用句点分隔的四个数字组成。" #. Type: string #. Description @@ -1052,17 +1053,17 @@ "you can leave this blank. If you don't know the proper answer to this " "question, consult your network administrator." msgstr "" -"网关是用以指示网关路由服务器的 IP 地址 (四个用句号分隔的数字)，也叫做默认路" -"由。所有与局域网外的通信 (例如，对互联网的访问) 都要经过它。在某些罕见情况" -"下，您可能并不使用路由；这时，置空就可以了。如果不知道应该回答什么，请咨询网" -"络管理员。" +"网关是用于指示网关路由 (也叫做默认路由) 的 IP 地址 (用句点分隔的四个数字)。所" +"有与局域网外的通信 (例如，对互联网的访问) 都要经过它。在某些罕见情况下，您可" +"能并不使用路由；这种情况下，置空就可以了。如果不知道应该回答什么，请咨询网络" +"管理员。" #. Type: error #. Description #. :sl2: #: ../netcfg-static.templates:6001 msgid "Unreachable gateway" -msgstr "不可到达的网关" +msgstr "网关不可达" #. Type: error #. Description @@ -1096,7 +1097,8 @@ "IPv6 addresses cannot be configured on point-to-point links. Please use an " "IPv4 address, or go back and select a different network interface." msgstr "" -"点对点链接上无法配置 IPv6 地址。请使用 IPv4 地址或返回并选择另外的网络接口。" +"无法在点对点链接上配置 IPv6 地址。请使用 IPv4 地址，或者返回并选择另一个网络" +"接口。" #. Type: boolean #. Description @@ -1126,7 +1128,7 @@ msgstr "" " 接口 = ${interface}\n" " IP 地址 = ${ipaddress}\n" -" 掩码 = ${netmask}\n" +" 网络掩码 = ${netmask}\n" " 网关 = ${gateway}\n" " 点对点 = ${pointopoint}\n" " 域名服务器 = ${nameservers}" diff --git a/netcfg-common.c b/netcfg-common.c index 81f82d5..c0b1085 100644 --- a/netcfg-common.c +++ b/netcfg-common.c @@ -1682,8 +1682,11 @@ if (interface->address_family == AF_INET) { return (gw_addr.in4.s_addr && ((gw_addr.in4.s_addr & mask.in4.s_addr) == net.in4.s_addr)); } else if (interface->address_family == AF_INET6) { + if ((ntohs(gw_addr.in6.s6_addr16[0]) & 0xffc0) == (0xfe80 & 0xffc0)) { + return 1; + } + int i; - 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; diff --git a/static.c b/static.c index ea12fba..f2934bb 100644 --- a/static.c +++ b/static.c @@ -368,7 +368,7 @@ if (!empty_str(interface->pointopoint)) { - snprintf(buf, sizeof(buf), "ip route add default dev %s", interface->name); + snprintf(buf, sizeof(buf), "ip route add default via %s dev %s", interface->pointopoint, interface->name); rv |= di_exec_shell_log(buf); } else if (!empty_str(interface->gateway)) { @@ -474,7 +474,8 @@ 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); + di_info("executing: %s", buf); rv |= di_exec_shell_log(buf); } #endif @@ -557,11 +558,13 @@ if (netcfg_get_ipaddress (client, iface)) { state = BACKUP; } else { + debconf_get(client, "netcfg/get_pointopoint"); if (strncmp(iface->name, "plip", 4) == 0 || strncmp(iface->name, "slip", 4) == 0 || strncmp(iface->name, "ctc", 3) == 0 || strncmp(iface->name, "escon", 5) == 0 - || strncmp(iface->name, "iucv", 4) == 0) + || strncmp(iface->name, "iucv", 4) == 0 + || !empty_str(client->value)) state = GET_POINTOPOINT; else if (iface->masklen == 0) { state = GET_NETMASK; diff --git a/test/test_netcfg_gateway_reachable.c b/test/test_netcfg_gateway_reachable.c index 75f5414..eda2518 100644 --- a/test/test_netcfg_gateway_reachable.c +++ b/test/test_netcfg_gateway_reachable.c @@ -81,6 +81,29 @@ } END_TEST +START_TEST(test_netcfg_gateway_reachable_v6_fe80) +{ + struct netcfg_interface iface; + netcfg_interface_init(&iface); + + strcpy(iface.ipaddress, "2001:3:5:7::42"); + strcpy(iface.gateway, "fe80::1"); + iface.masklen = 64; + iface.address_family = AF_INET6; + + ck_assert_msg (netcfg_gateway_reachable(&iface), "Gateway erroneously unreachable"); + + strcpy (iface.gateway, "febf::1"); + ck_assert_msg (netcfg_gateway_reachable(&iface), "Gateway erroneously unreachable"); + + strcpy (iface.gateway, "fe7f::1"); + ck_assert_msg (!netcfg_gateway_reachable(&iface), "Gateway erroneously reachable"); + + strcpy (iface.gateway, "fec0::1"); + ck_assert_msg (!netcfg_gateway_reachable(&iface), "Gateway erroneously reachable"); +} +END_TEST + Suite *test_netcfg_gateway_reachable_suite (void) { Suite *s = suite_create ("netcfg_gateway_reachable"); @@ -90,6 +113,7 @@ tcase_add_test (tc, test_netcfg_gateway_reachable_v4_22); tcase_add_test (tc, test_netcfg_gateway_reachable_v6_64); tcase_add_test (tc, test_netcfg_gateway_reachable_v6_48); + tcase_add_test (tc, test_netcfg_gateway_reachable_v6_fe80); suite_add_tcase (s, tc); diff --git a/write_interface.c b/write_interface.c index 1f683b2..406513e 100644 --- a/write_interface.c +++ b/write_interface.c @@ -120,7 +120,7 @@ fprintf(fd, "iface %s inet static\n", interface->name); fprintf(fd, "\taddress %s/%i\n", interface->ipaddress, empty_str(interface->pointopoint) ? interface->masklen : 32); - if (!empty_str(interface->gateway)) + if (!empty_str(interface->gateway) || !empty_str(interface->pointopoint)) fprintf(fd, "\tgateway %s\n", empty_str(interface->pointopoint) ? interface->gateway : interface->pointopoint); if (!empty_str(interface->pointopoint))