re-add netcfg/dhcp_hostname template

r15229
19 years ago · d3710b3d9e
39 changed files with 2164 additions and 1333 deletions
--- a/debian/netcfg-dhcp.templates
+++ b/debian/netcfg-dhcp.templates
@ -1,3 +1,11 @@
+Template: netcfg/dhcp_hostname
+Type: string
+_Description: DHCP hostname:
+ 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.
+ .
+ Most other users can just leave this blank.
+
 Template: netcfg/confirm_dhcp
 Type: boolean
 Default: true
@ -36,6 +44,11 @@ _Description: Next network configuration step:
 Otherwise, you may configure the network manually, or choose not to configure
 it at all right now.

+Template: netcfg/dhcp-title
+Type: text
+#  Title displayed when configuring this package
+_Description: Dynamic network configuration (DHCP)
+
 Template: debian-installer/netcfg-dhcp/title
 Type: text
 #  Item in the main menu to select this package
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tools_netcfg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
 "PO-Revision-Date: 2004-01-10 20:50+0300\n"
 "Last-Translator: Ossama Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@ -411,19 +411,43 @@ msgstr "أعدّ الشبكة"
 msgid "Configure the network"
 msgstr "أعدّ الشبكة"

+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "اسم مضيف DHCP:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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. إن كنت تستخدم كابل مودم، قد تحتاج تحديد "
+"رقم الحساب هنا."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr "معظم المستخدمين الآخرين يمكنهم ترك هذا فارغاً."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "هل هذه المعلومات صحيحة؟"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "متغيّرات الشبكة المعدّة حالياً:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -439,72 +463,72 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "أعدّ الشبكة باستخدام DHCP"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "قد يستغرق هذا بعض الوقت."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "لم يوجد أي مستفيد DHCP"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
 msgstr "لم يوجد أي مستفيد DHCP. تتطلب هذه الحزمة pump أو مستفيد dhcp."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "عملية الإعداد بواسطة DHCP سيتم إجهاضها."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration"
 msgstr "إعداد الشبكة الثابت"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
 msgstr "إعداد الشبكة الديناميكي (DHCP)"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Configure network manually"
 msgstr "أعدّ الشبكة"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Do not configure the network at this time"
 msgstr "أعدّ الشبكة"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 #, fuzzy
 msgid "Next network configuration step:"
 msgstr "طريقة إعداد الشبكة:"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -513,10 +537,17 @@ msgid ""
 "configure it at all right now."
 msgstr ""

+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "إعداد الشبكة الديناميكي (DHCP)"
+
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:42
+#: ../netcfg-dhcp.templates:55
 msgid "Configure the network using dynamic addressing (DHCP)"
 msgstr "أعدّ الشبكة باستخدام العنونة الديناميكية (DHCP)"

@ -631,6 +662,8 @@ msgid ""
 "You may have made an error entering your IP address, netmask and/or gateway."
 msgstr "قد تكون قمت بخطأ بإدخال عنوان IP، قناع الشبكة و/أو البوابة."

+#. Type: boolean
+#. Description
 #: ../netcfg-static.templates:53
 msgid ""
 " interface     = ${interface}\n"
@ -658,8 +691,10 @@ msgstr ""
 msgid "Configure a network using static addressing"
 msgstr "أعدّ الشبكة باستخدام عنوان ثابت"

-#, fuzzy
-#~ msgid "Do you want to retry network autoconfiguration?"
+#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
+#~ msgstr "PC-Card (PCMCIA) Ethernet أو Token Ring"
+
+#~ msgid "Do you want to retry DHCP network configuration?"
 #~ msgstr "هل تريد إعادة محاولة إعداد الشبكة بواسطة DHCP؟"

 #, fuzzy
@ -670,22 +705,6 @@ msgstr "أعدّ الشبكة باستخدام عنوان ثابت"
 #~ "لم يقدّم أي عنوان IP خلال عملية إعداد الشبكة بواسطة DHCP. تكون خادمات DHCP "
 #~ "بعض الأحيان بطيئة. إن رغبت، يمكنك إعادة المحاولة."

