diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/changelog /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/changelog --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/changelog 2004-10-06 19:33:34.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/changelog 2005-01-18 17:51:02.000000000 +0000 @@ -1,3 +1,19 @@ +main-menu (1.02ubuntu2) hoary; urgency=low + + * Add support for executables in /lib/main-menu.d/, which get run at + main-menu startup. This allows packages to run scripts that need to + share main-menu's debconf frontend but that don't merit a menu item, + such as changing the background title. + + -- Colin Watson Tue, 18 Jan 2005 17:51:01 +0000 + +main-menu (1.02ubuntu1) hoary; urgency=low + + * Merge from Debian. + * Fix Catalan branding. + + -- Colin Watson Tue, 26 Oct 2004 17:36:42 +0100 + main-menu (1.02) unstable; urgency=low * Updated translations: @@ -131,6 +147,36 @@ -- Bastian Blank Sat, 10 Jul 2004 22:02:28 +0200 +main-menu (0.067ubuntu4) warty; urgency=low + + * Restore previous default priority when selecting a menu item immediately + after backing up to the main menu. + + -- Colin Watson Tue, 31 Aug 2004 20:18:53 +0100 + +main-menu (0.067ubuntu3) warty; urgency=low + + * Lower priority to medium after backup or menu item failure so that the + main menu is always displayed immediately (closes: Warty #687). + + -- Colin Watson Fri, 27 Aug 2004 13:56:20 +0100 + +main-menu (0.067ubuntu2) warty; urgency=low + + * Colin Watson + - Fixed Lithuanian translation of "Ubuntu", per Steve Alexander. + + -- Colin Watson Mon, 16 Aug 2004 17:04:37 +0100 + +main-menu (0.067ubuntu1) warty; urgency=low + + * Tollef Fog Heen + - Ubuntu branding. + * Colin Watson + - Update most translations. + + -- Colin Watson Thu, 12 Aug 2004 17:34:07 +0100 + main-menu (0.067) unstable; urgency=low * Matt Kraai diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/main-menu.templates /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/main-menu.templates --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/main-menu.templates 2004-08-18 09:54:23.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/main-menu.templates 2004-10-26 16:40:07.000000000 +0100 @@ -1,13 +1,13 @@ Template: debian-installer/main-menu-title Type: text -_Description: Debian installer main menu +_Description: Ubuntu installer main menu Template: debian-installer/main-menu Type: select Choices: ${MENU} Default: ${DEFAULT} _Description: Choose the next step in the install process: - This is the main menu for the Debian installer. + This is the main menu for the Ubuntu installer. Template: debian-installer/main-menu/item-failure Type: error diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ar.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ar.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ar.po 2004-09-01 22:17:20.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ar.po 2004-10-26 16:52:56.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: debian-installer_packages_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-08-31 22:05+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabeyes \n" @@ -25,8 +25,9 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "قائمة مثبّت دبيان الرّئيسيّة" +#, fuzzy +msgid "Ubuntu installer main menu" +msgstr "ألقائمة ألرئيسية لتركيب نظام دبيان" #. Type: select #. Description @@ -37,8 +38,9 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "هذه هي القائمة الرّئيسيّة لمثبّت دبيان." +#, fuzzy +msgid "This is the main menu for the Ubuntu installer." +msgstr "هذة ألقائمة ألرئيسية لتركيب نظام دبيان:" #. Type: error #. Description @@ -69,3 +71,23 @@ "This installation step depends on one or more other steps that have not yet " "been performed." msgstr "خطوة التّثبيت هذه تعتمد على خطوةٍ واحدة أو أكثر غيرها لم تنفّذ بعد." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "خطئ في تنفيذ ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "خطئ" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "ألخطئ التالي حصل خلال تشغيل ال ${PACKAGE}:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "قائمة مثبّت دبيان الرّئيسيّة" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "هذه هي القائمة الرّئيسيّة لمثبّت دبيان." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/bg.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/bg.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/bg.po 2004-10-05 20:51:31.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/bg.po 2004-10-26 17:06:10.000000000 +0100 @@ -12,20 +12,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 15:02+0300\n" "Last-Translator: Ognyan Kulev \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Главно меню на инсталатор на Debian" +msgid "Ubuntu installer main menu" +msgstr "Главно меню на инсталатор на Ubuntu" #. Type: select #. Description @@ -36,8 +36,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Това е главното меню на инсталатора на Debian" +msgid "This is the main menu for the Ubuntu installer." +msgstr "Това е главното меню на инсталатора на Ubuntu" #. Type: error #. Description @@ -71,3 +71,25 @@ msgstr "" "Тази инсталационна стъпка зависи от една или повече други стъпки, които все " "още не са изпълнени." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Грешка при изпълнението на ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Грешка" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Следната грешка или предупреждение беше забелязано по време на " +#~ "изпълнението на ${PACKAGE}" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Главно меню на инсталатор на Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Това е главното меню на инсталатора на Debian" diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/bs.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/bs.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/bs.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/bs.po 2004-10-26 16:52:56.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-08-29 09:47+0200\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Glavni meni Debian installera" +msgid "Ubuntu installer main menu" +msgstr "Glavni meni Ubuntu installera" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Ovo je glavni meni Debian installera." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Ovo je glavni meni Ubuntu installera." #. Type: error #. Description @@ -69,3 +69,9 @@ msgstr "" "Ovaj instalacijski korak zahtijeva jedan ili više prethodnih koraka koji još " "nisu obavljeni." + +#~ msgid "Debian installer main menu" +#~ msgstr "Glavni meni Debian installera" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Ovo je glavni meni Debian installera." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ca.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ca.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ca.po 2004-10-06 19:17:12.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ca.po 2004-10-26 17:08:38.000000000 +0100 @@ -11,20 +11,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 03:18+0200\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Menú principal de l'instal·lador de Debian" +msgid "Ubuntu installer main menu" +msgstr "Menú principal de l'instal·lador d'Ubuntu" #. Type: select #. Description @@ -35,8 +35,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Aquest és el menú principal de l'instal·lador de Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Aquest és el menú principal de l'instal·lador d'Ubuntu." #. Type: error #. Description @@ -70,3 +70,25 @@ msgstr "" "Aquest pas de la configuració depén en un o més passos addicionals que " "encara no s'han dut a terme." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "S'ha produït un error en executar ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Error" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "S'ha registrat el següent missatge d'error o avís mentre s'executava " +#~ "${PACKAGE}:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Menú principal de l'instal·lador de Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Aquest és el menú principal de l'instal·lador de Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/cs.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/cs.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/cs.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/cs.po 2004-10-26 17:09:22.000000000 +0100 @@ -10,19 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 19:51+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" +#, fuzzy +msgid "Ubuntu installer main menu" msgstr "Hlavní menu instalace Debianu" #. Type: select @@ -34,7 +35,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." +#, fuzzy +msgid "This is the main menu for the Ubuntu installer." msgstr "Toto je hlavní menu instalačního programu Debianu." #. Type: error @@ -68,3 +70,9 @@ msgstr "" "Tento instalační krok závisí na jednom nebo více krocích, které ještě nebyly " "provedeny." + +#~ msgid "Debian installer main menu" +#~ msgstr "Hlavní menu instalace Debianu" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Toto je hlavní menu instalačního programu Debianu." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/cy.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/cy.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/cy.po 2004-10-06 18:25:32.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/cy.po 2004-10-26 16:52:57.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-06 08:15+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Prif ddewislen sefydlydd Debian" +msgid "Ubuntu installer main menu" +msgstr "Prif ddewislen sefydlydd Ubuntu" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Dyma brif ddewislen y sefydlydd Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Dyma brif ddewislen y sefydlydd Ubuntu." #. Type: error #. Description @@ -68,3 +68,9 @@ msgstr "" "Mae'r cam sefydlu yma yn dibynnu ar un neu fwy cam arall nid ydynt wedi eu " "cyflawni eto." + +#~ msgid "Debian installer main menu" +#~ msgstr "Prif ddewislen sefydlydd Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Dyma brif ddewislen y sefydlydd Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/da.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/da.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/da.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/da.po 2004-10-26 17:13:35.000000000 +0100 @@ -11,22 +11,22 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 12:09+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "\n" "Language-Team: Debian German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 0.9.5\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian-Installer Hauptmenü" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu-Installer Hauptmenü" #. Type: select #. Description @@ -43,8 +43,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Dies ist das Hauptmenü des Debian-Installers" +msgid "This is the main menu for the Ubuntu installer." +msgstr "Dies ist das Hauptmenü des Ubuntu-Installers" #. Type: error #. Description @@ -78,3 +78,9 @@ msgstr "" "Dieser Konfigurationsschritt benötigt einen oder mehrere " "Konfigurationsschritte, die noch nicht gemacht wurden." + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian-Installer Hauptmenü" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Dies ist das Hauptmenü des Debian-Installers" diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/el.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/el.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/el.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/el.po 2004-10-26 16:52:58.000000000 +0100 @@ -17,7 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: el\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-02 10:41+0300\n" "Last-Translator: Greek Translation Team \n" @@ -25,7 +26,6 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "org>\n" "org>\n" "org>\n" @@ -38,8 +38,8 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Κυρίως Μενού της Εγκατάστασης του Debian" +msgid "Ubuntu installer main menu" +msgstr "Κυρίως Μενού της Εγκατάστασης του Ubuntu" #. Type: select #. Description @@ -50,9 +50,9 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." +msgid "This is the main menu for the Ubuntu installer." msgstr "" -"Αυτό ειναι το κύριο μενού επιλογών του προγράμματος εγκαταστάσης του Debian." +"Αυτό ειναι το κύριο μενού επιλογών του προγράμματος εγκαταστάσης του Ubuntu." #. Type: error #. Description @@ -86,3 +86,11 @@ msgstr "" "Η συγκεκριμένη εργασία εξαρτάται από μία άλλη ή περισσότερες εργασίες που " "δεν έχουν ολοκληρωθεί." + +#~ msgid "Debian installer main menu" +#~ msgstr "Κυρίως Μενού της Εγκατάστασης του Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "" +#~ "Αυτό ειναι το κύριο μενού επιλογών του προγράμματος εγκαταστάσης του " +#~ "Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/es.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/es.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/es.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/es.po 2004-10-26 16:52:58.000000000 +0100 @@ -36,20 +36,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 08:48+0200\n" "Last-Translator: Javier Fernandez-Sanguino Peña \n" "Language-Team: Debian Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Menú principal del instalador de Debian" +msgid "Ubuntu installer main menu" +msgstr "Menú principal del instalador de Ubuntu" #. Type: select #. Description @@ -60,8 +60,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Éste es el menú principal del instalador de Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Éste es el menú principal del instalador de Ubuntu." #. Type: error #. Description @@ -95,3 +95,23 @@ msgstr "" "Esta etapa de configuración depende de una o varias etapas de configuración " "que aún no se han realizado." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Error al ejecutar ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Error" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "Se registró un error o mensaje de aviso al ejecutar ${PACKAGE}" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Menú principal del instalador de Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Éste es el menú principal del instalador de Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/eu.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/eu.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/eu.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/eu.po 2004-10-26 16:52:58.000000000 +0100 @@ -11,22 +11,22 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 00:08+0200\n" "Last-Translator: Piarres Beobide Egaña \n" "Language-Team: Euskara \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian instalatzailearen menu nagusia" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu instalatzailearen menu nagusia" #. Type: select #. Description @@ -37,8 +37,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Hau Debian instalatzailearen menu nagusia da" +msgid "This is the main menu for the Ubuntu installer." +msgstr "Hau Ubuntu instalatzailearen menu nagusia da" #. Type: error #. Description @@ -72,3 +72,9 @@ msgstr "" "Instalazio hurrats honek oraindik egin ez duzun beste bat (edo gehiago) " "aurretik egina egotea behar du." + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian instalatzailearen menu nagusia" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Hau Debian instalatzailearen menu nagusia da" diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/fa.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/fa.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/fa.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/fa.po 2004-10-26 16:52:58.000000000 +0100 @@ -10,19 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-06 10:53+0200\n" "Last-Translator: Arash Bijanzadeh \n" "Language-Team: Farsi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" +#, fuzzy +msgid "Ubuntu installer main menu" msgstr "منوی اصلی نصب‌کننده‌ی دبیان" #. Type: select @@ -34,7 +35,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." +#, fuzzy +msgid "This is the main menu for the Ubuntu installer." msgstr "این منوی اصلی نصب‌کننده‌ی دیان است." #. Type: error @@ -67,3 +69,23 @@ "been performed." msgstr "" "این مرحله وابسته ب یک یا چند مرحله‌ی دیگر است که هنوز انجام نگردیده است." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "خطا در اجرای بسته‌ی ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "خطا" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "خطا یا اخطار زیر هنگام اجرای ${PACKAGE}: ثبت شده است." + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "منوی اصلی نصب‌کننده‌ی دبیان" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "این منوی اصلی نصب‌کننده‌ی دیان است." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/fi.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/fi.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/fi.po 2004-10-05 20:51:32.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/fi.po 2004-10-26 16:52:58.000000000 +0100 @@ -13,20 +13,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 02:09+0300\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian-asennusohjelman päävalikko" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu-asennusohjelman päävalikko" #. Type: select #. Description @@ -37,8 +37,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Tämä on Debian-asennusohjelman eli asentimen päävalikko." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Tämä on Ubuntu-asennusohjelman eli asentimen päävalikko." #. Type: error #. Description @@ -72,3 +72,25 @@ msgstr "" "Tämä asennustapahtuman vaihe riippuu yhdestä tai useammasta muusta vaiheesta " "joita ei ole vielä tehty." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Virhe suoritettaessa ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Virhe" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Seuraava virhe- tai varoitusviesti kirjattiin lokiin suoritettaessa " +#~ "${PACKAGE}:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian-asennusohjelman päävalikko" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Tämä on Debian-asennusohjelman eli asentimen päävalikko." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/fr.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/fr.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/fr.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/fr.po 2004-10-26 17:19:13.000000000 +0100 @@ -16,22 +16,22 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 08:52+0200\n" "Last-Translator: French Team \n" "Language-Team: French \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" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Menu principal du programme d'installation Debian" +msgid "Ubuntu installer main menu" +msgstr "Menu principal du programme d'installation Ubuntu" #. Type: select #. Description @@ -42,8 +42,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Voici le menu principal du programme d'installation Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Voici le menu principal du programme d'installation Ubuntu." #. Type: error #. Description @@ -77,3 +77,9 @@ msgstr "" "Cette tape de configuration dpend d'une ou de plusieurs tapes pralables " "que vous n'avez pas encore traites." + +#~ msgid "Debian installer main menu" +#~ msgstr "Menu principal du programme d'installation Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Voici le menu principal du programme d'installation Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/gl.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/gl.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/gl.po 2004-08-25 12:40:20.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/gl.po 2004-10-26 16:52:59.000000000 +0100 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: debian-installer_packages_main-menu_gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-04-08 02:07+0200\n" "Last-Translator: Hctor Fernndez Lpez \n" "Language-Team: Proxecto Trasno \n" @@ -25,8 +25,8 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Men principal da instalacin de Debian" +msgid "Ubuntu installer main menu" +msgstr "Men principal da instalacin de Ubuntu" #. Type: select #. Description @@ -37,8 +37,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Este o men principal do instalador de Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Este o men principal do instalador de Ubuntu." #. Type: error #. Description @@ -72,3 +72,9 @@ msgstr "" "Este paso da instalacin depende doutro ou doutros que non foron feitos " "anda." + +#~ msgid "Debian installer main menu" +#~ msgstr "Men principal da instalacin de Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Este o men principal do instalador de Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/he.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/he.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/he.po 2004-10-06 18:25:32.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/he.po 2004-10-26 16:52:59.000000000 +0100 @@ -12,20 +12,24 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-06 02:04+0200\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Debian L10n Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" +# Type: text +# Description +# Type: text +# Description #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian installer main menu" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu installer main menu" #. Type: select #. Description @@ -36,8 +40,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "זה המסך הראשי של מתקין Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "זה המסך הראשי של מתקין Ubuntu." #. Type: error #. Description @@ -68,3 +72,9 @@ "This installation step depends on one or more other steps that have not yet " "been performed." msgstr "שלב ההתקנה הזה תלוי בשלב או שלבי התקנה אחרים שעדיין לא בוצעו." + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian installer main menu" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "זה המסך הראשי של מתקין Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/hr.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/hr.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/hr.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/hr.po 2004-10-26 17:20:01.000000000 +0100 @@ -11,20 +11,20 @@ msgid "" msgstr "" "Project-Id-Version: Debian-installer 1st-stage master file HR\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 21:45+0200\n" "Last-Translator: Krunoslav Gernhard \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Glavni izabirnik Debian-instalacije" +msgid "Ubuntu installer main menu" +msgstr "Glavni izabirnik Ubuntu-instalacije" #. Type: select #. Description @@ -35,8 +35,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Ovo je glavni izabirnik Debian-instalacije." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Ovo je glavni izabirnik Ubuntu-instalacije." #. Type: error #. Description diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/hu.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/hu.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/hu.po 2004-10-06 19:17:12.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/hu.po 2004-10-26 16:52:59.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-05 22:24+0200\n" "Last-Translator: VEROK Istvan \n" "Language-Team: Debian L10n Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "A Debian-telepítő főmenüje" +msgid "Ubuntu installer main menu" +msgstr "A Ubuntu-telepítő főmenüje" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Ez a Debian-telepítő főmenüje." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Ez a Ubuntu-telepítő főmenüje." #. Type: error #. Description @@ -68,3 +68,25 @@ "been performed." msgstr "" "Ez a telepítőlépés egy vagy több még meg nem történt lépés eredményére épít." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Futtatási hiba: ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Hiba" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Egy rész (${PACKAGE}) futtatásakor a következő figyelmeztető vagy " +#~ "hibaüzenet naplózása történt:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "A Debian-telepítő főmenüje" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Ez a Debian-telepítő főmenüje." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/id.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/id.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/id.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/id.po 2004-10-26 17:22:00.000000000 +0100 @@ -18,7 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-02 16:27+0700\n" "Last-Translator: Debian Indonesia Team \n" "Language-Team: Debian Indonesia Team \n" "Language-Team: debian italian translators \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Menu principale dell'installatore Debian" +msgid "Ubuntu installer main menu" +msgstr "Menu principale dell'installatore Ubuntu" #. Type: select #. Description @@ -33,8 +33,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Questo è il menu principale dell'installatore Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Questo è il menu principale dell'installatore Ubuntu." #. Type: error #. Description @@ -84,3 +84,9 @@ #~ msgid "${ERROR}" #~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Menu principale dell'installatore Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Questo è il menu principale dell'installatore Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ja.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ja.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ja.po 2004-10-05 20:51:32.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ja.po 2004-10-26 16:53:00.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-03 10:08+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Debian L10n Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian インストーラメインメニュー" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu インストーラメインメニュー" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "これは Debian インストーラのメインメニューです。" +msgid "This is the main menu for the Ubuntu installer." +msgstr "これは Ubuntu インストーラのメインメニューです。" #. Type: error #. Description @@ -69,3 +69,9 @@ msgstr "" "このインストールステップはまだ行われていない 1 つ以上のほかのステップを必要と" "します。" + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian インストーラメインメニュー" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "これは Debian インストーラのメインメニューです。" diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ko.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ko.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ko.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ko.po 2004-10-26 16:53:00.000000000 +0100 @@ -10,19 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 22:56+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" +#, fuzzy +msgid "Ubuntu installer main menu" msgstr "데비안 설치 프로그램 메인 메뉴" #. Type: select @@ -34,7 +35,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." +#, fuzzy +msgid "This is the main menu for the Ubuntu installer." msgstr "데비안 설치 프로그램의 메인 메뉴입니다." #. Type: error @@ -66,3 +68,23 @@ "This installation step depends on one or more other steps that have not yet " "been performed." msgstr "설치 단계는 어떤 단계를 아직 수행하지 않았느냐에 따라 결정됩니다." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "${PACKAGE} 실행에 오류가 발생했습니다" + +#~ msgid "Error" +#~ msgstr "오류" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "${PACKAGE} 실행에서 다음 오류 혹은 경고 메세지가 기록되었습니다:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "데비안 설치 프로그램 메인 메뉴" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "데비안 설치 프로그램의 메인 메뉴입니다." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/lt.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/lt.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/lt.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/lt.po 2004-10-26 16:53:00.000000000 +0100 @@ -11,21 +11,21 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 11:29+0300\n" "Last-Translator: Kęstutis Biliūnas\n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.3.1\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian'o įdiegiklio pagrindinis meniu" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu įdiegiklio pagrindinis meniu" #. Type: select #. Description @@ -36,8 +36,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Tai yra pagrindinis Debian'o įdiegiklio meniu." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Tai yra pagrindinis Ubuntu įdiegiklio meniu." #. Type: error #. Description @@ -71,3 +71,9 @@ msgstr "" "Šis diegimo žingsnis priklauso nuo vieno ar kelių kitų, kol kas dar " "neatliktų žingsnių." + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian'o įdiegiklio pagrindinis meniu" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Tai yra pagrindinis Debian'o įdiegiklio meniu." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/lv.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/lv.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/lv.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/lv.po 2004-10-26 17:28:38.000000000 +0100 @@ -11,20 +11,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-02 02:08+0300\n" "Last-Translator: Aigars Mahinovs \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian instalātora galvenā izvēlne." +msgid "Ubuntu installer main menu" +msgstr "Ubuntu instalātora galvenā izvēlne." #. Type: select #. Description @@ -35,8 +35,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Šī ir Debian instalātora galvenā izvēlne." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Šī ir Ubuntu instalātora galvenā izvēlne." #. Type: error #. Description @@ -70,3 +70,20 @@ msgstr "" "Šī instalācijas soļa izpilde ir atkarīga no citu instalācijas soļu izpildes " "pirms šī soļa un tie vēl nav izpildīti." + +#, fuzzy +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Kļūda vai brīdinājuma ziņojums tika pamanīts laikā kamēr tika palaists " +#~ "${PACKAGE}" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian instalātora galvenā izvēlne." + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Šī ir Debian instalātora galvenā izvēlne." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/nb.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/nb.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/nb.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/nb.po 2004-10-26 16:53:01.000000000 +0100 @@ -16,21 +16,21 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 10:18+0200\n" "Last-Translator: Bjorn Steensrud \n" "Language-Team: Norwegian Bokmål \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.9\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Hovedmenyen for installeringen av Debian" +msgid "Ubuntu installer main menu" +msgstr "Hovedmenyen for installeringen av Ubuntu" #. Type: select #. Description @@ -41,8 +41,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Dette er hovedmenyen for installeringen av Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Dette er hovedmenyen for installeringen av Ubuntu." #. Type: error #. Description @@ -76,3 +76,9 @@ msgstr "" "Dette trinnet av installasjonen forutsetter ett eller flere trinn som ennå " "ikke er blitt utført." + +#~ msgid "Debian installer main menu" +#~ msgstr "Hovedmenyen for installeringen av Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Dette er hovedmenyen for installeringen av Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/nl.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/nl.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/nl.po 2004-08-25 12:40:21.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/nl.po 2004-10-26 16:53:01.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: main-menu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-04-06 18:05+0100\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" @@ -26,8 +26,8 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Hoofdmenu Debian-installatieprogramma" +msgid "Ubuntu installer main menu" +msgstr "Hoofdmenu Ubuntu-installatieprogramma" #. Type: select #. Description @@ -38,8 +38,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Dit is het hoofdmenu van het Debian-installatieprogramma." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Dit is het hoofdmenu van het Ubuntu-installatieprogramma" #. Type: error #. Description @@ -72,3 +72,9 @@ msgstr "" "Deze installatiestap is afhankelijk van n of meer nog niet uitgevoerde " "installatiestappen." + +#~ msgid "Debian installer main menu" +#~ msgstr "Hoofdmenu Debian-installatieprogramma" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Dit is het hoofdmenu van het Debian-installatieprogramma." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/nn.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/nn.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/nn.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/nn.po 2004-10-26 16:53:01.000000000 +0100 @@ -13,22 +13,22 @@ msgid "" msgstr "" "Project-Id-Version: nn\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 19:28+0200\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian nynorsk \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "nynorsk@lists.debian.org>\n" "X-Generator: KBabel 1.0.2\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Hovudmenyen i Debian-installeringa" +msgid "Ubuntu installer main menu" +msgstr "Hovudmenyen i Ubuntu-installeringa" #. Type: select #. Description @@ -39,8 +39,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Dette er hovudmenyen i Debian-installeringa." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Dette er hovudmenyen i Ubuntu-installeringa." #. Type: error #. Description @@ -74,3 +74,9 @@ msgstr "" "Dette installasjonssteget krev eitt eller fleire steg som ikkje er utførde " "enno." + +#~ msgid "Debian installer main menu" +#~ msgstr "Hovudmenyen i Debian-installeringa" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Dette er hovudmenyen i Debian-installeringa." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/pl.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/pl.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/pl.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/pl.po 2004-10-26 16:53:01.000000000 +0100 @@ -11,19 +11,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 08:55+0200\n" "Last-Translator: Bartosz Fenski \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" +#, fuzzy +msgid "Ubuntu installer main menu" msgstr "Menu gwne instalatora Debiana" #. Type: select @@ -35,7 +36,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." +#, fuzzy +msgid "This is the main menu for the Ubuntu installer." msgstr "To jest menu gwne instalatora Debiana." #. Type: error @@ -70,3 +72,9 @@ msgstr "" "Ten etap instalacji zaley od jednego lub wikszej iloci innych etapw, " "ktre nie zostay jeszcze wykonane." + +#~ msgid "Debian installer main menu" +#~ msgstr "Menu gwne instalatora Debiana" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "To jest menu gwne instalatora Debiana." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/pt.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/pt.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/pt.po 2004-08-25 12:40:21.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/pt.po 2004-10-26 16:53:01.000000000 +0100 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: main-menu 0.063\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-04-10 23:05+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -24,8 +24,8 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Menu principal do instalador Debian" +msgid "Ubuntu installer main menu" +msgstr "Menu principal do instalador Ubuntu" #. Type: select #. Description @@ -36,8 +36,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Este é o menu principal do instalador Debian" +msgid "This is the main menu for the Ubuntu installer." +msgstr "Este é o menu principal do instalador Ubuntu" #. Type: error #. Description @@ -86,3 +86,9 @@ #~ msgid "${ERROR}" #~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Menu principal do instalador Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Este é o menu principal do instalador Debian" diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/pt_BR.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/pt_BR.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/pt_BR.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/pt_BR.po 2004-10-26 16:53:02.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-03 18:05-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debia-BR Project \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Menu principal do instalador Debian" +msgid "Ubuntu installer main menu" +msgstr "Menu principal do instalador Ubuntu" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Este é o menu principal do instalador Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Este é o menu principal do instalador Ubuntu." #. Type: error #. Description @@ -69,3 +69,25 @@ msgstr "" "Esta etapa de instalação depende de uma ou mais etapas que ainda não foram " "executadas." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Error na execução de ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Erro" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Um erro ou mensagem de aviso a seguir foi logado na execução de " +#~ "${PACKAGE} :" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Menu principal do instalador Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Este é o menu principal do instalador Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ro.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ro.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ro.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ro.po 2004-10-26 16:53:02.000000000 +0100 @@ -21,21 +21,21 @@ msgid "" msgstr "" "Project-Id-Version: cdrom-detect\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-04 20:43+0300\n" "Last-Translator: Eddy Petrisor \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.3.1\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Meniul principal al instaler-ului Debian" +msgid "Ubuntu installer main menu" +msgstr "Meniul principal al instaler-ului Ubuntu" #. Type: select #. Description @@ -46,8 +46,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Acesta este meniul principal pentru instaler-ul Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Acesta este meniul principal pentru instaler-ul Ubuntu." #. Type: error #. Description @@ -81,3 +81,9 @@ msgstr "" "Acest pas al instalării depinde de unul sau mai mulţi alţi paşi care nu au " "fost parcurşi." + +#~ msgid "Debian installer main menu" +#~ msgstr "Meniul principal al instaler-ului Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Acesta este meniul principal pentru instaler-ul Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ru.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ru.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/ru.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/ru.po 2004-10-26 16:53:02.000000000 +0100 @@ -13,14 +13,14 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 17:34+0200\n" "Last-Translator: Russian L10N Team \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -32,8 +32,8 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Основное меню инсталлятора Debian" +msgid "Ubuntu installer main menu" +msgstr "Основное меню инсталлятора Ubuntu" #. Type: select #. Description @@ -44,8 +44,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Это главное меню инсталлятора Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Это главное меню инсталлятора Ubuntu." #. Type: error #. Description @@ -77,3 +77,9 @@ "been performed." msgstr "" "Этот этап установки требует завершения другого, еще не выполненного этапа." + +#~ msgid "Debian installer main menu" +#~ msgstr "Основное меню инсталлятора Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Это главное меню инсталлятора Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sk.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sk.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sk.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sk.po 2004-10-26 17:33:01.000000000 +0100 @@ -10,19 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 10:56+0200\n" "Last-Translator: Peter KLFMANiK Mann \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" +#, fuzzy +msgid "Ubuntu installer main menu" msgstr "Hlavné menu inštalačného programu Debianu" #. Type: select @@ -34,7 +35,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." +#, fuzzy +msgid "This is the main menu for the Ubuntu installer." msgstr "Toto je hlavné menu inštalačného programu Debianu." #. Type: error @@ -68,3 +70,25 @@ msgstr "" "Tento inštalačný krok závisí na jednom alebo viacerých krokoch, ktoré ešte " "neboli vykonané." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Chyba pri spustení ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Chyba" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Pri spustení ${PACKAGE} bola zaznamenaná nasledujúca chyba alebo varovná " +#~ "správa:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Hlavné menu inštalačného programu Debianu" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Toto je hlavné menu inštalačného programu Debianu." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sl.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sl.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sl.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sl.po 2004-10-26 16:53:02.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 22:28+0100\n" "Last-Translator: Jure Čuhalev \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Glavni meni Debian namestilnika" +msgid "Ubuntu installer main menu" +msgstr "Glavni meni Ubuntu namestilnika" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "To je glavni meni Debian namestilnika." +msgid "This is the main menu for the Ubuntu installer." +msgstr "To je glavni meni Ubuntu namestilnika." #. Type: error #. Description @@ -69,3 +69,9 @@ msgstr "" "Ta korak nastavitev je odvisen od enega ali več drugih korakov, ki jih še " "niste izvedli." + +#~ msgid "Debian installer main menu" +#~ msgstr "Glavni meni Debian namestilnika" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "To je glavni meni Debian namestilnika." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sq.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sq.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sq.po 2004-10-05 20:51:29.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sq.po 2004-10-26 16:53:03.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-09-30 23:36+0200\n" "Last-Translator: Elian Myftiu \n" "Language-Team: Debian L10n Albanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Menuja kryesore e instaluesit Debian" +msgid "Ubuntu installer main menu" +msgstr "Menuja kryesore e instaluesit Ubuntu" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Kjo është menuja kryesore e instaluesit Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Kjo është menuja kryesore e instaluesit Ubuntu." #. Type: error #. Description @@ -68,3 +68,25 @@ msgstr "" "Ky hap instalimi varet nga një apo më tepër hapa të tjerë që nuk janë " "ndërmarrë akoma." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Gabim dukë përmbushur ${PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Gabim" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Gabimi apo paralajmërimi i mëposhtëm u regjistrua duke përmbushur " +#~ "${PACKAGE}:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Menuja kryesore e instaluesit Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Kjo është menuja kryesore e instaluesit Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sv.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sv.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/sv.po 2004-10-05 20:51:32.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/sv.po 2004-10-26 16:53:03.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 20:17+0200\n" "Last-Translator: Per Olofsson \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Huvudmeny i Debians installationsprogram." +msgid "Ubuntu installer main menu" +msgstr "Huvudmeny i Ubuntus installationsprogram." #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Det här är huvudmenyn i Debians installationsprogram." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Det här är huvudmenyn i Ubuntus installationsprogram." #. Type: error #. Description @@ -69,3 +69,24 @@ msgstr "" "Det här installationssteget kräver ett eller flera andra steg som ännu inte " "har utförts." + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "Fel vid körning av {$PACKAGE}" + +#~ msgid "Error" +#~ msgstr "Fel" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "" +#~ "Följande fel- eller varningsmeddelande loggades medan {$PACKAGE} kördes:" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Huvudmeny i Debians installationsprogram." + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Det här är huvudmenyn i Debians installationsprogram." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/templates.pot /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/templates.pot --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/templates.pot 2004-08-19 08:59:43.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/templates.pot 2004-10-26 16:43:01.000000000 +0100 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,7 +27,7 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" +msgid "Ubuntu installer main menu" msgstr "" #. Type: select @@ -39,7 +39,7 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." +msgid "This is the main menu for the Ubuntu installer." msgstr "" #. Type: error diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/tr.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/tr.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/tr.po 2004-10-05 20:51:30.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/tr.po 2004-10-26 17:34:07.000000000 +0100 @@ -16,21 +16,21 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-01 23:55+0300\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Debian L10n Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" "Plural-Forms: nplurals=1; plural=0;\n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian Kur ana menüsü" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu Kur ana menüsü" #. Type: select #. Description @@ -41,8 +41,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Şu an Debian kurulum programının ana menüsündesiniz." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Şu an Ubuntu kurulum programının ana menüsündesiniz." #. Type: error #. Description @@ -75,3 +75,9 @@ "been performed." msgstr "" "Bu kurulum adımı henüz icra edilmemiş diğer bazı adımları gerektiriyor." + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian Kur ana menüsü" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Şu an Debian kurulum programının ana menüsündesiniz." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/uk.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/uk.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/uk.po 2004-08-25 12:40:20.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/uk.po 2004-10-26 16:53:03.000000000 +0100 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: main-menu-templates_uk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-04-03 14:26+0300\n" "Last-Translator: Eugeniy Meshcheryakov \n" "Language-Team: Ukrainian\n" @@ -29,8 +29,8 @@ #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Головне меню встановлювача Debian" +msgid "Ubuntu installer main menu" +msgstr "Головне меню встановлювача Ubuntu" #. Type: select #. Description @@ -41,8 +41,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "Це головне меню встановлювача Debian." +msgid "This is the main menu for the Ubuntu installer." +msgstr "Це головне меню встановлювача Ubuntu." #. Type: error #. Description @@ -89,3 +89,9 @@ #~ msgid "${ERROR}" #~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Головне меню встановлювача Debian" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "Це головне меню встановлювача Debian." diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/zh_CN.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/zh_CN.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/zh_CN.po 2004-10-05 20:51:32.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/zh_CN.po 2004-10-26 16:53:03.000000000 +0100 @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-02 02:23+1200\n" "Last-Translator: Carlos Z.F. Liu \n" "Language-Team: Debian Chinese [GB] \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: \n" #. Type: text #. Description #: ../main-menu.templates:3 -msgid "Debian installer main menu" -msgstr "Debian 安装程序主菜单" +msgid "Ubuntu installer main menu" +msgstr "Ubuntu 安装程序主菜单" #. Type: select #. Description @@ -34,8 +34,8 @@ #. Type: select #. Description #: ../main-menu.templates:9 -msgid "This is the main menu for the Debian installer." -msgstr "这是 Debian 安装程序的主菜单。" +msgid "This is the main menu for the Ubuntu installer." +msgstr "这是 Ubuntu 安装程序的主菜单。" #. Type: error #. Description @@ -66,3 +66,23 @@ "This installation step depends on one or more other steps that have not yet " "been performed." msgstr "这一安装步骤依赖于另外的一个或多个尚未进行的步骤。" + +#~ msgid "Error running ${PACKAGE}" +#~ msgstr "运行 ${PACKAGE} 过程中发生错误" + +#~ msgid "Error" +#~ msgstr "错误" + +#~ msgid "" +#~ "The following error or warning message was logged while running " +#~ "${PACKAGE}:" +#~ msgstr "在运行 ${PACKAGE} 的过程中，记录了如下错误或警告信息：" + +#~ msgid "${ERROR}" +#~ msgstr "${ERROR}" + +#~ msgid "Debian installer main menu" +#~ msgstr "Debian 安装程序主菜单" + +#~ msgid "This is the main menu for the Debian installer." +#~ msgstr "这是 Debian 安装程序的主菜单。" diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/zh_TW.po /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/zh_TW.po --- /tmp/Z27oCU1Dnq/main-menu-1.02/debian/po/zh_TW.po 2004-10-06 18:25:32.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/debian/po/zh_TW.po 2004-10-26 16:53:03.000000000 +0100 @@ -10,7 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: debian-installer\n" -"POT-Creation-Date: 2004-08-19 09:28+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 16:42+0100\n" "PO-Revision-Date: 2004-10-06 10:37+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] #include #include +#include +#include const int RAISE = 1; const int LOWER = 0; @@ -266,7 +268,7 @@ menu_entry(debconf, language, menudefault, buf, sizeof (buf)); debconf_set(debconf, MAIN_MENU, buf); } - debconf_input(debconf, "medium", MAIN_MENU); + debconf_input(debconf, MENU_PRIORITY, MAIN_MENU); debconf_go(debconf); debconf_get(debconf, MAIN_MENU); s = strdup(debconf->value); @@ -472,9 +474,20 @@ #define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0])) static void modify_debconf_priority (int raise_or_lower) { int pri, i; + static int menu_pri = -1; const char *template = "debconf/priority"; debconf_get(debconf, template); + if (menu_pri == -1) { + for (i = 0; (size_t)i < ARRAY_SIZE(debconf_priorities); ++i) { + if (0 == strcmp(MENU_PRIORITY, + debconf_priorities[i]) ) { + menu_pri = i; + break; + } + } + } + pri = 1; if ( debconf->value ) { for (i = 0; (size_t)i < ARRAY_SIZE(debconf_priorities); ++i) { @@ -485,8 +498,14 @@ } } } - if (raise_or_lower == LOWER) + if (raise_or_lower == LOWER) { --pri; + /* Make sure the menu is always displayed after a single + * backing up. + */ + if (menu_pri != -1 && pri > menu_pri) + pri = menu_pri; + } else if (raise_or_lower == RAISE) ++pri; if (0 > pri) @@ -527,6 +546,14 @@ } } +static void restore_default_priority (void) { + const char *template = "debconf/priority"; + + di_log(DI_LOG_LEVEL_INFO, "Restoring default debconf priority '%s'", + debconf_priorities[default_priority] ? debconf_priorities[default_priority] : "(null)"); + debconf_set(debconf, template, debconf_priorities[default_priority]); +} + void notify_user_of_failure (di_system_package *p) { char *language = NULL; char buf[256]; @@ -542,11 +569,62 @@ debconf_capb(debconf, "backup"); } +/* Cheap-and-cheerful run-parts-a-like for /lib/main-menu.d. Allows packages + * to register scripts to be run at main-menu startup that need to share + * main-menu's debconf frontend but that don't merit a menu item, such as + * changing the background title. + */ +static void menu_startup (void) { + struct dirent **namelist; + int entries, i; + + /* scandir() isn't POSIX, but it makes things easy. */ + entries = scandir(MAIN_MENU_DIR, &namelist, NULL, alphasort); + if (entries < 0) + return; + + for (i = 0; i < entries; ++i) { + size_t len; + char *filename; + struct stat st; + int ret; + + /* sizeof(MAIN_MENU_DIR) includes trailing \0 */ + len = sizeof(MAIN_MENU_DIR) + 1 + strlen(namelist[i]->d_name); + filename = di_new(char, len); + snprintf(filename, len, "%s/%s", MAIN_MENU_DIR, namelist[i]->d_name); + + if (stat(filename, &st) != 0) { + di_log(DI_LOG_LEVEL_WARNING, "Can't stat %s (%s)", filename, strerror(errno)); + di_free(filename); + continue; + } + if (!S_ISREG(st.st_mode)) { + di_log(DI_LOG_LEVEL_WARNING, "%s is not a regular file", filename); + di_free(filename); + continue; + } + if (access(filename, X_OK) != 0) { + di_log(DI_LOG_LEVEL_WARNING, "%s is not executable", filename); + di_free(filename); + continue; + } + + di_log(DI_LOG_LEVEL_DEBUG, "Executing %s", filename); + ret = system(filename); + if (ret != 0) + di_log(DI_LOG_LEVEL_WARNING, "%s exited with status %d", filename, ret); + + di_free(filename); + } +} + int main (int argc __attribute__ ((unused)), char **argv) { di_system_package *p; di_packages *packages; di_packages_allocator *allocator; int ret; + int last_item_backup = 0; debconf = debconfclient_new(); di_system_init(basename(argv[0])); @@ -554,9 +632,15 @@ /* Tell udpkg to shut up. */ setenv("UDPKG_QUIET", "y", 1); + menu_startup(); + allocator = di_system_packages_allocator_alloc (); packages = di_system_packages_status_read_file(DI_SYSTEM_DPKG_STATUSFILE, allocator); while ((p=show_main_menu(packages, allocator))) { + if (last_item_backup) { + restore_default_priority(); + last_item_backup = 0; + } ret = do_menu_item(p); adjust_default_priority(); switch (ret) { @@ -574,6 +658,7 @@ case EXIT_BACKUP: di_log(DI_LOG_LEVEL_INFO, "Menu item '%s' succeeded but requested to be left unconfigured.", p->p.package); modify_debconf_priority(LOWER); + last_item_backup = 1; break; default: di_log(DI_LOG_LEVEL_WARNING, "Menu item '%s' failed.", p->p.package); diff -Nru /tmp/Z27oCU1Dnq/main-menu-1.02/main-menu.h /tmp/ewhBbabLob/main-menu-1.02ubuntu2/main-menu.h --- /tmp/Z27oCU1Dnq/main-menu-1.02/main-menu.h 2004-08-27 16:42:10.000000000 +0100 +++ /tmp/ewhBbabLob/main-menu-1.02ubuntu2/main-menu.h 2005-01-18 17:44:13.000000000 +0000 @@ -12,6 +12,7 @@ #define MAIN_MENU "debian-installer/main-menu" #define MISSING_PROVIDE "debian-installer/missing-provide" #define ITEM_FAILURE "debian-installer/main-menu/item-failure" +#define MAIN_MENU_DIR "/lib/main-menu.d" #include @@ -23,5 +24,8 @@ EXIT_BACKUP = 10, }; +/* Priority at which the menu is displayed */ +#define MENU_PRIORITY "medium" + /* vim: noexpandtab sw=8 */