Browse Source

Remove empty netcfg-ppp package, and do some i18n fixes

r4365
master
Martin Sjögren 19 years ago
parent
commit
73ed21c3e9
  1. 5
      debian/changelog
  2. 9
      debian/control
  3. 60
      debian/netcfg-common.templates
  4. 4
      debian/netcfg-dhcp.templates
  5. 4
      debian/netcfg-static.templates
  6. 88
      debian/po/da.po
  7. 88
      debian/po/de.po
  8. 88
      debian/po/es.po
  9. 90
      debian/po/fr.po
  10. 94
      debian/po/ja.po
  11. 88
      debian/po/nb.po
  12. 137
      debian/po/nl.po
  13. 88
      debian/po/nn.po
  14. 94
      debian/po/pt_BR.po
  15. 88
      debian/po/ru.po
  16. 88
      debian/po/sv.po
  17. 87
      debian/po/templates.pot
  18. 12
      netcfg-dhcp.c
  19. 20
      netcfg-static.c
  20. 63
      netcfg.c
  21. 6
      netcfg.h

5
debian/changelog

@ -8,6 +8,9 @@ netcfg (0.25) UNRELEASED; urgency=low
- Update Brazilian Portuguese (pt_BR) debconf template translations.
* Martin Sjögren
- Fix hostname corruption bug.
- Remove empty netcfg-ppp package.
- Use SETTITLE instead of TITLE for i18n reasons.
- Use debconf templates for i18n.
* Pierre Machard
- Update French debconf template translation [Philippe Batailler]
* Javier Fernandez-Sanguino:
@ -25,7 +28,7 @@ netcfg (0.25) UNRELEASED; urgency=low
* Kenshi Muto
- Update ja.po
-- Bart Cornelis <cobaco@bartLaptop> Thu, 25 Sep 2003 23:50:54 +0200
-- Martin Sjogren <sjogren@debian.org> Sun, 28 Sep 2003 15:15:34 +0200
netcfg (0.24) unstable; urgency=low

9
debian/control

@ -29,12 +29,3 @@ Description: Configure a static network
If you have information such as IP address, netmask, gateway, then you will be
able to configure a static network. If you don't know this information, you
should ask you system administrator, or look at configuration via DHCP.
Package: netcfg-ppp
Architecture: any
Depends: ${shlibs:Depends}, cdebconf-udeb
Provides: configured-network
XB-Installer-Menu-Item: 14
Description: Configure a network via PPP over modem or serial line
This package allows you to create a network connection via a modem
or over a direct serial line

60
debian/netcfg-common.templates

@ -55,3 +55,63 @@ _Description: No interfaces were detected.
system was unable to find a network device. If you do have a network
card, then it is possible that the module for it hasn't been selected
yet. Go back to 'Detect network hardware and load kernel drivers for it'.
Template: netcfg/internal-none
Type: text
_Description: <none>
Template: netcfg/internal-eth
Type: text
_Description: Ethernet or Fast Ethernet
Template: netcfg/internal-pcmcia
Type: text
_Description: PC-Card (PCMCIA) Ethernet or Token Ring
Template: netcfg/internal-tr
Type: text
_Description: Token Ring
Template: netcfg/internal-arc
Type: text
_Description: Arcnet
Template: netcfg/internal-slip
Type: text
_Description: Serial-line IP
Template: netcfg/internal-plip
Type: text
_Description: Parallel-line IP
Template: netcfg/internal-ppp
Type: text
_Description: Point-to-Point Protocol
Template: netcfg/internal-sit
Type: text
_Description: IPv6-in-IPv4
Template: netcfg/internal-ippp
Type: text
_Description: ISDN Point-to-Point Protocol
Template: netcfg/internal-ctc
Type: text
_Description: Channel-to-channel
Template: netcfg/internal-escon
Type: text
_Description: Real channel-to-channel
Template: netcfg/internal-hsi
Type: text
_Description: Hypersocket
Template: netcfg/internal-iucv
Type: text
_Description: Inter-user communication vehicle
Template: netcfg/internal-unknown-iface
Type: text
_Description: Unknown interface