-#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
-#~ msgstr "PC-Card (PCMCIA) Ethernet أو Token Ring"
-
-#~ msgid "DHCP hostname:"
-#~ msgstr "اسم مضيف DHCP:"
-
-#~ msgid ""
-#~ "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. إن كنت تستخدم كابل مودم، قد تحتاج تحديد "
-#~ "رقم الحساب هنا."
-
-#~ msgid "Most other users can just leave this blank."
-#~ msgstr "معظم المستخدمين الآخرين يمكنهم ترك هذا فارغاً."
-
 #~ msgid "Network Configuration"
 #~ msgstr "إعداد الشبكة"

--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
 "PO-Revision-Date: 2004-04-22 21:07+0300\n"
 "Last-Translator: Ognyan Kulev <ogi@fmi.uni-sofia.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@ -431,19 +431,43 @@ msgstr "Настройка на мрежата..."
 msgid "Configure the network"
 msgstr "Настройка на мрежата"

+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "DHCP сървър:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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 сървър. Ако използвате кабелен "
+"модем, може да се наложи да предоставите номер на акаунт."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr "Повечето други потребители може да оставят това поле празно."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "Вярна ли е тази информация?"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "Текущите настроени параметри на мрежата:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -459,72 +483,72 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "Настройка на мрежата чрез DHCP"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "Това може да отнеме известно време."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "Няма намерен DHCP клиент"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
 msgstr "Не беше намерен DHCP клиент. Този пакет изисква pump или dhcp-client."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "Процесът на настройка на DHCP ще бъде прекъснат."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration"
 msgstr "Статична мрежова настройка"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
 msgstr "Динамична мрежова настройка (DHCP)"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Configure network manually"
 msgstr "Настройка на мрежата"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Do not configure the network at this time"
 msgstr "Настройка на мрежата"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 #, fuzzy
 msgid "Next network configuration step:"
 msgstr "Метод за настройка на мрежата:"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -533,10 +557,17 @@ msgid ""
 "configure it at all right now."
 msgstr ""

+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "Динамична мрежова настройка (DHCP)"
+
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:42
+#: ../netcfg-dhcp.templates:55
 msgid "Configure the network using dynamic addressing (DHCP)"
 msgstr "Настройка на мрежата, използвайки динамично адресиране (DHCP)"

@ -657,6 +688,8 @@ msgstr ""
 "Може да сте направили грешка, докато сте въвеждали Вашия IP адрес, мрежова "
 "маска и/или шлюз."

+#. Type: boolean
+#. Description
 #: ../netcfg-static.templates:53
 msgid ""
 " interface     = ${interface}\n"
@ -684,8 +717,10 @@ msgstr ""
 msgid "Configure a network using static addressing"
 msgstr "Настройка на мрежа чрез статични адреси"

-#, fuzzy
-#~ msgid "Do you want to retry network autoconfiguration?"
+#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
+#~ msgstr "PC-Card (PCMCIA) Ethernet или Token Ring"
+
+#~ msgid "Do you want to retry DHCP network configuration?"
 #~ msgstr "Искате ли да пробвате отново да настроите мрежата чрез DHCP?"

 #~ msgid ""
@ -695,22 +730,6 @@ msgstr "Настройка на мрежа чрез статични адрес
 #~ "Не беше получен IP адрес по време на мрежовата настройка чрез DHCP. DHCP-"
 #~ "сървърите понякога са наистина бавни. Ако искате, можете да пробвате пак."

-#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
-#~ msgstr "PC-Card (PCMCIA) Ethernet или Token Ring"
-
-#~ msgid "DHCP hostname:"
-#~ msgstr "DHCP сървър:"
-
-#~ msgid ""
-#~ "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 сървър. Ако използвате кабелен "
-#~ "модем, може да се наложи да предоставите номер на акаунт."
-
-#~ msgid "Most other users can just leave this blank."
-#~ msgstr "Повечето други потребители може да оставят това поле празно."
-
 #~ msgid "Network Configuration"
 #~ msgstr "Мрежова Настройка"

--- a/debian/po/bs.po
+++ b/debian/po/bs.po
@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: netcfg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
 "PO-Revision-Date: 2004-04-09 17:30+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@ -444,19 +444,45 @@ msgstr "Podešavam mrežu ..."
 msgid "Configure the network"
 msgstr "Podesi mrežu"

