Imported Debian patch 3.12-4.1

diff --git a/debian/changelog b/debian/changelog
index 4b0feed4ae36761a8d486917b543dc2530c85df1..e403144a7353c791f4cf3a873ff46f4c27d243f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-elilo (3.12-5) UNRELEASED; urgency=low
+elilo (3.12-4.1) unstable; urgency=low
 
-  * add Vcs entries to control file
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Danish (Joe Hansen).  Closes: #602446
+    - Polish (Michał Kułach).  Closes: #657502
 
- -- Bdale Garbee <bdale@gag.com>  Thu, 11 Nov 2010 18:10:38 -0700
+ -- Christian Perrier <bubulle@debian.org>  Wed, 01 Feb 2012 20:13:32 +0100
 
 elilo (3.12-4) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index e95f9f91207af9e6ab1a29d9de208f8e38858473..df908550a5270ab75d9f802e010fe899fd47e6fd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Depends: debhelper (>> 5), binutils (>= 2.17.50.0.14), gcc-multilib [i386 amd64], gnu-efi (>=3.0d), po-debconf
-Standards-Version: 3.9.3
-Vcs-Git: git://git.gag.com/debian/elilo
-Vcs-Browser: http://git.gag.com/?p=debian/elilo
+Standards-Version: 3.9.1
 
 Package: elilo
 Architecture: i386 ia64 amd64

diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644 (file)
index 0000000..5334732
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,86 @@
+# Danish translation elilo.
+# Copyright (C) 2010 elilo & nedenstående oversættere.
+# This file is distributed under the same license as the elilo package.
+# Joe Hansen (joedalton2@yahoo.dk), 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: elilo\n"
+"Report-Msgid-Bugs-To: bdale@gag.com\n"
+"POT-Creation-Date: 2007-03-13 08:22+0100\n"
+"PO-Revision-Date: 2010-11-04 12:42+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid "Automatically run elilo?"
+msgstr "Kør automatisk elilo?"
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid ""
+"It is necessary to run /usr/sbin/elilo to install the new elilo binary into "
+"the EFI partition."
+msgstr ""
+"Det er nødvendigt at køre /usr/sbin/elilo for at installere den nye binære "
+"elilo til EFI-partitionen."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid ""
+"WARNING: This procedure will write data into the debian directory of the EFI "
+"disk partition, possibly overwriting files installed there by hand."
+msgstr ""
+"ADVARSEL: Denne procedure vil skrive data til debianmappen på EFI-"
+"diskpartitionen, og muligvis overskrive filer installeret der manuelt."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid ""
+"Not installing the new elilo binary on the EFI disk partition may leave the "
+"system in an unbootable state.  Alternatives to automatic updating of the "
+"partition include running /usr/sbin/elilo by hand, or installing the new /"
+"usr/lib/elilo/elilo.efi executable into the EFI disk partition manually."
+msgstr ""
+"Undladelse af at installere den nye binære elilo på EFI-diskpartionen kan "
+"efterlade systemet i en tilstand, hvor det ikke kan startes op. Alternativer "
+"til automatisk opdatering af partitionen inkluderer at køre /usr/sbin/elilo "
+"manuelt, eller installere den nye kørbare /usr/lib/elilo/elilo.efi i EFI-"
+"diskpartitionen manuelt."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:2001
+msgid "Reformat and reload EFI partition?"
+msgstr "Genformater og genindlæs EFI-partition?"
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:2001
+msgid ""
+"The structure of files in the EFI disk partition has changed since pre-3.2 "
+"versions of the elilo package.  The EFI boot manager entry for Debian needs "
+"to be updated to reflect these changes."
+msgstr ""
+"Strukturen på filer i EFI-diskpartitionen har ændret sig siden pre-3.2-"
+"versionerne af elilopakken. Debians punkt i EFI-opstartshåndteringen skal "
+"opdateres for at afspejle disse ændringer."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:2001
+msgid ""
+"In most cases, if no manual changes to the EFI partition content need to be "
+"preserved, this update can be handled automatically."
+msgstr ""
+"I de fleste tilfælde, hvor der ikke er behov for at bevare manuelle "
+"ændringer, kan denne opdatering håndteres automatisk."

diff --git a/debian/po/pl.po b/debian/po/pl.po
new file mode 100644 (file)
index 0000000..1b2836e
--- /dev/null
+++ b/debian/po/pl.po
@@ -0,0 +1,90 @@
+# Copyright (C) 2007
+# This file is distributed under the same license as the elilo package.
+#
+# Michał Kułach <michal.kulach@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: bdale@gag.com\n"
+"POT-Creation-Date: 2007-03-13 08:22+0100\n"
+"PO-Revision-Date: 2012-01-26 13:57+0100\n"
+"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
+"Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid "Automatically run elilo?"
+msgstr "Uruchomić elilo automatycznie?"
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid ""
+"It is necessary to run /usr/sbin/elilo to install the new elilo binary into "
+"the EFI partition."
+msgstr ""
+"Konieczne jest uruchomienie /usr/sbin/elilo, aby zainstalować nowy plik "
+"binarny elilo na partycji EFI."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid ""
+"WARNING: This procedure will write data into the debian directory of the EFI "
+"disk partition, possibly overwriting files installed there by hand."
+msgstr ""
+"OSTRZEŻENIE: Ta procedura zapisze dane do katalogu debian na partycji "
+"dyskowej EFI, potencjalnie nadpisując pliki, które zostały tam zainstalowane "
+"ręcznie."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:1001
+msgid ""
+"Not installing the new elilo binary on the EFI disk partition may leave the "
+"system in an unbootable state.  Alternatives to automatic updating of the "
+"partition include running /usr/sbin/elilo by hand, or installing the new /"
+"usr/lib/elilo/elilo.efi executable into the EFI disk partition manually."
+msgstr ""
+"Niezainstalowanie nowego pliku binarnego elilo na partycji dyskowej EFI może "
+"uniemożliwić ponowny rozruch systemu. Alternatywami dla automatycznego "
+"uaktualnienia partycji są: ręczne uruchomienie /usr/sbin/elilo lub ręczne "
+"zainstalowanie nowego pliku wykonywalnego /usr/lib/elilo/elilo.efi na "
+"partycji dyskowej EFI."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:2001
+msgid "Reformat and reload EFI partition?"
+msgstr "Sformatować i załadować partycję EFI ponownie?"
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:2001
+msgid ""
+"The structure of files in the EFI disk partition has changed since pre-3.2 "
+"versions of the elilo package.  The EFI boot manager entry for Debian needs "
+"to be updated to reflect these changes."
+msgstr ""
+"Struktura plików na partycji dyskowej EFI zmieniła się od czasu wersji "
+"pre-3.2 pakietu elilo. Wpis dla Debiana w menedżerze rozruchu EFI musi "
+"zostać uaktualniony, aby uwzględnić te zmiany."
+
+#. Type: boolean
+#. Description
+#: ../elilo.templates:2001
+msgid ""
+"In most cases, if no manual changes to the EFI partition content need to be "
+"preserved, this update can be handled automatically."
+msgstr ""
+"W większości przypadków, jeśli nie ma potrzeby zachowania, dokonanych "
+"ręcznie, zmian w zawartości partycji EFI, uaktualnienie może zostać wykonane "
+"automatycznie."