4
debian/netcfg-dhcp.templates

@ -24,3 +24,7 @@ Template: netcfg/no_dhcp_client
Type: note
_Description: No dhcp client found. I cannot continue.
This package requires pump or dhcp-client.
Template: netcfg/dhcp-title
Type: text
_Description: DHCP Network Configuration

4
debian/netcfg-static.templates

@ -50,3 +50,7 @@ _Description: Is this configuration correct?
gateway = ${gateway}
pointopoint = ${pointopoint}
nameservers = ${nameservers}
Template: netcfg/static-title
Type: text
_Description: Static Network Configuration

88
debian/po/da.po

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2002-10-22 18:24+0200\n"
"Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@ -140,6 +140,82 @@ msgstr ""
"ikke kunne finde et netkort. Hvis du har et netkort, kan det være at dets "
"modul endnu ikke er blevet valgt. Gå tilbage til 'Sæt netværksudstyr op'."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Vælg netkort"
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -199,6 +275,11 @@ msgstr "Fandt ingen dhcp-klient. Kan ikke forts
msgid "This package requires pump or dhcp-client."
msgstr "Denne pakke kræver pakken pump eller dhcp-client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -310,6 +391,11 @@ msgstr ""
" punkt-til-punkt = ${pointopoint}\n"
" navneservere = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""
#~ msgid "${ifchoices}"
#~ msgstr "${ifchoices}"

88
debian/po/de.po

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-05-18 11:39+0200\n"
"Last-Translator: Thorsten Sauter <tsauter@gmx.net>\n"
"Language-Team: German <de@li.org>\n"
@ -143,6 +143,82 @@ msgstr ""
"entsprechende Modul noch nicht ausgewählt worden. Gehen Sie zurück zum "
"'Configure Network Hardware'."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Wählen Sie ein Interface."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -201,6 +277,11 @@ msgstr "Kein DHCP-Client gefunden. Es kann nicht fortgefahren werden."
msgid "This package requires pump or dhcp-client."
msgstr "Diese Paket benötigt den pump- oder dhcp-Client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -311,3 +392,8 @@ msgstr ""
" Netmask = ${netmask}\n"
" Gateway = ${gateway}\n"
" Nameserver = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

88
debian/po/es.po

@ -29,7 +29,7 @@ msgid ""
msgstr ""
"Project-Id-Version: netcfg VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-08-23 2:00+0100\n"
"Last-Translator: Javier Fernandez-Sanguino Peña <jfs@computer.org>\n"
"Language-Team: Spanish <es@li.org>\n"
@ -161,6 +161,82 @@ msgstr ""
"para ésta. Vuelva a la sección 'Configure su hardware de red y cargar "
"drivers para éste'."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Escoja una interfaz."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -221,6 +297,11 @@ msgstr "No se encontr
msgid "This package requires pump or dhcp-client."
msgstr "Este paquete require pump o dhcp-client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -331,3 +412,8 @@ msgstr ""
" pasarela = ${gateway}\n"
" punto a punto = ${pointopoint}\n"
" servidores de nombres = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

90
debian/po/fr.po

@ -6,14 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: netcfg 0.23\n"
"POT-Creation-Date: 2003-09-22 00:13-0600\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-09-22 09:03+0200\n"
"Last-Translator: Philippe Batailler <pbatailler@teaser.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
"debian.org>\n"
#. Description
@ -140,6 +140,82 @@ msgstr ""
"peut que vous n'ayez pas encore choisi son module. Revenez à « Détection du "
"matériel réseau et chargement des modules noyau appropriés »."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Choisissez une interface"
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -196,6 +272,11 @@ msgstr "Aucun client dhcp
msgid "This package requires pump or dhcp-client."
msgstr "Ce paquet demande pump ou dhcp-client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -307,3 +388,8 @@ msgstr ""
" passerelle = ${gateway}\n"
" point-à-point = ${pointopoint}\n"
" serveurs de noms = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

94
debian/po/ja.po