+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "DHCP hostname:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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 ""
+"Možda biste trebali unijeti DHCP host name. Ako koristite kablovski modem, "
+"trebali biste ovdje navesti broj računa."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr "Većina korisnika može ovo ostaviti prazno."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "Jesu li ove informacije tačne?"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "Trenutno podešeni mrežni parametri:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -472,44 +498,44 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "Podešavam mrežu preko DHCP-a"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "Ovo može potrajati neko vrijeme."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "DHCP klijent nije pronađen"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
 msgstr "DHCP klijent nije pronađen. Ovaj paket zahtijeva pump ili dhcp-client."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "DHCP konfiguracijski proces će biti obustavljen."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration"
 msgstr "Statička konfiguracija mreže"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
 msgstr "Dinamička konfiguracija mreže (DHCP)"
@ -519,7 +545,7 @@ msgstr "Dinamička konfiguracija mreže (DHCP)"
 #  Item in the main menu to select this package
 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Configure network manually"
 msgstr "Podesi mrežu"
@ -529,21 +555,21 @@ msgstr "Podesi mrežu"
 #  Item in the main menu to select this package
 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Do not configure the network at this time"
 msgstr "Podesi mrežu"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 #, fuzzy
 msgid "Next network configuration step:"
 msgstr "Statička konfiguracija mreže"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -552,10 +578,17 @@ msgid ""
 "configure it at all right now."
 msgstr ""

+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "Dinamička konfiguracija mreže (DHCP)"
+
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:42
+#: ../netcfg-dhcp.templates:55
 msgid "Configure the network using dynamic addressing (DHCP)"
 msgstr "Podesi mrežu koristeći dinamično adresiranje (DHCP)"

@ -673,6 +706,8 @@ msgstr ""
 "Napravili ste grešku prilikom unošenja vaše IP adrese, netmaska i/ili "
 "gatewaya."

+#. Type: boolean
+#. Description
 #: ../netcfg-static.templates:53
 msgid ""
 " interface     = ${interface}\n"
@ -703,8 +738,10 @@ msgstr ""
 msgid "Configure a network using static addressing"
 msgstr "Podesi mrežu koristeći statičko adresiranje"

-#, fuzzy
-#~ msgid "Do you want to retry network autoconfiguration?"
+#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
+#~ msgstr "PC-Card (PCMCIA) Ethernet ili Token Ring"
+
+#~ msgid "Do you want to retry DHCP network configuration?"
 #~ msgstr "Da li želite ponovo pokušati DHCP mrežnu konfiguraciju?"

 #~ msgid ""
@ -715,24 +752,6 @@ msgstr "Podesi mrežu koristeći statičko adresiranje"
 #~ "a. DHCP serveri su ponekad veoma spori. Ako želite, možete pokušati "
 #~ "ponovo."

-#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
-#~ msgstr "PC-Card (PCMCIA) Ethernet ili Token Ring"
-
-#  Type: string
-#  Description
-#~ msgid "DHCP hostname:"
-#~ msgstr "DHCP hostname:"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Možda biste trebali unijeti DHCP host name. Ako koristite kablovski "
-#~ "modem, trebali biste ovdje navesti broj računa."
-
-#~ msgid "Most other users can just leave this blank."
-#~ msgstr "Većina korisnika može ovo ostaviti prazno."
-
 #  Type: text
 #  Description
 #  Title displayed when configuring this package
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: netcfg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
 "PO-Revision-Date: 2004-04-14 02:01+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@ -427,19 +427,44 @@ msgstr "S'està configurant la xarxa..."
 msgid "Configure the network"
 msgstr "Configura la xarxa"

+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "Nom de l'ordinador DHCP:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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 ""
+"És possible que necessiteu donar un nom de l'ordinador DHCP. Si esteu "
+"utilitzant un mòdem de cable, és possible que tingueu que especificar un "
+"nombre de compte ací."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr "La major part dels altres usuaris poden deixar això en blanc."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "És aquesta informació correcta?"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "Paràmetres de la xarxa actualment configurada:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -455,73 +480,73 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "S'està configurant la xarxa amb DHCP"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "Això pot trigar un temps."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "No s'ha trobat cap client DHCP"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
 msgstr ""
 "No s'ha trobat cap client DHCP. Aquest paquet requereix pump o dhcp-client."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "S'avortarà el procés de configuració per DHCP."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration"
 msgstr "Configuració de xarxa estàtica"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
 msgstr "Configuració dinàmica de la xarxa (DHCP)"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Configure network manually"
 msgstr "Configura la xarxa"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Do not configure the network at this time"
 msgstr "Configura la xarxa"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 #, fuzzy
 msgid "Next network configuration step:"
 msgstr "Mètode de configuració de la xarxa:"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -530,10 +555,17 @@ msgid ""
 "configure it at all right now."
 msgstr ""

