* Misc fixes in l10n infrastructure that will enable build on any system

    where locales-all (added to Build-Depends) is installed, no matter the
    locale setup.  (Closes: #441193)

r49181

1 files changed, 56 insertions, 57 deletions

diff --git a/l10n/po/ru.po b/l10n/po/ru.po
index 03dddb4..59353cc 100644
--- a/l10n/po/ru.po
+++ b/l10n/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-01 23:58+0200\n"
+"POT-Creation-Date: 2007-09-07 21:14+0000\n"
 "PO-Revision-Date: 2006-02-21 20:00+MSK\n"
 "Last-Translator: Evgeny Burzak <moongod@yandex.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,38 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. translate:
+#. This must be a valid string recognised by Nsis.  If your
+#. language is not yet supported by Nsis, please translate the
+#. missing Nsis part first.
+#.
+#: win32-loader.sh:28 win32-loader.c:39
+msgid "LANG_ENGLISH"
+msgstr "LANG_RUSSIAN"
+
+#. translate:
 #. This must be the string used by Windows to represent your
 #. language's charset.  If you don't know, check [wine]/tools/wmc/lang.c,
 #. or http://www.microsoft.com/globaldev/reference/WinCP.mspx
 #.
 #. IMPORTANT: In the rest of this file, only the subset of UTF-8 that can be
 #. converted to this charset should be used.
-#: win32-loader.sh:43
+#: win32-loader.sh:44
 msgid "windows-1252"
 msgstr "windows-1251"
 
 #. translate:
 #. Charset used by NTLDR in your localised version of Windows XP.  If you
 #. don't know, maybe http://en.wikipedia.org/wiki/Code_page helps.
-#: win32-loader.sh:48
+#: win32-loader.sh:49
 msgid "cp437"
 msgstr ""
 
 #. translate:
-#. This must be a valid string recognised by Nsis.  If your
-#. language is not yet supported by Nsis, please translate the
-#. missing Nsis part first.
-#.
-#: win32-loader.c:39
-msgid "LANG_ENGLISH"
-msgstr "LANG_RUSSIAN"
-
-#. translate:
 #. IMPORTANT: only the subset of UTF-8 that can be converted to NTLDR charset
 #. (e.g. cp437) should be used in this string.  If you don't know which charset
 #. applies, limit yourself to ascii.
-#.
-#: win32-loader.c:71
+#: win32-loader.sh:64
 msgid "Debian Installer"
 msgstr "Установщик Debian"
 
@@ -56,29 +55,29 @@ msgstr "Установщик Debian"
 #. The nlf file for your language should be found in
 #. /usr/share/nsis/Contrib/Language files/
 #.
-#: win32-loader.c:80
+#: win32-loader.c:68
 msgid "English.nlf"
 msgstr "Russian.nlf"
 
-#: win32-loader.c:83
+#: win32-loader.c:71
 msgid "Debian-Installer Loader"
 msgstr "Загрузчик Установщика Debian"
 
-#: win32-loader.c:84
+#: win32-loader.c:72
 msgid "Cannot find win32-loader.ini."
 msgstr ""
 
-#: win32-loader.c:85
+#: win32-loader.c:73
 msgid "win32-loader.ini is incomplete.  Contact the provider of this medium."
 msgstr ""
 
-#: win32-loader.c:86
+#: win32-loader.c:74
 msgid ""
 "This program has detected that your keyboard type is \"$0\".  Is this "
 "correct?"
 msgstr ""
 
-#: win32-loader.c:87
+#: win32-loader.c:75
 msgid ""
 "Please send a bug report with the following information:\n"
 "\n"
@@ -90,7 +89,7 @@ msgid ""
 "Thank you."
 msgstr ""
 
-#: win32-loader.c:88
+#: win32-loader.c:76
 msgid ""
 "Debian-Installer Loader will be setup with the following parameters.  Do NOT "
 "change any of these unless you know what you're doing."
@@ -98,23 +97,23 @@ msgstr ""
 "Загрузчик Установщика Debian будет запущен со следующими параметрами.   НЕ "
 "изменяйте их, пока вы не знаете, для чего они предназначены."
 
-#: win32-loader.c:89
+#: win32-loader.c:77
 msgid "Proxy settings (host:port):"
 msgstr "Настройки прокси-сервера (хост:порт):"
 
-#: win32-loader.c:90
+#: win32-loader.c:78
 msgid "Location of boot.ini:"
 msgstr "Путь к boot.ini:"
 
-#: win32-loader.c:91
+#: win32-loader.c:79
 msgid "Debconf preseed line:"
 msgstr "Инициализационная строка Debconf:"
 
-#: win32-loader.c:92
+#: win32-loader.c:80
 msgid "Base URL for netboot images (linux and initrd.gz):"
 msgstr "Основной адрес для образов сетевой установки (linux и initrd.gz):"
 
-#: win32-loader.c:93
+#: win32-loader.c:81
 #, fuzzy
 msgid ""
 "There doesn't seem to be enough free disk space in drive $c.  For a complete "
@@ -128,16 +127,16 @@ msgstr ""
 "несколько жестких дисков или выделенный раздел для установки Debian, или вы "
 "планируете полностью удалить Windows, просто проигнорируйте это сообщение."
 
-#: win32-loader.c:94
+#: win32-loader.c:82
 msgid "Error: not enough free disk space.  Aborting install."
 msgstr ""
 "Ошибка: не достаточно свободного места на жестком диске.  Отмена установки."
 
-#: win32-loader.c:95
+#: win32-loader.c:83
 msgid "This program doesn't support Windows $windows_version yet."
 msgstr ""
 
-#: win32-loader.c:96
+#: win32-loader.c:84
 msgid ""
 "The version of Debian you're trying to install is designed to run on modern, "
 "64-bit computers.  However, your computer is uncapable of running 64-bit "
@@ -149,7 +148,7 @@ msgid ""
 "This installer will abort now."
 msgstr ""
 
-#: win32-loader.c:97
+#: win32-loader.c:85
 msgid ""
 "Your computer is capable of running modern, 64-bit operating systems.  "
 "However, the version of Debian you're trying to install is designed to run "
@@ -163,15 +162,15 @@ msgid ""
 "Would you like to abort now?"
 msgstr ""
 
-#: win32-loader.c:98 win32-loader.c:105
+#: win32-loader.c:86 win32-loader.c:93
 msgid "Select install mode:"
 msgstr "Выберите режим установки:"
 
-#: win32-loader.c:99
+#: win32-loader.c:87
 msgid "Normal mode.  Recommended for most users."
 msgstr "Обычный режим.  Рекомендован для большинства пользователей."
 
-#: win32-loader.c:100
+#: win32-loader.c:88
 msgid ""
 "Expert mode.  Recommended for expert users who want full control of the "
 "install process."
@@ -179,53 +178,53 @@ msgstr ""
 "Режим эксперта.  Рекомендован для опытных пользователей, которые хотят "
 "полностью контролировать процесс установки."
 
-#: win32-loader.c:101
+#: win32-loader.c:89
 msgid "Select which version of Debian-Installer to use:"
 msgstr ""
 
-#: win32-loader.c:102
+#: win32-loader.c:90
 msgid "Stable release.  This will install Debian \"stable\"."
 msgstr ""
 
-#: win32-loader.c:103
+#: win32-loader.c:91
 msgid ""
 "Daily build.  This is the development version of Debian-Installer.  It will "
 "install Debian \"testing\" by default, and may be capable of installing "
 "\"stable\" or \"unstable\" as well."
 msgstr ""
 
-#: win32-loader.c:104
+#: win32-loader.c:92
 msgid ""
 "It is recommended that you check for known issues before using a daily "
 "build.  Would you like to do that now?"
 msgstr ""
 
-#: win32-loader.c:106
+#: win32-loader.c:94
 msgid "Graphical install"
 msgstr "Установка в графическом режиме"
 
-#: win32-loader.c:107
+#: win32-loader.c:95
 msgid "Text install"
 msgstr "Установка в текстовом режиме"
 
-#: win32-loader.c:108
+#: win32-loader.c:96
 #, fuzzy, c-format
 msgid "Downloading %s"
 msgstr "Загрузка %s"
 
-#: win32-loader.c:109
+#: win32-loader.c:97
 msgid "Connecting ..."
 msgstr "Подключение ..."
 
-#: win32-loader.c:110
+#: win32-loader.c:98
 msgid "second"
 msgstr "с"
 
-#: win32-loader.c:111
+#: win32-loader.c:99
 msgid "minute"
 msgstr "м"
 
-#: win32-loader.c:112
+#: win32-loader.c:100
 msgid "hour"
 msgstr "ч"
 
@@ -235,44 +234,44 @@ msgstr "ч"
 #. has been proposed [1] but in the meantime we'll have to cope with this.
 #. [1] http://sourceforge.net/tracker/index.php?func=detail&aid=1656076&group_id=22049&atid=373087
 #.
-#: win32-loader.c:120
+#: win32-loader.c:108
 msgid "s"
 msgstr " "
 
-#: win32-loader.c:121
+#: win32-loader.c:109
 #, fuzzy, c-format
 msgid "%dkB (%d%%) of %dkB at %d.%01dkB/s"
 msgstr "%dКб (%d%%) из %dКб на %d.%01dКб/с"
 
-#: win32-loader.c:122
+#: win32-loader.c:110
 #, fuzzy, c-format
 msgid " (%d %s%s remaining)"
 msgstr " (%d %s%s осталось)"
 
-#: win32-loader.c:123
+#: win32-loader.c:111
 msgid "Error"
 msgstr "Ошибка"
 
-#: win32-loader.c:124
+#: win32-loader.c:112
 msgid "Error: failed to copy $0 to $1."
 msgstr ""
 
-#: win32-loader.c:125
+#: win32-loader.c:113
 msgid "Error: unable to run $0."
 msgstr ""
 
-#: win32-loader.c:126
+#: win32-loader.c:114
 msgid "Error: failed to parse bcdedit.exe output."
 msgstr ""
 
-#: win32-loader.c:127
+#: win32-loader.c:115
 #, fuzzy
 msgid "Error: $boot_ini not found.  Is this really Windows $windows_version?"
 msgstr ""
 "Ошибка: $boot_ini не найден.  Ваша версия Windows может быть очень старой "
 "или поврежденной."
 
-#: win32-loader.c:128
+#: win32-loader.c:116
 msgid "VERY IMPORTANT NOTICE:\\n\\n"
 msgstr ""
 
@@ -282,14 +281,14 @@ msgstr ""
 #. Take into account that either option has to make sense in our
 #. current context (i.e. be careful when using pronouns, etc).
 #.
-#: win32-loader.c:136
+#: win32-loader.c:124
 msgid ""
 "The second stage of this install process will now be started.  After your "
 "confirmation, this program will restart Windows in DOS mode, and "
 "automaticaly load Debian Installer.\\n\\n"
 msgstr ""
 
-#: win32-loader.c:137
+#: win32-loader.c:125
 msgid ""
 "You need to reboot in order to proceed with your Debian install.  During "
 "your next boot, you will be asked whether you want to start Windows or "
@@ -297,7 +296,7 @@ msgid ""
 "process.\\n\\n"
 msgstr ""
 
-#: win32-loader.c:138
+#: win32-loader.c:126
 #, fuzzy
 msgid ""
 "During the install process, you will be offered the possibility of either "
@@ -321,6 +320,6 @@ msgstr ""
 "диске), вы можете удалить Загрузчик Установщика Debian через диалог Windows "
 "'Установка и удаление программ' в 'Панели управления'."
 
-#: win32-loader.c:139
+#: win32-loader.c:127
 msgid "Do you want to reboot now?"
 msgstr "Перезагрузить компьютер сейчас?"