@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-08-23 12:16+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@ -146,6 +146,82 @@ msgstr ""
"いでしょう。'ネットワークハードウェアの検出とカーネルドライバのロード' に戻っ"
"てください。"
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "インターフェイスの選択"
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -158,9 +234,9 @@ msgid ""
"might need to specify an account number here. Most other users can just "
"leave this blank."
msgstr ""
"DHCP ホスト名を与える必要があるかもしれません。ケーブルモデルのユーザな"
"らば、アカウント番号をここに指定する必要があるでしょう。そうでなければ、単に"
"ここは空のままにしておきます。"
"DHCP ホスト名を与える必要があるかもしれません。ケーブルモデルのユーザならば、"
"アカウント番号をここに指定する必要があるでしょう。そうでなければ、単にここは"
"空のままにしておきます。"
#. Description
#: ../netcfg-dhcp.templates:11
@ -202,6 +278,11 @@ msgstr "dhcp クライアントが見つかりません。継続できません
msgid "This package requires pump or dhcp-client."
msgstr "このパッケージは pump または dhcp-client を必要とします。"
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -312,3 +393,8 @@ msgstr ""
" ゲートウェイ = ${gateway}\n"
" Point-to-Point = ${pointopoint}\n"
" ネームサーバ = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

88
debian/po/nb.po

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-05-03 08:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans.fredrik@nordhaug.no>\n"
"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
@ -139,6 +139,82 @@ msgstr ""
"kan det hende at modulen for dette ikke er valgt ennå. Gå tilbake til «Sett "
"opp nettverks-maskinvare»."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Velg et (nett)grensesnitt."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -197,6 +273,11 @@ msgstr "Fant ingen dhcp-klient. Jeg kan ikke fortsette."
msgid "This package requires pump or dhcp-client."
msgstr "Denne pakken trenger punp eller dhcp-klient."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -303,3 +384,8 @@ msgstr ""
" portner = ${gateway}\n"
" punktilpunkt = ${pointopoint}\n"
" navnetjenere = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

137
debian/po/nl.po