+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "Configuració dinàmica de la xarxa (DHCP)"
+
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:42
+#: ../netcfg-dhcp.templates:55
 msgid "Configure the network using dynamic addressing (DHCP)"
 msgstr "Configura la xarxa utilitzant adreçament dinàmic (DHCP)"

@ -656,6 +688,8 @@ msgstr ""
 "Pot ser heu comés un error en introduir la vostra adreça IP, màscara de "
 "xarxa i/o pasarel·la."

+#. Type: boolean
+#. Description
 #: ../netcfg-static.templates:53
 msgid ""
 " interface     = ${interface}\n"
@ -683,8 +717,10 @@ msgstr ""
 msgid "Configure a network using static addressing"
 msgstr "Configura una xarxa utilitzant adreçament estàtic"

-#, fuzzy
-#~ msgid "Do you want to retry network autoconfiguration?"
+#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
+#~ msgstr "Ethernet PC-Card (PCMCIA) o Token Ring"
+
+#~ msgid "Do you want to retry DHCP network configuration?"
 #~ msgstr "Voleu tornar a provar la configuració de la xarxa per DHCP?"

 #~ msgid ""
@ -695,23 +731,6 @@ msgstr "Configura una xarxa utilitzant adreçament estàtic"
 #~ "A vegades, els servidors DHCP són molt lents. Si voleu, podeu tornar a "
 #~ "provar."

-#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
-#~ msgstr "Ethernet PC-Card (PCMCIA) o Token Ring"
-
-#~ msgid "DHCP hostname:"
-#~ msgstr "Nom de l'ordinador DHCP:"
-
-#~ msgid ""
-#~ "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 ""
-#~ "És possible que necessiteu donar un nom de l'ordinador DHCP. Si esteu "
-#~ "utilitzant un mòdem de cable, és possible que tingueu que especificar un "
-#~ "nombre de compte ací."
-
-#~ msgid "Most other users can just leave this blank."
-#~ msgstr "La major part dels altres usuaris poden deixar això en blanc."
-
 #~ msgid "Network Configuration"
 #~ msgstr "Configuració de la xarxa"

--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: netcfg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
 "PO-Revision-Date: 2004-04-15 20:19+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@ -424,19 +424,43 @@ msgstr "Nastavuje se s
 msgid "Configure the network"
 msgstr "Nastavit sí»"

+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "DHCP jméno:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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 ""
+"Mo¾ná budete muset zadat DHCP jméno poèítaèe. Pokud pou¾íváte kabelový "
+"modem, nìkdy se sem zadává èíslo úètu."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr "Vìt¹ina u¾ivatelù nemusí vyplòovat nic."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "Jsou tyto informace správné?"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "Momentálnì nastavené parametry sítì:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -452,72 +476,72 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "Nastavuje se sí» pøes DHCP"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "Mù¾e to chvíli trvat."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "Nebyl nalezen DHCP klient"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
 msgstr "Nebyl nalezen DHCP klient. Tento balík vy¾aduje pump nebo dhcp-client."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "Proces nastavení DHCP se pøeru¹í."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration"
 msgstr "Statické nastavení sítì"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
 msgstr "Dynamické nastavení sítì (DHCP)"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Configure network manually"
 msgstr "Nastavit sí»"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Do not configure the network at this time"
 msgstr "Nastavit sí»"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 #, fuzzy
 msgid "Next network configuration step:"
 msgstr "Statické nastavení sítì"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -526,10 +550,17 @@ msgid ""
 "configure it at all right now."
 msgstr ""

+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "Dynamické nastavení sítì (DHCP)"
+
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:42
+#: ../netcfg-dhcp.templates:55
 msgid "Configure the network using dynamic addressing (DHCP)"
 msgstr "Nastavit sí» s dynamickými adresami (DHCP)"

