[l10n-russian CVS] base-config base-config-debconf_ru.po,1.8,1.9 base-config_ru.po,1.39,1.40
Nikolai Prokoschenko
debian-l10n-russian@lists.debian.org
Sat, 09 Jul 2005 15:16:17 +0000
Update of /cvsroot/l10n-russian/base-config
In directory haydn:/tmp/cvs-serv17491
Modified Files:
base-config-debconf_ru.po base-config_ru.po
Log Message:
Автоматическая синхронизация шаблонов
Index: base-config-debconf_ru.po
===================================================================
RCS file: /cvsroot/l10n-russian/base-config/base-config-debconf_ru.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- base-config-debconf_ru.po 10 Jun 2005 18:20:07 -0000 1.8
+++ base-config-debconf_ru.po 9 Jul 2005 15:16:15 -0000 1.9
@@ -17,7 +17,7 @@
msgstr ""
"Project-Id-Version: base-config-debconf_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-03 09:07+0200\n"
+"POT-Creation-Date: 2005-07-08 15:29+0000\n"
"PO-Revision-Date: 2005-06-10 22:21+0400\n"
"Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -144,7 +144,8 @@
msgid ""
"Setup of your Debian system is complete. You may now login at the login: "
"prompt."
-msgstr "Установка Debian завершена. Для входа в систему, введите ваш логин и пароль."
+msgstr ""
+"Установка Debian завершена. Для входа в систему, введите ваш логин и пароль."
#. Type: note
#. Description
@@ -210,7 +211,8 @@
msgid ""
"The graphical display manager makes it possible to log in using a graphical "
"environment."
-msgstr "Графический вход систему позволяет входить в систему в графическом режиме."
+msgstr ""
+"Графический вход систему позволяет входить в систему в графическом режиме."
#. Type: text
#. Description
@@ -379,22 +381,8 @@
"Канады."
#. Type: select
-#. Choices
-#: ../../tzsetup.templates:47
-msgid "East, West, Acre, DeNoronha, other"
-msgstr "East, West, Acre, DeNoronha, другой"
-
-#. Type: select
#. Description
-#: ../../tzsetup.templates:48
-msgid "The following are common time zones in Brazil."
-msgstr ""
-"Ниже указаны основные часовые пояса и нестандартные регионы на территории "
-"Бразилии."
-
-#. Type: select
-#. Description
-#: ../../tzsetup.templates:48
+#: ../../tzsetup.templates:38
msgid ""
"If you are in a different time zone, choose \"other\" to select from all "
"available time zones."
@@ -404,13 +392,13 @@
#. Type: boolean
#. Description
-#: ../../tzsetup.templates:57
+#: ../../tzsetup.templates:47
msgid "Are you in the ${zone} time zone?"
msgstr "Находитесь ли вы в часовом поясе \"${zone}\"?"
#. Type: boolean
#. Description
-#: ../../tzsetup.templates:57
+#: ../../tzsetup.templates:47
msgid "Based on your country, your time zone is probably ${zone}."
msgstr ""
"Исходя из вашего местоположения, ваш часовой пояс скорее всего \"${timezone}"
@@ -418,19 +406,19 @@
#. Type: select
#. Choices
-#: ../../tzsetup.templates:62
+#: ../../tzsetup.templates:52
msgid "${choices}, other"
msgstr "${choices}, другой"
#. Type: select
#. Description
-#: ../../tzsetup.templates:63
+#: ../../tzsetup.templates:53
msgid "Select your time zone:"
msgstr "Выберите ваш часовой пояс:"
#. Type: select
#. Description
-#: ../../tzsetup.templates:63
+#: ../../tzsetup.templates:53
msgid ""
"Based on your country, you are probably in one of these time zones. If you "
"are not, choose \"other\" to select from all available time zones."
@@ -441,7 +429,7 @@
#. Type: select
#. Choices
-#: ../../tzsetup.templates:69
+#: ../../tzsetup.templates:59
msgid ""
"Africa, America, US, Canada, Asia, Atlantic Ocean, Australia, Europe, Indian "
"Ocean, Pacific Ocean, System V style time zones, None of the above"
@@ -451,25 +439,25 @@
#. Type: select
#. Description
-#: ../../tzsetup.templates:70
+#: ../../tzsetup.templates:60
msgid "Area for your time zone:"
msgstr "Выберите ваш город или часовой пояс:"
#. Type: select
#. Description
-#: ../../tzsetup.templates:70
+#: ../../tzsetup.templates:60
msgid "Pick the geographic area in which the time zone you desire is located."
msgstr "Выберите географический регион, в котором вы находитесь."
#. Type: select
#. Description
-#: ../../tzsetup.templates:76
+#: ../../tzsetup.templates:66
msgid "Select a city or time zone:"
msgstr "Выберите город или часовой пояс:"
#. Type: select
#. Description
-#: ../../tzsetup.templates:76
+#: ../../tzsetup.templates:66
msgid ""
"Cities represent the time zone in which they are located, so you may choose "
"any city in the desired time zone."
@@ -479,19 +467,19 @@
#. Type: boolean
#. Description
-#: ../../tzsetup.templates:82
+#: ../../tzsetup.templates:72
msgid "Is this information correct?"
msgstr "Верны ли эти данные?"
#. Type: boolean
#. Description
-#: ../../tzsetup.templates:82
+#: ../../tzsetup.templates:72
msgid "Here is your selected time zone information."
msgstr "Вот введённые вами данные о часовом поясе."
#. Type: boolean
#. Description
-#: ../../tzsetup.templates:82
+#: ../../tzsetup.templates:72
msgid ""
" Local time is now: ${tzdate}\n"
" Universal Time is now: ${utdate}\n"
@@ -503,7 +491,7 @@
#. Type: boolean
#. Description
-#: ../../tzsetup.templates:82
+#: ../../tzsetup.templates:72
msgid "If something looks wrong, you can go through the setup process again."
msgstr ""
"Если что-то кажется неверным, то вы можете снова пройти через процесс "
@@ -729,7 +717,8 @@
msgid ""
"Enter the device file to use to access your CD-ROM, and place a Debian CD in "
"the drive."
-msgstr "Введите имя файла устройства СD-ROM и поместите компакт-диск Debian в привод."
+msgstr ""
+"Введите имя файла устройства СD-ROM и поместите компакт-диск Debian в привод."
#. Type: note
#. Description
@@ -809,7 +798,8 @@
#. Type: boolean
#. Description
#: ../../apt-setup.templates:122
-msgid "Please choose whether you want this software to be made available to you."
+msgid ""
+"Please choose whether you want this software to be made available to you."
msgstr "Хотите ли вы устанавливать подобные программы?"
#. Type: note
@@ -938,3 +928,10 @@
msgid "${apt_error}"
msgstr "${apt_error}"
+#~ msgid "East, West, Acre, DeNoronha, other"
+#~ msgstr "East, West, Acre, DeNoronha, другой"
+
+#~ msgid "The following are common time zones in Brazil."
+#~ msgstr ""
+#~ "Ниже указаны основные часовые пояса и нестандартные регионы на территории "
+#~ "Бразилии."
Index: base-config_ru.po
===================================================================
RCS file: /cvsroot/l10n-russian/base-config/base-config_ru.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- base-config_ru.po 9 Jul 2005 13:16:06 -0000 1.39
+++ base-config_ru.po 9 Jul 2005 15:16:15 -0000 1.40
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: base-config_ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-09 15:04+0300\n"
+"POT-Creation-Date: 2005-07-08 15:29+0000\n"
"PO-Revision-Date: 2004-07-02 18:55+1000\n"
"Last-Translator: Yuriy Talakan' <yt@amur.elektra.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -18,17 +18,17 @@
"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"
-#: ../lib/menu/shell:3
+#: ../debian/base-config/usr/lib/base-config/menu/shell:3 ../lib/menu/shell:3
msgid "Type 'exit' to return to base-config."
msgstr "Наберите 'exit', чтобы вернуться в программу настройки."
#. translators: there MUST be a comma followed by a space at the end
#. of your translation, or things will break!
-#: ../apt-setup:129
+#: ../apt-setup:129 ../debian/base-config/usr/sbin/apt-setup:129
msgid "enter information manually, "
msgstr "введите информацию вручную, "
-#: ../apt-setup:240
+#: ../apt-setup:240 ../debian/base-config/usr/sbin/apt-setup:240
msgid "Scanning CD, this will take a minute."
msgstr "Сканирование компакт-диска, может занять некоторое время."
@@ -37,7 +37,7 @@
#. * If package count is 0, a separate error message should be displayed.
#. * This sentence is part of a longer paragraph, full stop is omitted here.
#. * "${PACKAGE_COUNT}" must not be translated.
-#: ../apt-setup:314
+#: ../apt-setup:314 ../debian/base-config/usr/sbin/apt-setup:314
#, sh-format
msgid ""
"The Debian package management tool, apt, is now configured, and can install "
@@ -55,7 +55,7 @@
"Утилита управления пакетами Debian, apt, настроена, и может установить "
"${PACKAGE_COUNT} пакетов"
-#: ../apt-setup:395
+#: ../apt-setup:395 ../debian/base-config/usr/sbin/apt-setup:395
msgid ""
"You probably used a CD to install the Debian base system, but it is not "
"currently in the drive. You should probably just insert it and select \"cdrom"
@@ -66,10 +66,13 @@
"пункт \"cdrom\"."
#: ../apt-setup:645 ../apt-setup:715 ../apt-setup:810
+#: ../debian/base-config/usr/sbin/apt-setup:645
+#: ../debian/base-config/usr/sbin/apt-setup:715
+#: ../debian/base-config/usr/sbin/apt-setup:810
msgid "Testing apt sources..."
msgstr "Проверка источников apt..."
-#: ../base-config:50
+#: ../base-config:50 ../debian/base-config/usr/sbin/base-config:50
msgid "Configuring the base system..."
msgstr "Идёт настройка основной системы..."