@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-09-20 02:40+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@ -37,11 +37,10 @@ msgid ""
"sure you use the same domain name on all your computers."
msgstr ""
"De domeinnaam is het gedeelte van uw Internetadres dat rechts van uw "
"computernaam staat. Meestal eindigt een domeinnaam in .nl, .com, .net of "
".org (bijvoorbeeld: mijndomein.nl). U kunt de domeinnaam zelf kiezen "
"wanneer uw computer onderdeel uitmaakt van een thuisnetwerk. Zorg er in "
"dat geval voor dat alle computers in dit netwerk dezelfde domeinnaam "
"gebruiken."
"computernaam staat. Meestal eindigt een domeinnaam in .nl, .com, .net of ."
"org (bijvoorbeeld: mijndomein.nl). U kunt de domeinnaam zelf kiezen wanneer "
"uw computer onderdeel uitmaakt van een thuisnetwerk. Zorg er in dat geval "
"voor dat alle computers in dit netwerk dezelfde domeinnaam gebruiken."
#. Description
#: ../netcfg-common.templates:11
@ -73,9 +72,9 @@ msgid ""
"network interface that you will need for installing the Debian system (via "
"NFS or HTTP)."
msgstr ""
"De volgende netwerkapparaten zijn gedetecteerd. Kies het netwerkapparaat "
"dat u wilt gebruiken voor het installeren van Debian via het HTTP- of "
"NFS-protocol."
"De volgende netwerkapparaten zijn gedetecteerd. Kies het netwerkapparaat dat "
"u wilt gebruiken voor het installeren van Debian via het HTTP- of NFS-"
"protocol."
#. Description
#: ../netcfg-common.templates:27
@ -125,7 +124,8 @@ msgstr ""
#. Description
#: ../netcfg-common.templates:48
msgid "An error occured and I cannot continue."
msgstr "Er is een fout opgetreden, De netwerkconfigureatie kan niet voltooid worden."
msgstr ""
"Er is een fout opgetreden, De netwerkconfigureatie kan niet voltooid worden."
#. Description
#: ../netcfg-common.templates:48
@ -150,6 +150,82 @@ msgstr ""
"Ga in dat geval terug naar het scherm 'Detecteer netwerk-hardware en laad de "
"nodige kernel-stuurprogramma's'."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Kies een interface (netwerkapparaat)."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -199,14 +275,21 @@ msgstr "Dit kan enige tijd duren, tot een minuut of twee."
#. Description
#: ../netcfg-dhcp.templates:25
msgid "No dhcp client found. I cannot continue."
msgstr "Er is geen DHCP-clientsoftware gevonden. De automatische "
"netwerkconfiguratie via DHCP kan niet worden voltooid."
msgstr ""
"Er is geen DHCP-clientsoftware gevonden. De automatische netwerkconfiguratie "
"via DHCP kan niet worden voltooid."
#. Description
#: ../netcfg-dhcp.templates:25
msgid "This package requires pump or dhcp-client."
msgstr "Automatische netwerkconfiguratie via DHCP vereist de 'pump'- of "
"'dhcp-client'-software."
msgstr ""
"Automatische netwerkconfiguratie via DHCP vereist de 'pump'- of 'dhcp-"
"client'-software."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
@ -238,11 +321,11 @@ msgid ""
"value. The pointopoint address should be entered as four numbers separated "
"by periods."
msgstr ""
"Gelieve het IP-adres van de PPP-server in te voeren. Dit adres wordt gebruikt"
" om het andere eindpunt in een PPP-netwerk te bepalen. Het adres bestaat uit "
"vier door punten gescheiden getallen tussen 0 en 255 (bijvoorbeeld: "
"192.169.1.10) . Neem contact op met uw netwerkbeheerder als u niet weet wat u "
"hier in moet vullen."
"Gelieve het IP-adres van de PPP-server in te voeren. Dit adres wordt "
"gebruikt om het andere eindpunt in een PPP-netwerk te bepalen. Het adres "
"bestaat uit vier door punten gescheiden getallen tussen 0 en 255 "
"(bijvoorbeeld: 192.169.1.10) . Neem contact op met uw netwerkbeheerder als u "
"niet weet wat u hier in moet vullen."
#. Description
#: ../netcfg-static.templates:19
@ -277,11 +360,12 @@ msgid ""
"consult your network administrator."
msgstr ""
"Gelieve hier het IP-adres van de gateway (ofwel 'default router') in te "
"voeren. De gateway routeert al het netwerkverkeer dat niet bestemd is voor uw "
"lokale netwerk (zoals communicatie met Internet). U kunt dit veld leeg laten "
"wanneer u geen gateway gebruikt. Het adres bestaat uit 4 door punten "
"gescheiden getallen tussen 0 en 255 (bijvoorbeeld: 192.168.0.1). Neem contact "
"op met uw netwerkbeheerder wanneer u niet weet wat u hier in moet vullen."
"voeren. De gateway routeert al het netwerkverkeer dat niet bestemd is voor "
"uw lokale netwerk (zoals communicatie met Internet). U kunt dit veld leeg "
"laten wanneer u geen gateway gebruikt. Het adres bestaat uit 4 door punten "
"gescheiden getallen tussen 0 en 255 (bijvoorbeeld: 192.168.0.1). Neem "
"contact op met uw netwerkbeheerder wanneer u niet weet wat u hier in moet "
"vullen."
#. Description
#: ../netcfg-static.templates:37
@ -321,3 +405,8 @@ msgstr ""
" gateway = ${gateway}\n"
" punt-naar-punt = ${pointopoint}\n"
" DNS-servers = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

88
debian/po/nn.po

@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-04-25 19:53+0200\n"
"Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
"Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
@ -147,6 +147,82 @@ msgstr ""
"har eit nettverkskort, kan det henda modulen for kortet ikkje er valt. Gå "
"tilbake til «Oppsett av nettverksmaskinvare»."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Vel eit grensesnitt."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -204,6 +280,11 @@ msgstr "Fann ingen DHCP-klient. Kan ikkje halda fram."
msgid "This package requires pump or dhcp-client."
msgstr "Denne pakken treng pump eller dhcp-client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -313,3 +394,8 @@ msgstr ""
" portnar = ${gateway}\n"
" punk-til-punkt= ${pointopoint}\n"
" namnetenarar = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