@ -646,6 +677,8 @@ msgid ""
 msgstr ""
 "Mo¾ná jste udìlali chybu pøi zadávání IP adresy, sí»ové masky a/nebo brány."

+#. Type: boolean
+#. Description
 #: ../netcfg-static.templates:53
 msgid ""
 " interface     = ${interface}\n"
@ -673,8 +706,10 @@ msgstr ""
 msgid "Configure a network using static addressing"
 msgstr "Nastavit sí» se statickými adresami"

-#, fuzzy
-#~ msgid "Do you want to retry network autoconfiguration?"
+#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
+#~ msgstr "PC-Card (PCMCIA) Ethernet nebo Token Ring"
+
+#~ msgid "Do you want to retry DHCP network configuration?"
 #~ msgstr "Chcete znovu zkusit nastavit sí» pøes DHCP?"

 #~ msgid ""
@ -683,19 +718,3 @@ msgstr "Nastavit s
 #~ msgstr ""
 #~ "Bìhem konfigurace sítì pøes DHCP jsme neobdr¾eli ¾ádnou IP adresu. DHCP "
 #~ "servery jsou obèas tro¹ku pomalej¹í. Jestli¾e chcete, zkuste to znovu."
-
-#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
-#~ msgstr "PC-Card (PCMCIA) Ethernet nebo Token Ring"
-
-#~ msgid "DHCP hostname:"
-#~ msgstr "DHCP jméno:"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Mo¾ná budete muset zadat DHCP jméno poèítaèe. Pokud pou¾íváte kabelový "
-#~ "modem, nìkdy se sem zadává èíslo úètu."
-
-#~ msgid "Most other users can just leave this blank."
-#~ msgstr "Vìt¹ina u¾ivatelù nemusí vyplòovat nic."
--- a/debian/po/cy.po
+++ b/debian/po/cy.po
@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
 "PO-Revision-Date: 2004-03-30 21:16+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <daf@muse.19inch.net>\n"
@ -439,19 +439,43 @@ msgstr "Yn cyflunio'r rhwydwaith ..."
 msgid "Configure the network"
 msgstr "Cyflunio'r rhwydwaith"

+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "Enw gwesteiwr DHCP:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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 ""
+"Efalli bydd rhaid i chi ddarparu enw gwesteiwr DHCP. Os ydych chi'n "
+"defnyddio modem cêbl, efallai bydd rhaid i chi benodi rhif cyfrif yma."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr "Gall y rhan fwyaf o ddefnyddwyr eraill adael hyn yn wag."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "Ydy'r wybodaeth hyn yn gywir?"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "Paramedrau rhwydwatih cyfluniedig cyfredol:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -467,72 +491,72 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "Yn cyflunio'r rhwydwaith efo DHCP"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "Gall hyn gymryd peth amser."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "Ni chanfuwyd cleient DHCP"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
 msgstr "Ni chanfuwyd cleient DHCP. Mae'r pecyn yma angen pump neu dhcp-client."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "Caiff y proses cyfluniad DHCP ei erthylu."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration"
 msgstr "Cyfluniad rhwydwaith statig"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
 msgstr "Cyfluniad rhwydwaith deinamig (DHCP)"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Configure network manually"
 msgstr "Cyflunio'r rhwydwaith"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
 #, fuzzy
 msgid "Do not configure the network at this time"
 msgstr "Cyflunio'r rhwydwaith"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 #, fuzzy
 msgid "Next network configuration step:"
 msgstr "Dull cyfluniad rhwydwaith:"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -541,10 +565,17 @@ msgid ""
 "configure it at all right now."
 msgstr ""

+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "Cyfluniad rhwydwaith deinamig (DHCP)"
+
 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:42
+#: ../netcfg-dhcp.templates:55
 msgid "Configure the network using dynamic addressing (DHCP)"
 msgstr "Cyflunio'r rhwydwaith gan ddefnuddio cyfeiriadaeth deinamig (DHCP)"

@ -667,6 +698,8 @@ msgstr ""
 "Efallai gwanethoch gamgymeriad yn rhoi eith cyfeiriad IP, masg rhwydwaith, "
 "neu fynedfa."

+#. Type: boolean
+#. Description
 #: ../netcfg-static.templates:53
 msgid ""
 " interface     = ${interface}\n"
