Package: ppp Version: 2.4.4rel-2 Severity: normal Tags: patch Hi,
Attached is the diff for my ppp 2.4.4rel-2.1 NMU which takes your comments on IRC into account. Let me know if you think it's ok to upload it. Cheers Luk -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u ppp-2.4.4rel/debian/rules ppp-2.4.4rel/debian/rules --- ppp-2.4.4rel/debian/rules +++ ppp-2.4.4rel/debian/rules @@ -9,7 +9,7 @@ B := $(BUILD_DIR) D := $(CURDIR)/debian/ppp -PPPDDIR := 2.4.4b1 +PPPDDIR := 2.4.4 # Various collections of files for use with dh_* tools. DOCS := FAQ README SETUP PLUGINS README.MPPE README.MSCHAP8? README.cbcp \ diff -u ppp-2.4.4rel/debian/po/sv.po ppp-2.4.4rel/debian/po/sv.po --- ppp-2.4.4rel/debian/po/sv.po +++ ppp-2.4.4rel/debian/po/sv.po @@ -8,16 +8,16 @@ # or http://www.debian.org/intl/l10n/po-debconf/README-trans # Developers do not need to manually edit POT or PO files. # , fuzzy -# -# +# +# msgid "" msgstr "" -"Project-Id-Version: ppp 2.4.3-20050321+2\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-07-12 18:26+0200\n" -"PO-Revision-Date: 2005-10-05 05:30+0200\n" +"Project-Id-Version: ppp 2.4.4rel-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-09 13:31-0600\n" +"PO-Revision-Date: 2006-09-11 20:52+0100\n" "Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n" -"Language-Team: Swedish <[EMAIL PROTECTED]>\n" +"Language-Team: Swedish <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,94 +29,85 @@ -#, fuzzy msgid "Configure and start a PPPoE connection" -msgstr "Konfigurera och starta PPPeO-n?tverket" +msgstr "Konfigurera och starta en PPPoE-anslutning" #. Type: error #. Description #: ../ppp-udeb.templates:2001 msgid "No concentrator was found" -msgstr "" +msgstr "Ingen koncentrator hittades" #. Type: error #. Description -#: ../ppp-udeb.templates:2002 -msgid "" -"All network interfaces have been probed, but a PPPoE concentrator was not " -"detected." -msgstr "" +#: ../ppp-udeb.templates:2001 +msgid "All network interfaces have been probed, but a PPPoE concentrator was not detected." +msgstr "Alla n?tverksgr?nssnitt har genoms?kts men ingen PPPoE-koncentrator hittades." #. Type: error #. Description #. Type: error #. Description -#: ../ppp-udeb.templates:2003 ../ppp-udeb.templates:6003 -msgid "" -"The configuration of PPPoE is aborted. It can be attempted again by " -"selecting the relevant menu entry." -msgstr "" +#: ../ppp-udeb.templates:2001 +#: ../ppp-udeb.templates:6001 +msgid "The configuration of PPPoE is aborted. It can be attempted again by selecting the relevant menu entry." +msgstr "Konfigurationen av PPPoE har avbrutits. F?rs?k kan g?ras igen genom att v?lja den relevanta menyposten." #. Type: string #. Description #: ../ppp-udeb.templates:4001 msgid "PPP login:" -msgstr "" +msgstr "PPP-inloggningsnamn:" #. Type: string #. Description -#: ../ppp-udeb.templates:4002 +#: ../ppp-udeb.templates:4001 msgid "Please enter the username for the PPP connection." -msgstr "" +msgstr "Ange anv?ndarnamnet f?r PPP-anslutningen." #. Type: string #. Description #. Type: password #. Description -#: ../ppp-udeb.templates:4003 ../ppp-udeb.templates:5003 -msgid "" -"This information should have been provided to you by your Internet Service " -"Provider." -msgstr "" +#: ../ppp-udeb.templates:4001 +#: ../ppp-udeb.templates:5001 +msgid "This information should have been provided to you by your Internet Service Provider." +msgstr "Denna information ska din Internetleverant?r tillhandah?llit dig." #. Type: password #. Description #: ../ppp-udeb.templates:5001 -#, fuzzy msgid "PPP password:" -msgstr "Ditt l?senord" +msgstr "PPP-l?senord:" #. Type: password #. Description -#: ../ppp-udeb.templates:5002 +#: ../ppp-udeb.templates:5001 msgid "Please enter the password for the PPP connection." -msgstr "" +msgstr "Ange l?senordet f?r PPP-anslutningen." #. Type: error #. Description #: ../ppp-udeb.templates:6001 msgid "No Ethernet interface found" -msgstr "" +msgstr "Inget Ethernet-gr?nssnitt hittades" #. Type: error #. Description -#: ../ppp-udeb.templates:6002 -msgid "" -"PPPoE networking cannot be configured because no Ethernet interface was " -"detected." -msgstr "" +#: ../ppp-udeb.templates:6001 +msgid "PPPoE networking cannot be configured because no Ethernet interface was detected." +msgstr "PPPoE-n?tverket kan inte konfigureras d?rf?r att inget Ethernet-gr?nssnitt hittades." #. Type: progress #. Description #: ../ppp-udeb.templates:7001 msgid "Searching for concentrators on ${IFACE}..." -msgstr "" +msgstr "S?ker efter koncentratorer p? ${IFACE}..." #, fuzzy #~ msgid "Your PPPoE username" #~ msgstr "Ditt anv?ndarnamn" - #~ msgid "Interface name" #~ msgstr "Interfacenamn" - #~ msgid "" #~ "Choose the name of the network interface connected to your PPPoE modem." #~ msgstr "" #~ "V?lj namnet p? n?tverksinterfacet som ?r kopplat till ditt PPPoE-modem." + diff -u ppp-2.4.4rel/debian/po/ja.po ppp-2.4.4rel/debian/po/ja.po --- ppp-2.4.4rel/debian/po/ja.po +++ ppp-2.4.4rel/debian/po/ja.po @@ -17,109 +17,113 @@ -"Project-Id-Version: ppp 2.4.2+20040202-1\n" +"Project-Id-Version: ppp 2.4.4rel2-1\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-07-12 18:26+0200\n" -"PO-Revision-Date: 2004-03-02 08:02+0900\n" -"Last-Translator: Hideki Yamane <[EMAIL PROTECTED]>\n" +"POT-Creation-Date: 2006-10-01 23:14+0900\n" +"PO-Revision-Date: 2006-09-20 23:45+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) <[EMAIL PROTECTED]>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: text #. Description #. Main menu item #: ../ppp-udeb.templates:1001 -#, fuzzy msgid "Configure and start a PPPoE connection" -msgstr "PPPoE ????????????????????????????" +msgstr "PPPoE ????????????????????????" #. Type: error #. Description #: ../ppp-udeb.templates:2001 msgid "No concentrator was found" -msgstr "" +msgstr "????????????????????????????????????????????????" #. Type: error #. Description -#: ../ppp-udeb.templates:2002 +#: ../ppp-udeb.templates:2001 msgid "" "All network interfaces have been probed, but a PPPoE concentrator was not " "detected." msgstr "" +"?????????????????????????????????????????????????????????????????????????????????PPPoE ????????????????????????" +"????????????????????????????????????" #. Type: error #. Description #. Type: error #. Description -#: ../ppp-udeb.templates:2003 ../ppp-udeb.templates:6003 +#: ../ppp-udeb.templates:2001 ../ppp-udeb.templates:6001 msgid "" "The configuration of PPPoE is aborted. It can be attempted again by " "selecting the relevant menu entry." msgstr "" +"PPPoE ?????????????????????????????????????????????????????????????????????????????????????????????????????????" +"??????" #. Type: string #. Description #: ../ppp-udeb.templates:4001 msgid "PPP login:" -msgstr "" +msgstr "PPP ????????????:" #. Type: string #. Description -#: ../ppp-udeb.templates:4002 +#: ../ppp-udeb.templates:4001 msgid "Please enter the username for the PPP connection." -msgstr "" +msgstr "PPP ???????????????????????????????????????????????????" #. Type: string #. Description #. Type: password #. Description -#: ../ppp-udeb.templates:4003 ../ppp-udeb.templates:5003 +#: ../ppp-udeb.templates:4001 ../ppp-udeb.templates:5001 msgid "" "This information should have been provided to you by your Internet Service " "Provider." -msgstr "" +msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????" #. Type: password #. Description #: ../ppp-udeb.templates:5001 -#, fuzzy msgid "PPP password:" -msgstr "??????????" +msgstr "PPP ???????????????:" #. Type: password #. Description -#: ../ppp-udeb.templates:5002 +#: ../ppp-udeb.templates:5001 msgid "Please enter the password for the PPP connection." -msgstr "" +msgstr "PPP ??????????????????????????????????????????????????????" #. Type: error #. Description #: ../ppp-udeb.templates:6001 msgid "No Ethernet interface found" -msgstr "" +msgstr "??????????????????????????????????????????????????????????????????" #. Type: error #. Description -#: ../ppp-udeb.templates:6002 +#: ../ppp-udeb.templates:6001 msgid "" "PPPoE networking cannot be configured because no Ethernet interface was " "detected." msgstr "" +"??????????????????????????????????????????????????????????????????????????????PPPoE ???????????????????????????" +"??????????????????????????????" #. Type: progress #. Description #: ../ppp-udeb.templates:7001 msgid "Searching for concentrators on ${IFACE}..." -msgstr "" +msgstr "${IFACE} ?????????????????????????????????????????????????????????????????????" #, fuzzy #~ msgid "Your PPPoE username" -#~ msgstr "????????" +#~ msgstr "????????????" #~ msgid "Interface name" -#~ msgstr "??????????????????" +#~ msgstr "???????????????????????????" #~ msgid "" #~ "Choose the name of the network interface connected to your PPPoE modem." #~ msgstr "" -#~ "PPPoE ????????????????????????????????????????????????????????????????????" -#~ "??????????????" +#~ "PPPoE ??????????????????????????????????????????????????????????????????????????????????????????????????????" +#~ "?????????????????????" diff -u ppp-2.4.4rel/debian/po/es.po ppp-2.4.4rel/debian/po/es.po --- ppp-2.4.4rel/debian/po/es.po +++ ppp-2.4.4rel/debian/po/es.po @@ -5,7 +5,8 @@ # Changes: # - Initial translation # Lucas Wall <[EMAIL PROTECTED]>, 2004 -# +# - Updating templates for package version 2.4.4rel-2 +# Nacho Barrientos Arias <[EMAIL PROTECTED]>, 2006 # # Traductores, si no conoce el formato PO, merece la pena leer la # documentaci?n de gettext, especialmente las secciones dedicadas a este @@ -27,29 +28,28 @@ # msgid "" msgstr "" -"Project-Id-Version: ppp 2.4.2+20040202-3\n" +"Project-Id-Version: ppp 2.4.4rel-2\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" "POT-Creation-Date: 2006-07-12 18:26+0200\n" -"PO-Revision-Date: 2004-06-12 16:00-0300\n" -"Last-Translator: Lucas Wall <[EMAIL PROTECTED]>\n" -"Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" +"PO-Revision-Date: 2006-08-27 16:49+0200\n" +"Last-Translator: Nacho Barrientos Arias <[EMAIL PROTECTED]>\n" +"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bit" #. Type: text #. Description #. Main menu item #: ../ppp-udeb.templates:1001 -#, fuzzy msgid "Configure and start a PPPoE connection" -msgstr "Configuraci?n e inicio del servicio de red ?PPPoE?" +msgstr "Configurar e iniciar una conexi?n PPPoE" #. Type: error #. Description #: ../ppp-udeb.templates:2001 msgid "No concentrator was found" -msgstr "" +msgstr "No se ha encontrado ning?n servidor PPPoE" #. Type: error #. Description @@ -58,6 +58,8 @@ "All network interfaces have been probed, but a PPPoE concentrator was not " "detected." msgstr "" +"Todas las interfaces de red han sido sondeadas, pero no se ha encontrado " +"ning?n servidor PPPoE." #. Type: error #. Description @@ -68,18 +70,20 @@ "The configuration of PPPoE is aborted. It can be attempted again by " "selecting the relevant menu entry." msgstr "" +"La configuraci?n de PPPoE ha sido abortada. Puede intentarlo de nuevo " +"seleccionando la opci?n pertinente en el men?." #. Type: string #. Description #: ../ppp-udeb.templates:4001 msgid "PPP login:" -msgstr "" +msgstr "Usuario para la conexi?n PPP:" #. Type: string #. Description #: ../ppp-udeb.templates:4002 msgid "Please enter the username for the PPP connection." -msgstr "" +msgstr "Por favor, introduzca el usuario para la conexi?n PPP." #. Type: string #. Description @@ -90,25 +94,26 @@ "This information should have been provided to you by your Internet Service " "Provider." msgstr "" +"Esta informaci?n deber?a de hab?rsela suministrado su proveedor de servicios " +"de Internet." #. Type: password #. Description #: ../ppp-udeb.templates:5001 -#, fuzzy msgid "PPP password:" -msgstr "Su contrase?a" +msgstr "Contrase?a para la conexi?n PPP:" #. Type: password #. Description #: ../ppp-udeb.templates:5002 msgid "Please enter the password for the PPP connection." -msgstr "" +msgstr "Por favor, introduzca la contrase?a para la conexi?n PPP." #. Type: error #. Description #: ../ppp-udeb.templates:6001 msgid "No Ethernet interface found" -msgstr "" +msgstr "No se ha encontrado ninguna interfaz Ethernet." #. Type: error #. Description @@ -120,18 +125,9 @@ +"La conexi?n PPPoE no se pudo configurar debido a que no se han " +"detectado interfaces Ethernet." #. Type: progress #. Description #: ../ppp-udeb.templates:7001 msgid "Searching for concentrators on ${IFACE}..." -msgstr "" +msgstr "Buscando servidores PPPoE en ${IFACE}..." -#, fuzzy -#~ msgid "Your PPPoE username" -#~ msgstr "Su nombre de usuario" - -#~ msgid "Interface name" -#~ msgstr "Nombre de la interfaz" - -#~ msgid "" -#~ "Choose the name of the network interface connected to your PPPoE modem." -#~ msgstr "" -#~ "Seleccione el nombre de la interfaz de red conectada a su m?dem ?PPPoE?." diff -u ppp-2.4.4rel/debian/po/nl.po ppp-2.4.4rel/debian/po/nl.po --- ppp-2.4.4rel/debian/po/nl.po +++ ppp-2.4.4rel/debian/po/nl.po @@ -1,3 +1,4 @@ +# translation of ppp_2.4.4rel-2_nl.po to Dutch # translation of ppp_2.4.2+20040202-1_nl.po to Dutch # translation of ppp_2.4.2+20040202-1_nl.po to Dutch # translation of ppp_2.4.2+20040202-1_nl.po to Dutch @@ -15,113 +16,102 @@ -# Frans Pop <[EMAIL PROTECTED]>, 2004. +# Frans Pop <[EMAIL PROTECTED]>, 2004, 2006. # msgid "" msgstr "" -"Project-Id-Version: ppp_2.4.2+20040202-1_nl\n" -"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-07-12 18:26+0200\n" -"PO-Revision-Date: 2004-03-22 21:30+0100\n" +"Project-Id-Version: ppp_2.4.4rel-2_nl\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-09-09 13:31-0600\n" +"PO-Revision-Date: 2006-09-10 03:20+0200\n" "Last-Translator: Frans Pop <[EMAIL PROTECTED]>\n" "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3\n" +"X-Generator: KBabel 1.9.1\n" #. Type: text #. Description #. Main menu item #: ../ppp-udeb.templates:1001 -#, fuzzy msgid "Configure and start a PPPoE connection" -msgstr "Configureer en start PPPoE-netwerkfunctionaliteit" +msgstr "Een PPPoE-verbinding configureren en starten" #. Type: error #. Description #: ../ppp-udeb.templates:2001 msgid "No concentrator was found" -msgstr "" +msgstr "Geen concentrator gevonden" #. Type: error #. Description -#: ../ppp-udeb.templates:2002 +#: ../ppp-udeb.templates:2001 msgid "" "All network interfaces have been probed, but a PPPoE concentrator was not " "detected." -msgstr "" +msgstr "Alle netwerkinterfaces zijn afgetast, maar er is geen PPPoE concentrator gevonden." #. Type: error #. Description #. Type: error #. Description -#: ../ppp-udeb.templates:2003 ../ppp-udeb.templates:6003 +#: ../ppp-udeb.templates:2001 ../ppp-udeb.templates:6001 msgid "" "The configuration of PPPoE is aborted. It can be attempted again by " "selecting the relevant menu entry." msgstr "" +"De configuratie van PPPoE wordt afgebroken. Het kan opnieuw worden geprobeerd " +"door de relevante regel in het menu te selecteren." #. Type: string #. Description #: ../ppp-udeb.templates:4001 msgid "PPP login:" -msgstr "" +msgstr "PPP-login:" #. Type: string #. Description -#: ../ppp-udeb.templates:4002 +#: ../ppp-udeb.templates:4001 msgid "Please enter the username for the PPP connection." -msgstr "" +msgstr "Geef de gebruikersnaam voor de PPP-verbinding." #. Type: string #. Description #. Type: password #. Description -#: ../ppp-udeb.templates:4003 ../ppp-udeb.templates:5003 +#: ../ppp-udeb.templates:4001 ../ppp-udeb.templates:5001 msgid "" "This information should have been provided to you by your Internet Service " "Provider." -msgstr "" +msgstr "Deze informatie zou aan u moeten zijn verstrekt door uw Internet provider (ISP)." #. Type: password #. Description #: ../ppp-udeb.templates:5001 -#, fuzzy msgid "PPP password:" -msgstr "Uw wachtwoord" +msgstr "PPP-wachtwoord:" #. Type: password #. Description -#: ../ppp-udeb.templates:5002 +#: ../ppp-udeb.templates:5001 msgid "Please enter the password for the PPP connection." -msgstr "" +msgstr "Geef het wachtwoord voor de PPP-verbinding." #. Type: error #. Description #: ../ppp-udeb.templates:6001 msgid "No Ethernet interface found" -msgstr "" +msgstr "Geen Ethernet-interface gevonden" #. Type: error #. Description -#: ../ppp-udeb.templates:6002 +#: ../ppp-udeb.templates:6001 msgid "" "PPPoE networking cannot be configured because no Ethernet interface was " "detected." -msgstr "" +msgstr "Er is geen Ethernet-interface gevonden en daardoor is het niet mogelijk PPPoE te configureren." #. Type: progress #. Description #: ../ppp-udeb.templates:7001 msgid "Searching for concentrators on ${IFACE}..." -msgstr "" +msgstr "Bezig met zoeken van concentrators op ${IFACE}..." -#, fuzzy -#~ msgid "Your PPPoE username" -#~ msgstr "Uw gebruikersnaam" - -#~ msgid "Interface name" -#~ msgstr "Interfacenaam" - -#~ msgid "" -#~ "Choose the name of the network interface connected to your PPPoE modem." -#~ msgstr "" -#~ "Kies de naam van de netwerkinterface die verwijst naar uw PPPoE-modem." diff -u ppp-2.4.4rel/debian/po/fr.po ppp-2.4.4rel/debian/po/fr.po --- ppp-2.4.4rel/debian/po/fr.po +++ ppp-2.4.4rel/debian/po/fr.po @@ -10,14 +10,16 @@ # or http://www.debian.org/intl/l10n/po-debconf/README-trans # # Developers do not need to manually edit POT or PO files. -# +# +# Former translator: +# Olivier Gauwin <[EMAIL PROTECTED]> msgid "" msgstr "" "Project-Id-Version: ppp 2.4.2\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-07-12 18:26+0200\n" +"POT-Creation-Date: 2006-07-09 20:03+0200\n" "PO-Revision-Date: 2004-03-02 11:18+0100\n" -"Last-Translator: Olivier Gauwin <[EMAIL PROTECTED]>\n" +"Last-Translator: Cyril Brulebois <[EMAIL PROTECTED]>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -27,15 +29,14 @@ #. Description #. Main menu item #: ../ppp-udeb.templates:1001 -#, fuzzy msgid "Configure and start a PPPoE connection" -msgstr "Configurer et d?marrer l'acc?s au r?seau par PPPoE" +msgstr "Configurer et activer les connexions r?seau PPPoE" #. Type: error #. Description #: ../ppp-udeb.templates:2001 msgid "No concentrator was found" -msgstr "" +msgstr "Aucun concentrateur trouv?" #. Type: error #. Description @@ -44,6 +45,8 @@ "All network interfaces have been probed, but a PPPoE concentrator was not " "detected." msgstr "" +"Toutes les interfaces r?seau ont ?t? test?es mais aucun concentrateur PPPoE " +"n'a ?t? d?tect?." #. Type: error #. Description @@ -54,18 +57,20 @@ "The configuration of PPPoE is aborted. It can be attempted again by " "selecting the relevant menu entry." msgstr "" +"La configuration de PPPoE est interrompue. Vous pouvez la tenter ? nouveau " +"en choisissant l'entr?e de menu correspondante." #. Type: string #. Description #: ../ppp-udeb.templates:4001 msgid "PPP login:" -msgstr "" +msgstr "Identifiant PPP?:" #. Type: string #. Description #: ../ppp-udeb.templates:4002 msgid "Please enter the username for the PPP connection." -msgstr "" +msgstr "Veuillez indiquer l'identifiant ? utiliser pour la connexion PPP." #. Type: string #. Description @@ -76,25 +81,26 @@ "This information should have been provided to you by your Internet Service " "Provider." msgstr "" +"Cette information est habituellement disponible aupr?s de votre Fournisseur " +"d'Acc?s Internet." #. Type: password #. Description #: ../ppp-udeb.templates:5001 -#, fuzzy msgid "PPP password:" -msgstr "Mot de passe?:" +msgstr "Mot de passe pour la connexion PPP ?:" #. Type: password #. Description #: ../ppp-udeb.templates:5002 msgid "Please enter the password for the PPP connection." -msgstr "" +msgstr "Veuillez indiquer le mot de passe pour la connexion PPP." #. Type: error #. Description #: ../ppp-udeb.templates:6001 msgid "No Ethernet interface found" -msgstr "" +msgstr "Aucune interface Ethernet trouv?e" #. Type: error #. Description @@ -106,19 +112,8 @@ +"La configuration PPPoE n'a pas pu ?tre effectu?e car aucune interface " +"Ethernet n'a ?t? d?tect?e." #. Type: progress #. Description #: ../ppp-udeb.templates:7001 msgid "Searching for concentrators on ${IFACE}..." -msgstr "" - -#, fuzzy -#~ msgid "Your PPPoE username" -#~ msgstr "Nom d'utilisateur?:" - -#~ msgid "Interface name" -#~ msgstr "Nom de l'interface?:" - -#~ msgid "" -#~ "Choose the name of the network interface connected to your PPPoE modem." -#~ msgstr "" -#~ "Veuillez choisir le nom de l'interface r?seau connect?e ? votre modem " -#~ "PPPoE." +msgstr "Recherche de concentrateurs sur ${IFACE}..." diff -u ppp-2.4.4rel/debian/po/ro.po ppp-2.4.4rel/debian/po/ro.po --- ppp-2.4.4rel/debian/po/ro.po +++ ppp-2.4.4rel/debian/po/ro.po @@ -15,22 +15,20 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" -"2:1))\n" +"Plural-Forms: nplurals=3;plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n" #. Type: text #. Description #. Main menu item #: ../ppp-udeb.templates:1001 -#, fuzzy msgid "Configure and start a PPPoE connection" -msgstr "Configureaz?? ??i porne??te re??elistica prin PPPoE" +msgstr "Configureaz?? ??i porne??te o conexiune PPPoE" #. Type: error #. Description #: ../ppp-udeb.templates:2001 msgid "No concentrator was found" -msgstr "" +msgstr "Nu s-a g??sit nici un concentrator" #. Type: error #. Description @@ -39,35 +37,32 @@ "All network interfaces have been probed, but a PPPoE concentrator was not " "detected." msgstr "" +"Au fost examinate toate interfe??ele, dar nu a fost detectat nici un concentrator " +"PPPoE." #. Type: error #. Description #. Type: error #. Description #: ../ppp-udeb.templates:2003 ../ppp-udeb.templates:6003 -#, fuzzy msgid "" "The configuration of PPPoE is aborted. It can be attempted again by " "selecting the relevant menu entry." msgstr "" -"Configurarea PPPoE este abandonat??. Poate fi ??ncercat?? din nou, mai t??rziu, " -"prin folosirea intr??rii relevante din meniul principal." +"Configurarea PPPoE este abandonat??. Poate fi ??ncercat?? din nou, " +"prin selectarea intr??rii relevante din meniu." #. Type: string #. Description #: ../ppp-udeb.templates:4001 -#, fuzzy msgid "PPP login:" -msgstr "Autentificare PPPoE:" +msgstr "Autentificare PPP:" #. Type: string #. Description #: ../ppp-udeb.templates:4002 -#, fuzzy msgid "Please enter the username for the PPP connection." -msgstr "" -"V?? rug??m s?? introduce??i numele de utilizator pentru conexiunea PPPoE care se " -"face prin interfa??a de re??ea ${IFACE}." +msgstr "Introduce??i numele de utilizator pentru conexiunea PPP." #. Type: string #. Description @@ -84,24 +79,21 @@ #. Type: password #. Description #: ../ppp-udeb.templates:5001 -#, fuzzy msgid "PPP password:" -msgstr "Parola pentru PPPoE:" +msgstr "Parola pentru PPP:" #. Type: password #. Description #: ../ppp-udeb.templates:5002 #, fuzzy msgid "Please enter the password for the PPP connection." -msgstr "" -"V?? rug??m s?? introduce??i parola pentru conexiunea PPPoE care se face prin " -"interfa??a de re??ea ${IFACE}." +msgstr "Introduce??i parola pentru conexiunea PPP." #. Type: error #. Description #: ../ppp-udeb.templates:6001 msgid "No Ethernet interface found" -msgstr "" +msgstr "Nu a fost g??sit?? nici o interfa???? Ethernet" #. Type: error #. Description @@ -110,13 +102,14 @@ "PPPoE networking cannot be configured because no Ethernet interface was " "detected." msgstr "" +"Conectarea prin PPPoe nu poate fi configurat?? deoarece nu a fost detectat?? " +"nici o interfa???? Ethernet." #. Type: progress #. Description #: ../ppp-udeb.templates:7001 -#, fuzzy msgid "Searching for concentrators on ${IFACE}..." -msgstr "Se caut?? concentratoare prin ${IFACE}" +msgstr "Se caut?? concentratoare prin ${IFACE}..." #~ msgid "Concentrator detection failed" #~ msgstr "Detec??ia concentratorului a e??uat" diff -u ppp-2.4.4rel/debian/po/cs.po ppp-2.4.4rel/debian/po/cs.po --- ppp-2.4.4rel/debian/po/cs.po +++ ppp-2.4.4rel/debian/po/cs.po @@ -16,26 +16,25 @@ "Project-Id-Version: ppp\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" "POT-Creation-Date: 2006-07-12 18:26+0200\n" -"PO-Revision-Date: 2004-04-17 18:23+0200\n" +"PO-Revision-Date: 2006-07-30 20:07+0200\n" "Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n" -"Language-Team: Czech <[EMAIL PROTECTED]>\n" +"Language-Team: Czech <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: text #. Description #. Main menu item #: ../ppp-udeb.templates:1001 -#, fuzzy msgid "Configure and start a PPPoE connection" -msgstr "Nastavit a spustit s??ov?n? p?es PPPoE" +msgstr "Nastavit a spustit PPPoE spojen??" #. Type: error #. Description #: ../ppp-udeb.templates:2001 msgid "No concentrator was found" -msgstr "" +msgstr "Nebyl nalezen ????dn?? koncentr??tor" #. Type: error #. Description @@ -44,6 +43,8 @@ "All network interfaces have been probed, but a PPPoE concentrator was not " "detected." msgstr "" +"Byla prov????ena v??echna s????ov?? rozhran??, ale nebyl rozpozn??n ????dn?? PPPoE " +"koncentr??tor." #. Type: error #. Description @@ -54,18 +55,20 @@ "The configuration of PPPoE is aborted. It can be attempted again by " "selecting the relevant menu entry." msgstr "" +"Nastaven?? PPPoE bude nyn?? p??eru??eno, m????ete se pokusit o nov?? nastaven?? " +"v??b??rem p????slu??n?? polo??ky v menu." #. Type: string #. Description #: ../ppp-udeb.templates:4001 msgid "PPP login:" -msgstr "" +msgstr "PPP p??ihl????en??:" #. Type: string #. Description #: ../ppp-udeb.templates:4002 msgid "Please enter the username for the PPP connection." -msgstr "" +msgstr "Zadejte pros??m u??ivatelsk?? jm??no pro toto PPP spojen??." #. Type: string #. Description @@ -76,25 +79,25 @@ "This information should have been provided to you by your Internet Service " "Provider." msgstr "" +"Tuto informaci by v??m m??l sd??lit v???? poskytovatel p??ipojen?? k Internetu." #. Type: password #. Description #: ../ppp-udeb.templates:5001 -#, fuzzy msgid "PPP password:" -msgstr "Va?e heslo" +msgstr "PPP heslo:" #. Type: password #. Description #: ../ppp-udeb.templates:5002 msgid "Please enter the password for the PPP connection." -msgstr "" +msgstr "Zadejte pros??m heslo pro toto PPP p??ipojen??." #. Type: error #. Description #: ../ppp-udeb.templates:6001 msgid "No Ethernet interface found" -msgstr "" +msgstr "Nebylo nalezeno ????dn?? ethernetov?? rozhran??" #. Type: error #. Description @@ -106,17 +109,8 @@ +"S????ov??n?? pomoc?? PPPoE nem????e b??t nastaveno, proto??e nebylo rozpozn??no ????dn?? " +"ethernetov?? rozhran??." #. Type: progress #. Description #: ../ppp-udeb.templates:7001 msgid "Searching for concentrators on ${IFACE}..." -msgstr "" - -#, fuzzy -#~ msgid "Your PPPoE username" -#~ msgstr "Va?e u?ivatelsk? jm?no" - -#~ msgid "Interface name" -#~ msgstr "Jm?no rozhran?" - -#~ msgid "" -#~ "Choose the name of the network interface connected to your PPPoE modem." -#~ msgstr "Vyberte rozhran?, kter? je p?ipojeno k va?emu PPPoE modemu." +msgstr "Hled??m koncentr??tory na ${IFACE}..." diff -u ppp-2.4.4rel/debian/control ppp-2.4.4rel/debian/control --- ppp-2.4.4rel/debian/control +++ ppp-2.4.4rel/debian/control @@ -23,9 +23,9 @@ XC-Package-Type: udeb Section: debian-installer Architecture: any -Depends: ${shlibs:Depends}, ethernet-card-detection, ppp-modules, di-utils +Depends: ${shlibs:Depends}, ethernet-card-detection, ppp-modules, di-utils, debconf Provides: configured-network -XB-Installer-Menu-Item: 18 +XB-Installer-Menu-Item: 17 Description: Point-to-Point Protocol (PPP) daemon The Point-to-Point Protocol (PPP) provides a standard way to transmit datagrams over a serial link, as well as a standard way for the machines diff -u ppp-2.4.4rel/debian/ppp-udeb.templates ppp-2.4.4rel/debian/ppp-udeb.templates --- ppp-2.4.4rel/debian/ppp-udeb.templates +++ ppp-2.4.4rel/debian/ppp-udeb.templates @@ -46,3 +46,3 @@ Template: ppp/detect_progress -Type: progress +Type: note _Description: Searching for concentrators on ${IFACE}... diff -u ppp-2.4.4rel/debian/changelog ppp-2.4.4rel/debian/changelog --- ppp-2.4.4rel/debian/changelog +++ ppp-2.4.4rel/debian/changelog @@ -1,3 +1,22 @@ +ppp (2.4.4rel-2.1) unstable; urgency=low + + * Non-maintainer upload with maintainer's consent. + * Add a Provides entry in the LSB type header (Closes: #386387). + * Updated Romanian debconf translation (Closes: #384191). + * Updated French debconf translation (Closes: #378636). + * Updated Czech debconf translation (Closes: #380529). + * Updated Spanish debconf translation (Closes: #384875). + * Updated Dutch debconf translation (Closes: #386769). + * Updated Swedisch debconf translation (Closes: #387028). + * Updated Japanese debconf translation (Closes: #390489). + * Sanitise debconf output for udeb (Closes: #385150). + - don't use db_stop in ppp-udeb.postinst. + - give ppp-udeb priority 17 in the menu so it runs before netcfg. + - don't fail when ppp is queued for installation (by apt-install). + * Fix PPPDIR (Closes: #384121, #392858). + + -- Luk Claes <[EMAIL PROTECTED]> Sun, 22 Oct 2006 22:41:53 +0200 + ppp (2.4.4rel-2) unstable; urgency=high * Make postinst not fail if /dev/MAKEDEV does not exist yet. diff -u ppp-2.4.4rel/debian/ppp.pppd-dns ppp-2.4.4rel/debian/ppp.pppd-dns --- ppp-2.4.4rel/debian/ppp.pppd-dns +++ ppp-2.4.4rel/debian/ppp.pppd-dns @@ -1,5 +1,6 @@ #!/bin/sh -e ### BEGIN INIT INFO +# Provides: pppd-dns # Required-Start: $local_fs # Default-Start: S # Short-Description: Restore resolv.conf if the system crashed. diff -u ppp-2.4.4rel/debian/ppp-udeb.postinst ppp-2.4.4rel/debian/ppp-udeb.postinst --- ppp-2.4.4rel/debian/ppp-udeb.postinst +++ ppp-2.4.4rel/debian/ppp-udeb.postinst @@ -117,8 +117,6 @@ db_unregister ppp/password db_unregister ppp/username -db_stop - cat <<EOF > /etc/ppp/peers/pppoe # kernel space PPPoE driver example configuration # @@ -195,7 +193,7 @@ # FIXME - how can this be improved? [ -e /etc/resolv.conf ] || ln -s /etc/ppp/resolv.conf /etc/resolv.conf -log-output apt-install ppp +log-output apt-install ppp || true #DEBHELPER# only in patch2: unchanged: --- ppp-2.4.4rel.orig/debian/ppp-udeb.todo +++ ppp-2.4.4rel/debian/ppp-udeb.todo @@ -0,0 +1,24 @@ +- idempotency + - use killall pppd? - this is barbaric, but for now we just support + one interface configuration, thus it would be reasonable for most + situations +- wrong authentication must be treated, not ignored +- how to blend well with netcfg? + - the new patch proposes assigning menu order 17 to ppp-udeb, so + is ran before netcfg +- finish-install.d was not working at some point in the past, but the + current situation is uncertain +- blend well with the rest of networking on an installed system (aka "do + not use symlinks for resolv.conf!") + - maybe the best thing would be to do what the deb package does + - this would mean no duplication of source code in the ppp + package, since the configuration would be roughly the same + - the configuration files would not be overwritten at each + ppp-udeb run, so if the user desires, some configuration + customisations would be preserved from one run to the + other even if the user modifies the configuration files + between runs, from the second console + - check what Frans was saying wrt to the netcfg-ppp conflict -it was + not possible to run netcfg after ppp-udeb (why?) + +# vim:tw=72:sw=4:ts=4:nowrap