94
debian/po/pt_BR.po

@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: netcfg-0.25\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2003-09-24 22:39-0300\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@ -144,6 +144,82 @@ msgstr ""
"tenha sido selecionado. Retorne ao passo `Detectar o hardware de rede e "
"carregar os módulos de kernel para o mesmo'."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Escolha uma interface."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -157,9 +233,9 @@ msgid ""
"leave this blank."
msgstr ""
"Em algumas situações você pode precisar informar um nome de máquina DHCP. "
"Caso você esteja usando um modem a cabo você pode precisar especificar "
"um número de conta aqui. A maioria dos usuários podem deixar essa opção "
"em branco."
"Caso você esteja usando um modem a cabo você pode precisar especificar um "
"número de conta aqui. A maioria dos usuários podem deixar essa opção em "
"branco."
#. Description
#: ../netcfg-dhcp.templates:11
@ -203,6 +279,11 @@ msgstr "Nenhum cliente dhcp foi encontrado. N
msgid "This package requires pump or dhcp-client."
msgstr "Este pacote requer o pump ou o dhcp-client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -314,3 +395,8 @@ msgstr ""
" gateway = ${gateway}\n"
" ponto-a-ponto = ${pointopoint}\n"
" servidores de nomes = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

88
debian/po/ru.po

@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -141,6 +141,82 @@ msgstr ""
"ÞÔÏ ÄÌÑ ÎÅÅ ÐÏËÁ ÎÅ ÂÙÌ ×ÙÂÒÁÎ ÍÏÄÕÌØ. ÷ÅÒÎÉÔÅÓØ ÎÁÚÁÄ Ë ÐÕÎËÔÕ 'Configure "
"Network Hardware'."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "÷ÙÂÅÒÉÔÅ ÉÎÔÅÒÆÅÊÓ."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -194,6 +270,11 @@ msgstr "
msgid "This package requires pump or dhcp-client."
msgstr "äÌÑ ÜÔÏÇÏ ÐÁËÅÔÁ ÔÒÅÂÕÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔ pump ÉÌÉ dhcp-client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -301,5 +382,10 @@ msgid ""
" nameservers = ${nameservers}"
msgstr ""
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""
#~ msgid "${ifchoices}"
#~ msgstr "${ifchoices}"

88
debian/po/sv.po

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: netcfg 0.20\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: 2002-11-27 15:20+0100\n"
"Last-Translator: David Weinehall <tao@kernel.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@ -138,6 +138,82 @@ msgstr ""
"nätverkskort kan det vara så att dess modul inte är vald. Gå tillbaka till "
"menyn 'Konfigurera nätverkshårdvara'."
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
#, fuzzy
msgid "Unknown interface"
msgstr "Välj ett nätverkskort."
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -197,6 +273,11 @@ msgstr "Inga DHCP-klienter funna. Kan inte forts
msgid "This package requires pump or dhcp-client."
msgstr "Det här paketet kräver paketen pump eller dhcp-client."
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -307,3 +388,8 @@ msgstr ""
" gateway = ${gateway}\n"
" punkt-till-punkt = ${pointopoint}\n"
" namnservrar = ${nameservers}"
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

87
debian/po/templates.pot