@ -694,8 +727,10 @@ msgstr ""
 msgid "Configure a network using static addressing"
 msgstr "Cyflunio rhwydwaith gan ddefnyddio cyfeiriadaeth statig"

-#, fuzzy
-#~ msgid "Do you want to retry network autoconfiguration?"
+#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
+#~ msgstr "Cerdyn PC-Card (PCMCIA) Ethernet neu Token Ring"
+
+#~ msgid "Do you want to retry DHCP network configuration?"
 #~ msgstr "A hoffech ailgeisio cyfluniad rhwydwaith DHCP?"

 #~ msgid ""
@ -705,22 +740,6 @@ msgstr "Cyflunio rhwydwaith gan ddefnyddio cyfeiriadaeth statig"
 #~ "Ni chanfuwyd cyfeiriad IP yn ystod cyfluniad rhwydwaith DHCP. Weithiau, "
 #~ "mae gweinyddion DHCP yn araf iawn. Os hoffech, gallwch ailgeisio."

-#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
-#~ msgstr "Cerdyn PC-Card (PCMCIA) Ethernet neu Token Ring"
-
-#~ msgid "DHCP hostname:"
-#~ msgstr "Enw gwesteiwr DHCP:"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Efalli bydd rhaid i chi ddarparu enw gwesteiwr DHCP. Os ydych chi'n "
-#~ "defnyddio modem cêbl, efallai bydd rhaid i chi benodi rhif cyfrif yma."
-
-#~ msgid "Most other users can just leave this blank."
-#~ msgstr "Gall y rhan fwyaf o ddefnyddwyr eraill adael hyn yn wag."
-
 #~ msgid "Network Configuration"
 #~ msgstr "Cyfluniad Rhwydwaith"

--- a/debian/po/da.po
+++ b/debian/po/da.po
@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
-"PO-Revision-Date: 2004-05-12 13:53+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
+"PO-Revision-Date: 2004-04-15 11:45+0200\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@ -426,19 +426,43 @@ msgstr "S
 msgid "Configure the network"
 msgstr "Sæt netværket op"

+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "DHCP-værtsnavn:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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 ""
+"Du kan være nødt til at angive et DHCP-værtsnavn. Hvis du bruger et "
+"kabelmodem, skal du muligvis angive et kontonummer her."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr " De fleste andre brugere kan blot lade feltet være tomt."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "Er disse oplysninger korrekte?"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "Aktuel netværksopsætning:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -454,67 +478,73 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "Sætter netværket op via DHCP"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "Det kan tage nogen tid."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "Fandt ingen DHCP-klient"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
-msgstr "Fandt ingen DHCP-klient. Denne pakke kræver pakken pump eller dhcp-client."
+msgstr ""
+"Fandt ingen DHCP-klient. Denne pakke kræver pakken pump eller dhcp-client."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "Opsætningen af DHCP afbrydes."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Retry network autoconfiguration"
-msgstr "Forsøg automatisk netværksopsætning igen"
+msgstr "Statisk netværksopsætning"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
-msgstr "Forsøg automatisk netværksopsætning igen med DHCP-værtsnavn"
+msgstr "Dynamisk netværksopsætning (DHCP)"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Configure network manually"
-msgstr "Sæt netværket op manuelt"
+msgstr "Sæt netværket op"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Do not configure the network at this time"
-msgstr "Sæt ikke netværket op på nuværende tidspunkt"
+msgstr "Jeg vil nu sætte netværket op."

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
+#, fuzzy
 msgid "Next network configuration step:"
-msgstr "Næste trin i netværksopsætningen:"
+msgstr "Netværksopsætnings-metode:"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -522,16 +552,18 @@ msgid ""
 "Otherwise, you may configure the network manually, or choose not to "
 "configure it at all right now."
 msgstr ""
-"Den automatiske netværksopsætning mislykkedes. Dette skyldes typisk en "
-"langsom DHCP-server på netværket, så du bør nok forsøge igen. Du kan "
-"også angive et DHCP-værtsnavn, der vil blive sendt til serveren, hvis "
-"du mener at den kræver et sådant. Ellers kan du sætte netværket op "
-"manuelt eller vælge slet ikke at sætte det op på nuværende tidspunkt."
+
+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "Dynamisk netværksopsætning (DHCP)"

 #. Type: text
 #. Description
 #. Item in the main menu to select this package
