[l10n-russian CVS]
di-docs hardware.po, 1.20, 1.21 preseed.po, 1.21,
1.22 random-bits.po, 1.64, 1.65
Nikolai Prokoschenko
pronik-guest at alioth.debian.org
Wed Jan 11 05:18:55 UTC 2006
Update of /cvsroot/l10n-russian/di-docs
In directory haydn:/tmp/cvs-serv11257
Modified Files:
hardware.po preseed.po random-bits.po
Log Message:
Автоматическая синхронизация шаблонов
Index: hardware.po
===================================================================
RCS file: /cvsroot/l10n-russian/di-docs/hardware.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- hardware.po 3 Dec 2005 11:18:58 -0000 1.20
+++ hardware.po 11 Jan 2006 05:18:52 -0000 1.21
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: hardware\n"
-"POT-Creation-Date: 2005-12-03 10:28+0000\n"
+"POT-Creation-Date: 2006-01-10 21:34+0000\n"
"PO-Revision-Date: 2005-09-04 14:58+0400\n"
"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -3172,13 +3172,13 @@
#. Tag: para
#: hardware.xml:1583
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"Debian's support for graphical interfaces is determined by the underlying "
-"support found in XFree86's X11 system. Most AGP, PCI and PCIe video cards "
-"work under XFree86. Details on supported graphics buses, cards, monitors, "
-"and pointing devices can be found at <ulink url=\"&url-xfree86;\"></ulink>. "
-"Debian &release; ships with XFree86 version &x11ver;."
+"support found in X.Org's X11 system. Most AGP, PCI and PCIe video cards work "
+"under X.Org. Details on supported graphics buses, cards, monitors, and "
+"pointing devices can be found at <ulink url=\"&url-xorg;\"></ulink>. Debian "
+"&release; ships with X.Org version &x11ver;."
msgstr ""
"Поддержка графического интерфейса в Debian полностью определяется поддержкой "
"этого интерфейса системой X11 XFree86. Большинство видеокарт AGP, PCI и PCIе "
@@ -3188,11 +3188,11 @@
#. Tag: para
#: hardware.xml:1592
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"The XFree86 X11 window system is only supported on the SGI Indy. The "
-"Broadcom BCM91250A evaluation board has standard 3.3v PCI slots and supports "
-"VGA emulation or Linux framebuffer on a selected range of graphics cards. A "
+"The X.Org X11 window system is only supported on the SGI Indy. The Broadcom "
+"BCM91250A evaluation board has standard 3.3v PCI slots and supports VGA "
+"emulation or Linux framebuffer on a selected range of graphics cards. A "
"<ulink url=\"&url-bcm91250a-hardware;\">compatibility listing</ulink> for "
"the BCM91250A is available."
msgstr ""
@@ -3204,9 +3204,9 @@
#. Tag: para
#: hardware.xml:1600
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"The XFree86 X11 window system is supported on some DECstation models. The "
+"The X.Org X11 window system is supported on some DECstation models. The "
"Broadcom BCM91250A evaluation board has standard 3.3v PCI slots and supports "
"VGA emulation or Linux framebuffer on a selected range of graphics cards. A "
"<ulink url=\"&url-bcm91250a-hardware;\">compatibility listing</ulink> for "
Index: random-bits.po
===================================================================
RCS file: /cvsroot/l10n-russian/di-docs/random-bits.po,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- random-bits.po 4 Jan 2006 05:52:56 -0000 1.64
+++ random-bits.po 11 Jan 2006 05:18:53 -0000 1.65
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: random-bits\n"
-"POT-Creation-Date: 2006-01-03 19:55+0000\n"
+"POT-Creation-Date: 2006-01-10 21:34+0000\n"
"PO-Revision-Date: 2006-01-04 07:33+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -379,14 +379,14 @@
#. Tag: para
#: random-bits.xml:148
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"If gpm is disabled or not installed with some reason, make sure to set X to "
"read directly from the mouse device such as /dev/psaux. For details, refer "
"to the 3-Button Mouse mini-Howto at <filename>/usr/share/doc/HOWTO/en-txt/"
"mini/3-Button-Mouse.gz</filename>, <userinput>man gpm</userinput>, "
-"<filename>/usr/share/doc/gpm/FAQ.gz</filename>, and <ulink url=\"&url-"
-"xfree86;current/mouse.html\">README.mouse</ulink>."
+"<filename>/usr/share/doc/gpm/FAQ.gz</filename>, and <ulink url=\"&url-xorg;"
+"current/doc/html/mouse.html\">README.mouse</ulink>."
msgstr ""
"Если gpm выключен или не установлен по каким-то причинам, убедитесь что X "
"сервер настроен на чтение прямо из устройства мыши, например /dev/psaux. "
Index: preseed.po
===================================================================
RCS file: /cvsroot/l10n-russian/di-docs/preseed.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- preseed.po 8 Jan 2006 23:34:33 -0000 1.21
+++ preseed.po 11 Jan 2006 05:18:53 -0000 1.22
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: preseed.po\n"
-"POT-Creation-Date: 2006-01-08 21:39+0000\n"
+"POT-Creation-Date: 2006-01-10 21:34+0000\n"
"PO-Revision-Date: 2006-01-04 07:28+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -213,10 +213,10 @@
#. Tag: para
#: preseed.xml:123
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"Obviously, any questions that have been processed before the preseeding "
-"configuration file is loaded, cannot be preseeded. <xref linkend=\"preseed-"
+"configuration file is loaded cannot be preseeded. <xref linkend=\"preseed-"
"bootparms\"/> offers a way to avoid these questions being asked."
msgstr ""
"Очевидно, что на любые вопросы, задаваемые перед загрузкой файла ответов, "
@@ -252,9 +252,9 @@
#. Tag: para
#: preseed.xml:208
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
-"A very powerfull and flexible option offered by the preseeding tools is the "
+"A very powerful and flexible option offered by the preseeding tools is the "
"ability to run commands or scripts at certain points in the installation. "
"See <xref linkend=\"preseed-shell\"/> for details."
msgstr ""
@@ -747,14 +747,30 @@
"или USB накопителя. Если вы загружаете файл ответов из сети, то вы можете "
"указать конфигурацию сети через загрузочные параметры ядра."
+#. Tag: para
+#: preseed.xml:466
+#, fuzzy, no-c-format
+msgid ""
+"If you need to pick a particular interface when netbooting before loading a "
+"preseed file from the network, use a boot parameter such as "
+"<userinput>netcfg/choose_interface=<replaceable>eth1</replaceable></"
+"userinput>."
+msgstr ""
+"Для указания языка и страны можно использовать локаль. Для назначения локали "
+"в параметре загрузки, используйте <userinput>debian-installer/"
+"locale=<replaceable>en_US</replaceable></userinput>."
+
#. Tag: screen
-#: preseed.xml:468
-#, no-c-format
+#: preseed.xml:474
+#, fuzzy, no-c-format
msgid ""
"# netcfg will choose an interface that has link if possible. This makes it\n"
"# skip displaying a list if there is more than one interface.\n"
"d-i netcfg/choose_interface select auto\n"
"\n"
+"# To pick a particular interface instead:\n"
+"#d-i netcfg/choose_interface select eth1\n"
+"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
"#d-i netcfg/dhcp_timeout string 60\n"
@@ -809,16 +825,16 @@
"#d-i netcfg/dhcp_hostname string radish"
#. Tag: title
-#: preseed.xml:473
+#: preseed.xml:479
#, no-c-format
msgid "Mirror settings"
msgstr "Настройка сервера-зеркала"
#. Tag: para
-#: preseed.xml:474
-#, no-c-format
+#: preseed.xml:480
+#, fuzzy, no-c-format
msgid ""
-"Depending on the installation method you use, a mirror may used both to "
+"Depending on the installation method you use, a mirror may be used both to "
"download additional components of the installer, the base system and to set "
"up the <filename>/etc/apt/sources.list</filename> for the installed system."
msgstr ""
@@ -828,7 +844,7 @@
"сервер-зеркало."
#. Tag: para
-#: preseed.xml:481
+#: preseed.xml:487
#, no-c-format
msgid ""
"The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -838,7 +854,7 @@
"для устанавливаемой системы."
#. Tag: para
-#: preseed.xml:486
+#: preseed.xml:492
#, no-c-format
msgid ""
"The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -857,7 +873,7 @@
"<classname>mirror/suite</classname>."
#. Tag: screen
-#: preseed.xml:498
+#: preseed.xml:504
#, no-c-format
msgid ""
"d-i mirror/country string enter information manually\n"
@@ -881,13 +897,13 @@
"#d-i mirror/udeb/suite string testing"
#. Tag: title
-#: preseed.xml:503
+#: preseed.xml:509
#, no-c-format
msgid "Partitioning"
msgstr "Разметка дисков"
#. Tag: para
-#: preseed.xml:504
+#: preseed.xml:510
#, no-c-format
msgid ""
"Using preseeding to partition the harddisk is very much limited to what is "
@@ -907,7 +923,7 @@
"разметка нескольких дисков и настройка RAID или LVM."
#. Tag: para
-#: preseed.xml:516
+#: preseed.xml:522
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -919,7 +935,7 @@
"как использовать автоматическую установку."
#. Tag: screen
-#: preseed.xml:524
+#: preseed.xml:530
#, no-c-format
msgid ""
"# If the system has free space you can choose to only partition that space.\n"
@@ -1025,13 +1041,13 @@
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:529
+#: preseed.xml:535
#, no-c-format
msgid "Clock and time zone setup"
msgstr "Настройка времени и часового пояса"
#. Tag: screen
-#: preseed.xml:531
+#: preseed.xml:537
#, no-c-format
msgid ""
"# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1049,13 +1065,13 @@
"d-i time/zone string US/Eastern"
#. Tag: title
-#: preseed.xml:536
+#: preseed.xml:542
#, no-c-format
msgid "Apt setup"
msgstr "Настройка Apt"
#. Tag: para
-#: preseed.xml:537
+#: preseed.xml:543
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -1069,7 +1085,7 @@
"конфигурирования доступны только три параметра."
#. Tag: screen
-#: preseed.xml:545
+#: preseed.xml:551
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -1087,13 +1103,13 @@
"#d-i apt-setup/security_host string"
#. Tag: title
-#: preseed.xml:550
+#: preseed.xml:556
#, no-c-format
msgid "Account setup"
msgstr "Настройка учётной записи"
#. Tag: para
-#: preseed.xml:551
+#: preseed.xml:557
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -1105,7 +1121,7 @@
"виде или в виде <emphasis>хешей</emphasis> MD5."
#. Tag: para
-#: preseed.xml:558
+#: preseed.xml:564
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1121,7 +1137,7 @@
"пароль прямым перебором."
#. Tag: screen
-#: preseed.xml:568
+#: preseed.xml:574
#, fuzzy, no-c-format
msgid ""
"# Root password, either in clear text\n"
@@ -1161,7 +1177,7 @@
"#passwd passwd/user-password-crypted password [MD5 hash]"
#. Tag: para
-#: preseed.xml:570
+#: preseed.xml:576
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -1181,26 +1197,26 @@
"суперпользователя (например используя аутентификацию по SSH ключу или sudo)."
#. Tag: para
-#: preseed.xml:580
+#: preseed.xml:586
#, no-c-format
msgid ""
"An MD5 hash for a password can be generated using the following command."
msgstr "MD5 хеш для пароля можно сгенерировать с помощью следующей команды."
#. Tag: screen
-#: preseed.xml:584
+#: preseed.xml:590
#, no-c-format
msgid "$ echo \"r00tme\" | mkpasswd -s -H MD5"
msgstr "$ echo \"r00tme\" | mkpasswd -s -H MD5"
#. Tag: title
-#: preseed.xml:590
+#: preseed.xml:596
#, fuzzy, no-c-format
msgid "Base system installation"
msgstr "Установка загрузчика"
#. Tag: para
-#: preseed.xml:591
+#: preseed.xml:597
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -1209,7 +1225,7 @@
msgstr ""
#. Tag: screen
-#: preseed.xml:598
+#: preseed.xml:604
#, no-c-format
msgid ""
"# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -1218,13 +1234,13 @@
msgstr ""
#. Tag: title
-#: preseed.xml:603
+#: preseed.xml:609
#, no-c-format
msgid "Boot loader installation"
msgstr "Установка загрузчика"
#. Tag: screen
-#: preseed.xml:605
+#: preseed.xml:611
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -1269,13 +1285,13 @@
"#d-i grub-installer/with_other_os boolean false"
#. Tag: title
-#: preseed.xml:610
+#: preseed.xml:616
#, no-c-format
msgid "Package selection"
msgstr "Выбор пакетов"
#. Tag: para
-#: preseed.xml:611
+#: preseed.xml:617
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -1285,61 +1301,61 @@
"Доступные задачи:"
#. Tag: userinput
-#: preseed.xml:620
+#: preseed.xml:626
#, no-c-format
msgid "Standard system"
msgstr "Standard system (стандартная система)"
#. Tag: userinput
-#: preseed.xml:623
+#: preseed.xml:629
#, no-c-format
msgid "Desktop environment"
msgstr "Desktop environment (рабочий стол)"
#. Tag: userinput
-#: preseed.xml:626
+#: preseed.xml:632
#, no-c-format
msgid "Web server"
msgstr "Web server (веб сервер)"
#. Tag: userinput
-#: preseed.xml:629
+#: preseed.xml:635
#, no-c-format
msgid "Print server"
msgstr "Print server (сервер печати)"
#. Tag: userinput
-#: preseed.xml:632
+#: preseed.xml:638
#, no-c-format
msgid "DNS server"
msgstr "DNS server (сервер имён DNS)"
#. Tag: userinput
-#: preseed.xml:635
+#: preseed.xml:641
#, no-c-format
msgid "File server"
msgstr "File server (файловый сервер)"
#. Tag: userinput
-#: preseed.xml:638
+#: preseed.xml:644
#, no-c-format
msgid "Mail server"
msgstr "Mail server (почтовый сервер)"
#. Tag: userinput
-#: preseed.xml:641
+#: preseed.xml:647
#, no-c-format
msgid "SQL database"
msgstr "SQL database (база данных SQL)"
#. Tag: userinput
-#: preseed.xml:644
+#: preseed.xml:650
#, no-c-format
msgid "Laptop"
msgstr "Laptop (для ноутбука)"
#. Tag: para
-#: preseed.xml:648
+#: preseed.xml:654
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -1351,7 +1367,7 @@
"задачу <userinput>Standard system</userinput>."
#. Tag: screen
-#: preseed.xml:656
+#: preseed.xml:662
#, fuzzy, no-c-format
msgid ""
"tasksel tasksel/first multiselect Standard system, Desktop environment\n"
@@ -1373,13 +1389,13 @@
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:661
+#: preseed.xml:667
#, no-c-format
msgid "Finishing up the first stage install"
msgstr "Завершение первого этапа установки"
#. Tag: screen
-#: preseed.xml:663
+#: preseed.xml:669
#, no-c-format
msgid ""
"# Avoid that last message about the install being complete.\n"
@@ -1397,13 +1413,13 @@
"#d-i cdrom-detect/eject boolean false"
#. Tag: title
-#: preseed.xml:668
+#: preseed.xml:674
#, no-c-format
msgid "Mailer configuration"
msgstr "Настройка почты"
#. Tag: para
-#: preseed.xml:669
+#: preseed.xml:675
#, no-c-format
msgid ""
"During a normal install, exim asks only a few questions. Here's how to avoid "
@@ -1414,7 +1430,7 @@
"автоматическая настройка."
#. Tag: screen
-#: preseed.xml:676
+#: preseed.xml:682
#, no-c-format
msgid ""
"exim4-config exim4/dc_eximconfig_configtype \\\n"
@@ -1430,13 +1446,13 @@
"exim4-config exim4/dc_postmaster string"
#. Tag: title
-#: preseed.xml:681
+#: preseed.xml:687
#, no-c-format
msgid "X configuration"
msgstr "Настройка X системы"
#. Tag: para
-#: preseed.xml:682
+#: preseed.xml:688
#, no-c-format
msgid ""
"Preseeding Debian's X config is possible, but you probably need to know some "
@@ -1449,29 +1465,29 @@
"оборудования."
#. Tag: screen
-#: preseed.xml:690
-#, no-c-format
+#: preseed.xml:696
+#, fuzzy, no-c-format
msgid ""
"# X can detect the right driver for some cards, but if you're preseeding,\n"
"# you override whatever it chooses. Still, vesa will work most places.\n"
-"#xserver-xfree86 xserver-xfree86/config/device/driver select vesa\n"
+"#xserver-xorg xserver-xorg/config/device/driver select vesa\n"
"\n"
"# A caveat with mouse autodetection is that if it fails, X will retry it\n"
"# over and over. So if it's preseeded to be done, there is a possibility of\n"
"# an infinite loop if the mouse is not autodetected.\n"
-"#xserver-xfree86 xserver-xfree86/autodetect_mouse boolean true\n"
+"#xserver-xorg xserver-xorg/autodetect_mouse boolean true\n"
"\n"
"# Monitor autodetection is recommended.\n"
-"xserver-xfree86 xserver-xfree86/autodetect_monitor boolean true\n"
+"xserver-xorg xserver-xorg/autodetect_monitor boolean true\n"
"# Uncomment if you have an LCD display.\n"
-"#xserver-xfree86 xserver-xfree86/config/monitor/lcd boolean true\n"
+"#xserver-xorg xserver-xorg/config/monitor/lcd boolean true\n"
"# X has three configuration paths for the monitor. Here's how to preseed\n"
"# the \"medium\" path, which is always available. The \"simple\" path may "
"not\n"
"# be available, and the \"advanced\" path asks too many questions.\n"
-"xserver-xfree86 xserver-xfree86/config/monitor/selection-method \\\n"
+"xserver-xorg xserver-xorg/config/monitor/selection-method \\\n"
" select medium\n"
-"xserver-xfree86 xserver-xfree86/config/monitor/mode-list \\\n"
+"xserver-xorg xserver-xorg/config/monitor/mode-list \\\n"
" select 1024x768 @ 60 Hz"
msgstr ""
"# X может определить нужный драйвер для некоторых карт, но при "
@@ -1499,13 +1515,13 @@
" select 1024x768 @ 60 Hz"
#. Tag: title
-#: preseed.xml:695
+#: preseed.xml:701
#, no-c-format
msgid "Preseeding other packages"
msgstr "Автоматизация других пакетов"
#. Tag: screen
-#: preseed.xml:697
+#: preseed.xml:703
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -1528,19 +1544,19 @@
"# debconf-get-selections >> файл"
#. Tag: title
-#: preseed.xml:703
+#: preseed.xml:709
#, no-c-format
msgid "Advanced options"
msgstr "Дополнительные параметры"
#. Tag: title
-#: preseed.xml:706
+#: preseed.xml:712
#, no-c-format
msgid "Shell commands"
msgstr "Команды оболочки"
#. Tag: screen
-#: preseed.xml:708
+#: preseed.xml:714
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1579,13 +1595,13 @@
"#d-i preseed/late_command string apt-get install zsh; chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:713
+#: preseed.xml:719
#, no-c-format
msgid "Chainloading preseed files"
msgstr "Последовательная загрузка нескольких файлов ответов"
#. Tag: para
-#: preseed.xml:714
+#: preseed.xml:720
#, no-c-format
msgid ""
"It is possible to include other preseed files from a preseed file. Any "
@@ -1601,7 +1617,7 @@
"конфигураций в другие файлы."
#. Tag: screen
-#: preseed.xml:724
+#: preseed.xml:730
#, no-c-format
msgid ""
"# More that one file can be listed, separated by spaces; all will be\n"
More information about the l10n-russian-cvs-commits
mailing list