@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-09-19 22:32+0200\n"
"POT-Creation-Date: 2003-09-28 15:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -126,6 +126,81 @@ msgid ""
"'Detect network hardware and load kernel drivers for it'."
msgstr ""
#. Description
#: ../netcfg-common.templates:61
msgid "<none>"
msgstr ""
#. Description
#: ../netcfg-common.templates:65
msgid "Ethernet or Fast Ethernet"
msgstr ""
#. Description
#: ../netcfg-common.templates:69
msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:73
msgid "Token Ring"
msgstr ""
#. Description
#: ../netcfg-common.templates:77
msgid "Arcnet"
msgstr ""
#. Description
#: ../netcfg-common.templates:81
msgid "Serial-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:85
msgid "Parallel-line IP"
msgstr ""
#. Description
#: ../netcfg-common.templates:89
msgid "Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:93
msgid "IPv6-in-IPv4"
msgstr ""
#. Description
#: ../netcfg-common.templates:97
msgid "ISDN Point-to-Point Protocol"
msgstr ""
#. Description
#: ../netcfg-common.templates:101
msgid "Channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:105
msgid "Real channel-to-channel"
msgstr ""
#. Description
#: ../netcfg-common.templates:109
msgid "Hypersocket"
msgstr ""
#. Description
#: ../netcfg-common.templates:113
msgid "Inter-user communication vehicle"
msgstr ""
#. Description
#: ../netcfg-common.templates:117
msgid "Unknown interface"
msgstr ""
#. Description
#: ../netcfg-dhcp.templates:3
msgid "What is your dhcp hostname?"
@ -174,6 +249,11 @@ msgstr ""
msgid "This package requires pump or dhcp-client."
msgstr ""
#. Description
#: ../netcfg-dhcp.templates:30
msgid "DHCP Network Configuration"
msgstr ""
#. Description
#: ../netcfg-static.templates:3
msgid "IP address?"
@ -258,3 +338,8 @@ msgid ""
" pointopoint = ${pointopoint}\n"
" nameservers = ${nameservers}"
msgstr ""
#. Description
#: ../netcfg-static.templates:56
msgid "Static Network Configuration"
msgstr ""

12
netcfg-dhcp.c

@ -49,6 +49,7 @@ enum {
int dhcp_client = PUMP;
static char *dhcp_hostname = NULL;
static char *none;
static char *my_debconf_input(char *priority, char *template)
{
@ -76,7 +77,7 @@ static void netcfg_get_dhcp()
client->command(client, "subst", "netcfg/confirm_dhcp",
"dhcp_hostname",
(dhcp_hostname ? dhcp_hostname : _("<none>")), NULL);
(dhcp_hostname ? dhcp_hostname : none), NULL);
}
@ -135,9 +136,10 @@ int main(int argc, char *argv[])
int finished = 0;
struct stat buf;
client = debconfclient_new();
client->command(client, "title", _("DHCP Network Configuration"),
NULL);
client->command(client, "SETTITLE", "netcfg/dhcp-title", NULL);
client->command(client, "METAGET", "netcfg/internal-none", "description", NULL);
none = client->value ? strdup(client->value) : strdup("<none>");
if (stat("/sbin/dhclient", &buf) == 0)
dhcp_client = DHCLIENT;
@ -164,14 +166,14 @@ int main(int argc, char *argv[])
"hostname", hostname, NULL);
client->command(client, "subst", "netcfg/confirm_dhcp",
"domain", (domain ? domain : _("<none>")),
"domain", (domain ? domain : none),
NULL);
netcfg_nameservers_to_array(nameservers, nameserver_array);
client->command(client, "subst", "netcfg/confirm_dhcp",
"nameservers",
(nameservers ? nameservers : _("<none>")),
(nameservers ? nameservers : none),
NULL);
netcfg_get_dhcp();

20
netcfg-static.c

@ -44,6 +44,7 @@ static u_int32_t netmask = 0;
static u_int32_t gateway = 0;
static u_int32_t pointopoint = 0;
static struct debconfclient *client;
static char *none;
static char *my_debconf_input(char *priority, char *template)
{
@ -67,7 +68,7 @@ static void netcfg_get_static()
client->command(client, "subst", "netcfg/confirm_static",
"ipaddress",
(ipaddress ? num2dot(ipaddress) : _("<none>")), NULL);
(ipaddress ? num2dot(ipaddress) : none), NULL);
if (strncmp(interface, "plip", 4) == 0
|| strncmp(interface, "slip", 4) == 0
@ -102,16 +103,16 @@ static void netcfg_get_static()
}
client->command(client, "subst", "netcfg/confirm_static",
"netmask", (netmask ? num2dot(netmask) : _("<none>")),
"netmask", (netmask ? num2dot(netmask) : none),
NULL);
client->command(client, "subst", "netcfg/confirm_static",
"gateway", (gateway ? num2dot(gateway) : _("<none>")),
"gateway", (gateway ? num2dot(gateway) : none),
<