-#: ../netcfg-dhcp.templates:42
+#: ../netcfg-dhcp.templates:55
 msgid "Configure the network using dynamic addressing (DHCP)"
 msgstr "Sæt nætværket op med dynamisk adressering (DHCP)"

@ -645,11 +677,14 @@ msgstr "Den angivne gateway-adresse kan ikke n
 #. Type: error
 #. Description
 #: ../netcfg-static.templates:44
-msgid "You may have made an error entering your IP address, netmask and/or gateway."
+msgid ""
+"You may have made an error entering your IP address, netmask and/or gateway."
 msgstr ""
 "Du kan have skrevet forkert, da du angav IP-adresse, netmaske og/eller "
 "gateway."

+#. Type: boolean
+#. Description
 #: ../netcfg-static.templates:53
 msgid ""
 " interface     = ${interface}\n"
@ -677,8 +712,10 @@ msgstr ""
 msgid "Configure a network using static addressing"
 msgstr "Sæt nætværket op med statisk adressering"

-#, fuzzy
-#~ msgid "Do you want to retry network autoconfiguration?"
+#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
+#~ msgstr "PC-Card (PCMCIA) Ethernet eller Token Ring"
+
+#~ msgid "Do you want to retry DHCP network configuration?"
 #~ msgstr "Vil du forsøge DHCP-netværksopsætningen igen?"

 #~ msgid ""
@ -689,22 +726,6 @@ msgstr "S
 #~ "DHCP-servere kan nogen gange være meget langsomme. Hvis du vil, kan du "
 #~ "prøve igen."

-#~ msgid "PC-Card (PCMCIA) Ethernet or Token Ring"
-#~ msgstr "PC-Card (PCMCIA) Ethernet eller Token Ring"
-
-#~ msgid "DHCP hostname:"
-#~ msgstr "DHCP-værtsnavn:"
-
-#~ msgid ""
-#~ "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 ""
-#~ "Du kan være nødt til at angive et DHCP-værtsnavn. Hvis du bruger et "
-#~ "kabelmodem, skal du muligvis angive et kontonummer her."
-
-#~ msgid "Most other users can just leave this blank."
-#~ msgstr " De fleste andre brugere kan blot lade feltet være tomt."
-
 #~ msgid "Network Configuration"
 #~ msgstr "Netværksopsætning"

@ -770,4 +791,3 @@ msgstr "S

 #~ msgid "debian"
 #~ msgstr "debian"
-
--- a/debian/po/de.po
+++ b/debian/po/de.po
@ -1,4 +1,3 @@
-# translation of de.po to 
 # translation of netcfg to German
 # This file is distributed under the same license as the PACKAGE package.
 #    Translators, please read /usr/share/doc/po-debconf/README-trans
@ -11,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 12:32+0200\n"
-"PO-Revision-Date: 2004-05-12 17:50+0200\n"
+"POT-Creation-Date: 2004-05-12 09:37-0700\n"
+"PO-Revision-Date: 2004-04-17 19:15+0200\n"
 "Last-Translator: Alwin Meschede <ameschede@gmx.de>\n"
 "Language-Team:  <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@ -57,7 +56,7 @@ msgid ""
 "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."
 msgstr ""
-"Der Domainname ist der rechte Teil Ihrer Internetadresse nach Ihrem "
+"Der Domainname ist der rechte Teil Ihrer Internetadresse nach Ihren "
 "Rechnernamen. Er endet oft mit .de, .com, .net oder .org. Wenn Sie ein "
 "lokales Heimnetz aufbauen, ist es egal, was Sie angeben. Diese Information "
 "sollte dann aber auf allen Rechnern gleich sein."
@ -431,19 +430,44 @@ msgstr "Konfiguriere das Netzwerk ..."
 msgid "Configure the network"
 msgstr "Netzwerk einrichten"

+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "DHCP hostname:"
+msgstr "DHCP Hostname:"
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid ""
+"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 ""
+"In einigen Situationen muss man einen DHCP Hostnamen angeben. Das kommt "
+"selten vor, vor allem aber bei Kabelmodembenutzern. Wenn Sie ein Kabelmodem "
+"besitzen, muss hier oft eine Benutzernummer angegeben werden."
+
+#. Type: string
+#. Description
+#: ../netcfg-dhcp.templates:3
+msgid "Most other users can just leave this blank."
+msgstr "Die meisten Benutzer können dieses Feld einfach leer lassen."
+
 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Is this information correct?"
 msgstr "Sind diese Informationen richtig?"

 #. Type: boolean
 #. Description
-#: ../netcfg-dhcp.templates:4 ../netcfg-static.templates:53
+#: ../netcfg-dhcp.templates:12 ../netcfg-static.templates:53
 msgid "Currently configured network parameters:"
 msgstr "Gegenwärtig konfigurierte Netzwerk-Parameter:"

-#: ../netcfg-dhcp.templates:4
+#. Type: boolean
+#. Description
+#: ../netcfg-dhcp.templates:12
 msgid ""
 " interface      = ${interface}\n"
 " hostname       = ${hostname}\n"
@ -459,67 +483,73 @@ msgstr ""

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:15
+#: ../netcfg-dhcp.templates:23
 msgid "Configuring the network with DHCP"
 msgstr "Konfiguriere das Netzwerk mit DHCP"

 #. Type: text
 #. Description
-#: ../netcfg-dhcp.templates:19
+#: ../netcfg-dhcp.templates:27
 msgid "This may take some time."
 msgstr "Dies kann einige Zeit dauern."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client found"
 msgstr "Kein DHCP-Client gefunden"

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "No DHCP client was found. This package requires pump or dhcp-client."
-msgstr "Kein DHCP-Client gefunden. Dieses Paket benötigt den pump oder dhcp-client."
+msgstr ""
+"Kein DHCP-Client gefunden. Dieses Paket benötigt den pump oder dhcp-client."

 #. Type: error
 #. Description
-#: ../netcfg-dhcp.templates:23
+#: ../netcfg-dhcp.templates:31
 msgid "The DHCP configuration process will be aborted."
 msgstr "Der DHCP-Konfigurationsprozess wird abgebrochen."

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Retry network autoconfiguration"
-msgstr "Netzwerk-Autokonfiguration nochmals versuchen"
+msgstr "Statische Netzwerkkonfiguration"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Retry network autoconfiguration with a DHCP hostname"
-msgstr "Netzwerk-Autokonfiguration nochmals mit DHCP-Hostname versuchen"
+msgstr "Dynamische Netzwerkkonfiguration (DHCP)"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Configure network manually"
-msgstr "Netzwerk manuell konfigurieren"
+msgstr "Netzwerk einrichten"

 #. Type: select
 #. Choices
-#: ../netcfg-dhcp.templates:30
+#: ../netcfg-dhcp.templates:38
+#, fuzzy
 msgid "Do not configure the network at this time"
-msgstr "Netzwerk jetzt nicht konfigurieren"
+msgstr "Netzwerk einrichten"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
+#, fuzzy
 msgid "Next network configuration step:"
-msgstr "Nächster Netzwerkkonfigurations-Schritt:"
+msgstr "Statische Netzwerkkonfiguration"

 #. Type: select
 #. Description
-#: ../netcfg-dhcp.templates:32
+#: ../netcfg-dhcp.templates:40
 msgid ""
 "Network autoconfiguration failed. This is typically due to a slow DHCP "
 "server on the network, so you probably want to try again. You may also "
@ -527,19 +557,21 @@ msgid ""
 "Otherwise, you may configure the network manually, or choose not to "
 "configure it at all right now."
 msgstr ""
-"Die Netzwerk-Autokonfiguration schlug fehl. Dies liegt häufig an einem "
-"langsamen DHCP-Server im Netzwerk, deshalb möchsten Sie es vielleicht "
-"nochmals versuchen. Sie können auch einen DHCP-Hostnamen angeben, der an "
-"den Server gesendet wird, wenn Sie glauben, dass einer benötigt wird. "
-"Andernfalls können Sie das Netzwerk manuell einrichten oder es jetzt gar "
-"nicht konfigurieren."
+
+#. Type: text
+#. Description
+#. Title displayed when configuring this package
+#: ../netcfg-dhcp.templates:50
+msgid "Dynamic network configuration (DHCP)"
+msgstr "Dynamische Netzwerkkonfiguration (DHCP)"

 #. Type: text
 #. Description