diff options
Diffstat (limited to 'doc/gettext/ru')
63 files changed, 4080 insertions, 4107 deletions
diff --git a/doc/gettext/ru/alsa-guide.xml.po b/doc/gettext/ru/alsa-guide.xml.po index f2bf7b9..dfafe3b 100644 --- a/doc/gettext/ru/alsa-guide.xml.po +++ b/doc/gettext/ru/alsa-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-04-14 01:42+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//alsa-guide.xml(guide:link):6 -msgid "/doc/en/alsa-guide.xml" -msgstr "/doc/ru/alsa-guide.xml" - #: ../../gentoo/xml/htdocs/doc/en//alsa-guide.xml(title):7 msgid "Gentoo Linux ALSA Guide" msgstr "Руководство ALSA в Gentoo Linux" diff --git a/doc/gettext/ru/anothertest.xml.po b/doc/gettext/ru/anothertest.xml.po index fc4862e..200a006 100644 --- a/doc/gettext/ru/anothertest.xml.po +++ b/doc/gettext/ru/anothertest.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:03+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//anothertest.xml(guide:link):5 -msgid "/doc/en/test.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//anothertest.xml(title):6 msgid "Testfile" msgstr "" diff --git a/doc/gettext/ru/arm-requirements.xml.po b/doc/gettext/ru/arm-requirements.xml.po index 70d32c4..396235b 100644 --- a/doc/gettext/ru/arm-requirements.xml.po +++ b/doc/gettext/ru/arm-requirements.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-04-21 05:04+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//arm-requirements.xml(guide:link):5 -msgid "/doc/en/arm-requirements.xml" -msgstr "/doc/ru/arm-requirements.xml" - #: ../../gentoo/xml/htdocs/doc/en//arm-requirements.xml(title):6 msgid "Gentoo ARM Hardware Requirements" msgstr "Аппаратные требования к Gentoo ARM" diff --git a/doc/gettext/ru/change-chost.xml.po b/doc/gettext/ru/change-chost.xml.po index a717d4b..455c548 100644 --- a/doc/gettext/ru/change-chost.xml.po +++ b/doc/gettext/ru/change-chost.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:06+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//change-chost.xml(guide:link):5 -msgid "/doc/en/change-chost.xml" -msgstr "/doc/ru/change-chost.xml" - #: ../../gentoo/xml/htdocs/doc/en//change-chost.xml(guide:lang):5 msgid "en" msgstr "" diff --git a/doc/gettext/ru/cross-compiling-distcc.xml.po b/doc/gettext/ru/cross-compiling-distcc.xml.po index ebe74c3..eae36ee 100644 --- a/doc/gettext/ru/cross-compiling-distcc.xml.po +++ b/doc/gettext/ru/cross-compiling-distcc.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:11+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//cross-compiling-distcc.xml(guide:link):5 -msgid "/doc/en/cross-compiling-distcc.xml" -msgstr "/doc/ru/cross-compiling-distcc.xml" - #: ../../gentoo/xml/htdocs/doc/en//cross-compiling-distcc.xml(title):6 msgid "DistCC Cross-compiling Guide" msgstr "" diff --git a/doc/gettext/ru/cvs-tutorial.xml.po b/doc/gettext/ru/cvs-tutorial.xml.po index c6b6472..67e8f25 100644 --- a/doc/gettext/ru/cvs-tutorial.xml.po +++ b/doc/gettext/ru/cvs-tutorial.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:11+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(guide:link):6 -msgid "/doc/en/cvs-tutorial.xml" -msgstr "/doc/ru/cvs-tutorial.xml" - #: ../../gentoo/xml/htdocs/doc/en//cvs-tutorial.xml(title):8 msgid "Gentoo Linux CVS Tutorial" msgstr "" diff --git a/doc/gettext/ru/desktop.xml.po b/doc/gettext/ru/desktop.xml.po index e95d985..fc5dbae 100644 --- a/doc/gettext/ru/desktop.xml.po +++ b/doc/gettext/ru/desktop.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:12+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//desktop.xml(guide:link):4 -msgid "desktop.xml" -msgstr "desktop.xml" - #: ../../gentoo/xml/htdocs/doc/en//desktop.xml(guide:redirect):4 msgid "index.xml?catid=desktop#doc_chap2" msgstr "" diff --git a/doc/gettext/ru/devfs-guide.xml.po b/doc/gettext/ru/devfs-guide.xml.po index a6af6d6..8728255 100644 --- a/doc/gettext/ru/devfs-guide.xml.po +++ b/doc/gettext/ru/devfs-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:12+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//devfs-guide.xml(guide:link):6 -msgid "/doc/en/devfs-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//devfs-guide.xml(title):7 msgid "Device File System Guide" msgstr "" diff --git a/doc/gettext/ru/diskless-howto.xml.po b/doc/gettext/ru/diskless-howto.xml.po index 3e7637c..cd85458 100644 --- a/doc/gettext/ru/diskless-howto.xml.po +++ b/doc/gettext/ru/diskless-howto.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:12+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//diskless-howto.xml(guide:link):5 -msgid "/doc/en/diskless-howto.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//diskless-howto.xml(title):6 msgid "Diskless Nodes with Gentoo" msgstr "" diff --git a/doc/gettext/ru/distcc.xml.po b/doc/gettext/ru/distcc.xml.po index b3511be..d7e51ce 100644 --- a/doc/gettext/ru/distcc.xml.po +++ b/doc/gettext/ru/distcc.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:13+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//distcc.xml(guide:link):5 -msgid "/doc/en/distcc.xml" -msgstr "/doc/ru/distcc.xml" - #: ../../gentoo/xml/htdocs/doc/en//distcc.xml(title):7 msgid "Gentoo Distcc Documentation" msgstr "" diff --git a/doc/gettext/ru/ebuild-submit.xml.po b/doc/gettext/ru/ebuild-submit.xml.po index 6b3110c..c4704d7 100644 --- a/doc/gettext/ru/ebuild-submit.xml.po +++ b/doc/gettext/ru/ebuild-submit.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:13+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//ebuild-submit.xml(guide:link):5 -msgid "/doc/en/ebuild-submit.xml" -msgstr "/doc/ru/ebuild-submit.xml" - #: ../../gentoo/xml/htdocs/doc/en//ebuild-submit.xml(title):6 msgid "Contributing Ebuilds" msgstr "" diff --git a/doc/gettext/ru/fluxbox-config.xml.po b/doc/gettext/ru/fluxbox-config.xml.po index a18647b..3e544a3 100644 --- a/doc/gettext/ru/fluxbox-config.xml.po +++ b/doc/gettext/ru/fluxbox-config.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:14+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//fluxbox-config.xml(guide:link):5 -msgid "/doc/en/fluxbox-config.xml" -msgstr "/doc/ru/fluxbox-config.xml" - #: ../../gentoo/xml/htdocs/doc/en//fluxbox-config.xml(title):6 msgid "The Fluxbox Configuration HOWTO" msgstr "" diff --git a/doc/gettext/ru/gcc-upgrading.xml.po b/doc/gettext/ru/gcc-upgrading.xml.po index 7aeec3f..5683388 100644 --- a/doc/gettext/ru/gcc-upgrading.xml.po +++ b/doc/gettext/ru/gcc-upgrading.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2011-01-26 13:57+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -10,16 +10,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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" +"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" "X-Generator: Lokalize 1.0\n" "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(guide:link):6 -msgid "/doc/en/gcc-upgrading.xml" -msgstr "/doc/ru/gcc-upgrading.xml" - #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(title):7 msgid "Gentoo GCC Upgrade Guide" msgstr "Руководство Gentoo по обновлению GCC" @@ -82,40 +79,122 @@ msgid "GCC Upgrading" msgstr "Обновление GCC" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):39 -msgid "Why should you upgrade? Well, GCC is quite similar to any other package on your system, just a bit more critical. You should upgrade GCC whenever a new version fixes some bug that annoys you, new functionality you need is introduced, or if you want to keep your system up-to-date. If none of the previous cases apply to you, you can safely postpone upgrade as long as your GCC version is supported by Gentoo developers." -msgstr "Зачем нужно обновлять? Ну, GCC схож с любым другим пакетов в вашей системе, только он чуточку важнее. GCC следует обновлять всякий раз, когда в новой версии исправляются какие-нибудь раздражающие вас ошибки, добавляется новые нужные функции, или если вы хотите держать свою систему обновленной. Если ни один из этих случаев к вам не относится, обновление можно спокойно откладывать, пока ваша версия GCC поддерживается разработчиками Gentoo." +msgid "" +"Why should you upgrade? Well, GCC is quite similar to any other package on " +"your system, just a bit more critical. You should upgrade GCC whenever a new " +"version fixes some bug that annoys you, new functionality you need is " +"introduced, or if you want to keep your system up-to-date. If none of the " +"previous cases apply to you, you can safely postpone upgrade as long as your " +"GCC version is supported by Gentoo developers." +msgstr "" +"Зачем нужно обновлять? Ну, GCC схож с любым другим пакетов в вашей системе, " +"только он чуточку важнее. GCC следует обновлять всякий раз, когда в новой " +"версии исправляются какие-нибудь раздражающие вас ошибки, добавляется новые " +"нужные функции, или если вы хотите держать свою систему обновленной. Если ни " +"один из этих случаев к вам не относится, обновление можно спокойно " +"откладывать, пока ваша версия GCC поддерживается разработчиками Gentoo." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):48 -msgid "If you install a new major version of GCC (such as 3.3.6 to 3.4.5), the system will not switch over to use it automatically. You'll have to explicitly request the change because the migration process might require some additional steps. If you decide not to switch, Portage will continue to use older version of your compiler until you change your mind, or remove the old compiler from the system. Non-major gcc upgrades are switched automatically for you (such as 3.4.5 to 3.4.6)." -msgstr "Если вы обновляете основную версию GCC (например, с 3.3.6 на 3.4.5), система не переключится на ее использование автоматически. Вам необходимо явно запросить изменение, потому что в процессе перехода может потребоваться несколько дополнительных действий. Если вы решите не переключаться, система Portage будет использовать более старую версию компилятора до тех пор, пока вы не передумаете или пока не удалите старый компилятор из своей системы. Неосновные обновления GCC (например, с 3.4.5 на 3.4.6) переключаются автоматически." +msgid "" +"If you install a new major version of GCC (such as 3.3.6 to 3.4.5), the " +"system will not switch over to use it automatically. You'll have to " +"explicitly request the change because the migration process might require " +"some additional steps. If you decide not to switch, Portage will continue to " +"use older version of your compiler until you change your mind, or remove the " +"old compiler from the system. Non-major gcc upgrades are switched " +"automatically for you (such as 3.4.5 to 3.4.6)." +msgstr "" +"Если вы обновляете основную версию GCC (например, с 3.3.6 на 3.4.5), система " +"не переключится на ее использование автоматически. Вам необходимо явно " +"запросить изменение, потому что в процессе перехода может потребоваться " +"несколько дополнительных действий. Если вы решите не переключаться, система " +"Portage будет использовать более старую версию компилятора до тех пор, пока " +"вы не передумаете или пока не удалите старый компилятор из своей системы. " +"Неосновные обновления GCC (например, с 3.4.5 на 3.4.6) переключаются " +"автоматически." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):58 -msgid "This guide will document the necessary steps required to perform a seamless upgrade of the compiler used by your Gentoo box. A specific section is dedicated to the <uri link=\"#upgrade-3.3-to-3.4\">upgrade from GCC 3.3 to 3.4</uri> and issues with <c>libstdc++</c>. A second specific section is for users <uri link=\"#first-install\">first installing</uri> Gentoo using a stage3 tarball, after a new GCC major/minor version has been released." -msgstr "В этом руководстве описываются обязательные шаги, необходимые для полноценного обновления компилятора, используемого в вашей системе Gentoo. Отдельный разделпосвящен <uri link=\"#upgrade-3.3-to-3.4\">переходу с GCC 3.3 на 3.4</uri> и проблемам с <c>libstdc++</c>. Другой частный раздел предназначен пользователям, <uri link=\"#first-install\">впервые устанавливающим</uri> Gentoo из архива третьей стадии (stage3) после выхода новой основной/неосновной версии GCC." +msgid "" +"This guide will document the necessary steps required to perform a seamless " +"upgrade of the compiler used by your Gentoo box. A specific section is " +"dedicated to the <uri link=\"#upgrade-3.3-to-3.4\">upgrade from GCC 3.3 to " +"3.4</uri> and issues with <c>libstdc++</c>. A second specific section is for " +"users <uri link=\"#first-install\">first installing</uri> Gentoo using a " +"stage3 tarball, after a new GCC major/minor version has been released." +msgstr "" +"В этом руководстве описываются обязательные шаги, необходимые для " +"полноценного обновления компилятора, используемого в вашей системе Gentoo. " +"Отдельный разделпосвящен <uri link=\"#upgrade-3.3-to-3.4\">переходу с GCC " +"3.3 на 3.4</uri> и проблемам с <c>libstdc++</c>. Другой частный раздел " +"предназначен пользователям, <uri link=\"#first-install\">впервые " +"устанавливающим</uri> Gentoo из архива третьей стадии (stage3) после выхода " +"новой основной/неосновной версии GCC." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(warn):67 -msgid "It should be noted that upgrading from GCC-3.4 (or 3.3) to GCC-4.1 or greater still requires you to follow the <uri link=\"#upgrade-general\">general upgrading instructions</uri>, as GCC-3.4 and GCC-4.1 use slightly different ABIs." -msgstr "Необходимо заметить, что обновление с GCC-3.4 (или 3.3) до GCC-4.1 или более нового также требует от вас следованию <uri link=\"#upgrade-general\">общим инструкциям по обновлению</uri>, так как в GCC-3.4 и GCC-4.1 используются слегка отличные друг от друга двоичные прикладные интерфейсы (ABI)." +msgid "" +"It should be noted that upgrading from GCC-3.4 (or 3.3) to GCC-4.1 or " +"greater still requires you to follow the <uri link=\"#upgrade-general" +"\">general upgrading instructions</uri>, as GCC-3.4 and GCC-4.1 use slightly " +"different ABIs." +msgstr "" +"Необходимо заметить, что обновление с GCC-3.4 (или 3.3) до GCC-4.1 или более " +"нового также требует от вас следованию <uri link=\"#upgrade-general\">общим " +"инструкциям по обновлению</uri>, так как в GCC-3.4 и GCC-4.1 используются " +"слегка отличные друг от друга двоичные прикладные интерфейсы (ABI)." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(title):78 msgid "General Upgrade Instructions" msgstr "Общие указания по обновлению" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(impo):83 -msgid "If you're looking for instructions specific to upgrades from GCC-3.3 to GCC-3.4, please consult the <uri link=\"#upgrade-3.3-to-3.4\">dedicated section</uri>." -msgstr "Если вам нужны указания по обновлению с GCC-3.3 на GCC-3.4, обратитесь к <uri link=\"#upgrade-3.3-to-3.4\">соответствующему разделу</uri>." +msgid "" +"If you're looking for instructions specific to upgrades from GCC-3.3 to " +"GCC-3.4, please consult the <uri link=\"#upgrade-3.3-to-3.4\">dedicated " +"section</uri>." +msgstr "" +"Если вам нужны указания по обновлению с GCC-3.3 на GCC-3.4, обратитесь к " +"<uri link=\"#upgrade-3.3-to-3.4\">соответствующему разделу</uri>." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(impo):89 -msgid "If you're looking for instructions specific to upgrades in GCC for new installs, please consult the <uri link=\"#first-install\">dedicated section</uri>." -msgstr "Если вам нужны указания по обновлению GCC на вновь установленных системах, обратитесь к <uri link=\"#first-install\">соответствующему разделу</uri>." +msgid "" +"If you're looking for instructions specific to upgrades in GCC for new " +"installs, please consult the <uri link=\"#first-install\">dedicated section</" +"uri>." +msgstr "" +"Если вам нужны указания по обновлению GCC на вновь установленных системах, " +"обратитесь к <uri link=\"#first-install\">соответствующему разделу</uri>." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):95 -msgid "Generally speaking, upgrades to <e>bug fix releases</e>, like from 3.3.5 to 3.3.6, should be quite safe -- just emerge new version, switch your system to use it and rebuild the only affected package, <c>libtool</c>. However, some GCC upgrades break binary compatibility; in such cases a rebuild of the affected packages (or even whole toolchain and system) might be required." -msgstr "Вообще говоря, переход на <e>версии с исправленными ошибками (bugfix release)</e>, как с 3.3.5 на 3.3.6, должен быть довольно безопасен — надо только установить новую версию, переключиться на нее и пересобрать единственный затрагиваемый пакет — <c>libtool</c>. Однако при некоторых обновлениях GCC может нарушаться двоичная совместимость; в таких случаях необходима пересборка всех затрагиваемых пакетов (или даже всего системного набора и пакетов, необходимых для компиляции)." +msgid "" +"Generally speaking, upgrades to <e>bug fix releases</e>, like from 3.3.5 to " +"3.3.6, should be quite safe -- just emerge new version, switch your system " +"to use it and rebuild the only affected package, <c>libtool</c>. However, " +"some GCC upgrades break binary compatibility; in such cases a rebuild of the " +"affected packages (or even whole toolchain and system) might be required." +msgstr "" +"Вообще говоря, переход на <e>версии с исправленными ошибками (bugfix release)" +"</e>, как с 3.3.5 на 3.3.6, должен быть довольно безопасен — надо только " +"установить новую версию, переключиться на нее и пересобрать единственный " +"затрагиваемый пакет — <c>libtool</c>. Однако при некоторых обновлениях GCC " +"может нарушаться двоичная совместимость; в таких случаях необходима " +"пересборка всех затрагиваемых пакетов (или даже всего системного набора и " +"пакетов, необходимых для компиляции)." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):103 -msgid "When we spoke about the need to switch your compiler to the newer version by hand, we said it won't happen automatically. However, there is one exception -- upgrades to bug fix releases, like from 3.3.5 to 3.3.6 in case you don't use the \"multislot\" feature allowing them to coexist on one system. Multislot is disabled by default as the majority of users won't benefit from it." -msgstr "Говоря о необходимости ручного переключения на новую версию компилятора, мы сказали, что оно не происходит автоматически. Тем не менее, есть одно исключение — переход на версию с исправленными ошибками (например, с 3.3.5 на 3.3.6), если при этом не задействован режим «multislot», позволяющий обеим версиям сосуществовать в одной системе. По умолчанию этот режим выключен, ведь большинству пользователей он ничего не даст." +msgid "" +"When we spoke about the need to switch your compiler to the newer version by " +"hand, we said it won't happen automatically. However, there is one exception " +"-- upgrades to bug fix releases, like from 3.3.5 to 3.3.6 in case you don't " +"use the \"multislot\" feature allowing them to coexist on one system. " +"Multislot is disabled by default as the majority of users won't benefit from " +"it." +msgstr "" +"Говоря о необходимости ручного переключения на новую версию компилятора, мы " +"сказали, что оно не происходит автоматически. Тем не менее, есть одно " +"исключение — переход на версию с исправленными ошибками (например, с 3.3.5 " +"на 3.3.6), если при этом не задействован режим «multislot», позволяющий " +"обеим версиям сосуществовать в одной системе. По умолчанию этот режим " +"выключен, ведь большинству пользователей он ничего не даст." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):111 #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):278 @@ -161,7 +240,9 @@ msgstr "" "# <i>emerge --oneshot -av libtool</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):129 -msgid "To be completely safe that your system is in a sane state, you <e>must</e> rebuild the toolchain and then world to make use of the new compiler." +msgid "" +"To be completely safe that your system is in a sane state, you <e>must</e> " +"rebuild the toolchain and then world to make use of the new compiler." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):134 @@ -181,8 +262,14 @@ msgstr "" "# <i>emerge -eav world</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):139 -msgid "It is safe to remove the older GCC version at this time. If you feel the need, please issue the following command (as usual, substitute <c>=sys-devel/gcc-3.4*</c> with the version you want to uninstall):" -msgstr "Теперь можно без опасений удалить старую версию GCC. Если вы чувствуете такую необходимость, введите следующую команду (как обычно, вместо <c>=sys-devel/gcc-3.4*</c> укажите версию, которую собираетесь удалить):" +msgid "" +"It is safe to remove the older GCC version at this time. If you feel the " +"need, please issue the following command (as usual, substitute <c>=sys-devel/" +"gcc-3.4*</c> with the version you want to uninstall):" +msgstr "" +"Теперь можно без опасений удалить старую версию GCC. Если вы чувствуете " +"такую необходимость, введите следующую команду (как обычно, вместо <c>=sys-" +"devel/gcc-3.4*</c> укажите версию, которую собираетесь удалить):" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):145 msgid "Removing older GCC version" @@ -198,40 +285,89 @@ msgstr "" "# <i>emerge -aC =sys-devel/gcc-3.4*</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(impo):149 -msgid "Please note that the GCC 4.1 and newer can compile only kernels newer than 2.4.34. Don't remove your old GCC version if you want to use an older kernel." -msgstr "Помните, что GCC 4.1 и выше не может собирать ядра ниже 2.4.34. Если вы собираетесь использовать старое ядро, то не удаляйте старую версию GCC." +msgid "" +"Please note that the GCC 4.1 and newer can compile only kernels newer than " +"2.4.34. Don't remove your old GCC version if you want to use an older kernel." +msgstr "" +"Помните, что GCC 4.1 и выше не может собирать ядра ниже 2.4.34. Если вы " +"собираетесь использовать старое ядро, то не удаляйте старую версию GCC." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(impo):154 -msgid "In case you're upgrading from GCC-3.3, you should run <c>emerge --oneshot sys-libs/libstdc++-v3</c> to provide compatibility with older binary C++ applications." -msgstr "При обновлении с GCC-3.3 вам необходимо выполнить <c>emerge --oneshot sys-libs/libstdc++-v3</c>, чтобы установить режим совместимости для старых двоичных приложений, написанных на C++." +msgid "" +"In case you're upgrading from GCC-3.3, you should run <c>emerge --oneshot " +"sys-libs/libstdc++-v3</c> to provide compatibility with older binary C++ " +"applications." +msgstr "" +"При обновлении с GCC-3.3 вам необходимо выполнить <c>emerge --oneshot sys-" +"libs/libstdc++-v3</c>, чтобы установить режим совместимости для старых " +"двоичных приложений, написанных на C++." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(title):165 msgid "Upgrading from GCC-3.3 to 3.4" msgstr "Переход с GCC-3.3 на 3.4" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):170 -msgid "The upgrade from GCC-3.3 to 3.4 is not seamless as the C++ ABI changed between these two versions. There is an issue with the <c>libstdc++</c> library which must be taken care of, as well." -msgstr "Переход с GCC-3.3 на 3.4 или более новую версию не так гладок, так как между этими версиями изменился двоичный прикладной интерфейс C++ (ABI). Также придется позаботиться о существующей проблеме с библиотекой <c>libstdc++</c>." +msgid "" +"The upgrade from GCC-3.3 to 3.4 is not seamless as the C++ ABI changed " +"between these two versions. There is an issue with the <c>libstdc++</c> " +"library which must be taken care of, as well." +msgstr "" +"Переход с GCC-3.3 на 3.4 или более новую версию не так гладок, так как между " +"этими версиями изменился двоичный прикладной интерфейс C++ (ABI). Также " +"придется позаботиться о существующей проблеме с библиотекой <c>libstdc++</c>." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(title):179 msgid "The Choices" msgstr "Варианты" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(impo):182 -msgid "If you upgrade from gcc 3.4 to 4.1, please consult the <uri link=\"#upgrade-general\">General Update instructions</uri>." -msgstr "Если обновляете gcc с 3.4 до 4.1, ознакомьтесь с <uri link=\"#upgrade-general\">общими инструкциями по обновлению</uri>." +msgid "" +"If you upgrade from gcc 3.4 to 4.1, please consult the <uri link=\"#upgrade-" +"general\">General Update instructions</uri>." +msgstr "" +"Если обновляете gcc с 3.4 до 4.1, ознакомьтесь с <uri link=\"#upgrade-general" +"\">общими инструкциями по обновлению</uri>." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(impo):187 -msgid "If you're upgrading on a SPARC machine, you will have to take the way of <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">complete system rebuild</uri> due to some internal <uri link=\"http://gcc.gnu.org/gcc-3.4/sparc-abi.html\">ABI changes</uri> in GCC's parameter passing." -msgstr "Если вы обновляете GCC на машине SPARC, вам придется выбрать путь <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">полной пересборки системы</uri> из-за некоторых внутренних <uri link=\"http://gcc.gnu.org/gcc-3.4/sparc-abi.html\">изменений ABI</uri> GCC в области передачи параметров функций." +msgid "" +"If you're upgrading on a SPARC machine, you will have to take the way of " +"<uri link=\"#upgrade-3.3-to-3.4-emerge-e\">complete system rebuild</uri> due " +"to some internal <uri link=\"http://gcc.gnu.org/gcc-3.4/sparc-abi.html\">ABI " +"changes</uri> in GCC's parameter passing." +msgstr "" +"Если вы обновляете GCC на машине SPARC, вам придется выбрать путь <uri link=" +"\"#upgrade-3.3-to-3.4-emerge-e\">полной пересборки системы</uri> из-за " +"некоторых внутренних <uri link=\"http://gcc.gnu.org/gcc-3.4/sparc-abi.html" +"\">изменений ABI</uri> GCC в области передачи параметров функций." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):194 -msgid "If you upgrade from gcc 3.3 to 3.4, you have two possibilities on how to upgrade your system. The <uri link=\"#upgrade-3.3-to-3.4-revdep-rebuild\">first method</uri> is faster and requires use of the <c>revdep-rebuild</c> tool from package <c>gentoolkit</c> while the <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">second one</uri> rebuilds the entire system from scratch so it will make use of new GCC features. It's up to you to decide which of these two ways you will choose. In most cases, the first method is sufficient." -msgstr "Если вы обновляете gcc 3.4 до 3.4, у вас есть два варианта обновления системы. <uri link=\"#upgrade-3.3-to-3.4-revdep-rebuild\">Первый способ</uri> быстрее и требует использования программы <c>revdep-rebuild</c> из пакета <c>gentoolkit</c>, а <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">во втором</uri> вся система пересобирается с нуля, чтобы задействовать новые возможности GCC. Ваше дело, какой из способов выбрать. В большинстве случаев первого способавполне достаточно." +msgid "" +"If you upgrade from gcc 3.3 to 3.4, you have two possibilities on how to " +"upgrade your system. The <uri link=\"#upgrade-3.3-to-3.4-revdep-rebuild" +"\">first method</uri> is faster and requires use of the <c>revdep-rebuild</" +"c> tool from package <c>gentoolkit</c> while the <uri link=\"#upgrade-3.3-" +"to-3.4-emerge-e\">second one</uri> rebuilds the entire system from scratch " +"so it will make use of new GCC features. It's up to you to decide which of " +"these two ways you will choose. In most cases, the first method is " +"sufficient." +msgstr "" +"Если вы обновляете gcc 3.4 до 3.4, у вас есть два варианта обновления " +"системы. <uri link=\"#upgrade-3.3-to-3.4-revdep-rebuild\">Первый способ</" +"uri> быстрее и требует использования программы <c>revdep-rebuild</c> из " +"пакета <c>gentoolkit</c>, а <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">во " +"втором</uri> вся система пересобирается с нуля, чтобы задействовать новые " +"возможности GCC. Ваше дело, какой из способов выбрать. В большинстве случаев " +"первого способавполне достаточно." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):205 -msgid "If you upgrade from gcc 3.3 to 4.1, do not use the method based on revdep-rebuild, but do a <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">complete system rebuild</uri>." -msgstr "Если вы обновляете gcc с 3.3 до 4.1, не используйте способ, основанный на revdep-rebuild, необходимо <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">пересобрать систему целиком</uri>." +msgid "" +"If you upgrade from gcc 3.3 to 4.1, do not use the method based on revdep-" +"rebuild, but do a <uri link=\"#upgrade-3.3-to-3.4-emerge-e\">complete system " +"rebuild</uri>." +msgstr "" +"Если вы обновляете gcc с 3.3 до 4.1, не используйте способ, основанный на " +"revdep-rebuild, необходимо <uri link=\"#upgrade-3.3-to-3.4-emerge-e" +"\">пересобрать систему целиком</uri>." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(title):214 #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):242 @@ -240,8 +376,16 @@ msgid "Using revdep-rebuild" msgstr "Использование revdep-rebuild" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):217 -msgid "This method requires that you first install <c>gentoolkit</c> if you have not already done so. Then we will upgrade GCC and switch to the new compiler. We will also rebuild the <c>libtool</c> package to ensure that toolchain is in healthy state." -msgstr "Для этого способа необходимо сначала установить <c>gentoolkit</c>, если вы еще этого не сделали. Затем обновите GCC и переключите систему на новый компилятор. Также пересоберите пакет <c>libtool</c>, чтобы обеспечить пригодность программ для компиляции." +msgid "" +"This method requires that you first install <c>gentoolkit</c> if you have " +"not already done so. Then we will upgrade GCC and switch to the new " +"compiler. We will also rebuild the <c>libtool</c> package to ensure that " +"toolchain is in healthy state." +msgstr "" +"Для этого способа необходимо сначала установить <c>gentoolkit</c>, если вы " +"еще этого не сделали. Затем обновите GCC и переключите систему на новый " +"компилятор. Также пересоберите пакет <c>libtool</c>, чтобы обеспечить " +"пригодность программ для компиляции." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):224 msgid "Installing gentoolkit and upgrading GCC" @@ -273,8 +417,14 @@ msgstr "" "# <i>emerge --oneshot -av libtool</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):236 -msgid "Now, we want to see which packages that revdep-rebuild will want to rebuild. Then we will tell revdep-rebuild to actually rebuild the packages. This may take some time, so have some patience." -msgstr "Теперь посмотрите, какие пакеты собирается пересобирать revdep-rebuild, затем запустите revdep-rebuild на собственно пересборку. Это займет некоторое время, так что потерпите." +msgid "" +"Now, we want to see which packages that revdep-rebuild will want to rebuild. " +"Then we will tell revdep-rebuild to actually rebuild the packages. This may " +"take some time, so have some patience." +msgstr "" +"Теперь посмотрите, какие пакеты собирается пересобирать revdep-rebuild, " +"затем запустите revdep-rebuild на собственно пересборку. Это займет " +"некоторое время, так что потерпите." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre):242 #, no-wrap @@ -289,12 +439,28 @@ msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(note):247 #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(note):405 -msgid "It is possible that you might have problems with non-existing package versions due to them being outdated or masked. If this is the case, you will want to use the <c>--package-names</c> option to <c>revdep-rebuild</c>. This causes packages to be recompiled based on the package name, rather than the exact name and version." -msgstr "Возможно, у вас появятся проблемы с несуществующими версиями пакетов из-за того, что они устарели или замаскированы. В этом случае можно при запуске <c>revdep-rebuild</c> указать параметр <c>--package-names</c>. Этом случае пакеты будут пересобираться на основе на имен, вместо точного имени и версии." +msgid "" +"It is possible that you might have problems with non-existing package " +"versions due to them being outdated or masked. If this is the case, you will " +"want to use the <c>--package-names</c> option to <c>revdep-rebuild</c>. This " +"causes packages to be recompiled based on the package name, rather than the " +"exact name and version." +msgstr "" +"Возможно, у вас появятся проблемы с несуществующими версиями пакетов из-за " +"того, что они устарели или замаскированы. В этом случае можно при запуске " +"<c>revdep-rebuild</c> указать параметр <c>--package-names</c>. Этом случае " +"пакеты будут пересобираться на основе на имен, вместо точного имени и версии." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):255 -msgid "To provide compatibility with older binary C++ applications and any packages that revdep-rebuild might have missed, <c>sys-libs/libstdc++-v3</c> needs to be merged before you unmerge GCC 3.3 from your system." -msgstr "Для обеспечения совместимости с более старыми двоичными приложениями C++ и любыми пакетами, которые revdep-rebuild мог пропустить, надо установить пакет<c>sys-libs/libstdc++-v3</c> до того, как удалять GCC 3.3 из своей системы." +msgid "" +"To provide compatibility with older binary C++ applications and any packages " +"that revdep-rebuild might have missed, <c>sys-libs/libstdc++-v3</c> needs to " +"be merged before you unmerge GCC 3.3 from your system." +msgstr "" +"Для обеспечения совместимости с более старыми двоичными приложениями C++ и " +"любыми пакетами, которые revdep-rebuild мог пропустить, надо установить " +"пакет<c>sys-libs/libstdc++-v3</c> до того, как удалять GCC 3.3 из своей " +"системы." #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):261 msgid "Installing libstdc++-v3 and cleaning up" @@ -317,7 +483,11 @@ msgid "Using emerge -e" msgstr "Использование emerge -e" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):272 -msgid "This method, while much slower, will rebuild your whole system to ensure that everything has been rebuilt with your new compiler, and therefore safer. At first, you will upgrade GCC and libtool and switch to your new compiler." +msgid "" +"This method, while much slower, will rebuild your whole system to ensure " +"that everything has been rebuilt with your new compiler, and therefore " +"safer. At first, you will upgrade GCC and libtool and switch to your new " +"compiler." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre):278 @@ -342,7 +512,9 @@ msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):295 #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):377 -msgid "To provide compatibility with older binary C++ applications, <c>sys-libs/libstdc++-v3</c> needs to be merged onto your system." +msgid "" +"To provide compatibility with older binary C++ applications, <c>sys-libs/" +"libstdc++-v3</c> needs to be merged onto your system." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):300 @@ -361,7 +533,13 @@ msgstr "" "# <i>emerge --oneshot sys-libs/libstdc++-v3</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):304 -msgid "Now we will go about first rebuilding the system target, then the world target. This will take a very long time, depending on the number of packages that you have installed, as it will rebuild your entire toolchain and supporting system files, followed by every package on your system, including the toolchain. This is necessary to ensure that all packages have been compiled with the new toolchain, including the toolchain itself." +msgid "" +"Now we will go about first rebuilding the system target, then the world " +"target. This will take a very long time, depending on the number of packages " +"that you have installed, as it will rebuild your entire toolchain and " +"supporting system files, followed by every package on your system, including " +"the toolchain. This is necessary to ensure that all packages have been " +"compiled with the new toolchain, including the toolchain itself." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):313 @@ -403,15 +581,36 @@ msgid "Upgrading to GCC on a First Install" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):336 -msgid "A GCC upgrade on a system after installation from a stage3 tarball is a simple affair. One advantage users of new installations have is they do not have a plethora of software installed that links against the older version of GCC. The following example is for a GCC-3.3 to 3.4 upgrade. Certain parts will be different if upgrading from other versions of GCC. For example, the library names used for <c>revdep-rebuild</c> below are GCC 3.3 specific, as well as the need to install <c>libstdc++-v3</c>." +msgid "" +"A GCC upgrade on a system after installation from a stage3 tarball is a " +"simple affair. One advantage users of new installations have is they do not " +"have a plethora of software installed that links against the older version " +"of GCC. The following example is for a GCC-3.3 to 3.4 upgrade. Certain parts " +"will be different if upgrading from other versions of GCC. For example, the " +"library names used for <c>revdep-rebuild</c> below are GCC 3.3 specific, as " +"well as the need to install <c>libstdc++-v3</c>." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):346 -msgid "If a user has not made any customizations to their system yet, then there are very few steps to get their system upgraded to a new GCC version. As with the GCC-3.3 to 3.4 upgrade, the user has a couple options. However, unlike the GCC-3.3 to 3.4 upgrade, this one is less complicated as there are fewer differences between the methods. The <uri link=\"#first-install-revdep-rebuild\">first method</uri> is faster and makes use of the <c>revdep-rebuild</c> tool from <c>gentoolkit</c>, similar to the above procedure. Using revdep-rebuild causes only packages which actually link against GCC libraries to be rebuilt, while the <uri link=\"#first-install-emerge-e\">second method</uri> causes your entire new install to be recompiled with the new GCC version and takes much longer. This second method is never required and only documented for completeness." +msgid "" +"If a user has not made any customizations to their system yet, then there " +"are very few steps to get their system upgraded to a new GCC version. As " +"with the GCC-3.3 to 3.4 upgrade, the user has a couple options. However, " +"unlike the GCC-3.3 to 3.4 upgrade, this one is less complicated as there are " +"fewer differences between the methods. The <uri link=\"#first-install-revdep-" +"rebuild\">first method</uri> is faster and makes use of the <c>revdep-" +"rebuild</c> tool from <c>gentoolkit</c>, similar to the above procedure. " +"Using revdep-rebuild causes only packages which actually link against GCC " +"libraries to be rebuilt, while the <uri link=\"#first-install-emerge-e" +"\">second method</uri> causes your entire new install to be recompiled with " +"the new GCC version and takes much longer. This second method is never " +"required and only documented for completeness." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):361 -msgid "These first steps are common between both methods, and should be completed by everyone." +msgid "" +"These first steps are common between both methods, and should be completed " +"by everyone." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre):366 @@ -429,7 +628,10 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):393 -msgid "This method requires that you first install <c>gentoolkit</c> if you have not already done so. We will then run <c>revdep-rebuild</c> to actually scan the installed packages for ones we need to rebuild, then rebuild them." +msgid "" +"This method requires that you first install <c>gentoolkit</c> if you have " +"not already done so. We will then run <c>revdep-rebuild</c> to actually scan " +"the installed packages for ones we need to rebuild, then rebuild them." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):399 @@ -450,11 +652,20 @@ msgstr "" "# <i>revdep-rebuild --library libstdc++.so.5</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):419 -msgid "This method, while much slower, will rebuild the system target to ensure that everything has been rebuilt with your new compiler. This is not necessary, but is valid if you are also making changes to CFLAGS or other make.conf variables that will affect the system compile." +msgid "" +"This method, while much slower, will rebuild the system target to ensure " +"that everything has been rebuilt with your new compiler. This is not " +"necessary, but is valid if you are also making changes to CFLAGS or other " +"make.conf variables that will affect the system compile." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):426 -msgid "Since we are performing these actions after an initial installation, we do not need to recompile the <c>world</c> target as we would when doing an upgrade on an already installed system. However, you may choose to perform a world update in place of the system update, to ensure that all packages are updated." +msgid "" +"Since we are performing these actions after an initial installation, we do " +"not need to recompile the <c>world</c> target as we would when doing an " +"upgrade on an already installed system. However, you may choose to perform a " +"world update in place of the system update, to ensure that all packages are " +"updated." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre):433 @@ -467,7 +678,9 @@ msgstr "" "# <i>emerge -e system</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):443 -msgid "It is also safe to remove older GCC versions at this time. Please substitute <c>YOUR-NEW-GCC-VERSION</c> with the actual version you've upgraded to:" +msgid "" +"It is also safe to remove older GCC versions at this time. Please substitute " +"<c>YOUR-NEW-GCC-VERSION</c> with the actual version you've upgraded to:" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre):448 @@ -484,15 +697,24 @@ msgid "Common Pitfalls" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):461 -msgid "It's important to disable <c>distcc</c> during upgrade. Mixing compiler versions on your nodes <e>will</e> cause build issues. This is not required for ccache, as the cache objects will be invalidated anyway." +msgid "" +"It's important to disable <c>distcc</c> during upgrade. Mixing compiler " +"versions on your nodes <e>will</e> cause build issues. This is not required " +"for ccache, as the cache objects will be invalidated anyway." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):467 -msgid "Always use same GCC version for your kernel and additional kernel modules. Once you rebuild your world with new GCC, external modules (like <c>app-emulation/qemu-softmmu</c>) will fail to load. Please rebuild your kernel with the new GCC to fix that." +msgid "" +"Always use same GCC version for your kernel and additional kernel modules. " +"Once you rebuild your world with new GCC, external modules (like <c>app-" +"emulation/qemu-softmmu</c>) will fail to load. Please rebuild your kernel " +"with the new GCC to fix that." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):474 -msgid "If you're upgrading on a SPARC machine, make sure to rerun <c>silo -f</c> after re-emerging world to avoid possible issues." +msgid "" +"If you're upgrading on a SPARC machine, make sure to rerun <c>silo -f</c> " +"after re-emerging world to avoid possible issues." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(title):482 @@ -500,19 +722,37 @@ msgid "Frequent Error Messages" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):485 -msgid "If your system complains about something like <e>libtool: link: `/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/libstdc++.la' is not a valid libtool archive</e>, please run <c>/usr/share/gcc-data/$CHOST/<gcc-version>/fix_libtool_files.sh 3.3.6</c> (substitute \"3.3.6\" with the version numbers from the error message, and $CHOST and <gcc-version> with your actual CHOST and GCC version)." +msgid "" +"If your system complains about something like <e>libtool: link: `/usr/lib/" +"gcc-lib/i686-pc-linux-gnu/3.3.6/libstdc++.la' is not a valid libtool " +"archive</e>, please run <c>/usr/share/gcc-data/$CHOST/<gcc-version>/" +"fix_libtool_files.sh 3.3.6</c> (substitute \"3.3.6\" with the version " +"numbers from the error message, and $CHOST and <gcc-version> with your " +"actual CHOST and GCC version)." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):494 -msgid "If you see <e>error: /usr/bin/gcc-config: line 632: /etc/env.d/gcc/i686-pc-linux-gnu-3.3.5: No such file or directory</e>, then try deleting <path>/etc/env.d/gcc/config-i686-pc-linux-gnu</path> and running <c>gcc-config</c> again, followed by <c>source /etc/profile</c>. Only do this if you do not have any cross-compilers set up, though." +msgid "" +"If you see <e>error: /usr/bin/gcc-config: line 632: /etc/env.d/gcc/i686-pc-" +"linux-gnu-3.3.5: No such file or directory</e>, then try deleting <path>/etc/" +"env.d/gcc/config-i686-pc-linux-gnu</path> and running <c>gcc-config</c> " +"again, followed by <c>source /etc/profile</c>. Only do this if you do not " +"have any cross-compilers set up, though." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):502 -msgid "If a package fails during <c>emerge -e system</c> or <c>emerge -e world</c>, you can resume operation with <c>emerge --resume</c>. If a package fails repeatedly, skip it with <c>emerge --resume --skipfirst</c>. Don't run any other instances of emerge in between or you will lose the resume information." +msgid "" +"If a package fails during <c>emerge -e system</c> or <c>emerge -e world</c>, " +"you can resume operation with <c>emerge --resume</c>. If a package fails " +"repeatedly, skip it with <c>emerge --resume --skipfirst</c>. Don't run any " +"other instances of emerge in between or you will lose the resume information." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(p):509 -msgid "If you get an error message <e>spec failure: unrecognized spec option</e> while upgrading your compiler, try to switch back to your default compiler, unset the <c>GCC_SPECS</c> variable and upgrade GCC again:" +msgid "" +"If you get an error message <e>spec failure: unrecognized spec option</e> " +"while upgrading your compiler, try to switch back to your default compiler, " +"unset the <c>GCC_SPECS</c> variable and upgrade GCC again:" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gcc-upgrading.xml(pre:caption):515 @@ -540,4 +780,3 @@ msgid "translator-credits" msgstr "" "Юрий Астахов; astakhov@warum.ru; переводчик\n" "Азамат Хакимов; azamat.hackimov@gmail.com; редактор перевода" - diff --git a/doc/gettext/ru/genkernel.xml.po b/doc/gettext/ru/genkernel.xml.po index 01c0d82..de31109 100644 --- a/doc/gettext/ru/genkernel.xml.po +++ b/doc/gettext/ru/genkernel.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-02-04 03:33+0500\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-01-11 17:52+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -68,11 +68,11 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(version):35 -msgid "6" +msgid "7" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(date):36 -msgid "2011-01-20" +msgid "2011-09-03" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):39 @@ -497,14 +497,6 @@ msgstr "" #: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):419 msgid "" -"<b>--evms</b>: Includes support for storage using the <uri link=\"http://" -"evms.sourceforge.net/\">Enterprise Volume Management System</uri> (EVMS2), " -"if available. Be sure to install the evms package on your system with " -"<c>emerge evms</c> before using this (genkernel) flag." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):426 -msgid "" "<b>--dmraid</b>: Includes support for <uri link=\"http://people.redhat.com/" "~heinzm/sw/dmraid/readme\">DMRAID</uri>; the utility which creates RAID " "mappings using the kernel device-mapper subsystem. DMRAID discovers, " @@ -512,7 +504,7 @@ msgid "" "(ATARAID, for example) and contained DOS partitions." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):433 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):426 msgid "" "<b>--luks</b>: Includes support for <uri link=\"http://luks.endorphin.org/" "\">Linux Unified Key Setup</uri> or LUKS. This will allow you to use a " @@ -521,23 +513,23 @@ msgid "" "(and real_root shall be the unencrypted device LUKS creates)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):441 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):434 msgid "" "<b>--disklabel</b>: Adds support for disk label and UUID support to your " "initrd." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):445 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):438 msgid "<b>--iscsi</b>: Adds support for iSCSI to your initrd." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):448 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):441 msgid "" "<b>--multipath</b>: Adds support for <uri link=\"/doc/en/multipath.xml" "\">Multipath</uri> to your initrd." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):452 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):445 msgid "" "<b>--linuxrc=/path/to/your/linuxrc</b>: Specifies a user-created <e>linuxrc</" "e>— a script that is initialized during the start-up stage of the " @@ -547,36 +539,36 @@ msgid "" "needed (as modules) by the system." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):460 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):453 msgid "" "<b>--cachedir=/path/to/alt/dir/</b>: Overrides the default cache location " "used while compiling the kernel." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):464 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):457 msgid "" "<b>--tempdir=/path/to/new/tempdir/</b>: Specifies the location of the " "temporary directory used by genkernel while compiling the kernel." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):468 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):461 msgid "" "<b>--unionfs</b>: Includes support for the <uri link=\"http://www.fsl.cs." "sunysb.edu/project-unionfs.html\">Unification File System</uri> in the " "initrd image." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):478 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):471 msgid "Miscellaneous Flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):481 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):474 msgid "" "The assortment of flags listed below are supported by genkernel, but do not " "fit neatly into any of the other categories:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):487 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):480 msgid "" "<b>--mountboot</b>: Detects whether or not the <path>/boot/</path> directory " "needs to be mounted on a separate partition. It will check <path>/etc/fstab</" @@ -584,7 +576,7 @@ msgid "" "system (if needed)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):493 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):486 msgid "" "<b>--kernname=<c>NickName</c></b>: Allows you to modify the name of the " "kernel and initrd images in the <path>/boot/</path> directory, so that the " @@ -592,61 +584,61 @@ msgid "" "<c>NickName</c>-version." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):504 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):497 msgid "Possible Actions" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):507 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):500 msgid "" "An action tells genkernel what to build. Currently, the following actions " "are supported:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):513 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):506 msgid "" "<c>all</c>: Builds all stages — the initrd, kernel image and modules." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):516 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):509 msgid "<c>bzImage</c>: Only builds the kernel image" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):517 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):510 msgid "<c>kernel</c>: Only builds the kernel image and modules" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):518 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):511 msgid "<c>initramfs</c>: Only builds the initramfs/ramdisk image" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):519 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):512 msgid "<c>ramdisk</c>: Only builds the initramfs/ramdisk image" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):522 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):515 msgid "" "The first action, <c>all</c>, is recommended for most users since it builds " "the stages required for a functional kernel. Remember, an <e>action</e> " "simply tells genkernel what to <e>build</e>, not <e>install</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):531 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):524 msgid "Bootloader Configuration" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):534 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):527 msgid "" "To set up genkernel to work with your bootloader, three or four changes " "should be applied to the bootloader's configuration file:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):540 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):533 msgid "" "Add <c>real_root=/dev/sda3</c>, for example, to the kernel parameters passed " "to the kernel image, if <path>/dev/sda3</path> contains your root partition." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):545 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):538 msgid "" "If you are using splash, add a suitable mode line such as <c>vga=0x317</c> " "to the parameters passed to the kernel and also add <c>splash=verbose</c> or " @@ -654,7 +646,7 @@ msgid "" "bootloader." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):551 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):544 msgid "" "Add the initrd information as required by the bootloader. Consult the <uri " "link=\"/doc/en/handbook/handbook-x86.xml?part=1&chap=10\">Bootloader " @@ -662,25 +654,25 @@ msgid "" "make your bootloader initrd-aware." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):564 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):557 msgid "Configuration Options" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):566 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):559 msgid "Editing /etc/genkernel.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):569 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):562 msgid "" "Passing flags to genkernel from the command line can be cumbersome, " "especially if you have about a dozen flags:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):574 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):567 msgid "Running genkernel (overloaded with flags)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):574 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):567 #, no-wrap msgid "" "\n" @@ -689,14 +681,14 @@ msgid "" "--kernel-config=/path/to/preferred/configfile --save-config --mountboot all</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):580 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):573 msgid "" "Fortunately, there is a configuration file where most of the basic options " "can be set (or changed) as necessary: <path>/etc/genkernel.conf</path>. What " "follows is a rundown of the more relevant options:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):587 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):580 msgid "" "<b>MENUCONFIG=<c>[yes|no]</c></b>: This option is equivalent to the <c>--" "menuconfig</c> flag used by genkernel, which in turn uses the <c>make " @@ -705,7 +697,7 @@ msgid "" "this script, set this option to 'yes' here; otherwise, choose 'no'." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):594 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):587 msgid "" "<b>CLEAN=<c>[yes|no]</c></b>: Setting this option to 'yes' is equivalent to " "the <c>--clean</c> flag used by genkernel, and invokes the <c>make clean</c> " @@ -716,7 +708,7 @@ msgid "" "essentially nullifying the <c>make mrproper</c> command." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):604 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):597 msgid "" "<b>MRPROPER=<c>[yes|no]</c></b>: Setting this option to 'yes' is equivalent " "to <c>--mrproper</c> flag used by genkernel, and invokes the <c>make " @@ -725,7 +717,7 @@ msgid "" "no-mrproper</c> flag, which disables the <c>make mrproper</c> command." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):611 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):604 msgid "" "<b>MOUNTBOOT=<c>[yes|no]</c></b>: Setting this option to 'yes' is equivalent " "to the <c>--mountboot</c> flag, and automatically mounts the <path>/boot/</" @@ -734,7 +726,7 @@ msgid "" "make for one less (essential) step to remember later." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):618 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):611 msgid "" "<b>SAVE_CONFIG=<c>[yes|no]</c></b>: After configuring the kernel, the " "selected options are stored as <path>.config</path> in the kernel source " @@ -745,14 +737,14 @@ msgid "" "directory. Choosing 'no' preserves the <e>status quo</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):627 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):620 msgid "" "<b>USECOLOR=<c>[yes|no]</c></b>: Setting this option to 'yes' is equivalent " "to the <c>--color</c> flag, which colors genkernel's output to ease " "debugging (when needed.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):632 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(li):625 msgid "" "<b>LOGLEVEL=<c>[0|1|2|3|4|5]</c></b>: This option is for adjusting the " "verbosity of the output produced by genkernel — setting this option to " @@ -761,21 +753,21 @@ msgid "" "all output produced by genkernel." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(note):641 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(note):634 msgid "More options are described in <path>/etc/genkernel.conf</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):645 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):638 msgid "" "By choosing the appropriate options in <path>/etc/genkernel.conf</path>, you " "can halve the number of flags passed to genkernel from the command line:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):650 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):643 msgid "Running genkernel (with flags), after employing genkernel.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):650 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):643 #, no-wrap msgid "" "\n" @@ -783,21 +775,21 @@ msgid "" "--kernel-config=/path/to/preferred/configfile --install all</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):655 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):648 msgid "" "Identical results are obtained from both approaches, but the latter has most " "of the options stored in a script that can be modified at a later date." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):665 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):658 msgid "Network-Booting with genkernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):667 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):660 msgid "Network Booting from an Installation CD" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):670 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):663 msgid "" "The genkernel utility can build kernel and initrd images that provide " "support for network booting, or <e>netboot</e>ing. With any luck, you should " @@ -805,29 +797,29 @@ msgid "" "Installation CD." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):677 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):670 msgid "" "The magic lies in genkernel's linuxrc script: it will try to <e>netmount</e> " "the Installation CD using NFS. From there, <e>the init scripts</e> of the " "Installation CD can take over, as if the CD was present locally." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):686 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):679 msgid "Building Kernel and Initrd Images with Support for Netbooting" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):689 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):682 msgid "" "To enable support for netbooting, include the following options while " "configuring the kernel:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(warn):694 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(warn):687 msgid "" "Support for netbooting with genkernel is experimental and may contain bugs." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):698 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):691 msgid "" "First, the kernel image must include the drivers for your Network Interface " "Cards (NIC). Normally, drivers for such devices will be compiled as modules. " @@ -835,11 +827,11 @@ msgid "" "compiled directly into the kernel image and <b>not</b> as modules." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):705 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):698 msgid "Configuring a 2.6.x series kernel to support your NIC driver" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):705 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):698 #, no-wrap msgid "" "\n" @@ -851,7 +843,7 @@ msgid "" "<comment>(Be sure to select <*> and not <M>)</comment>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):714 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):707 msgid "" "Secondly, we suggest that you enable <c>IP: kernel level autoconfiguration</" "c> and the <c>IP: DHCP support</c> options. This avoids an unnecessary layer " @@ -861,11 +853,11 @@ msgid "" "for <e>etherbooting</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):723 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):716 msgid "Configuring a 2.6.x series kernel to support DHCP" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):723 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):716 #, no-wrap msgid "" "\n" @@ -878,7 +870,7 @@ msgid "" "<comment>(These options tell the kernel to send a DHCP request at bootup.)</comment>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):733 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):726 msgid "" "Additionally, you should enable SquashFS because most modern Gentoo " "Installation CDs require it. Support for SquashFS is not included with the " @@ -886,11 +878,11 @@ msgid "" "to the generic kernel source or install <c>gentoo-sources</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):740 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):733 msgid "Configuring the kernel to support SquashFS" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):740 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):733 #, no-wrap msgid "" "\n" @@ -899,7 +891,7 @@ msgid "" " [*] SquashFS 2.X - Squashed file system support\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):746 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):739 msgid "" "Once the compilation process is completed, create a compressed <e>tarball</" "e> (tar.gz) that contains the kernel's modules. This step is only necessary " @@ -907,11 +899,11 @@ msgid "" "Installation CD." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):753 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):746 msgid "Creating a compressed tarball containing the kernel modules" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):753 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):746 #, no-wrap msgid "" "\n" @@ -920,17 +912,17 @@ msgid "" "# <i>tar -cf /tmp/modules-X.Y.Z.tar.gz /lib/modules/X.Y.Z/</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):759 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):752 msgid "" "Depending on your network boot mechanism, you will need to do some of the " "following steps:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):764 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):757 msgid "Creating a boot image" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):764 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):757 #, no-wrap msgid "" "\n" @@ -949,18 +941,18 @@ msgid "" "<comment>(PXE does not need any more steps, the kernel and initrd can be used as is)</comment>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):780 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):773 msgid "" "Finally, copy this kernel to your TFTP server. The details are architecture-" "dependent and are beyond the scope of this guide. Please refer to the " "documentation for your platform." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):789 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):782 msgid "NFS Setup" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):792 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):785 msgid "" "To setup a NFS share that contains the Installation CD, use the loop device " "to mount the ISO image and then copy the contents of the CD into the NFS " @@ -970,11 +962,11 @@ msgid "" "livecd/add/</path> directory." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):801 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):794 msgid "Preparing the NFS share" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):801 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):794 #, no-wrap msgid "" "\n" @@ -988,22 +980,22 @@ msgid "" "# <i>cp /tmp/modules-X.Y.Z.tar.gz /nfs/livecd/add</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):815 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):808 msgid "DHCP Setup" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):818 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):811 msgid "" "The netboot images will ask your DHCP server for an IP as well as a root-" "path parameter. Both can be specified per host using a MAC address to " "identify machines:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):824 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):817 msgid "Sample client dhcpd.conf setup" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):824 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):817 #, no-wrap msgid "" "\n" @@ -1019,12 +1011,12 @@ msgid "" "...\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):840 -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):851 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):833 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre:caption):844 msgid "Netbooting Instructions" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):843 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):836 msgid "" "Netbooting itself is again very platform-specific. The important part is to " "specify the <c>ip=dhcp</c> and <c>init=/linuxrc</c> parameters on the kernel " @@ -1033,7 +1025,7 @@ msgid "" "specific tips:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):851 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(pre):844 #, no-wrap msgid "" "\n" @@ -1055,15 +1047,15 @@ msgid "" " APPEND initrd=initrd-X.Y.Z root=/dev/ram0 init=/linuxrc ip=dhcp\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):875 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):868 msgid "Conclusion" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):877 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(title):870 msgid "To Automate or not to Automate?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):880 +#: ../../gentoo/xml/htdocs/doc/en//genkernel.xml(p):873 msgid "" "The purpose of genkernel is to provide an (easier) alternative to the time-" "tested approach to kernel compilation. As always, you are free to decide on " diff --git a/doc/gettext/ru/gentoo-alpha-faq.xml.po b/doc/gettext/ru/gentoo-alpha-faq.xml.po index f6e3a21..5a7bd3f 100644 --- a/doc/gettext/ru/gentoo-alpha-faq.xml.po +++ b/doc/gettext/ru/gentoo-alpha-faq.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-01-11 17:53+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,16 +14,13 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(guide:link):5 -msgid "/doc/en/gentoo-alpha-faq.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):7 msgid "Gentoo Linux/Alpha Frequently Asked Questions" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(author:title):8 #: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(author:title):11 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(author:title):17 msgid "Author" msgstr "автор" @@ -51,44 +48,52 @@ msgstr "редактор" msgid "nightmorph" msgstr "nightmorph" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(abstract):18 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(mail:link):18 +msgid "mattst88" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(mail):18 +msgid "Matt Turner" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(abstract):21 msgid "" "This FAQ is intended to answer some of the most frequently asked questions " "relating to Gentoo/Alpha and Linux/Alpha in general." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(version):27 -msgid "1.5" -msgstr "1.5" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(version):30 +msgid "2" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(date):28 -msgid "2008-01-20" -msgstr "2008-01-20" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(date):31 +msgid "2011-08-15" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):31 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):34 msgid "About this Document" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):34 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):37 msgid "Introduction" msgstr "Введение" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):37 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):40 msgid "" "This document contains answers to the most commonly asked questions about " "Gentoo/Alpha and Alpha/Linux. It's aimed at both new users and experienced " "users alike." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):48 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):51 msgid "About the Gentoo/Alpha Project" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):50 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):53 msgid "What is Gentoo/Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):53 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):56 msgid "" "The Gentoo/Alpha project is responsible for keeping the Gentoo distribution " "updated and current for the Alpha platform. This primarily includes " @@ -97,122 +102,106 @@ msgid "" "servers." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):63 -msgid "What is the current status of the Gentoo/Alpha Project?" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):66 -msgid "" -"You can find out about the current status of the Gentoo/Alpha project via " -"status reports. These reports inform the public about what we've been up to. " -"New status reports will be posted about once every 6 months. Current and " -"past status report can be found on the <uri link=\"/proj/en/base/alpha/" -"status/index.xml\">Status Reports Project page</uri>." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):79 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):68 msgid "The Alpha Architecture" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):81 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):70 msgid "Isn't the Alpha architecture dead?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):84 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):73 msgid "" -"Not quite! HP stopped taking orders for new Alpha systems on April 27, 2007. " -"They will take orders for Alpha options and upgrades until April 25, 2008. " -"See their <uri link=\"http://h18002.www1.hp.com/alphaserver/evolution.html" -"\">planning page</uri> for more details." +"Kind of, yes. HP stopped taking orders for new Alpha systems on April 27, " +"2007. and for Alpha options and upgrades on April 25, 2008. See their <uri " +"link=\"http://h18002.www1.hp.com/alphaserver/evolution.html\">planning page</" +"uri> for more details." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):94 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):83 msgid "Can I run 32-bit applications?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):97 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):86 msgid "" "No, all Alpha systems use a pure 64 bit kernel and a pure 64 bit userland. " "You cannot even force gcc to output 32 bit code using the <c>-m32</c> " "compiler flag." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):106 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):95 msgid "Is Alpha big endian or little endian?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):109 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):98 msgid "" -"All Alpha systems support both little and big endian. However, Linux only " -"uses little endian." +"Alpha systems are little endian. A large Cray system using Alphas was big " +"endian, but Linux will never support it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):117 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):106 msgid "Can I run Linux/x86 applications on Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):120 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):109 msgid "" -"No, not without a full x86 system emulator like <uri link=\"http://bochs." -"sourceforge.net/\">bochs</uri>. In the past DEC/Compaq/HP maintained a " -"program called <c>em86</c> which allowed Linux/x86 applications to be run on " -"Linux/Alpha systems. However, the program is closed source and no longer " +"No, not without a x86 emulator like <uri link=\"http://wiki.qemu.org/" +"Main_Page\">qemu</uri>. In the past DEC/Compaq/HP maintained a program " +"called <c>em86</c> which allowed Linux/x86 applications to be run on Linux/" +"Alpha systems. However, the program is closed source and no longer " "maintained upstream. There are no <c>em86</c> binaries available that are " -"compatible with gcc3's ABI." +"compatible with gcc-3's ABI." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):132 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):121 msgid "Why install Gentoo on Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):135 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):124 msgid "" "Admittedly, you can find faster 64-bit systems out there, like amd64. " "However, that doesn't mean that Alpha systems are useless. The following are " "a few good reasons why you'd want to install Linux on this sort of hardware:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):142 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):131 msgid "" "You can turn an old computer into something useful. Older Alphas make great " "routers and servers. Their desktop performance isn't that bad either." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):146 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):135 msgid "You will learn about unusual computer hardware." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):147 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):136 msgid "" "It's cool. How many people can say they've got Linux running on an Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):155 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):144 msgid "Where can I buy Alpha hardware?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):158 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):147 msgid "" -"Alpha hardware generally isn't available at your local computer store. If " -"you want a new Alpha you're going to have to contact <uri link=\"http://" -"h18002.www1.hp.com/alphaserver/\">HP</uri>. If you want a used Alpha (more " -"economical), <uri link=\"http://ebay.com\">eBay</uri> is usually a good " -"option, assuming that the shipping doesn't cost you too much. There are " -"several used equipment dealers that can be found via google, however most of " -"them charge too much." +"Alpha hardware generally isn't available at your local computer store. <uri " +"link=\"http://ebay.com\">eBay</uri> is usually a good option, assuming that " +"the shipping doesn't cost you too much. There are several used equipment " +"dealers that can be found via Google, however most of them charge too much." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):173 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):160 msgid "Hardware" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):175 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):162 msgid "" "I opened up the case on an AlphaServer and now it won't power on, what do I " "do?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):179 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):166 msgid "" "Make sure the top panel of the case is on and properly in place. The middle " "of the top panel of the case has a small piece of metal oriented downwards. " @@ -221,15 +210,15 @@ msgid "" "will refuse to power on." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):192 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):179 msgid "Alpha Specific Compiler Flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):194 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):181 msgid "Is the use of Alpha specific compiler flags recommended?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):197 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):184 msgid "" "As with all compiler optimizations, don't over do it. Use these flags with " "care and they will give you a stable, speedy system; use them too " @@ -237,11 +226,11 @@ msgid "" "it out. If you need further clarification, check the <c>gcc</c> man page." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):207 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):194 msgid "How do I optimize for a specific instruction set and scheduling model?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):212 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):199 msgid "" "You can optimize for a specific instruction set and scheduling model with " "<c>-mcpu=XXX</c>, where XXX is your cpu type. Valid cpu types are <c>ev4</" @@ -251,18 +240,18 @@ msgid "" "c> is equivalent to the <c>-march=</c> flag on x86." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(note):221 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(note):208 msgid "" "AlphaServer 800 users should set <c>ev5</c>. There are known issues setting " "<c>ev56</c> particularly with Xorg causing a full system lock up." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):229 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):216 msgid "" "How do I specify the scheduling model without changing the instruction set?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):234 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):221 msgid "" "You can specify the scheduling model without changing the instruction set " "with <c>-mtune=XXX</c>, where XXX is your cpu type. Valid cpu types are " @@ -272,11 +261,11 @@ msgid "" "equivalent to the <c>-mcpu=</c> flag on x86." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):246 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):233 msgid "How do I enable software assisted floating point numbers?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):249 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):236 msgid "" "You can enable software assisted floating point numbers with <c>-mieee</c>. " "This will enable software assistance to correctly support denormalized " @@ -284,17 +273,17 @@ msgid "" "infinity." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):255 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):242 msgid "" "This should be in your global <c>CFLAGS</c> unless you really know what you " "are doing." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):263 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):250 msgid "How do I specify the memory latency of my system?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):266 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):253 msgid "" "You can specify the memory latency of your system with <c>-mmemory-" "latency=XXX</c>, where XXX is the number of clock cycles. This sets the " @@ -304,48 +293,48 @@ msgid "" "for Scache, <c>L3</c> for Bcache, and <c>main</c> for main memory." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):275 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):262 msgid "" "This flag should probably not be use in your global <c>CFLAGS</c> as the " "value you choose is highly dependent on the memory access pattern of the " "application you are compiling." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):284 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):271 msgid "" "How do I specify that static data should be placed in the small data area?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):289 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):276 msgid "" "You can specify that static data should be placed in the small data area " "with <c>-msmall-data</c>. This will cause <c>gcc</c> to take advantage of " "some features of the Alpha architecture by storing heavily used pieces of " "data in specific sections called the small memory sections. The sections are " -"limited to 64kb which means accessing anything stored in them will only take " -"one instruction." +"limited to 64KiB which means accessing anything stored in them will only " +"take one instruction." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):298 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):285 msgid "" "<c>-fPIC</c> will override <c>-msmall-data</c>, so you should use the <c>-" "fpic</c> flag instead if you do not want <c>-msmall-data</c> to be " "overridden." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):304 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):291 msgid "" "This flag should probably not be used in your global <c>CFLAGS</c> as some " -"objects require more than 64kb to be stored, and this will cause a " +"objects require more than 64KiB to be stored, and this will cause a " "gp_overflow ld error." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):313 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):300 msgid "" "How do I specify that object code should be placed in the small text area?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):318 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):305 msgid "" "You can specify that object code should be placed in the small text area " "with <c>-msmall-text</c>. This will cause <c>gcc</c> to assume that the " @@ -354,19 +343,19 @@ msgid "" "call from 4 to 1." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):326 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):313 msgid "" "This flag should probably not be used in your global <c>CFLAGS</c> as some " "programs (or libraries) are larger than 4MB, and this will cause an ld error." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):334 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):321 msgid "" "What do I do if any of these compiler flags cause a compile, linker, or " "runtime error?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):340 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):327 msgid "" "As <uri link=\"#CFLAGS\">already mentioned</uri>, please use these " "<c>CFLAGS</c> cautiously. They may break your system. If you experience " @@ -374,15 +363,15 @@ msgid "" "\">filing a bug report</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):352 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):339 msgid "Alpha Booting and Bootloaders" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):354 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):341 msgid "What is SRM?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):357 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):344 msgid "" "SRM is based on the Alpha Console Subsystem specification, which provides an " "operating environment for OpenVMS, Tru64 UNIX, and Linux operating systems. " @@ -390,45 +379,45 @@ msgid "" "uri> for more information about SRM." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):367 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):354 msgid "What is ARC?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):370 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):357 msgid "" "ARC is based on the Advanced RISC Computing (ARC) specification, which " "provides an operating environment for Windows NT." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):378 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):365 msgid "How can I tell if which firmware my Alpha has, ARC or SRM?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):381 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):368 msgid "" "When you power your system on you will see a screen with a blue background " "and white text if it is using SRM. You will see a graphical boot system if " "it is using ARC." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):390 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):377 msgid "Which bootloader do I use?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):393 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):380 msgid "" "If your Alpha system supports SRM, then you should use aboot. If your system " "supports both SRM and ARCs (ARC, AlphaBIOS, ARCSBIOS), then you should " "follow <uri link=\"http://www.alphalinux.org/faq/x31.html\">the SRM Firmware " "Howto</uri> for switching to SRM and use aboot. If your system can only use " -"ARCs (Ruffian, nautilus, xl, etc.) then you will need to choose milo." +"ARCs (Ruffian, xl, etc.) then you will need to choose milo." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):404 -msgid "Can aboot boot kernels from xfs, reiserfs, or jfs partitions?" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):391 +msgid "Can aboot boot kernels from EXT4, XFS, ReiserFS, or JFS partitions?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):407 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):394 msgid "" "No, <c>aboot</c> only supports booting kernels from <c>ext2</c> and <c>ext3</" "c> partitions. You may still use other files systems for your root " @@ -436,71 +425,72 @@ msgid "" "either <c>ext2</c> or <c>ext3</c> on it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):414 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):401 msgid "" -"Support for reiserfs and xfs is planned. In fact, there are patches floating " -"around that add support for those two file systems. However, the use of " -"those patches is unsupported." +"Support for ext4 is planned. In fact, there are patches floating around that " +"add support for <uri link=\"https://bugs.gentoo.org/show_bug.cgi?" +"id=106855\">ReiserFS</uri>, <uri link=\"https://bugs.gentoo.org/show_bug.cgi?" +"id=107103\">XFS</uri>, and <uri link=\"http://alphalinux.org/wiki/index.php/" +"Aboot_EXT4_support\">ext4</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):424 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):413 msgid "Software" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):427 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):416 msgid "How is Java support in Gentoo/Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):430 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):419 msgid "" -"There was only one option for Java VM and Java SDK on Gentoo/Alpha. The " -"packages were called <c>compaq-jre</c> and <c>compaq-jdk</c>. Sadly, Compaq/" -"HP stopped all support and the packages were removed from Gentoo on October " -"11, 2006." +"Compaq/HP offered binary packages, called <c>compaq-jre</c> and <c>compaq-" +"jdk</c>. They stopped all support, and the packages were removed from Gentoo " +"on October 11, 2006. Since then, we haven't supported Java." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):441 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):429 msgid "Will there ever be working Java support?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):444 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):432 msgid "" -"We really hope so. We are following the development of the jdk from <uri " -"link=\"http://sablevm.org\">SableVM</uri>. It isn't ready yet, but we hope " -"with time that it will be a full drop in replacement jdk." +"It's possible to use <c>icedtea</c> on Alpha, but we have no plans to " +"support it, due to the high maintenance costs involved with testing hundreds " +"of additional packages." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):453 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):441 msgid "How is .NET support in Gentoo/Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):456 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):444 msgid "" "Neither of the two main open source efforts, <uri link=\"http://www.mono-" "project.com/Main_Page\">mono</uri> nor <uri link=\"http://www.dotgnu.org/" "\">DotGNU</uri>, support the alpha architecture." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):465 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):453 msgid "What is needed for .NET support?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):468 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):456 msgid "" -"Bringing .NET to alpha isn't a simple task. It requires coding all of the " +"Bringing .NET to Alpha isn't a simple task. It requires coding all of the " "assembly language code generation macros for the JIT (just in time) compiler " "and coding architecture specific functions (register allocators, etc)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):479 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):467 msgid "Alpha Linux Kernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):481 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):469 msgid "Which kernel sources should I use?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):484 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):472 msgid "" "We recommend using <c>gentoo-sources</c> but <c>vanilla-sources</c> is also " "supported by Gentoo/Alpha. You should read the <uri link=\"/doc/en/gentoo-" @@ -508,11 +498,11 @@ msgid "" "your needs." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):494 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):482 msgid "My system is broken with kernel-2.6, Can I build a 2.4 bassed system?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):497 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):485 msgid "" "Gentoo/Alpha stopped supporting 2.4 kernel and profile in January 2008. " "Technically you can build a 2.4 Gentoo System (the kernel is in the tree) " @@ -520,46 +510,42 @@ msgid "" "won't have support from developers." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):504 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):492 msgid "" -"Gentoo/Alpha will review all bug reports about non working 2.6 systems and " +"Gentoo/Alpha will review all bug reports about non-working 2.6 systems and " "will try to help as much as we can." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):513 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):501 msgid "Are hardened-sources supported?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):516 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):504 msgid "" "Short answer is no. They were supported some time ago, but we lost the " -"hardware and the maintainer so right now they are not supported. If you are " +"hardware and the maintainer so now they are not supported. If you are " "interested and want to continue the initial work, please let us know." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):525 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):513 msgid "Does the 2.6 kernel support Alpha SMP?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):528 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):516 msgid "" -"There were some times in the past when it was broken. However, <c>2.6.15.1</" -"c> and <c>2.6.16.19</c> are both known to work well. If you find that SMP is " -"broken and want SMP support you will need revert to the one of the versions " -"mentioned above or use a 2.4 kernel. If you really need to run the latest " -"2.6 kernel on an SMP box and you don't care that only one of your processors " -"is getting used, then you could configure the 2.6 kernel without SMP support." +"There were some times in the past when it was broken. However, modern kernel " +"versions are known to work well." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):542 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):526 msgid "Helping out the Gentoo/Alpha Project" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):544 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):528 msgid "How do I report bugs?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):547 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):531 msgid "" "If you find a bug or you want to send us patches, then you need to file a " "bug report. It only takes you a little bit of your time, and your help is " @@ -567,73 +553,73 @@ msgid "" "\">Gentoo Bug Reporting Guide</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):557 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):541 msgid "How can I help the Gentoo/Alpha Project?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):560 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):544 msgid "Users can help us by:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):565 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):549 msgid "Filing clear and concise <uri link=\"#bugs\">bug reports</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):566 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):550 msgid "Testing software that does not yet have the <c>~alpha</c> keyword." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):567 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):551 msgid "" "Answering questions on the <uri link=\"/main/en/lists.xml\">mailing lists</" "uri>, <uri link=\"http://forums.gentoo.org/viewforum-f-32.html\"> forum</" "uri> and IRC channel." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):572 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):556 msgid "Sending patches" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):573 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(li):557 msgid "" "Becoming an <uri link=\"http://www.gentoo.org/proj/en/base/alpha/AT/index.xml" "\">AT</uri>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):581 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):565 msgid "Is there an Alpha Arch Testers Project?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):584 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):568 msgid "" "Yes, see the <uri link=\"http://www.gentoo.org/proj/en/base/alpha/AT/index." "xml\"> Gentoo Linux Alpha Arch Testers Project</uri> page for details." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):594 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):578 msgid "Troubleshooting" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):596 -msgid "Why is my Xorg locking up my Alpha?" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):580 +msgid "Why is Xorg locking up my Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):599 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):583 msgid "" "This is usually caused by a bad -mcpu setting. For example, the AlphaServer " "800 needs to be compiled with the <c>ev5</c> flag for xorg <b>and</b> glibc. " "Failing to do so will cause undesired results." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):610 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):594 msgid "Other Resources" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):612 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):596 msgid "Why is there no Gentoo on Alpha forum?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):615 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):599 msgid "" "On the <uri link=\"http://forums.gentoo.org\">Gentoo Forums</uri> there are " "several arch specific categories like <uri link=\"http://forums.gentoo.org/" @@ -645,11 +631,11 @@ msgid "" "Architectures</uri> category." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):630 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):614 msgid "Where can I get more help or information about Gentoo/Alpha?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):633 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):617 msgid "" "If any of your questions weren't answered here, you can try other resources " "like the <uri link=\"/doc/en/handbook/handbook-alpha.xml\">Alpha Handbook</" @@ -660,14 +646,14 @@ msgid "" "mail> mailing list." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):646 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(title):630 msgid "Where can I get more help or information about Alpha/Linux?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):649 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-alpha-faq.xml(p):633 msgid "" -"<uri link=\"http://alphalinux.org/\">AlphaLinux.org</uri> is a central " -"repository for all things Alpha/Linux." +"<uri link=\"http://alphalinux.org/wiki/index.php/Main_Page\">AlphaLinux.org</" +"uri> is a central repository for all things Alpha/Linux." msgstr "" #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL diff --git a/doc/gettext/ru/gentoo-mips-faq.xml.po b/doc/gettext/ru/gentoo-mips-faq.xml.po index 17585ec..3b1aa42 100644 --- a/doc/gettext/ru/gentoo-mips-faq.xml.po +++ b/doc/gettext/ru/gentoo-mips-faq.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-01-11 17:56+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(guide:link):5 -msgid "/doc/en/gentoo-mips-faq.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):7 msgid "Gentoo Linux/MIPS Frequently Asked Questions" msgstr "" @@ -34,29 +30,42 @@ msgstr "redhatter@gentoo.org" msgid "Stuart Longland" msgstr "Stuart Longland" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(abstract):13 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(author:title):12 +msgid "Editor" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(mail:link):13 +msgid "mattst88" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(mail):13 +msgid "Matt Turner" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(abstract):16 msgid "" "This FAQ is intended to answer some of the most frequently asked questions " "relating to Gentoo/MIPS and Linux/MIPS in general." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(version):22 -msgid "1.1" -msgstr "1.1" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(version):25 +#, fuzzy +msgid "2" +msgstr "O2" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(date):23 -msgid "2005-09-08" -msgstr "2005-09-08" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(date):26 +msgid "2011-08-14" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):26 -msgid "About this document" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):29 +msgid "About this Document" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):28 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):31 msgid "Introduction" msgstr "Введение" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):31 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):34 msgid "" "This FAQ is intended to answer frequently asked questions about Gentoo/MIPS " "and Linux/MIPS that we receive from various users. It's aimed at both new " @@ -64,34 +73,32 @@ msgid "" "categories to make navigation easier." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):38 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):41 msgid "" -"If you have anything to contribute to the FAQ or, having read this guide, " -"you still have questions that are left unanswered, feel free to <uri link=" -"\"http://mips.gentoo.org\">drop us a line</uri>." +"If you'd like to contribute to the FAQ or, having read this guide, you still " +"have questions that are left unanswered, feel free to <uri link=\"http://www." +"gentoo.org/proj/en/base/mips/\">drop us a line</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):49 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):52 msgid "About the Gentoo/MIPS Project" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):51 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):54 msgid "What is Gentoo/MIPS?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):54 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):57 msgid "" -"Gentoo/MIPS is a small project within the Gentoo Foundation, responsible for " -"looking after the MIPS port of Gentoo Linux. We currently look after two " -"main sub architectures of the MIPS family specifically: Silicon Graphics " -"systems and MIPS-based Cobalt servers." +"Gentoo/MIPS is a small project responsible for looking after the MIPS port " +"of Gentoo Linux." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):64 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):65 msgid "Why install Gentoo Linux on MIPS?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):67 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):68 msgid "" "Okay, sure, some MIPS machines aren't the fastest boxes on the block these " "days. However, despite the age of some of these beasts, they still can make " @@ -101,313 +108,83 @@ msgid "" "install Linux on this sort of hardware." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):77 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):78 msgid "" "It teaches you a lot about computer hardware by giving you an alternate " "frame of reference" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):81 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):82 msgid "" "It allows you to turn what would otherwise be useless junk into a very " "functional system" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):85 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):86 msgid "" "Status Symbol: Linux on x86 is so common these days it's not funny. However, " "Linux on MIPS is a lot less common and quite a talking point." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):94 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):95 msgid "Why don't you port Gentoo to NetBSD/MIPS or IRIX?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):97 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):98 msgid "" "Hey, great idea. Unfortunately, a lot of the Gentoo/MIPS team already have " -"their hands full looking after Linux/MIPS as well as other commitments. " -"However, you're welcome to give it a try. May I suggest raising this on the " -"<uri link=\"http://forums.gentoo.org/viewforum-f-32.html\">Gentoo Forums</" -"uri> and see what the interest is first. Also, have a look at some of the " -"other threads on porting Gentoo to other architectures such as <uri link=" -"\"http://forums.gentoo.org/viewtopic-t-113387.html\">Solaris/SPARC</uri>, " -"<uri link=\"http://forums.gentoo.org/viewtopic-t-319607.html\">IBM OS/2</" -"uri> and <uri link=\"http://forums.gentoo.org/viewtopic-t-319691.html" -"\">Microsoft Services For Unix</uri> for hints on how to proceed. If after " -"some hacking you get something useful out of it... chances are a few " -"developers will pick up on this and help you get it to the next stage." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):117 +"their hands full looking after Linux/MIPS as well as other commitments. A " +"project like this would fall under the umbrella of the <uri link=\"http://" +"www.gentoo.org/proj/en/gentoo-alt/prefix/\">Gentoo Prefix project</uri>. " +"Some work has been done for IRIX, the remnants of which can be found in <uri " +"link=\"https://bugs.gentoo.org/buglist.cgi?quicksearch=irix\">bugzilla</uri>." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):113 msgid "MIPS Hardware FAQs" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):119 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):115 msgid "What is MIPS?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):122 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):118 msgid "" "<uri link=\"http://www.mips.com\">MIPS Technologies</uri> is a company that " -"produce a number of RISC CPU cores which implement the MIPS Instruction Set " -"Architecture. These processors appear in all sorts of hardware ranging from " -"small embedded devices to large servers." +"produce a number of RISC CPU cores which implement the <uri link=\"http://en." +"wikipedia.org/wiki/MIPS_architecture\">MIPS Architecture</uri>. These " +"processors appear in all sorts of hardware ranging from small embedded " +"devices to large servers." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):129 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):126 msgid "" "It also happens to be an acronym; <b>M</b>illions of <b>I</b>nstructions " "<b>P</b>er <b>S</b>econd." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):137 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):134 msgid "What sort of hardware uses MIPS processors?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):140 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):137 msgid "" -"Good question. In short... Heaps. MIPS Processors see use inside all sorts " -"of machines, ranging from small PDAs (such as the early Windows CE powered " -"Casio PDAs), X Terminals (e.g. Tektronix TekXPress XP330 series), through to " -"workstations such as the Silicon Graphics Indy and O2 and even high end " -"servers such as the Silicon Graphics Origin 2000." +"In short... lots. MIPS Processors see use inside all sorts of machines, " +"ranging from small PDAs (such as the early Windows CE powered Casio PDAs), X " +"Terminals (e.g. Tektronix TekXPress XP330 series), through to workstations " +"such as the Silicon Graphics Indy and O2 and even high end servers such as " +"the Silicon Graphics Origin 2000." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):148 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):145 msgid "" -"Here is a list of some of the more famous MIPS-based systems in use. A more " -"comprehensive list can be found on the <uri link=\"http://www.linux-mips.org/" -"wiki/index.php/Systems\">Linux/MIPS website</uri>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(th):156 -msgid "Sony Game Consoles" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):158 -msgid "http://www.linux-mips.org/wiki/index.php/PS1" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):158 -msgid "PlayStation" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):160 -msgid "http://www.linux-mips.org/wiki/index.php/PS2" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):160 -msgid "PlayStation 2" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):162 -msgid "http://www.linux-mips.org/wiki/index.php/PSP" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):162 -msgid "PlayStation Pocket" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(th):167 -msgid "Nintendo Game Consoles" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):169 -msgid "http://www.linux-mips.org/wiki/index.php/Nintendo_64" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):169 -msgid "Nintendo 64" +"A comprehensive list can be found on the <uri link=\"http://www.linux-mips." +"org/wiki/index.php/Systems\">Linux/MIPS website</uri>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(th):175 -msgid "Silicon Graphics Machines" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):177 -msgid "http://www.linux-mips.org/wiki/index.php/IP12" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):177 -msgid "Iris Indigo" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):179 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):181 -msgid "http://www.linux-mips.org/wiki/index.php/IP19" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):179 -msgid "Challenge" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):181 -msgid "Onyx" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):183 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):185 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):187 -msgid "http://www.linux-mips.org/wiki/index.php/IP22" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):183 -msgid "Indy" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):185 -msgid "Indigo 2" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):187 -msgid "Challenge S" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):189 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):191 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):193 -msgid "http://www.linux-mips.org/wiki/index.php/IP27" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):189 -#, fuzzy -msgid "Origin 200" -msgstr "Origin 200/2000" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):191 -#, fuzzy -msgid "Origin 2000" -msgstr "Origin 200/2000" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):193 -msgid "Onyx 2" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):195 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):197 -msgid "http://www.linux-mips.org/wiki/index.php/IP30" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):195 -msgid "Octane" -msgstr "Octane" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):197 -#, fuzzy -msgid "Octane 2" -msgstr "Octane" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):199 -msgid "http://www.linux-mips.org/wiki/index.php/IP32" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):199 -msgid "O2" -msgstr "O2" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):201 -msgid "http://www.linux-mips.org/wiki/index.php/IP34" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):201 -msgid "Fuel" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):203 -msgid "http://www.linux-mips.org/wiki/index.php/IP35" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):203 -#, fuzzy -msgid "Origin 3000" -msgstr "Origin 200/2000" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):205 -msgid "http://www.linux-mips.org/wiki/index.php/IP45" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):205 -#, fuzzy -msgid "Origin 300" -msgstr "Origin 200/2000" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):207 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):209 -msgid "http://www.linux-mips.org/wiki/index.php/IP53" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):207 -#, fuzzy -msgid "Origin 350" -msgstr "Origin 200/2000" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):209 -msgid "Tezro" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(th):214 -msgid "DECStations" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):216 -msgid "http://www.linux-mips.org/wiki/index.php/Deskstation_rPC44" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):216 -msgid "rPC44" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):218 -msgid "http://www.linux-mips.org/wiki/index.php/Deskstation_Tyne" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):218 -msgid "Tyne" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(th):223 -msgid "Cobalt Microservers" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):225 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):227 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):229 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):231 -msgid "http://www.linux-mips.org/wiki/index.php/Cobalt" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):225 -msgid "Qube 2700" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):227 -msgid "Qube 2800" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):229 -msgid "RaQ" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):231 -msgid "RaQ 2" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(th):236 -msgid "Broadcom-based 802.11g<br/> Broadband Internet Routers" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri:link):241 -msgid "http://openwrt.org/" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(uri):241 -msgid "Linksys WRT54G" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):246 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):150 msgid "" -"... and that's only just scratching the surface. These machines are wide and " +"... and that's only scratching the surface. These machines are wide and " "varied. Many of them do not currently run Linux. Of those that do, we only " "support a handful, although you're welcome to port Gentoo/MIPS to any MIPS " "machine if you so wish. Some of these machines are also the focus of the " @@ -415,40 +192,18 @@ msgid "" "as the Linksys WRT54G." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):258 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):162 msgid "Is my machine supported?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):261 -msgid "" -"This question is difficult to answer. Your machine could fall into one of " -"three different baskets:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):267 -msgid "Your machine is supported by Gentoo/MIPS" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):268 -msgid "Your machine is supported by Linux/MIPS, but not by Gentoo/MIPS (yet)" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):269 -msgid "Your machine is not supported by Linux/MIPS" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):272 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):165 msgid "" "For the first one an easy way to find out is to have a look at the <uri link=" "\"/doc/en/mips-requirements.xml\">Gentoo/MIPS requirements page</uri>. This " -"will tell you if the system you've got can theoretically run Gentoo/MIPS. " -"Stuart has also written a <uri link=\"http://stuartl.longlandclan.hopto.org/" -"gentoo/mips/\">hardware support database</uri> in which users may contribute " -"their experiences. This can help measure how well Gentoo/MIPS runs on a " -"particular machine." +"will tell you if the system you've got can theoretically run Gentoo/MIPS." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):282 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):172 msgid "" "If you don't find your machine listed there, you may wish to have a look on " "the <uri link=\"http://www.linux-mips.org/wiki/index.php/Systems\">Linux/" @@ -458,121 +213,107 @@ msgid "" "though, we'll try to help where we can." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):294 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):184 msgid "Why don't you support machine X" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):297 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):187 msgid "" "If you've looked at the Gentoo/MIPS Hardware Requirements page, you've " -"probably noticed there are a LOT of machines we don't support. In the case " +"probably noticed there are a lot of machines we don't support. In the case " "of SGI hardware, very little is known about some of them, not enough to " "successfully port Linux to them." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):304 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):194 msgid "" "If you managed to get Linux working on a box currently listed as " -"<e>unsupported</e> however, feel free to tell us. We'd be interested to know." +"<e>unsupported</e> however, please tell us. We'd be interested to know." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):314 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):204 msgid "MIPS Software FAQs" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):316 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):206 msgid "Which stage tarball do I use?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):319 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):209 msgid "" "This will depend on the CPU type running in your system. The stage filename " "is named as follows:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(pre:caption):324 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(pre:caption):214 msgid "Stage Tarball Naming Scheme" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(pre):324 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(pre):214 #, no-wrap msgid "" "\n" -" stage3-mipsel4-2005.0.tar.bz2\n" -" \\____/ \\_____/ \\____/\n" +" stage3-mipsel4_multilib-20110627.tar.bz2\n" +" \\____/ \\_____/ \\_____/ \\______/\n" +" | | | |\n" +" | | | `-- Gentoo Release (date of creation)\n" " | | |\n" -" | | `--- Gentoo Release (e.g. 1.4, 2004.3, 2005.0)\n" +" | | `--- ABI: multilib, n32, n64 (nothing for o32)\n" " | |\n" " | `----------- Endianness and ISA Level\n" " | mips ==> Big Endian\n" " | mipsel ==> Little Endian\n" " |\n" -" | R3xxx and earlier: ISA Level 1\n" -" | R4xxx series: ISA Level 3\n" -" | R5000 and above: ISA Level 4\n" -" |\n" " `------------------ Stage Tarball type: 1, 2 or 3.\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):341 -msgid "" -"So for those of you who are running R4000-class CPUs, try a <c>mips3</c> or " -"<c>mipsel3</c> stage tarball." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):346 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):229 msgid "" -"For those running R5000-class or later CPUs, try a <c>mips4</c> or " -"<c>mipsel4</c> stage tarball." +"For R4000-class CPUs, use a <c>mips3</c> or <c>mipsel3</c> stage tarball." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):351 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):233 msgid "" -"Sometimes the filename will have <c>n32</c> or <c>n64</c> in the filename as " -"well. These refer to 64-bit userland images. At the moment, support for 64-" -"bit userlands is still quite flaky and a lot of packages are broken. I'd " -"suggest leaving these alone unless you're particularly brave and don't mind " -"a rather bumpy ride." +"For R5000-class or later CPUs, use a <c>mips4</c> or <c>mipsel4</c> stage " +"tarball." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):362 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):241 msgid "" -"I got told \"Illegal Instruction\" or \"Cannot Execute Binary File\" when " -"chrooting. What did I do wrong?" +"I got an \"Illegal Instruction\" or \"Cannot Execute Binary File\" error " +"message when chrooting. What did I do wrong?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):366 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):245 msgid "" "This is generally caused by using the wrong stage tarball. If you try to run " "a <c>mips4</c> userland on a <c>mips3</c> CPU, you'll get an <e>illegal " "instruction</e> error message. Likewise, if you have a Big Endian CPU and " -"you try running Little Endian code on it, you'll get told <e>cannot execute " -"binary file</e>." +"you try to run Little Endian code on it, you'll get <e>cannot execute binary " +"file</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):374 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):253 msgid "" -"The fix is simple... clean out your partition, then unpack the correct " -"tarball. Which one is that I hear you ask? Have a read of the previous FAQ " -"entry." +"The fix is simple: clean out your partition, then unpack the correct tarball." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):384 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):262 msgid "Silicon Graphics Specific FAQs" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):386 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):264 msgid "Why doesn't my SGI machine netboot?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):389 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):267 msgid "" "This could be for any number of reasons, ranging from cabling issues, " "through to issues on the server. The best way to troubleshoot any problem is " "a step-by-step approach..." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):396 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):274 msgid "" "<b>Have you got the SGI machine (and server) plugged into the right network " "ports?</b><br/> Make sure the network is cabled correctly. Also note that " @@ -581,7 +322,7 @@ msgid "" "port via a transceiver." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):404 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):282 msgid "" "<b>Are there any firewalls in use?</b><br/> Make sure your firewall is not " "blocking DHCP/BOOTP requests (ports 67 and 68 on UDP) or TFTP (port 69 on " @@ -589,7 +330,7 @@ msgid "" "get things rolling." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):411 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):289 msgid "" "<b>Have you disabled packet MTU discovery and set the port range?</b><br/> " "SGI boxes require <path>/proc/sys/net/ipv4/ip_no_pmtu_disc</path> = 1 and " @@ -598,7 +339,7 @@ msgid "" "chap=2#doc_chap4\">the Gentoo/MIPS handbook</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):419 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):297 msgid "" "<b>Is the server giving out the correct details via BOOTP?</b><br/> Double " "check your <path>/etc/dhcp/dhcpd.conf</path>. ISC's dhcpd won't dish out " @@ -606,7 +347,7 @@ msgid "" "defined with a fixed address." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):425 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):303 msgid "" "<b>Which TFTP server are you using?</b><br/><c>tftp-hpa</c> and <c>netkit-" "tftp</c> are known to work. <c>atftp</c> is a lot more advanced, this can " @@ -614,7 +355,7 @@ msgid "" "problem clears up." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):431 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):309 msgid "" "<b>Are the daemons running?</b><br/><c>dhcpd</c> should show up when typing " "<c>ps ax</c>. As for TFTP, it'll largely depend on whether its a standalone " @@ -623,7 +364,7 @@ msgid "" "start any services not currently running." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):439 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):317 msgid "" "<b>Does the kernel exist in <path>/tftpboot</path>?</b><br/> Make sure you " "place the kernel image to be booted in this directory and that it is world-" @@ -632,19 +373,19 @@ msgid "" "<path>/tftpboot</path> directory if you're using <c>tftp-hpa</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):447 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):325 msgid "" "<b>Have you unset the <c>netaddr</c> and <c>dlserver</c> PROM variables?</" "b><br/> Try running <c>unsetenv netaddr</c> and <c>unsetenv dlserver</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):457 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):335 msgid "" "The machine downloads the kernel, but then \"hangs\" (using a monitor and " -"keyboard -- not serial console)" +"keyboard – not serial console)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):461 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):339 msgid "" "Unfortunately, not all graphics frame buffers are supported under Linux yet. " "This doesn't mean you can't use the machine... it just means you'll need a " @@ -653,28 +394,28 @@ msgid "" "console rather than the screen." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):474 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):352 msgid "Cobalt Specific FAQs" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):476 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):354 msgid "Why won't my Cobalt machine boot?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):479 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):357 msgid "" "This could be for a number of reasons. Our easiest bet however is to run " "through a checklist and make sure everything is correct." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):485 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):363 msgid "" "<b>Have you got the Cobalt machine (and server) plugged into the right " "network ports?</b><br/> Make sure the network is cabled correctly. Please " "note, the Cobalt firmware will only boot via the Primary network port." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):491 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):369 msgid "" "<b>Are there any firewalls in use?</b><br/> Make sure your firewall is not " "blocking DHCP/BOOTP requests (ports 67 and 68 on UDP) or RPC/Portmap (port " @@ -684,7 +425,7 @@ msgid "" "rolling." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):500 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):378 msgid "" "<b>Is the server giving out the correct details via BOOTP?</b><br/> Double " "check your <path>/etc/dhcp/dhcpd.conf</path>. ISCs dhcpd won't dish out " @@ -692,7 +433,7 @@ msgid "" "defined with a fixed address." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):506 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):384 msgid "" "<b>Are you exporting <path>/nfsroot</path> in your <path>/etc/exports</path>?" "</b><br/> Make sure you are exporting that to the Cobalt machine. It only " @@ -700,7 +441,7 @@ msgid "" "edit the file." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):513 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):391 msgid "" "<b>Are the daemons running?</b><br/><c>dhcpd</c> should show up when typing " "<c>ps ax</c>. Likewise with <c>portmap</c> and the other RPC daemons. The " @@ -708,24 +449,23 @@ msgid "" "start</c><br/><c>/etc/init.d/nfs start</c>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):521 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(li):399 msgid "" "<b>Does the kernel exist in <path>/nfsroot</path>?</b><br/> Make sure you " "place the kernel image to be booted in this directory and that it is world-" "readable. (<c>chmod 644 /nfsroot/foo</c>)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):531 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(title):409 msgid "Why don't you support the Qube 2700?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):534 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-mips-faq.xml(p):412 msgid "" "The Qube 2700 was the first of the Cobalt servers. While they are very nice " "machines, unfortunately, they lack a serial port. In other words, any " "interaction with the machine has to be done through a network. At present, " -"our netboot images do not support this, although plans are in the works that " -"may enable support for this machine." +"our netboot images do not support this." msgstr "" #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL diff --git a/doc/gettext/ru/gentoo-ppc-install.xml.po b/doc/gettext/ru/gentoo-ppc-install.xml.po index 49671e3..a2e755b 100644 --- a/doc/gettext/ru/gentoo-ppc-install.xml.po +++ b/doc/gettext/ru/gentoo-ppc-install.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:56+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-install.xml(guide:link):4 -msgid "/doc/en/gentoo-ppc-install.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-install.xml(guide:redirect):4 msgid "/doc/en/handbook/handbook-ppc.xml" msgstr "" diff --git a/doc/gettext/ru/gentoo-security.xml.po b/doc/gettext/ru/gentoo-security.xml.po index d73fbb7..cd34f6b 100644 --- a/doc/gettext/ru/gentoo-security.xml.po +++ b/doc/gettext/ru/gentoo-security.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:56+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-security.xml(guide:link):5 -msgid "/doc/en/gentoo-security.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-security.xml(guide:redirect):5 msgid "/doc/en/security/" msgstr "" diff --git a/doc/gettext/ru/gentoo-sparc-install.xml.po b/doc/gettext/ru/gentoo-sparc-install.xml.po index e1d96ce..2a1b83c 100644 --- a/doc/gettext/ru/gentoo-sparc-install.xml.po +++ b/doc/gettext/ru/gentoo-sparc-install.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:56+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-sparc-install.xml(guide:link):4 -msgid "/doc/en/gentoo-sparc-install.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-sparc-install.xml(guide:redirect):4 msgid "/doc/en/handbook/handbook-sparc.xml" msgstr "" diff --git a/doc/gettext/ru/gentoo-sparc-obpreference.xml.po b/doc/gettext/ru/gentoo-sparc-obpreference.xml.po index 1a025b5..54e834f 100644 --- a/doc/gettext/ru/gentoo-sparc-obpreference.xml.po +++ b/doc/gettext/ru/gentoo-sparc-obpreference.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:57+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-sparc-obpreference.xml(guide:link):6 -msgid "/doc/en/gentoo-sparc-obpreference.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-sparc-obpreference.xml(title):7 msgid "OpenBoot PROM (OBP) Reference" msgstr "" diff --git a/doc/gettext/ru/gentoo-upgrading.xml.po b/doc/gettext/ru/gentoo-upgrading.xml.po index 8532877..bcfc7b8 100644 --- a/doc/gettext/ru/gentoo-upgrading.xml.po +++ b/doc/gettext/ru/gentoo-upgrading.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:57+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-upgrading.xml(guide:link):5 -msgid "/doc/en/gentoo-upgrading.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-upgrading.xml(title):6 msgid "Gentoo Upgrading Guide" msgstr "" diff --git a/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po b/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po index 411bec2..9244b5f 100644 --- a/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po +++ b/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-05-18 19:18+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:58+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -53,11 +53,11 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(version):32 -msgid "18" +msgid "19" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(date):33 -msgid "2011-05-09" +msgid "2011-08-23" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):36 @@ -224,16 +224,17 @@ msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):180 msgid "" -"Then create the RAID device nodes and devices. Please bear in mind that the " -"<c>/boot</c> and <c>/</c> mount points should use an older metadata format " -"which can be specified by the <c>--metadata=0.90</c> flag:" +"Then create the RAID device nodes and devices. Please bear in mind that, if " +"you are not using an initramfs to help during boot, the <c>/boot</c> and <c>/" +"</c> mount points should use an older metadata format which can be specified " +"by the <c>--metadata=0.90</c> flag:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):186 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):187 msgid "Create device nodes and devices" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):186 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):187 #, no-wrap msgid "" "\n" @@ -261,104 +262,111 @@ msgid "" "88256 blocks [2/2] [UU]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):211 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):212 +msgid "" +"If you use an initramfs, then it is responsible for assembling the RAID " +"arrays during boot. When using a genkernel initramfs, this can be triggered " +"using the <c>domdadm</c> boot option." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):218 msgid "" "Then create the LVM2 volumes in <path>/dev/md4</path>. The following scheme " "is used as an <b>example</b>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(th):218 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(th):225 msgid "Directory" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(th):219 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(th):226 msgid "Size" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(th):220 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(th):227 msgid "File system" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):223 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):230 msgid "/usr" msgstr "/usr" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):224 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):231 msgid "8 GB" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):225 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):240 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):245 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):250 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):232 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):247 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):252 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):257 msgid "ext3" msgstr "ext3" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):228 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):235 msgid "/usr/portage" msgstr "/usr/portage" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):229 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):259 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):236 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):266 msgid "2 GB" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):230 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):237 msgid "ext2, small block size, many inodes" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):233 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):240 msgid "/usr/portage/distfiles" msgstr "/usr/portage/distfiles" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):234 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):244 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):249 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):241 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):251 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):256 msgid "4 GB" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):235 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):242 msgid "ext2, large block size, less inodes" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):238 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):245 msgid "/home" msgstr "/home" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):239 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):246 msgid "10 GB" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):243 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):250 msgid "/opt" msgstr "/opt" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):248 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):255 msgid "/var" msgstr "/var" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):253 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):260 msgid "/var/tmp" msgstr "/var/tmp" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):254 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):261 msgid "6 GB" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):255 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):260 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):262 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):267 msgid "ext2" msgstr "ext2" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):258 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(ti):265 msgid "/tmp" msgstr "/tmp" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):264 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):271 msgid "Create LVM2 volumes" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):264 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):271 #, no-wrap msgid "" "\n" @@ -404,18 +412,18 @@ msgid "" " vartmp vg -wi-a- 6.00G\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):307 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):314 msgid "" "Use <c>mke2fs</c>, <c>mke2fs -j</c>, <c>mkreiserfs</c>, <c>mkfs.xfs</c> and " "<c>mkfs.jfs</c> to create file systems. Initialize swap using <c>mkswap</c> " "and <c>swapon</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):313 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):320 msgid "Create the file systems and activate swap" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):313 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):320 #, no-wrap msgid "" "\n" @@ -445,17 +453,17 @@ msgid "" "/dev/sdb2 partition 401616 0 1\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):340 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):347 msgid "" "Mount the freshly created file systems on <path>/mnt/gentoo</path>. Create " "directories for the other mount points and mount them too." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):345 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):352 msgid "Mount the file systems" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):345 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):352 #, no-wrap msgid "" "\n" @@ -478,22 +486,22 @@ msgid "" "livecd gentoo # <i>chmod 1777 /mnt/gentoo/tmp /mnt/gentoo/var/tmp</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):373 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):380 msgid "Kernel Configuration" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):376 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):383 msgid "" "Install a kernel source (usually <c>gentoo-sources</c>), configure it, " "compile it and copy the <path>arch/i386/boot/bzImage</path> file to <path>/" "boot</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):381 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):388 msgid "Install a kernel source, compile it and install the kernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):381 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):388 #, no-wrap msgid "" "\n" @@ -537,16 +545,16 @@ msgid "" "livecd linux # <i>cp arch/i386/boot/bzImage /boot/kernel</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):430 -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):437 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):437 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre:caption):444 msgid "Reboot" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):433 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):440 msgid "Exit the chrooted environment, unmount all file systems and reboot:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):437 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):444 #, no-wrap msgid "" "\n" diff --git a/doc/gettext/ru/gentoo-x86-install.xml.po b/doc/gettext/ru/gentoo-x86-install.xml.po index 6e9b2fc..d157a55 100644 --- a/doc/gettext/ru/gentoo-x86-install.xml.po +++ b/doc/gettext/ru/gentoo-x86-install.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:57+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-install.xml(guide:link):5 -msgid "/doc/en/gentoo-x86-install.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-install.xml(guide:redirect):5 msgid "/doc/en/handbook/handbook-x86.xml" msgstr "" diff --git a/doc/gettext/ru/gentoo-x86-quickinstall-system.xml.po b/doc/gettext/ru/gentoo-x86-quickinstall-system.xml.po index a078725..b2a28fb 100644 --- a/doc/gettext/ru/gentoo-x86-quickinstall-system.xml.po +++ b/doc/gettext/ru/gentoo-x86-quickinstall-system.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:57+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -15,12 +15,12 @@ msgstr "" "X-Generator: Lokalize 1.0\n" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(version):7 -msgid "2" -msgstr "2" +msgid "4" +msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(date):8 -msgid "2008-03-05" -msgstr "2008-03-05" +msgid "2011-08-23" +msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(title):11 msgid "Configure the system" @@ -93,30 +93,31 @@ msgstr "" #, no-wrap msgid "" "\n" -"livecd etc # <i>cd conf.d</i>\n" -"livecd conf.d # <i>echo 'config_eth0=( \"192.168.1.10/24\" )' >> net</i>\n" -"livecd conf.d # <i>echo 'routes_eth0=( \"default via 192.168.1.1\" )' >> net</i>\n" +"livecd etc # <i>cd init.d</i>\n" +"livecd init.d # <i>ln -s net.lo net.eth0</i>\n" +"livecd init.d # <i>cd ../conf.d</i>\n" +"livecd conf.d # <i>echo 'config_eth0=\"192.168.1.10 netmask 255.255.255.0 brd 192.168.1.255\"' >> net</i>\n" +"livecd conf.d # <i>echo 'routes_eth0=\"default via 192.168.1.1\"' >> net</i>\n" "livecd conf.d # <i>rc-update add net.eth0 default</i>\n" -"<comment>(If you compiled your network card driver as a module,\n" -"add it to /etc/modules.autoload.d/kernel-2.6)</comment>\n" -"livecd conf.d # <i>echo r8169 >> /etc/modules.autoload.d/kernel-2.6</i>\n" +"<comment>(If you compiled your network card driver as a module, add it to /etc/conf.d/modules</comment>\n" +"livecd conf.d # <i>echo 'modules=\"r8169\"' >> /etc/conf.d/modules</i>\n" "<comment>(If you want to reconnect via ssh after you have rebooted your new box)</comment>\n" "livecd conf.d # <i>rc-update add sshd default</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(note):78 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(note):79 msgid "Emerge <c>pcmciautils</c> if you need support for PCMCIA cards." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):82 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):83 msgid "Set the root password using <c>passwd</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):86 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):87 msgid "Set the root password" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):86 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):87 #, no-wrap msgid "" "\n" @@ -126,70 +127,66 @@ msgid "" "passwd: password updated successfully\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):93 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):94 msgid "" -"Edit <path>/etc/conf.d/clock</path> to define the time zone you used " -"previously." +"Edit <path>/etc/timezone</path> to define the time zone you used previously." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):98 -msgid "Edit /etc/conf.d/clock" +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):99 +msgid "Edit /etc/timezone" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):98 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):99 #, no-wrap msgid "" "\n" -"livecd conf.d # <i>nano -w /etc/conf.d/clock</i>\n" -"TIMEZONE=\"Europe/Brussels\"\n" +"Europe/Brussels\n" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):103 msgid "" -"Check the system configuration in <path>/etc/rc.conf</path>, <path>/etc/conf." -"d/rc</path>, <path>/etc/conf.d/keymaps</path> and edit any of those files if " -"required." +"Check the system configuration in <path>/etc/rc.conf</path> and <path>/etc/" +"conf.d/keymaps</path> and edit any of those files if required." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):109 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):108 msgid "Optional: edit some config files" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):109 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):108 #, no-wrap msgid "" "\n" "livecd conf.d # <i>nano -w /etc/rc.conf</i>\n" -"livecd conf.d # <i>nano -w /etc/conf.d/rc</i>\n" "livecd conf.d # <i>nano -w /etc/conf.d/keymaps</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(title):118 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(title):116 msgid "Installing System Tools" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):122 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):120 msgid "Install RAID and LVM2 utilities." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):126 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):124 msgid "Install RAID LVM2 tools" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):126 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):124 #, no-wrap msgid "" "\n" "livecd conf.d # <i>emerge mdadm lvm2</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):133 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):131 msgid "" "Install a system logger like <c>syslog-ng</c> and a cron daemon like " "<c>vixie-cron</c>, and add them to the default run level." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(note):138 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(note):136 msgid "" "Cron daemons depend on an MTA. <c>mail-mta/ssmtp</c> will be pulled in as a " "dependency. If you want to use a more advanced MTA, you might want to " @@ -197,11 +194,11 @@ msgid "" "later when you install the MTA of your choice." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):145 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):143 msgid "Install a syslogger and a cron daemon" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):145 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):143 #, no-wrap msgid "" "\n" @@ -214,18 +211,18 @@ msgid "" "livecd conf.d # <i>rc-update add vixie-cron default</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):155 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):153 msgid "" "Install the necessary file system tools (<c>xfsprogs</c>, <c>reiserfsprogs</" "c> or <c>jfsutils</c>) and networking tools (<c>dhcpcd</c> or <c>ppp</c>) if " "you need any." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):161 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):159 msgid "Install extra tools if required" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):161 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):159 #, no-wrap msgid "" "\n" @@ -236,19 +233,21 @@ msgid "" "livecd conf.d # <i>emerge ppp</i> <comment>(If you need PPPoE ADSL connectivity)</comment>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(title):173 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(title):171 msgid "Configuring the Bootloader" msgstr "Настройка начального загрузчика" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):176 -msgid "Emerge <c>grub</c> and configure it." +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(p):174 +msgid "" +"Emerge <c>grub</c> and configure it. Do not forget to update the necessary " +"boot parameters if you are using an initramfs." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):180 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):179 msgid "Emerge grub and edit its configuration file" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):180 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):179 #, no-wrap msgid "" "\n" @@ -260,11 +259,11 @@ msgid "" "livecd conf.d # <i>nano -w /boot/grub/grub.conf</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):189 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):188 msgid "Example grub.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):189 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):188 #, no-wrap msgid "" "\n" @@ -276,11 +275,11 @@ msgid "" "kernel /boot/kernel root=<keyval id=\"root\"></keyval>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):198 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):197 msgid "Install grub" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):198 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):197 #, no-wrap msgid "" "\n" @@ -303,11 +302,11 @@ msgid "" "grub> <i>quit</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):218 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre:caption):217 msgid "Install grub on both disks" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):218 +#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-system.xml(pre):217 #, no-wrap msgid "" "\n" diff --git a/doc/gettext/ru/gentoolkit.xml.po b/doc/gettext/ru/gentoolkit.xml.po index f566da5..5317dda 100644 --- a/doc/gettext/ru/gentoolkit.xml.po +++ b/doc/gettext/ru/gentoolkit.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-01-11 17:56+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -37,6 +37,7 @@ msgstr "Matt Butcher" #: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(author:title):23 #: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(author:title):26 #: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(author:title):29 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(author:title):32 msgid "Editor" msgstr "редактор" @@ -92,7 +93,15 @@ msgstr "nightmorph@gentoo.org" msgid "Joshua Saddler" msgstr "Joshua Saddler" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(abstract):33 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(mail:link):33 +msgid "douglasjanderson@gmail.com" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(mail):33 +msgid "Douglas Anderson" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(abstract):36 msgid "" "Gentoolkit is a suite of tools to ease the administration of a Gentoo " "system. This document covers the basics of some of the tools present in " @@ -100,26 +109,25 @@ msgid "" msgstr "" #. Licensed under GFDL -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(version):40 -msgid "2" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(version):43 +msgid "4" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(date):41 -#, fuzzy -msgid "2010-10-03" -msgstr "2007-06-25" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(date):44 +msgid "2011-08-16" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):44 -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):112 -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):443 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):47 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):115 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):626 msgid "Introduction" msgstr "Введение" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):46 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):49 msgid "What is Gentoolkit?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):49 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):52 msgid "" "Gentoo is a unique distribution and presents some complexities that simply " "don't exist for other distributions. As Gentoo developers and contributors " @@ -129,7 +137,7 @@ msgid "" "portage/gentoolkit</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):58 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):61 msgid "" "As of now, there are two versions of gentoolkit: <c>app-portage/gentoolkit</" "c> and <c>app-portage/gentoolkit-dev</c>. While the former contains " @@ -139,7 +147,7 @@ msgid "" "This document discusses gentoolkit only." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):67 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):70 msgid "" "Gentoolkit contains a whole bunch of useful tools to help manage your " "packages and keep track of what is going on in your system. Most users --" @@ -147,19 +155,19 @@ msgid "" "having gentoolkit installed." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):77 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):80 msgid "Installation" msgstr "Установка" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):80 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):83 msgid "Just as with any Gentoo package, installation is just a simple emerge." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):84 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):87 msgid "Getting gentoolkit" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):84 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):87 #, no-wrap msgid "" "\n" @@ -168,433 +176,647 @@ msgstr "" "\n" "# <i>emerge gentoolkit</i>\n" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):88 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):91 msgid "" "Many of the tools in gentoolkit reveal important information about your " "system or require root privilege. For that reason, some of the programs may " "only be executed (or only function properly) if run by a user with root " -"permission." +"privileges." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):97 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):100 msgid "Finding Documentation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):100 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):103 msgid "" "Any documentation that a program might have (other than man pages) is stored " "in <path>/usr/share/doc/gentoolkit-[version]/[program-name]/</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):110 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):113 msgid "equery" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):115 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):118 msgid "" -"<c>equery</c> is a tool that displays a great deal of useful information " -"about the packages on your system and much more. <c>equery --help</c> gives " -"you the full set of options." +"<c>equery</c> is a tool that displays useful information about the packages " +"on your system. <c>equery</c> is based on a system of modules. Every module " +"has a shorthand name. For example, <c>equery l gcc</c> is the same as " +"<c>equery list gcc</c>. <c>equery --help</c> explains global options and " +"lists all available modules and their shorthand names. <c>equery --help " +"module</c> will display the help screen for a specific module. Lastly, " +"<c>man equery</c> provides a detailed explanation of all available modules " +"and options, and provides useful examples." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):121 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):129 +msgid "Below is a list of features that work over the majority of modules." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):133 +msgid "Examples of Acceptable Input" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):133 +#, no-wrap msgid "" -"Not all features listed by <c>equery --help</c> have been implemented yet. " -"Those that have not been, are mentioned clearly. You will also see that " -"every command has a short option, e.g. <c>b</c> instead of <c>belongs</c>." +"\n" +"<comment>(Many modules require a package argument. equery accepts all emerge-like input):</comment>\n" +"$ <i>equery --quiet list gcc</i> # <comment>package</comment>\n" +"sys-devel/gcc-4.3.2-r3\n" +"$ <i>equery --quiet list sys-devel/gcc</i> # <comment>category/package</comment>\n" +"sys-devel/gcc-4.3.2-r3\n" +"$ <i>equery --quiet list '>=sys-devel/gcc-4'</i> # <comment>atom syntax</comment>\n" +"sys-devel/gcc-4.3.2-r3\n" +"\n" +"<comment>(Like emerge, equery doesn't understand partial package names):</comment>\n" +"$ <i>equery check zilla</i>\n" +"!!! No package found matching zilla\n" +"\n" +"<comment>(Unlike emerge, equery can accept shell-like globbing in the category and/or package name):</comment>\n" +"$ <i>equery check '*zilla*'</i>\n" +" * Checking www-client/mozilla-firefox-3.0.14 ...\n" +" 90 out of 90 files passed\n" +"$ <i>equery check www-c*/*</i>\n" +" * Checking www-client/links-2.2 ...\n" +" 30 out of 30 files passed\n" +" * Checking www-client/mozilla-firefox-3.0.14 ...\n" +" 90 out of 90 files passed\n" +"\n" +"<comment>(Most equery modules take multiple input):</comment>\n" +"$ <i>equery hasuse sse sse2</i>\n" +" * Searching for USE flag sse ...\n" +"[IP-] [ ] media-libs/flac-1.2.1-r3 (0)\n" +"[IP-] [ ] media-libs/speex-1.2_beta3_p2 (0)\n" +"\n" +" * Searching for USE flag sse2 ...\n" +"[IP-] [ ] dev-libs/openssl-0.9.8k (0)\n" +"[IP-] [ ] x11-libs/pixman-0.16.0 (0)\n" +"\n" +"<comment>(A few modules also allow full regular expressions):</comment>\n" +"$ <i>equery -q list --portage-tree --full-regex '[kr]?flickr.*'</i>\n" +"dev-dotnet/flickrnet-bin-2.2\n" +"dev-ruby/flickr-1.0.2-r1\n" +"dev-ruby/flickr-1.0.2-r2\n" +"dev-ruby/rflickr-20060201\n" +"media-gfx/kflickr-0.6\n" +"[...]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):127 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):176 msgid "" -"Be aware that equery currently changes the format of the output if it is " -"sent through a pipe. The piped format is intended to be easier to parse by " -"tools, but you can also turn it off by adding the <c>--no-pipe</c> option. " -"If you write scripts that employ equery, you should be aware of this." +"Globbing support replaced a number of older options in <c>equery</c>. For " +"example, to act on all packages in a certain set, use <c>'*'</c>. To act on " +"all packages in a category, use <c>'category-name/*'</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):137 -msgid "Finding the Package That a File Came From" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(warn):182 +msgid "" +"Don't forget to quote input when using special shell characters like " +"asterisks or greater than/less than signs." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):140 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):187 msgid "" -"<c>equery</c> also provides the functionality of finding the package that a " -"file came from, using <c>belongs</c> command (or just <c>b</c>)." +"The next few sections in this document give a quick introduction to the " +"different <c>equery</c> modules." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):145 -msgid "Finding the ebuild that installed a given file" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):195 +msgid "Finding the Package That a File Came From with belongs (b)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):145 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):198 +msgid "Finding the Package that Installed a Given File" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):198 #, no-wrap msgid "" "\n" -"# <i>equery belongs /usr/bin/audacious</i>\n" -"[ Searching for file(s) /usr/bin/audacious in *... ]\n" -"media-sound/audacious-1.1.2 (/usr/bin/audacious)\n" +"$ <i>equery belongs -e /usr/bin/glxgears</i>\n" +" * Searching for /usr/bin/glxgears ...\n" +" x11-apps/mesa-progs-7.5.1 (/usr/bin/glxgears)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):151 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):204 msgid "" -"By using the <c>-f</c> option, you may search for packages with files " -"matching any regular expression. The <c>-e</c> option is useful for " -"terminating your search immediately when a match is found." +"<c>belongs</c> can search for files matching a regular expression with the " +"<c>-f</c> option. The <c>-e</c> option stops searching after it finds a " +"match. Since no file on your system should be owned by two packages, this is " +"a safe optimization." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):160 -msgid "Verifying Package Integrity" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):214 +msgid "Viewing ChangeLog Entries with changes (c)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):163 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):217 msgid "" -"Sometimes it is useful to check a package's integrity. <c>equery</c> can " -"verify md5 sums as well as timestamps to indicate when a package might have " -"been corrupted, replaced, or removed." +"<c>changes</c> lets you view ChangeLog entries for a package version or " +"range of versions. Imagine after an <c>emerge --sync</c>, you notice Portage " +"is going to be upgraded and want to check what has changed:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):169 -msgid "OK package integrity" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):223 +msgid "Viewing Gentoo ChangeLog Entries" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):169 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):223 #, no-wrap msgid "" "\n" -"# <i>equery check gentoolkit</i>\n" -"[ Checking app-portage/gentoolkit-0.2.0 ]\n" -" * 54 out of 54 files good\n" +"<comment>(Show the latest installable version's entry):</comment>\n" +"$ <i>equery changes portage</i>\n" +"*portage-2.1.6.13 (03 May 2009)\n" +"\n" +" 03 May 2009; Zac Medico <zmedico@gentoo.org> +portage-2.1.6.13.ebuild:\n" +" 2.1.6.13 bump. This fixes bug #268398 (document econf automatic die)\n" +" and bug #267104 (handle insufficient space interaction with userfetch).\n" +" Bug #268228 tracks all bugs fixed since 2.1.6.11.\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):237 +msgid "Verifying Package Integrity with check (k)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):175 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):240 msgid "" -"Please note that if you change configuration files after installation, these " -"may be reported as \"not good\"." +"Sometimes it is useful to check a package's integrity. <c>equery</c> can " +"verify MD5 sums as well as timestamps to indicate when a package might have " +"been corrupted, replaced, or removed." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):183 -msgid "List of all packages depending on ..." +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):246 +msgid "Checking Package Integrity" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):186 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):246 +#, no-wrap msgid "" -"<c>equery</c> is able to list all direct dependencies matching a package. " -"The function we should use to do this is <c>depends</c> and it's as easy as:" +"\n" +"$ <i>equery check gentoolkit</i>\n" +" * Checking app-portage/gentoolkit-0.3.0_rc7 ...\n" +" 71 out of 71 files passed\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):191 -msgid "Looking for packages depending on pygtk" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):255 +msgid "Listing All Packages Depending on Package X with depends (d)" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):258 +msgid "" +"Ever wonder why a certain package has been installed on your system? " +"<c>equery</c> can tell which packages list it as a dependency with " +"<c>depends</c>. Include indirect dependencies with the <c>-D</c> option." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):191 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):265 +msgid "Looking for Packages Depending on pygtk" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):265 #, no-wrap msgid "" "\n" -"# <i>equery depends pygtk</i>\n" -"[ Searching for packages depending on pygtk... ]\n" -"app-office/dia-0.93\n" -"dev-python/gnome-python-2.0.0-r1\n" -"gnome-extra/gdesklets-core-0.26.2\n" -"media-gfx/gimp-2.0.4\n" -"x11-libs/vte-0.11.11-r1\n" +"$ <i>equery depends pygtk</i>\n" +" * Searching for pygtk ...\n" +"app-admin/pessulus-2.24.0 (>=dev-python/pygtk-2.6.0)\n" +"app-editors/gedit-2.24.3 (python ? >=dev-python/pygtk-2.12)\n" +"dev-libs/libgweather-2.24.3 (python ? >=dev-python/pygtk-2)\n" +"dev-python/gnome-python-base-2.22.3 (>=dev-python/pygtk-2.10.3)\n" +"dev-python/gnome-python-desktop-base-2.24.1 (>=dev-python/pygtk-2.10.3)\n" +"[...]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):204 -msgid "Dependency Graphs" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):279 +msgid "Getting Dependency Graphs with depgraph (g)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):207 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):282 msgid "" -"<c>equery</c> is capable of giving us a dependency graph for a specified " -"package. The dependency graph gives a listing of all the packages that have " -"direct and indirect dependencies on the package in question." +"<c>depgraph</c> is the opposite of <c>depends</c>. You pass it a package, " +"and it will find the packages <e>it</e> depends on (not that depend on it). " +"When it finds a dependency, it will recursively search for all of <e>that</" +"e> package's dependencies. Control how deep the tree gets with the <c>--" +"depth</c> option." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):213 -msgid "Dependency Graph for cdrtools" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):290 +msgid "Viewing Dependency Graph for mozilla-firefox" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):213 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):290 #, no-wrap msgid "" "\n" -"# <i>equery depgraph cdrtools</i>\n" -"Displaying dependencies for app-cdr/cdrtools-2.01_alpha37\n" -"`-- app-cdr/cdrtools-2.01_alpha37\n" -" `-- sys-libs/glibc-2.3.4.20040808 (virtual/libc)\n" -" `-- sys-kernel/linux-headers-2.4.22 (virtual/os-headers)\n" -" `-- sys-apps/baselayout-1.10.4\n" -" `-- sys-apps/sysvinit-2.85-r1\n" -" `-- sys-apps/gawk-3.1.3-r1\n" -" `-- sys-apps/util-linux-2.12-r4\n" -" `-- sys-apps/sed-4.0.9\n" -" `-- sys-libs/ncurses-5.4-r4\n" -" `-- sys-apps/pam-login-3.14\n" -" `-- sys-libs/pam-0.77-r1\n" -" `-- sys-libs/cracklib-2.7-r10\n" -" `-- sys-apps/miscfiles-1.3-r1\n" -" `-- app-arch/gzip-1.3.5-r1\n" -" `-- sys-apps/portage-2.0.50-r10\n" +"$ <i>equery depgraph mozilla-firefox</i>\n" +" * Searching for mozilla-firefox ...\n" +" * dependency graph for www-client/mozilla-firefox-2.0.0.19:\n" +"`-- www-client/mozilla-firefox-2.0.0.19\n" +" `-- virtual/jre-1.6.0 (virtual/jre) [java]\n" +" `-- virtual/jdk-1.6.0 (virtual/jdk-1.6.0*)\n" +" `-- dev-java/icedtea6-bin (unable to resolve: package masked or removed)\n" +" `-- dev-java/sun-jdk-1.6.0.15\n" +" `-- dev-java/java-sdk-docs-1.6.0.10 [doc]\n" +" `-- app-arch/unzip-6.0-r1\n" +" `-- app-arch/bzip2-1.0.5-r1 [bzip2]\n" +" `-- sys-libs/glibc-2.9_p20081201-r2\n" +" `-- sys-devel/gettext-0.17 [nls]\n" +" `-- virtual/libiconv-0 (virtual/libiconv)\n" +"[...]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):233 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):308 msgid "" -"For example, while glibc is a direct dependency for cdrtools,linux-headers " -"are an indirect dependency. Note that the output also includes information " -"about virtual packages. In the example above, <c>cdrtools</c> is actually " -"written to require virtual/libc, not sys-libs/glibc, but on the given system " -"in the example sys-libs/glibc provides virtual/libc." +"Notice how <c>jre</c> is a direct dependency and <c>jdk</c> is an indirect " +"dependency if the <c>java</c> USE flag is set." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):244 -msgid "Listing Files Belonging to an Ebuild" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):316 +msgid "Listing Files Installed by a Package with files (f)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):247 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):319 msgid "" -"<c>equery</c> can list the files that belong to an installed ebuild. If I " -"don't know the files that Gentoolkit has installed on the system, I will use " -"<c>equery</c> to show them." +"<c>equery</c> can list all the files installed by an ebuild with the " +"<c>files</c> module. Try <c>--tree</c> to get an easy to read directory " +"layout. Use <c>--filter</c> to only find a certain type of file. For " +"example, to find where executables were installed, use <c>--filter=cmd</c>, " +"and to quickly find the configuration file location, try <c>--filter=conf</" +"c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):253 -msgid "Listing files" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):327 +msgid "Listing Installed Files in Tree Format" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):253 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):327 #, no-wrap msgid "" "\n" -"# <i>equery files gentoolkit</i>\n" -"[ Searching for packages matching gentoolkit... ]\n" -"app-portage/gentoolkit-0.2.0\n" -"* Contents of app-portage/gentoolkit-0.2.0:\n" -"/usr\n" -"/usr/bin\n" -"/usr/bin/equery\n" -"/usr/bin/etcat\n" -"/usr/bin/euse\n" -"/usr/bin/glsa-check\n" -"/usr/bin/qpkg\n" -"/usr/bin/revdep-rebuild\n" -"/usr/lib\n" -"/usr/lib/gentoolkit\n" -"/usr/lib/gentoolkit/pym\n" -"/usr/lib/gentoolkit/pym/gentoolkit\n" -"/usr/lib/gentoolkit/pym/gentoolkit/__init__.py\n" -"/usr/lib/gentoolkit/pym/gentoolkit/gentoolkit.py\n" -"/usr/lib/gentoolkit/pym/gentoolkit/pprinter.py\n" -"/usr/lib/gentoolkit/pym/glsa.py\n" -"/usr/sbin\n" -"/usr/share\n" -"/usr/share/doc\n" -"/usr/share/doc/gentoolkit-0.2.0_pre10\n" -"\n" +"$ <i>equery files --tree gentoolkit</i>\n" +" * Searching for gentoolkit ...\n" +" * Contents of app-portage/gentoolkit-0.3.0_rc7:\n" +" /etc\n" +" > /eclean\n" +" + distfiles.exclude\n" +" + packages.exclude\n" +" > /env.d\n" +" + 99gentoolkit-env\n" +" > /revdep-rebuild\n" +" + 99revdep-rebuild\n" +" /usr\n" +" > /bin\n" +" + eclean\n" +" + eclean-dist -> eclean\n" +" + eclean-pkg -> eclean\n" +" + epkginfo\n" +" + equery\n" +" + eread\n" +" + euse\n" +" + glsa-check\n" +" + revdep-rebuild\n" +" > /lib\n" +" > /python2.6\n" +" > /site-packages\n" +" > /gentoolkit\n" +" + gentoolkit-0.3.0_rc7-py2.6.egg-info\n" +" + __init__.py\n" +" > /equery\n" +" + __init__.py\n" +" + belongs.py\n" +" + changes.py\n" +" + check.py\n" +" + depends.py\n" +" + depgraph.py\n" +" + files.py\n" "[...]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):282 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):370 +msgid "Looking for Packages that Have a Specific USE Flag with hasuse (h)" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):373 +msgid "" +"You can use <c>hasuse</c> to find out which packages have a given USE flag. " +"<c>hasuse</c> won't tell you if the flag is enabled, only if the ebuild " +"lists it as an option. See the EXAMPLES section of <c>hasuse</c> in the " +"<c>equery</c> man page for more tip on getting that information." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):380 +msgid "Searching For Installed Packages that Use the qt3 or qt4 USE Flags" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):380 +#, no-wrap msgid "" -"The command <c>files</c> of <c>equery</c> provide some options to modify the " -"output. You can look them all up in the <c>equery</c> man page." +"\n" +"$ <i>equery hasuse qt3 qt4</i>\n" +" * Searching for USE flag qt3 ...\n" +"[IP-] [ ] app-crypt/pinentry-0.7.5 (0)\n" +"[IP-] [ ] net-dns/avahi-0.6.24-r2 (0)\n" +"[IP-] [ ] net-wireless/wpa_supplicant-0.6.9 (0)\n" +"\n" +" * Searching for USE flag qt4 ...\n" +"[IP-] [ ] net-dns/avahi-0.6.24-r2 (0)\n" +"[IP-] [ ] net-wireless/wpa_supplicant-0.6.9 (0)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):290 -msgid "Looking for packages that use a specific USE flag" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):395 +msgid "Listing Packages with list (l)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):293 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):398 msgid "" -"If you want to find which packages on your system that make use of a " -"specific USE flag, <c>equery</c> has the function <c>hasuse</c>:" +"<c>list</c> is a simple, yet powerful module to list packages that are " +"installed, in the Portage tree or in an overlay." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):298 -msgid "Searching packages which use the firefox USE flag" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):403 +msgid "Listing Installed Packages with list" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):298 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):403 #, no-wrap msgid "" "\n" -"# <i>equery hasuse firefox</i>\n" -"[ Searching for USE flag firefox in all categories among: ]\n" -" * installed packages\n" -"[I--] [ ] dev-python/gnome-python-extras-2.14.0-r1 (0)\n" -"[I--] [ ] media-video/totem-2.16.4 (0)\n" +"$ <i>equery list '*'</i>\n" +" * Searching for * ...\n" +"[IP-] [ ] app-admin/eselect-1.2.3 (0)\n" +"[IP-] [ ] app-admin/eselect-ctags-1.10 (0)\n" +"[IP-] [ ] app-admin/eselect-esd-20060719 (0)\n" +"[IP-] [ ] app-admin/eselect-fontconfig-1.0 (0)\n" +"[IP-] [ ] app-admin/eselect-opengl-1.0.8-r1 (0)\n" +"[IP-] [ ] app-admin/eselect-python-20090824 (0)\n" +"[IP-] [ ] app-admin/eselect-ruby-20081227 (0)\n" +"[IP-] [ ] app-admin/eselect-vi-1.1.5 (0)\n" +"[IP-] [ ] app-admin/perl-cleaner-1.05 (0)\n" +"[IP-] [ ] app-admin/pessulus-2.24.0 (0)\n" +"[IP-] [ ] app-admin/python-updater-0.7 (0)\n" +"[IP-] [ ] app-admin/sudo-1.7.2_p1 (0)\n" +"[...]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):309 -msgid "Listing Packages" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):421 +msgid "" +"The standard query will search installed packages for the given package " +"name. Passing in '*' displays all packages in the set. In the leftmost " +"field, we see that all the above packages are <c>I</c>nstalled and from the " +"<c>P</c>ortage tree. They're not masked (the second field is blank), and " +"they're all installed in the default slot (0)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):312 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):429 msgid "" -"<c>equery</c> has a power feature to list packages belonging to our system, " -"portage or even an overlay. Let's try this:" +"This time we are going to use local options to look for packages in the " +"Portage tree and overlays." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):317 -msgid "Listing packages with equery" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):434 +msgid "Using Local Options with list" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):317 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):434 #, no-wrap msgid "" "\n" -"# <i>equery list gentoolkit</i>\n" -"[ Searching for package 'gentoolkit' in all categories among: ]\n" -" * installed packages\n" -"[I--] [ ] app-portage/gentoolkit-0.2.0 (0)\n" +"$ <i>equery list -po vim</i>\n" +" * Searching for vim ...\n" +"[-P-] [ ] app-editors/vim-7.0.235 (0)\n" +"[-P-] [ ~] app-editors/vim-7.0.243 (0)\n" +"[-P-] [ ] app-editors/vim-7.1.123 (0)\n" +"[-P-] [ ~] app-editors/vim-7.1.330 (0)\n" +"[-P-] [ ] app-editors/vim-7.2 (0)\n" +"[-P-] [ ~] app-editors/vim-7.2.108 (0)\n" +"[IP-] [ ] app-editors/vim-7.2.182 (0)\n" +"[-P-] [ ~] app-editors/vim-7.2.238 (0)\n" +"[-P-] [ ~] app-editors/vim-7.2.264 (0)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):324 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):448 msgid "" -"The standard query will search our installed packages for the name given. If " -"found, the following info will be displayed: the package location between " -"the first square brackets (I for Installed packages, P for Portage, O for " -"Overlay), the possible masks between the second (~ by keyword, - by arch or " -"M hard masked), then the category and complete name and last of all, the " -"slot in which the package is stored." +"In this example you can see version 7.2.182 is installed and there are no " +"versions available from an overlay. You can see which versions are keyword " +"masked by the <c>~</c> in the second field." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):457 +msgid "Viewing Package Metadata with meta (m)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):333 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):460 msgid "" -"Another example, this time we are going to use the local options in order to " -"look for packages in our portage tree and overlay." +"Each package in the Portage tree provides at least some metadata about its " +"maintainer, herd, etc. Read about <uri link=\"http://www.gentoo.org/proj/en/" +"devrel/handbook/handbook.xml?part=2&chap=4\"> Gentoo Metadata</uri>. The " +"amount of useful information depends on how much package maintainers decide " +"to provide. With no options, <c>meta</c> returns some basic useful " +"information." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):338 -msgid "Using local options with equery" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):469 +msgid "Getting Package Metadata with meta" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):338 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):469 #, no-wrap msgid "" "\n" -"# <i>equery list -p -o vim</i>\n" -"[ Searching for package 'vim' in all categories among: ]\n" -" * installed packages\n" -"[I--] [ ] app-editors/vim-6.3-r4 (0)\n" -" * Portage tree (/usr/portage)\n" -"[-P-] [M~] app-editors/vim-7.0_alpha20050126 (0)\n" -"[-P-] [M~] app-editors/vim-7.0_alpha20050201 (0)\n" -"[-P-] [ ] app-editors/vim-6.3-r2 (0)\n" -"[-P-] [M~] app-editors/vim-7.0_alpha20050122 (0)\n" -"[-P-] [M~] app-editors/vim-core-7.0_alpha20050126 (0)\n" -"[-P-] [ ] app-editors/vim-core-6.3-r3 (0)\n" -"[-P-] [M~] app-editors/vim-core-7.0_alpha20050122 (0)\n" -"[-P-] [M~] app-editors/vim-core-7.0_alpha20050201 (0)\n" -"[-P-] [ ] app-editors/vim-core-6.3-r4 (0)\n" -" * overlay tree (/opt/ebuilds)\n" +"$ <i>equery meta gnucash</i>\n" +" * app-office/gnucash [gentoo]\n" +" Herd: gnome-office (gnome-office@gentoo.org)\n" +" Maintainer: tove@gentoo.org (Torsten Veller)\n" +" Upstream: None specified\n" +" Location: /usr/portage/app-office/gnucash\n" +" Keywords: 2.2.9-r1:0: alpha amd64 ppc sparc x86\n" +" Keywords: 2.2.9-r2:0:\n" +" Keywords: 2.3.8:0:\n" +" Keywords: 2.3.10:0: ~alpha ~amd64 ~ppc ~sparc ~x86\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):359 -msgid "Finding Package Sizes" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):482 +msgid "When the maintainer provides extra information, it can be very useful:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):362 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):486 +msgid "Getting Long Package Descriptions with meta" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):486 +#, no-wrap msgid "" -"Ever been curious to find out how much space a specific package is " +"\n" +"$ <i>equery meta --description emacs</i>\n" +" * app-editors/emacs\n" +" GNU Emacs is an extensible, customizable text editor - and more. At its core\n" +" is an interpreter for Emacs Lisp, a dialect of the Lisp programming language\n" +" with extensions to support text editing. The features of GNU Emacs include:\n" +" * Content-sensitive editing modes, including syntax coloring, for a wide\n" +" variety of file types including plain text, source code, and HTML.\n" +" * Complete built-in documentation, including a tutorial for new users.\n" +" * Support for many languages and their scripts, including all the European\n" +" \"Latin\" scripts, Russian, Greek, Japanese, Chinese, Korean, Thai,\n" +" Vietnamese, Lao, Ethiopian, and some Indian scripts.\n" +" * Highly customizable, using Emacs Lisp code or a graphical customization\n" +" interface.\n" +" * A large number of extensions that add other functionality, including a\n" +" project planner, mail and news reader, debugger interface, calendar, and\n" +" more. Many of these extensions are distributed with GNU Emacs; others are\n" +" available separately.\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):509 +msgid "Finding Package Sizes with size (s)" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):512 +msgid "" +"Have you ever been curious to find out how much space a specific package is " "occupying? Since a package could have its files over a number of " "directories, the usual <c>du -hc</c> might not give you the correct figure. " "Not to worry, here comes <c>equery</c> to the rescue!" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):369 -msgid "Package Size" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):519 +msgid "Displaying Package Size" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):369 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):519 #, no-wrap msgid "" "\n" -"# <i>equery size openoffice-bin</i>\n" -"* app-office/openoffice-bin-1.1.2\n" -" Total Files : 2908\n" -" Total Size : 223353.31 KiB\n" +"$ <i>equery size openoffice-bin</i>\n" +" * app-office/openoffice-bin-3.1.1\n" +" Total files : 4624\n" +" Total size : 361.38 MiB\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):376 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):526 msgid "" -"As you can see, <c>equery</c> prints the total space used in kilobytes and " -"also lists the total number of files the package has." +"As you can see, <c>size</c> prints the total space used in human-readable " +"units and lists the total number of files the package has. To get the total " +"size in bytes, use <c>--bytes</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):384 -msgid "Package-wise list of USE Flags" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):535 +msgid "Listing Per-Package USE Flags with uses (u)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):387 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):538 msgid "" -"<c>equery</c> can be used to give us information about what USE flags are " -"being used by a specific package. It also tells us what our current USE " -"flags are for a package and also what USE flags are available for the " -"package." +"<c>equery</c>'s <c>uses</c> module can provide information about what USE " +"flags are available for a specific package, and which of those flags is " +"currently enabled." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):393 -msgid "Set and Unset USE Flags" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):544 +msgid "Showing Set and Unset USE Flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):393 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):544 #, no-wrap msgid "" "\n" -"# <i>equery uses wireshark</i>\n" -"[ Colour Code : set unset ]\n" -"[ Legend : (U) Col 1 - Current USE flags ]\n" -"[ : (I) Col 2 - Installed With USE flags ]\n" -"\n" -" U I [ Found these USE variables in : net-analyzer/wireshark-0.99.4 ]\n" -" - - adns : Adds support for the adns DNS client library\n" -" + + gtk : Adds support for x11-libs/gtk+ (The GIMP Toolkit)\n" -" - - ipv6 : Adds support for IP version 6\n" -" - - kerberos : Adds kerberos support\n" -" - - portaudio : Adds support for the crossplatform portaudio audio API\n" -" - - selinux : !!internal use only!! Security Enhanced Linux support, this must be set by the selinux profile or breakage will occur\n" -" - - snmp : Adds support for the Simple Network Management Protocol if available\n" -" + + ssl : Adds support for Secure Socket Layer connections\n" -" - - threads : Adds threads support for various packages. Usually pthreads\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):411 -msgid "" -"I have installed wireshark with only the gtk and ssl flags set, but there " -"are several other USE flags for wireshark still available. For more " +"$ <i>equery uses gst-plugins-meta</i>\n" +" * Searching for gst-plugins-meta ...\n" +"[ Legend : U - flag is set in make.conf ]\n" +"[ : I - package is installed with flag ]\n" +"[ Colors : set, unset ]\n" +" * Found these USE flags for media-plugins/gst-plugins-meta-0.10-r2:\n" +" U I\n" +" + + X : Adds support for X11\n" +" - - a52 : Enables support for decoding ATSC A/52 streams used in DVD\n" +" + + alsa : Adds support for media-libs/alsa-lib (Advanced Linux Sound\n" +" Architecture)\n" +" - - dvb : Adds support for DVB (Digital Video Broadcasting)\n" +" + + dvd : Adds support for DVDs\n" +" + + esd : Adds support for media-sound/esound (Enlightened Sound Daemon)\n" +" + + ffmpeg : Enable ffmpeg-based audio/video codec support\n" +" + + flac : Adds support for FLAC: Free Lossless Audio Codec\n" +" - - mad : Adds support for mad (high-quality mp3 decoder library and cli\n" +" frontend)\n" +" + + mpeg : Adds libmpeg3 support to various packages\n" +" - - mythtv : Support for retrieval from media-tv/mythtv backend\n" +" + + ogg : Adds support for the Ogg container format (commonly used by\n" +" Vorbis, Theora and flac)\n" +" - - oss : Adds support for OSS (Open Sound System)\n" +" + + theora : Adds support for the Theora Video Compression Codec\n" +" + + vorbis : Adds support for the OggVorbis audio codec\n" +" - - xv : Adds in optional support for the Xvideo extension (an X API for\n" +" video playback)\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):574 +msgid "" +"Here, a number of USE flags are enabled in <c>gstreamer</c>'s plugin meta-" +"package, but you can see that there are other USE flags available. For more " "information on USE flags, please refer to the <uri link=\"/doc/en/handbook/" "handbook-x86.xml?part=2&chap=2\">USE Flags</uri> chapter of the <uri " "link=\"/doc/en/handbook/\">Gentoo Handbook</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):422 -msgid "Where's the ebuild?" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):585 +msgid "Finding the Ebuild Path with which (w)" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):588 +msgid "" +"<c>which</c> is a simple script to help you quickly find the file path to an " +"ebuild. If you pass an unversioned package name, <c>which</c> will return " +"the path to the newest installable ebuild version, in other words, the " +"ebuild Portage would use if you typed <c>emerge package</c>. Pass in a " +"versioned package to get the path to that ebuild." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):596 +msgid "Displaying the Latest Installable Ebuild Path" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):425 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):596 +#, no-wrap msgid "" -"We can also find out which ebuild is being used for a specific package using " -"<c>equery</c>. This is done by using the <c>equery which</c> command which " -"displays the full path to the ebuild." +"\n" +"$ <i>equery which gnome</i>\n" +"/usr/portage/gnome-base/gnome/gnome-2.26.3.ebuild\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):431 -msgid "Displaying the ebuild path" +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):601 +msgid "" +"Lastly, if none of the above features of <c>equery</c> have answered your " +"question, try using <c>which</c> to manually search an ebuild with programs " +"like <c>cat</c>, <c>less</c> or <c>grep</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):431 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):607 +msgid "Other Useful Ways to Use which" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):607 #, no-wrap msgid "" "\n" -"# <i>equery which cdrtools</i>\n" -"/usr/portage/app-cdr/cdrtools/cdrtools-2.01_alpha37.ebuild\n" +"$ <i>grep HOMEPAGE $(equery which gentoolkit)</i>\n" +"HOMEPAGE=\"http://www.gentoo.org/proj/en/portage/tools/index.xml\"\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(warn):612 +msgid "" +"Be aware that <c>equery</c> currently changes the format of the output if it " +"is sent through a pipe. The piped format is intended to be easier to parse " +"by tools, but you can also turn it off by adding the <c>--no-pipe</c> " +"option. If you write scripts that employ <c>equery</c>, you should be aware " +"of this." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):441 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):624 msgid "euse" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):446 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):629 msgid "" "<c>euse</c> is a tool to see, set and unset USE flags at various places. For " "more information on USE flags, please refer to the <uri link=\"/doc/en/" @@ -602,17 +824,17 @@ msgid "" "<c>euse -h</c> for complete help and all options." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):456 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):639 msgid "Viewing, Setting and Unsetting USE Flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):459 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):642 msgid "" "The <c>euse -a</c> command reads the current active USE flags and displays " "them." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):464 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):647 msgid "" "There are 5 \"columns\" that <c>euse</c> now uses to show whether a flag is " "set/unset and where all the flag has been set. The columns are as follows -- " @@ -620,11 +842,11 @@ msgid "" "in make.Globals. The output looks like [+ECDG]." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):471 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):654 msgid "Viewing all active USE flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):471 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):654 #, no-wrap msgid "" "\n" @@ -721,7 +943,7 @@ msgid "" "zlib [+ CD ]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):565 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):748 msgid "" "Similarly you can use the <c>euse -a -g</c> command to only view active " "global USE flags. The <c>euse -a -l</c> command does the same for active " @@ -729,11 +951,11 @@ msgid "" "need an option before them (like <c>-a</c>) to function correctly." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):572 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):755 msgid "Viewing active local USE flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):572 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):755 #, no-wrap msgid "" "\n" @@ -749,14 +971,14 @@ msgid "" "truetype [+ CD ]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):585 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):768 msgid "" "We can also use <c>euse</c> to set or unset use flags. The commands used for " "this are <c>euse -E flagname</c> (enable a flag) and <c>euse -D flagname</c> " "(disable a flag)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(warn):591 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(warn):774 msgid "" "Do not use the <c>euse -E</c> or <c>euse -D</c> commands by themselves " "(without a flag). It will set/unset ALL USE flags in <c>/etc/make.conf</c>. " @@ -764,11 +986,11 @@ msgid "" "be careful while using <c>euse -E</c> or <c>euse -D</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):598 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):781 msgid "Setting and Unsetting USE flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):598 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):781 #, no-wrap msgid "" "\n" @@ -799,133 +1021,125 @@ msgid "" " vanilla X xosd xv xvid x86 zlib -3dfx\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):626 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):809 msgid "" "<c>euse</c> does not physically remove the flag from make.conf. It just adds " "a - (minus) before the flag to unset it. You may have to manually clean up " "your make.conf to avoid unwanted variables." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):637 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):820 msgid "Other tools" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):639 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):822 msgid "revdep-rebuild" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):642 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):825 msgid "" "This tool is Gentoo's Reverse Dependency rebuilder. It will scan your " "installed ebuilds to find packages that have become broken as a result of an " "upgrade of a package they depend on. It can emerge those packages for you " -"but it can also happen that a given package does not work anymore with the " +"but it can also happen that a given package does not work any more with the " "currently installed dependencies, in which case you should upgrade the " "broken package to a more recent version. revdep-rebuild will pass flags to " "emerge which lets you use the <c>--pretend</c> flag to see what is going to " "be emerged again before you go any further." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):653 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):836 msgid "Running revdep-rebuild in pretend mode" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):653 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):836 #, no-wrap msgid "" "\n" "# <i>revdep-rebuild -p</i>\n" "\n" -"Checking reverse dependencies...\n" -"Packages containing binaries and libraries broken by any package update,\n" -"will be recompiled.\n" -"\n" -"Collecting system binaries and libraries... done.\n" -" (/root/.revdep-rebuild.1_files)\n" -"\n" -"Collecting complete LD_LIBRARY_PATH... done.\n" -" (/root/.revdep-rebuild.2_ldpath)\n" -"\n" -"Checking dynamic linking consistency...\n" -" broken /usr/lib/ao/plugins-2/libarts.so (requires libartsc.so.0)\n" -" broken /usr/lib/kde3/libkpresenterpart.so (requires libartskde.so.1 libqtmcop.so.1\n" -" libsoundserver_idl.so.1 libkmedia2_idl.so.1 libartsflow.so.1 libartsflow_idl.so.1 libmcop.so.1)\n" -" broken /usr/lib/ruby/site_ruby/1.8/i686-linux/fox.so (requires libFOX-1.0.so.0)\n" -" broken /usr/lib/xine/plugins/1.0.0/xineplug_ao_out_arts.so (requires libartsc.so.0)\n" -" broken /usr/lib/perl5/vendor_perl/5.8.0/i686-linux/auto/SDL_perl/SDL_perl.so (requires libSDL_gfx.so.0)\n" -" broken /usr/lib/libloudmouth-1.so.0.0.0 (requires libgnutls.so.10)\n" -" broken /usr/bin/k3b (requires libartskde.so.1 libqtmcop.so.1 libsoundserver_idl.so.1 libkmedia2_idl.so.1\n" -" libartsflow.so.1 libartsflow_idl.so.1 libmcop.so.1)\n" -" broken /usr/bin/lua (requires libhistory.so.4)\n" -" broken /usr/bin/lyx (requires libAiksaurus-1.0.so.0)\n" -" broken /usr/bin/luac (requires libhistory.so.4)\n" -" broken /usr/bin/avidemux2 (requires libartsc.so.0)\n" -" broken /usr/bin/pptout (requires libxml++-0.1.so.11)\n" -" broken /usr/bin/xml2ps (requires libxml++-0.1.so.11)\n" -" done.\n" -" (/root/.revdep-rebuild.3_rebuild)\n" -"\n" -"Assigning files to ebuilds... done.\n" -" (/root/.revdep-rebuild.4_ebuilds)\n" -"\n" -"Evaluating package order... done.\n" -" (/root/.revdep-rebuild.5_order)\n" -"\n" -"All prepared. Starting rebuild...\n" -"emerge --oneshot --nodeps -p =app-cdr/k3b-0.11.14 =app-office/koffice-1.3.2 =app-office/lyx-1.3.4 \\\n" -" =app-office/passepartout-0.2 =dev-lang/lua-5.0.2 =dev-ruby/fxruby-1.0.29 =media-libs/libao-0.8.5 \\\n" -" =media-libs/xine-lib-1_rc5-r3 =media-video/avidemux-2.0.26 =net-libs/loudmouth-0.16\n" -"\n" -"These are the packages that I would merge, in order:\n" -"\n" -"Calculating dependencies ...done!\n" -"[ebuild R ] app-cdr/k3b-0.11.14\n" -"[ebuild R ] app-office/koffice-1.3.2\n" -"[ebuild R ] app-office/lyx-1.3.4\n" -"[ebuild R ] app-office/passepartout-0.2\n" -"[ebuild R ] dev-lang/lua-5.0.2\n" -"[ebuild R ] dev-ruby/fxruby-1.0.29\n" -"[ebuild R ] media-libs/libao-0.8.5\n" -"[ebuild R ] media-libs/xine-lib-1_rc5-r3\n" -"[ebuild R ] media-video/avidemux-2.0.26\n" -"[ebuild R ] net-libs/loudmouth-0.16\n" -"\n" -"Now you can remove -p (or --pretend) from arguments and re-run revdep-rebuild.\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):713 +" * Configuring search environment for revdep-rebuild\n" +"\n" +" * Checking reverse dependencies\n" +" * Packages containing binaries and libraries broken by a package update\n" +" * will be emerged.\n" +"\n" +" * Collecting system binaries and libraries\n" +" * Generated new 1_files.rr\n" +" * Collecting complete LD_LIBRARY_PATH\n" +" * Generated new 2_ldpath.rr\n" +" * Checking dynamic linking consistency\n" +"[ 48% ] * broken /usr/lib/gstreamer-0.10/libgsttaglib.la (requires /usr/lib/libtag.la)\n" +"[ 64% ] * broken /usr/lib/libgdkglext-x11-1.0.la (requires /usr/lib/libGLU.la)\n" +"[ 67% ] * broken /usr/lib/libgtkglext-x11-1.0.la (requires /usr/lib/libGLU.la)\n" +"[ 85% ] * broken /usr/lib/python2.6/site-packages/gtk-2.0/gtk/gdkgl/_gdkgl.la (requires /usr/lib/libGLU.la)\n" +" * broken /usr/lib/python2.6/site-packages/gtk-2.0/gtk/gtkgl/_gtkgl.la (requires /usr/lib/libGLU.la)\n" +"[ 97% ] * broken /usr/qt/3/lib/libqt-mt.la (requires -lpng)\n" +"[ 100% ]\n" +" * Generated new 3_broken.rr\n" +" * Assigning files to packages\n" +" * /usr/lib/gstreamer-0.10/libgsttaglib.la -> media-plugins/gst-plugins-taglib\n" +" * /usr/lib/libgdkglext-x11-1.0.la -> x11-libs/gtkglext\n" +" * /usr/lib/libgtkglext-x11-1.0.la -> x11-libs/gtkglext\n" +" * /usr/lib/python2.6/site-packages/gtk-2.0/gtk/gdkgl/_gdkgl.la -> dev-python/pygtkglext\n" +" * /usr/lib/python2.6/site-packages/gtk-2.0/gtk/gtkgl/_gtkgl.la -> dev-python/pygtkglext\n" +" * /usr/qt/3/lib/libqt-mt.la -> x11-libs/qt\n" +" * Generated new 4_raw.rr and 4_owners.rr\n" +" * Cleaning list of packages to rebuild\n" +" * Generated new 4_pkgs.rr\n" +" * Assigning packages to ebuilds\n" +" * Generated new 4_ebuilds.rr\n" +" * Evaluating package order\n" +" * Generated new 5_order.rr\n" +" * All prepared. Starting rebuild\n" +"emerge --oneshot --pretend dev-python/pygtkglext:0\n" +"media-plugins/gst-plugins-taglib:0.10\n" +"x11-libs/gtkglext:0\n" +"x11-libs/qt:3\n" +"\n" +"These are the packages that would be merged, in order:\n" +"\n" +"Calculating dependencies... done!\n" +"[ebuild R ] media-plugins/gst-plugins-taglib-0.10.17\n" +"[ebuild R ] x11-libs/gtkglext-1.2.0\n" +"[ebuild R ] x11-libs/qt-3.3.8b-r2\n" +"[ebuild R ] dev-python/pygtkglext-1.1.0\n" +" * Now you can remove -p (or --pretend) from arguments and re-run revdep-rebuild.\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):888 msgid "" "If you need to rebuild some packages, you may run <c>revdep-rebuild</c> " "without the <c>-p</c> flag and the listed packages will be emerged again." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):721 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):896 msgid "glsa-check" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):724 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):899 msgid "" "<c>glsa-check</c> is mainly a test tool that keeps track of the various " -"GLSAs (Gentoo Linux Security Advisory) and will eventually be integrated " +"GLSA's (Gentoo Linux Security Advisory) and will eventually be integrated " "into <c>emerge</c> and <c>equery</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):733 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):908 msgid "eread" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):736 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):911 msgid "" "<c>eread</c> is a simple utility to display elog files produced by >" "=<c>portage-2.1</c>. You can set the saving of elog files by setting a " "couple of variables in <path>/etc/make.conf</path>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):742 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):917 msgid "Enabling elog in /etc/make.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):742 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):917 #, no-wrap msgid "" "\n" @@ -933,7 +1147,7 @@ msgid "" "PORTAGE_ELOG_SYSTEM=\"save\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):747 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(note):922 msgid "" "This is just one way of saving elog messages. For more information on how " "Portage's elog system works, please refer to the appropriate page in the " @@ -941,17 +1155,17 @@ msgid "" "chap=1#doc_chap4\">Portage Handbook</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):754 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):929 msgid "" "Once you've set up elog to your satisfaction, just run <c>eread</c> to view " "your log files." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):759 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre:caption):934 msgid "Using eread" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):759 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(pre):934 #, no-wrap msgid "" "\n" @@ -967,30 +1181,30 @@ msgid "" "Choice?\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):772 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):947 msgid "" "Select a number and the file will be displayed using the paging program " "specified in the PAGER environment variable. If PAGER is not set, it will " "use <c>less</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):778 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):953 msgid "" "After displaying the elog item, you will be prompted if you want to delete " "the file." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):786 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(title):961 msgid "eclean" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):789 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):964 msgid "" "<c>eclean</c> is a tool to remove old source files and old binary packages " "from your system." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):794 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):969 msgid "" "When you build and install packages, the source files are downloaded and " "preserved in DISTDIR, usually <path>/usr/portage/distfiles</path>. This can " @@ -999,7 +1213,7 @@ msgid "" "DISTDIR." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):802 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):977 msgid "" "You can create archives of installed packages by using <c>quickpg</c> or " "FEATURES=\"buildpkg\". These archived packages are kept in PKGDIR, usually " @@ -1009,7 +1223,7 @@ msgid "" "only the latest versions." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):811 +#: ../../gentoo/xml/htdocs/doc/en//gentoolkit.xml(p):986 msgid "" "For more information on <c>eclean</c> and tips on maintaining a cruft-free " "system, please read <c>man eclean</c>." diff --git a/doc/gettext/ru/gnome-config.xml.po b/doc/gettext/ru/gnome-config.xml.po index 83006e9..77d3dc5 100644 --- a/doc/gettext/ru/gnome-config.xml.po +++ b/doc/gettext/ru/gnome-config.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-08-02 23:45+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:59+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -54,11 +54,11 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(version):27 -msgid "2" +msgid "3" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(date):28 -msgid "2011-07-02" +msgid "2011-08-13" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(title):31 @@ -214,23 +214,46 @@ msgid "Next we'll clean up the remaining services and user groups." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):144 -msgid "Services and groups" +msgid "Setting up the DBUS service" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):144 -#, no-wrap +#, fuzzy, no-wrap msgid "" "\n" -"# <i>gpasswd -a yourregularuser plugdev</i>\n" "# <i>/etc/init.d/dbus start</i>\n" "# <i>rc-update add dbus default</i>\n" msgstr "" +"\n" +"# <i>rc-update add xdm default</i>\n" + +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):149 +msgid "" +"Check if the <e>plugdev</e> group exists. If it does, it is adviseable to " +"make yourself member of that group, but this is optional (the group is not " +"that common anymore)." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):155 +msgid "Checking and adding users to plugdev" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):155 +#, no-wrap +msgid "" +"\n" +"~# <i>getent group plugdev</i>\n" +"plugdev:x:104:\n" +"\n" +"<comment># Substitute yourUserName with your user name ;-)</comment>\n" +"~# <i>gpasswd -a yourUserName plugdev</i>\n" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(title):153 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(title):166 msgid "First Impressions" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):156 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):169 msgid "" "Let us first take a look at what we just built. Exit your root shell and log " "on as a regular user. We will configure our session to run GNOME when we " @@ -239,18 +262,18 @@ msgid "" "xml\">X Server Configuration Howto</uri>):" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):164 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):177 msgid "Setting GNOME as the default desktop environment" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):164 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):177 #, no-wrap msgid "" "\n" "$ <i>echo \"exec gnome-session\" > ~/.xinitrc</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):168 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):181 msgid "" "Starting with <c>gnome-base/gnome-session-2.26.2</c>, you will need to " "prepend the XDG_MENU_PREFIX variable to get the Gnome menus if you're using " @@ -259,26 +282,26 @@ msgid "" "additional configuration is needed.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):176 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):189 msgid "Prepending XDG_MENU_PREFIX to ~/.xinitrc" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):176 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):189 #, no-wrap msgid "" "\n" "$ <i>sed -i '1i\\export XDG_MENU_PREFIX=gnome-' ~/.xinitrc</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):180 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):193 msgid "Now start your graphical environment by running <c>startx</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):184 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):197 msgid "Starting GNOME" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):184 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):197 #, no-wrap msgid "" "\n" @@ -287,32 +310,32 @@ msgstr "" "\n" "$ <i>startx</i>\n" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):188 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):201 msgid "" "If all goes well, you should be greeted by GNOME. Congratulations. Now let " "us take a look at how you can configure GNOME to suit your needs." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(title):197 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(title):210 msgid "Configuring GNOME" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(title):199 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(title):212 msgid "GNOME's Graphical Login Manager" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):202 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):215 msgid "" "If you want the GNOME Display Manager (GDM) to run automatically when you " "boot (so you can log on graphically), you must add the <c>xdm</c> init " "script to the default runlevel:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):208 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):221 msgid "Adding xdm to the default runlevel" msgstr "Добавление xdm в уровень исполнения по умолчанию" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):208 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):221 #, no-wrap msgid "" "\n" @@ -321,23 +344,23 @@ msgstr "" "\n" "# <i>rc-update add xdm default</i>\n" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):212 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):225 msgid "" "Now edit <path>/etc/conf.d/xdm</path> and alter the DISPLAYMANAGER variable." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):216 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre:caption):229 msgid "Editing /etc/conf.d/xdm" msgstr "Изменение /etc/conf.d/xdm" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):216 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(pre):229 #, no-wrap msgid "" "\n" "DISPLAYMANAGER=\"gdm\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):220 +#: ../../gentoo/xml/htdocs/doc/en//gnome-config.xml(p):233 msgid "" "If you reboot now, the GNOME Display Manager will prompt you for your " "username and password and will default to using GNOME as Desktop Environment " diff --git a/doc/gettext/ru/gpm.xml.po b/doc/gettext/ru/gpm.xml.po index bd00006..222d552 100644 --- a/doc/gettext/ru/gpm.xml.po +++ b/doc/gettext/ru/gpm.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2011-01-24 14:41+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -10,16 +10,13 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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" +"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" "X-Generator: Lokalize 1.0\n" "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../../gentoo/xml/htdocs/doc/en//gpm.xml(guide:link):5 -msgid "/doc/en/gpm.xml" -msgstr "/doc/ru/gpm.xml" - #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(title):6 msgid "Using a Mouse within the Console" msgstr "Использование мыши в консоли" @@ -37,8 +34,15 @@ msgid "Joshua Saddler" msgstr "Joshua Saddler" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(abstract):12 -msgid "This guide shows you how to set up and use GPM (the General Purpose Mouse server) from within a command line interface. This is especially useful for new Gentoo installations or for systems that cannot or do not use an X server." -msgstr "Это руководство посвящено тому, как установить и использовать GPM (General Purpose Mouse server) в консоли. GPM особенно удобен для новых установок Gentoo или для систем, которые не могут или просто не используют X-сервер." +msgid "" +"This guide shows you how to set up and use GPM (the General Purpose Mouse " +"server) from within a command line interface. This is especially useful for " +"new Gentoo installations or for systems that cannot or do not use an X " +"server." +msgstr "" +"Это руководство посвящено тому, как установить и использовать GPM (General " +"Purpose Mouse server) в консоли. GPM особенно удобен для новых установок " +"Gentoo или для систем, которые не могут или просто не используют X-сервер." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(version):22 msgid "1.2" @@ -53,8 +57,16 @@ msgid "Getting GPM" msgstr "Установка GPM" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):30 -msgid "If you've just installed Gentoo, you almost certainly don't have your mouse set up to work within a command line interface (CLI) yet. Or perhaps you can't use or don't need an X server, yet you still need to use a mouse. The solution is simple: <c>gpm</c>, the General Purpose Mouse server." -msgstr "Если вы только что установили Gentoo, ваша мышь наверняка еще не настроена для работы в интерфейсе командной строки (CLI). Или, возможно, вы не можете или не хотите использовать X-сервер, но вам все же нужна мышь. Простое решение: <c>gpm</c>, General Purpose Mouse server." +msgid "" +"If you've just installed Gentoo, you almost certainly don't have your mouse " +"set up to work within a command line interface (CLI) yet. Or perhaps you " +"can't use or don't need an X server, yet you still need to use a mouse. The " +"solution is simple: <c>gpm</c>, the General Purpose Mouse server." +msgstr "" +"Если вы только что установили Gentoo, ваша мышь наверняка еще не настроена " +"для работы в интерфейсе командной строки (CLI). Или, возможно, вы не можете " +"или не хотите использовать X-сервер, но вам все же нужна мышь. Простое " +"решение: <c>gpm</c>, General Purpose Mouse server." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):37 msgid "First, you will need to get GPM:" @@ -74,16 +86,26 @@ msgstr "" "# <i>emerge gpm</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):45 -msgid "You might have noticed a few messages during the compilation that warned about configuring the server. You must do this before starting GPM." -msgstr "Во время компиляции вы могли заметить несколько сообщений, напоминающих о необходимости настройки сервера. Вы должны настроить GPM до того, как его запустить." +msgid "" +"You might have noticed a few messages during the compilation that warned " +"about configuring the server. You must do this before starting GPM." +msgstr "" +"Во время компиляции вы могли заметить несколько сообщений, напоминающих о " +"необходимости настройки сервера. Вы должны настроить GPM до того, как его " +"запустить." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(title):55 msgid "Configuring GPM" msgstr "Настройка GPM" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):59 -msgid "Before you can use GPM, you will need to uncomment the lines corresponding to the location and protocol of your mouse. You do this by editing the GPM configuration file:" -msgstr "Перед использованием GPM, вам потребуется раскомментировать строчки в конфигурационном файле GPM, отвечающие за расположение и протокол вашей мыши:" +msgid "" +"Before you can use GPM, you will need to uncomment the lines corresponding " +"to the location and protocol of your mouse. You do this by editing the GPM " +"configuration file:" +msgstr "" +"Перед использованием GPM, вам потребуется раскомментировать строчки в " +"конфигурационном файле GPM, отвечающие за расположение и протокол вашей мыши:" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(pre:caption):65 msgid "Setting up GPM" @@ -99,8 +121,23 @@ msgstr "" "# <i>nano /etc/conf.d/gpm</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):69 -msgid "In my case, I have a USB mouse on <path>/dev/input/mouse0</path>. So, I have uncommented <path>/dev/input/mice</path>, as this is the cumulative device for all mice on the system, and the appropriate protocol. Try using <path>/dev/input/mice</path> before <path>/dev/psaux</path>, as the latter is deprecated and can be disabled in the latest 2.6 kernels. If <path>/dev/input/mice</path> fails, then fall back to other devices. Here is my example <path>/etc/conf.d/gpm</path>:" -msgstr "В моем случае USB-мышь находится в <path>/dev/input/mouse0</path>. Итак, я раскомментировал <path>/dev/input/mice</path> (так как это общее устройство для всех мышей в системе) и соответствующий протокол. Попробуйте использовать <path>/dev/input/mice</path> до того, как использовать <path>/dev/psaux</path>, так как использование последнего устарело, он может быть убран из последующих ядер 2.6. Если <path>/dev/input/mice</path> не работает, тогда пробуйте другие устройства. Для примера, вот мой конфигурационный файл <path>/etc/conf.d/gpm</path>:" +msgid "" +"In my case, I have a USB mouse on <path>/dev/input/mouse0</path>. So, I have " +"uncommented <path>/dev/input/mice</path>, as this is the cumulative device " +"for all mice on the system, and the appropriate protocol. Try using <path>/" +"dev/input/mice</path> before <path>/dev/psaux</path>, as the latter is " +"deprecated and can be disabled in the latest 2.6 kernels. If <path>/dev/" +"input/mice</path> fails, then fall back to other devices. Here is my example " +"<path>/etc/conf.d/gpm</path>:" +msgstr "" +"В моем случае USB-мышь находится в <path>/dev/input/mouse0</path>. Итак, я " +"раскомментировал <path>/dev/input/mice</path> (так как это общее устройство " +"для всех мышей в системе) и соответствующий протокол. Попробуйте " +"использовать <path>/dev/input/mice</path> до того, как использовать <path>/" +"dev/psaux</path>, так как использование последнего устарело, он может быть " +"убран из последующих ядер 2.6. Если <path>/dev/input/mice</path> не " +"работает, тогда пробуйте другие устройства. Для примера, вот мой " +"конфигурационный файл <path>/etc/conf.d/gpm</path>:" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(pre:caption):79 msgid "Example GPM config" @@ -126,8 +163,19 @@ msgstr "" "MOUSEDEV=/dev/input/mice\n" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):88 -msgid "If you have a wheelmouse, you will want to use the imps2 protocol, so uncomment that line. If imps2 and ps2 both fail to work for you, please refer to the GPM info page (<c>info gpm</c>) for other protocols to try. Also, if you want to be able to click on hyperlinks in terminals to navigate to a website, it is a good idea to follow the suggestion in the <c>/etc/conf.d/gpm</c> file:" -msgstr "Если у вас мышь с колесиком, следует использовать протокол imps2; тогда раскомментируйте соответствующую строчку. Если не работает ни imps2, ни ps2, разузнайте о других протоколах на info-странице GPM (<c>info gpm</c>). Кроме того, если вы хотите, нажимая в терминале на гиперссылки, перемещаться по сайтам, стоит последовать совету, данному в файле <c>/etc/conf.d/gpm</c>:" +msgid "" +"If you have a wheelmouse, you will want to use the imps2 protocol, so " +"uncomment that line. If imps2 and ps2 both fail to work for you, please " +"refer to the GPM info page (<c>info gpm</c>) for other protocols to try. " +"Also, if you want to be able to click on hyperlinks in terminals to navigate " +"to a website, it is a good idea to follow the suggestion in the <c>/etc/conf." +"d/gpm</c> file:" +msgstr "" +"Если у вас мышь с колесиком, следует использовать протокол imps2; тогда " +"раскомментируйте соответствующую строчку. Если не работает ни imps2, ни ps2, " +"разузнайте о других протоколах на info-странице GPM (<c>info gpm</c>). Кроме " +"того, если вы хотите, нажимая в терминале на гиперссылки, перемещаться по " +"сайтам, стоит последовать совету, данному в файле <c>/etc/conf.d/gpm</c>:" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(pre:caption):96 msgid "Other options" @@ -151,16 +199,26 @@ msgstr "" "APPEND=\"-l \\\"a-zA-Z0-9_.:~/\\300-\\326\\330-\\366\\370-\\377\\\"\"\n" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):104 -msgid "The rest of the conf.d file contains other suggestions for your mouse server; uncomment the various options according to your needs. See <c>man gpm</c> for more information." -msgstr "В оставшейся части файла conf.d содержатся дополнительные рекомендации для сервера GPM. Раскомментируйте эти параметры в соответствии с вашими требованиями. За дополнительной информацией обращайтесь к <c>man gpm</c>." +msgid "" +"The rest of the conf.d file contains other suggestions for your mouse " +"server; uncomment the various options according to your needs. See <c>man " +"gpm</c> for more information." +msgstr "" +"В оставшейся части файла conf.d содержатся дополнительные рекомендации для " +"сервера GPM. Раскомментируйте эти параметры в соответствии с вашими " +"требованиями. За дополнительной информацией обращайтесь к <c>man gpm</c>." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(title):115 msgid "Running GPM" msgstr "Запуск GPM" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):119 -msgid "Now that your mouse server is installed and configured, it's time to start using it:" -msgstr "Теперь, когда сервер мыши установлен и настроен, самое время начать его использовать:" +msgid "" +"Now that your mouse server is installed and configured, it's time to start " +"using it:" +msgstr "" +"Теперь, когда сервер мыши установлен и настроен, самое время начать его " +"использовать:" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(pre:caption):124 msgid "The GPM init script" @@ -176,8 +234,17 @@ msgstr "" "# <i>/etc/init.d/gpm start</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):128 -msgid "You should see a block cursor appear. Remember that only root can run the GPM init script. However, to avoid having to <c>su</c> and run the script every single time you begin a new session, why not set GPM to begin every time you turn on your computer?" -msgstr "На экране должен появиться прямоугольный курсор. Помните, что только root может запускать сценарий инициализации GPM. Поэтому, каждый раз после начала новогосеанса, приходиться запускать <c>su</c>, а затем сценарий инициализации. Чтобы избежать этого, почему бы не запускать GPM всякий раз, когда вы включаете компьютер?" +msgid "" +"You should see a block cursor appear. Remember that only root can run the " +"GPM init script. However, to avoid having to <c>su</c> and run the script " +"every single time you begin a new session, why not set GPM to begin every " +"time you turn on your computer?" +msgstr "" +"На экране должен появиться прямоугольный курсор. Помните, что только root " +"может запускать сценарий инициализации GPM. Поэтому, каждый раз после начала " +"новогосеанса, приходиться запускать <c>su</c>, а затем сценарий " +"инициализации. Чтобы избежать этого, почему бы не запускать GPM всякий раз, " +"когда вы включаете компьютер?" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(pre:caption):135 msgid "Adding GPM to the default runlevel" @@ -193,8 +260,14 @@ msgstr "" "# <i>rc-update add gpm default</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):139 -msgid "Now, whenever you start your computer, you'll be greeted by the console cursor by the time you get to the login prompt. The mouse server will continue to run even if you're not logged in as root." -msgstr "Теперь, когда бы вы не включили свой компьютер, еще до того, как вы увидите приглашение войти в систему, вас встретит курсор консольный мыши. Сервер мыши будет работать, даже если вы будете входить в систему не как root." +msgid "" +"Now, whenever you start your computer, you'll be greeted by the console " +"cursor by the time you get to the login prompt. The mouse server will " +"continue to run even if you're not logged in as root." +msgstr "" +"Теперь, когда бы вы не включили свой компьютер, еще до того, как вы увидите " +"приглашение войти в систему, вас встретит курсор консольный мыши. Сервер " +"мыши будет работать, даже если вы будете входить в систему не как root." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(title):150 msgid "Working with GPM" @@ -205,20 +278,57 @@ msgid "Copying and pasting" msgstr "Копирование и вставка" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):155 -msgid "Copying and pasting large blocks of text with a working mouse server is very easy. Simply highlight the text with the left mouse button (it will stay highlighted when you release the button), switch to a different terminal if you wish, position the cursor, and press the middle mouse button to paste the text where you placed the cursor. Note that you can copy and paste without ever leaving the terminal you started. This makes posting the output of error messages to the <uri link=\"http://forums.gentoo.org\">Gentoo Forums</uri> extremely simple." -msgstr "С работающим сервером мыши легко осуществить копирование и вставку больших кусков текста. Просто выделите текст левой кнопкой мыши (при отпускании кнопкитекст останется выделенным), если нужно, переключитесь на другой терминал, установите курсор в нужную позицию и нажмите среднюю кнопку мыши. Текст будетвставлен в то место, куда вы поместили курсор. Заметьте, что копировать и вставлять текст можно не покидая того терминала, в котором вы выделяли текст.Так процитировать сообщение об ошибке на <uri link=\"http://forums.gentoo.org\">форумах Gentoo</uri> становится проще простого." +msgid "" +"Copying and pasting large blocks of text with a working mouse server is very " +"easy. Simply highlight the text with the left mouse button (it will stay " +"highlighted when you release the button), switch to a different terminal if " +"you wish, position the cursor, and press the middle mouse button to paste " +"the text where you placed the cursor. Note that you can copy and paste " +"without ever leaving the terminal you started. This makes posting the output " +"of error messages to the <uri link=\"http://forums.gentoo.org\">Gentoo " +"Forums</uri> extremely simple." +msgstr "" +"С работающим сервером мыши легко осуществить копирование и вставку больших " +"кусков текста. Просто выделите текст левой кнопкой мыши (при отпускании " +"кнопкитекст останется выделенным), если нужно, переключитесь на другой " +"терминал, установите курсор в нужную позицию и нажмите среднюю кнопку мыши. " +"Текст будетвставлен в то место, куда вы поместили курсор. Заметьте, что " +"копировать и вставлять текст можно не покидая того терминала, в котором вы " +"выделяли текст.Так процитировать сообщение об ошибке на <uri link=\"http://" +"forums.gentoo.org\">форумах Gentoo</uri> становится проще простого." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(title):169 msgid "Text-mode browsing and GPM" msgstr "Текстовые браузеры и GPM" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):172 -msgid "If you have a message on one screen and a text-mode web browser on the other, you can copy the error message by highlighting it, then change to the other terminal, left-click the appropriate text entry box to select it, and then press the middle mouse button. Voilà! Your error message can now be posted to the forums." -msgstr "Если у вас есть текстовое сообщение в одной консоли и текстовый браузер в другой, можно скопировать это сообщение. Для этого нужно сначала выделить его, затем, перейдя на другой терминал, щелкнуть левой кнопкой мыши для выделения поля ввода и нажать среднюю кнопку мыши. Вуаля! Можно отправлять сообщение об ошибке на форум." +msgid "" +"If you have a message on one screen and a text-mode web browser on the " +"other, you can copy the error message by highlighting it, then change to the " +"other terminal, left-click the appropriate text entry box to select it, and " +"then press the middle mouse button. Voilà! Your error message can now be " +"posted to the forums." +msgstr "" +"Если у вас есть текстовое сообщение в одной консоли и текстовый браузер в " +"другой, можно скопировать это сообщение. Для этого нужно сначала выделить " +"его, затем, перейдя на другой терминал, щелкнуть левой кнопкой мыши для " +"выделения поля ввода и нажать среднюю кнопку мыши. Вуаля! Можно отправлять " +"сообщение об ошибке на форум." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):180 -msgid "Though discussion of text-only browsers is somewhat beyond the scope of this guide, inevitably users will need to find a compatible console browser. Though <c>lynx</c> is most likely the oldest and well established browser, its interface has poor mouse support and recognition. Instead, try using <c>links</c> which has excellent mouse integration." -msgstr "Несмотря на то, что обсуждение текстовых браузеров выходит за рамки данного руководства, пользователям несомненно потребуется браузер, совместимый с консольной мышью. Хотя <c>Lynx</c> является самым старым и популярным текстовым браузером, его интерфейс плохо поддерживает и распознает консольную мышь. Вместо него попробуйте <c>links</c>, который отлично подходит для работы с мышью." +msgid "" +"Though discussion of text-only browsers is somewhat beyond the scope of this " +"guide, inevitably users will need to find a compatible console browser. " +"Though <c>lynx</c> is most likely the oldest and well established browser, " +"its interface has poor mouse support and recognition. Instead, try using " +"<c>links</c> which has excellent mouse integration." +msgstr "" +"Несмотря на то, что обсуждение текстовых браузеров выходит за рамки данного " +"руководства, пользователям несомненно потребуется браузер, совместимый с " +"консольной мышью. Хотя <c>Lynx</c> является самым старым и популярным " +"текстовым браузером, его интерфейс плохо поддерживает и распознает " +"консольную мышь. Вместо него попробуйте <c>links</c>, который отлично " +"подходит для работы с мышью." #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(pre:caption):188 msgid "Obtaining links" @@ -234,11 +344,12 @@ msgstr "" "# <i>emerge links</i>\n" #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(p):192 -msgid "This concludes the guide to using a mouse within the console. Happy mousing!" -msgstr "На этом руководство по использованию мыши в консоли заканчивается. Удачи!" +msgid "" +"This concludes the guide to using a mouse within the console. Happy mousing!" +msgstr "" +"На этом руководство по использованию мыши в консоли заканчивается. Удачи!" #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL #: ../../gentoo/xml/htdocs/doc/en//gpm.xml(None):0 msgid "translator-credits" msgstr "Вячеслав Матюшин; переводчик; v.matyushin@gmail.com" - diff --git a/doc/gettext/ru/grub-error-guide.xml.po b/doc/gettext/ru/grub-error-guide.xml.po index 5d94cd6..20a699a 100644 --- a/doc/gettext/ru/grub-error-guide.xml.po +++ b/doc/gettext/ru/grub-error-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:59+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//grub-error-guide.xml(guide:link):5 -msgid "/doc/en/grub-error-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//grub-error-guide.xml(title):6 msgid "Gentoo Grub Error Collection" msgstr "" diff --git a/doc/gettext/ru/guide-localization.xml.po b/doc/gettext/ru/guide-localization.xml.po index 422ce82..1f31c05 100644 --- a/doc/gettext/ru/guide-localization.xml.po +++ b/doc/gettext/ru/guide-localization.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:00+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//guide-localization.xml(guide:link):5 -msgid "/doc/en/guide-localization.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//guide-localization.xml(title):6 msgid "Gentoo Linux Localization Guide" msgstr "" diff --git a/doc/gettext/ru/guide-to-mutt.xml.po b/doc/gettext/ru/guide-to-mutt.xml.po index d58141c..b73f317 100644 --- a/doc/gettext/ru/guide-to-mutt.xml.po +++ b/doc/gettext/ru/guide-to-mutt.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:00+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(guide:link):6 -msgid "/doc/en/guide-to-mutt.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):8 msgid "QuickStart Guide to Mutt E-Mail" msgstr "" @@ -27,716 +23,366 @@ msgid "Author" msgstr "автор" #: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail:link):11 -msgid "mikpolniak@adelphia.net" -msgstr "mikpolniak@adelphia.net" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):11 -msgid "Mike Polniak" -msgstr "Mike Polniak" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(author:title):13 -msgid "Editor" -msgstr "редактор" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail:link):14 -msgid "antifa@gentoo.org" +#, fuzzy +msgid "grobian@gentoo.org" msgstr "antifa@gentoo.org" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):14 -msgid "Ken Nowack" -msgstr "Ken Nowack" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(author:title):16 -msgid "Contributor" -msgstr "участник" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail:link):17 -msgid "hitch17@gmail.com" -msgstr "hitch17@gmail.com" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):17 -msgid "John Hitchings" -msgstr "John Hitchings" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(abstract):20 -msgid "" -"This guide shows you how to begin using the powerful command line tools for " -"e-mail: fetchmail, procmail, mutt, nbsmtp, msmtp." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(version):29 -msgid "1.7" -msgstr "1.7" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(date):30 -msgid "2006-09-17" -msgstr "2006-09-17" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):33 -msgid "Introduction to E-Mail" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):37 -msgid "" -"If you're not a fan of e-mail clients with fancy graphical user interfaces, " -"or if you would just like to experiment with other mail clients before " -"deciding which is best for you, here is the easy way to begin using these " -"powerful command line tools:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):48 -msgid "" -"These programs are not only powerful and highly customizable but also small " -"and efficient. Once you are up and running with this e-mail system you will " -"be amazed at what you can do with it." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):54 -msgid "" -"Because this is a quick start guide, we will eliminate the Mail Transfer " -"Agent (MTA) such as sendmail, postfix or exim. This means no complex MTA " -"configuration. It also eliminates using port 25 for mail service." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):60 -msgid "" -"We can do this because fetchmail can force the mail it retrieves directly to " -"a Mail Delivery Agent (MDA) rather than forwarding to port 25. And we don't " -"need to use a complex MTA for plain old outgoing mail delivery." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):66 -msgid "These are the programs you will need to get your e-mail running." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):70 -msgid "Getting needed programs" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):70 -#, no-wrap -msgid "" -"\n" -"# <i>emerge fetchmail nbsmtp procmail mutt</i>\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):74 -msgid "" -"Then just four quick steps to configure files and you will be up and running " -"a brand new e-mail system." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(impo):79 -msgid "" -"After each step you can run a test to make sure the setup is correct. This " -"means you will have a complete working e-mail system when you are done." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):89 -msgid "Fetchmail" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):93 -msgid "" -"Fetchmail fetches mail from remote servers and forwards it to your local " -"machines delivery system. To use it you need to set up a <path>.fetchmailrc</" -"path> file in your home directory like this example:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):99 -msgid "Sample .fetchmailrc" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):103 -msgid "" -"Once you have created a <path>.fetchmailrc</path> file, you have to change " -"the permissions on the file using the chmod command. The file must be " -"readable only by the file owner. Set the permissions with the following " -"command:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):109 -msgid "Changing Permissions" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):109 -#, no-wrap -msgid "" -"\n" -"$ <i>chmod 600 .fetchmailrc</i>\n" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(mail):11 +msgid "Fabian Groffen" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):113 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(abstract):14 msgid "" -"To see fetchmail in action, use the verbose mode (-v). To fetch all messages " -"use -a. And you must use the option -m to tell fetchmail to send the mail to " -"procmail." +"This guide shows you how to begin using the powerful command line e-mail " +"client mutt." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(warn):119 -msgid "" -"While testing, it's a good idea to tell fetchmail to keep (-k) the mail on " -"the remote server in case something goes wrong and you need to fetch it " -"again." +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(version):23 +msgid "3" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):124 -msgid "Run it now to see fetchmail in action!" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(date):24 +msgid "2011-08-18" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):128 -msgid "Fetchmail test #1" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):27 +msgid "The Mutt e-mail client" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):128 -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):250 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):31 msgid "" -"\n" -"$ <i>fetchmail -akv -m \"/usr/bin/procmail -d %T\"</i>\n" +"If you're not a fan of e-mail clients with fancy graphical user interfaces, " +"or you just like to be able to quickly read some mail over an SSH " +"connection, the class of console-based mail clients might be for you." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):132 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):37 msgid "" -"Once you have a working mail system you can set this as a cron job or put it " -"in a monitor like gkrellm. Fetchmail can also run in a daemon mode for which " -"you specify a polling interval in seconds." +"Mutt is one of the current console-based mail clients that's still under " +"active development and has a vast crowd of active supporters (and users). It " +"is powerful, highly customisable, small and efficient." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):143 -msgid "Procmail" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):147 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):43 msgid "" -"Procmail is the processor that filters the mail that is forwarded to it by " -"fetchmail. It also acts as the MDA to deliver mail to your mailboxes where " -"mutt (your e-mail client) can read it." +"While Mutt was originally designed to read mail from the local mbox mail " +"spool (e.g. <path>/var/spool/mail/</path>), nowadays it comes with full " +"support for Maildir stored folders, remote fetching from POP3 servers and " +"complete management of IMAP accounts. For a full description of what Mutt " +"can do, please read the Mutt manual and Mutt website at <uri>http://www.mutt." +"org/</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):153 -msgid "" -"To use procmail you need to create a <path>.procmailrc</path> file in your " -"home directory. For our quickstart purposes we will use a very simple <path>." -"procmailrc</path> that will filter mail from three gentoo mailing lists into " -"these mailboxes:<e>gentoo-dev, gentoo-user</e> and <e>gentoo-announce</e>" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):56 +msgid "Acquiring Mutt" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):160 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):60 msgid "" -"The procmail filter rules are called recipes, and I have also included " -"recipes to filter out some spam." +"Starting your Mutt adventure simply requires you to emerge it. " +"Unfortunately, Mutt has a lots of options, which enable or disable certain " +"functionalities of Mutt. We now briefly discuss the most important USE-flags " +"that you may want to enable based on your intended usage of Mutt. Please " +"note that enabling most of them won't harm your Mutt, but may make it do " +"more than an experienced Mutt user would like." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):165 -msgid "Sample .procmailrc" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):69 +msgid "Mutt's USE-flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):165 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):69 #, no-wrap msgid "" "\n" -"MAILDIR=$HOME/MuttMail ##you better make sure it exists\n" -"LOGFILE=$HOME/.procmaillog\n" -"LOGABSTRACT=no\n" -"#VERBOSE=on...is only used for debugging\n" -"VERBOSE=off\n" -"FORMAIL=/usr/bin/formail\n" -"NL=\"\n" -"\"\n" -"##recipe lines begin with :0\n" -"##dont put comments on recipe lines\n" -"##disable a recipe with the false condition !\n" -"##condition lines begin with * and regex is your friend\n" -"##conditions are anded and everything after * is fed straight into egrep\n" -"##one action line follows the conditions, in this case it is a mailbox name\n" -"\n" -"#catch duplicates using formail\n" -":0 Whc: .msgid.lock\n" -"| $FORMAIL -D 16384 .msgid.cache\n" -"\n" -":0 a\n" -"$MAILDIR/duplicates\n" -"\n" -"#people we always allow mail from\n" -":0\n" -"* ^From:.*(craig\\@hotmail|renee\\@local.com)\n" -"$MAILDIR/friends\n" -"\n" -"#now flush some spam out\n" -":0\n" -"* ^Subject:.*(credit|cash|money|debt|sex|sale|loan)\n" -"$MAILDIR/spam\n" -"\n" -"#no more html messages\n" -":0\n" -"* ^Content-Type:.*html\n" -"$MAILDIR/junk\n" -"\n" -"#now put my mail lists into mailboxes\n" -":0\n" -"* ^List-Id:.*gentoo-user\n" -"gentoo-user\n" -"\n" -":0\n" -"* ^List-Id:.*gentoo-dev\n" -"gentoo-dev\n" -"\n" -":0\n" -"* ^List-Id:.*gentoo-announce\n" -"gentoo-announce\n" -"\n" -"#catch any other gentoo mail\n" -":0\n" -"* ^From:.*gentoo.org\n" -"gentoo\n" -"\n" -":0\n" -"* ^From:.*@freshmeat\\.net\n" -"freshmeat\n" -"\n" -"################################\n" -"# Last rule: mail that gets #\n" -"# this far goes in default box #\n" -"################################\n" -":0\n" -"* .*\n" -"default\n" -"\n" -"# End of file\n" +"% <i>emerge -pv mutt</i>\n" +"[ebuild N ] mail-client/mutt-1.5.21-r1 USE=\"gdbm gpg imap mbox nls nntp \\\n" +" sidebar smime smtp ssl -berkdb -crypt -debug -doc -gnutls \\\n" +" -idn -pop -qdbm -sasl -tokyocabinet\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):236 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):76 msgid "" -"It is only required to make the MAILDIR <path>$HOME/MuttMail</path> as " -"Procmail will create all the mailbox files as needed in this directory using " -"the names on the action lines. For some useful links visit <uri>http://www." -"procmail.org/</uri>" +"First off, for newcomers, the <c>imap</c> USE-flag is most probably the most " +"important one. Enabling it won't hurt anything, so if you're unsure what " +"account you're going to use Mutt with, just enable it. Most email providers, " +"even free ones such as GMail, use IMAP these days, for it is the most " +"convenient way to store email that is accessed from multiple clients at the " +"same time and/or different locations. Because IMAP keeps all mail at the " +"server, Mutt just downloads the messages that you want to view." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):243 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):86 msgid "" -"You can now test <path>.procmailrc</path> by re-running the fetchmail " -"command we tested in the first step. Remember the -k option to keep all mail " -"on the remote server so we have it if we need to rerun it." +"Often you happen to jump through a couple of messages a couple of times " +"shortly after each other, which would require to download the same message " +"over and over again. Since this simply is a waste, Mutt uses a so-called " +"header cache (hcache) to keep the most important bits of messages that it " +"needs. This hcache is backed by a db-library, of which four flavours exist: " +"<c>gdbm</c>, <c>berkdb</c>, <c>qdbm</c> and <c>tokyocabinet</c>. If you " +"don't have any preference yourself, pick gdbm or berkdb. Most likely you " +"will have both already installed on your system. Enabling the USE-flags for " +"more than one hcache backend will make Mutt choose one it likes best. It " +"will always use at most one." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):250 -msgid "Procmail test #1" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):254 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):99 msgid "" -"Now that fetchmail and procmail have run, go to <path>$HOME/MuttMail</path> " -"and read your messages with <c>less</c> or your file manager." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):264 -msgid "Mutt e-mail client" +"While IMAP is important for reading mail, sending mail requires a mail " +"server. Mutt can talk to a mail server that exists on the local system, but " +"often that's not the case, or simply not a good solution for e.g. laptop " +"users that often travel around. Mutt comes with SMTP support which gets " +"enabled by the <c>smtp</c> USE-flag. Again, enabling it if you're not sure " +"doesn't harm. Mutt's SMTP support allows you just to send mail over a mail " +"server of your choice; usually the one that you are given by your email " +"provider." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):268 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):109 msgid "" -"Mutt is used to read and compose e-mail. It is powerful and highly " -"customizable but also small and efficient." +"Both IMAP and SMTP mostly go over encrypted channels these days, hence if " +"you enabled any of both, it is wise to also enable either of the <c>ssl</c> " +"or <c>gnutls</c> USE-flags. Both just add the secure variants (imaps and " +"smtps) to Mutt's list of supported protocols using either OpenSSL's or " +"GNUTLS' implementation. If you don't have a strong preference for either, " +"just go for <c>ssl</c>. Most likely this is in your global USE already " +"anyway. If you intend to authenticate yourself when sending e-mail, be sure " +"to also include <c>sasl</c> in your USE-flags, since that's a prerequisite " +"for that." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):273 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):120 msgid "" -"Mutt supports reading and writing of four different mailbox formats: mbox, " -"MMDF, MH and Maildir. The mailbox type is autodetected. In our case we are " -"using the mbox format, where all messages of a mailbox are stored in a " -"single file." +"Last but not least, there is the <c>sidebar</c> USE-flag. It enables an " +"extension to Mutt that can show a navigation pane of available mailboxes on " +"the left hand side of the screen. While this is not a recommended feature " +"for absolute newcomers (it is nowhere mentioned in any official docs, since " +"it simply isn't official), more experienced users might like its " +"functionality. Luckily, just enabling the USE-flag doesn't make it visible " +"at all, meaning you don't even notice it's enabled." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):280 -msgid "" -"Mutt also has the ability to work with folders located on a remote IMAP " -"server. See IMAP Support in section 4.11 of the Mutt manual and the Mutt web " -"site <uri>http://www.mutt.org/</uri>" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):135 +msgid "Configuring Mutt" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):286 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):139 msgid "" -"When you emerged mutt in the first step it installed a configuration file in " -"<path>/etc/mutt/Muttrc</path>. You also need to create a <path>.muttrc</" -"path> file in your home directory." +"After you emerged mutt with your USE-flags of choice, the only necessary " +"step is to create a <path>.muttrc</path> file in your home directory. " +"Muttrc's are to be found in many places on the web and in Mutt's " +"documentation. In <path>/usr/share/doc/mutt-<version>/samples</path> " +"you can find some muttrc samples that are from the official distribution. We " +"discuss a very minimal <path>.muttrc</path> for an IMAP based account with " +"SMTP mail delivery below." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):292 -msgid "Sample .muttrc" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):149 +msgid "A .muttrc example file" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):292 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):149 #, no-wrap msgid "" "\n" -"<comment>(Be sure to read the fine Mutt manual in /usr/share/doc/mutt*)\n" -"(Any settings here override the system settings in /etc/mutt/Muttrc)</comment>\n" -"\n" -"# <i>cp /etc/mutt/Muttrc ~/.muttrc</i>\n" -"# <i>nano -w .muttrc</i>\n" -"set pager_context=1\n" -"set pager_index_lines=6 #show a mini-index in pager\n" -"set menu_scroll\n" -"set pgp_verify_sig=no #dont show pgp in pager\n" -"set status_on_top #put status line at top\n" -"set sort=threads #sort by message threads in index\n" -"\n" -"set status_format=\" %r %b %f %n Del %d Msgs %m %l %> (%P)\"\n" -"set pager_format=\"%-10.10i %[!%a %b %d %R]\"\n" -"set date_format=\"!%H:%M %a %d %b \"\n" -"set index_format=\"%4C %Z %[%b%d] %-15.15F %s\"\n" -"set folder_format=\"%2C %t %8s %d %N %f\"\n" -"\n" -"#set sendmail=\"/usr/bin/nbsmtp -d isp.net -h smtp.isp.net -f yourname@isp.net\"\n" -"\n" -"#set from=\"default-mailaddress\" #set to your from address\n" -"#set realname=\"myname\"\n" -"\n" -"set record=\"$HOME/MuttMail/sent\" #sent mail is saved here\n" -"set delete=yes #delete without prompting\n" -"set include=yes #quote msg in reply\n" -"set fast_reply=yes #no prompting on reply\n" -"set beep=no #no noise\n" -"set markers=no #no + on wrapped lines\n" -"set confirmappend=no #no prompt for save to =keep\n" -"set to_chars=\" +TCF\" #no L for mail_list\n" -"\n" -"set folder = $HOME/MuttMail\n" -"mailboxes =gentoo-user\n" -"mailboxes =gentoo-dev\n" -"mailboxes =gentoo-announce\n" -"mailboxes =gentoo\n" -"mailboxes =freshmeat\n" -"mailboxes =duplicates\n" -"mailboxes =default\n" -"mailboxes =friends\n" -"mailboxes =junk\n" -"mailboxes =spam\n" -"mailboxes =keep\n" -"\n" -"save-hook .* =keep #default mbox to (s)ave mail is =keep\n" -"subscribe gentoo-user gentoo-dev #subscribed to these lists\n" -"\n" -"bind pager h display-toggle-weed #toggle headers with h key\n" -"\n" -"# simulate the old url menu\n" -"macro index \\cb |urlview\\n 'call urlview to extract URLs out of a message'\n" -"macro pager \\cb |urlview\\n 'call urlview to extract URLs out of a message'\n" -"\n" -"#run fetchmail by hitting key of G\n" -"macro index G \"!fetchmail -a -m 'procmail -d %T'\\r\"\n" -"macro pager G \"!fetchmail -a -m 'procmail -d %T'\\r\"\n" -"\n" -"#use to edit .muttrc and then source it...no restart necessary\n" -"macro generic ,sm \":source $HOME/.muttrc\\r\"\n" -"macro generic \\cj \"!rxvt -bg wheat -e joe $HOME/.muttrc\\r\"\n" -"\n" -"# default list of header fields to weed out when displaying mail\n" -"#ignore them all and then unignore what you want to see\n" -"ignore *\n" -"unignore Date To From: Subject X-Mailer Organization User-Agent\n" -"hdr_order Date From To Subject X-Mailer User-Agent Organization\n" -"\n" -"##your Mutt has to have some colors\n" -"##these are for four levels of quoted text\n" -"##they override the system settings in /etc/mutt/Muttrc\n" -"\n" -"#color quoted green default\n" -"color quoted1 magenta blue\n" -"#color quoted2 yellow default\n" -"#color quoted3 red default\n" -"#color signature cyan cyan\n" +"# character set on messages that we send\n" +"set send_charset=\"utf-8\"\n" +"# if there is no character set given on incoming messages, it is probably windows\n" +"set assumed_charset=\"iso-8859-1\"\n" +"\n" +"# make sure Vim knows mutt is a mail client and that we compose an UTF-8 encoded message\n" +"set editor=\"vim -c 'set syntax=mail ft=mail enc=utf-8'\"\n" +"\n" +"# just scroll one line instead of full page\n" +"set menu_scroll=yes\n" +"\n" +"# we want to see some MIME types inline, see below this code listing for explanation\n" +"auto_view application/msword\n" +"auto_view application/pdf\n" +"\n" +"# make default search pattern to search in To, Cc and Subject\n" +"set simple_search=\"~f %s | ~C %s | ~s %s\"\n" +"\n" +"# threading preferences, sort by threads\n" +"set sort=threads\n" +"set strict_threads=yes\n" +"\n" +"# show spam score (from SpamAssassin only) when reading a message\n" +"spam \"X-Spam-Score: ([0-9\\\\.]+).*\" \"SA: %1\"\n" +"set pager_format = \" %C - %[%H:%M] %.20v, %s%* %?H? [%H] ?\"\n" +"\n" +"# do not show all headers, just a few\n" +"ignore *\n" +"unignore From To Cc Bcc Date Subject\n" +"# and in this order\n" +"unhdr_order *\n" +"hdr_order From: To: Cc: Bcc: Date: Subject:\n" "\n" +"# brighten up stuff with colours, for more colouring examples see:\n" +"# http://aperiodic.net/phil/configs/mutt/colors\n" +"color normal white black\n" +"color hdrdefault green default\n" +"color quoted green default\n" +"color quoted1 yellow default\n" +"color quoted2 red default\n" +"color signature cyan default\n" +"color indicator brightyellow red\n" +"color error brightred default\n" +"color status brightwhite blue\n" +"color tree brightmagenta black\n" +"color tilde blue default\n" +"color attachment brightyellow default\n" +"color markers brightred default\n" +"color message white black\n" +"color search brightwhite magenta\n" +"color bold brightyellow default\n" +"# if you don't like the black progress bar at the bottom of the screen,\n" +"# comment out the following line\n" +"color progress white black\n" +"\n" +"# personality settings\n" +"set realname = \"Andrew Dalziel\"\n" +"set from = \"andy@mail.server\"\n" +"alternates \"andrew@mail.server|andrew.dalziel@mail.server\"\n" +"# this file must exist, and contains your signature, comment it out if\n" +"# you don't want a signature to be used\n" +"set signature = ~/.signature\n" "\n" -"#this color setup is copied from /etc/mutt/Muttrc.color\n" -"#comment it out if you want the default colors in /etc/mutt/Muttrc\n" -"# Je vois la vie en rose :-)\n" -"color hdrdefault brightcyan blue\n" -"color header brightwhite blue \"^from:\"\n" -"color header brightwhite blue \"^subject:\"\n" +"# aliases (sort of address book)\n" +"source ~/.aliases\n" "\n" -"color quoted brightgreen blue\n" -"color signature brightwhite blue\n" +"# IMAP connection settings\n" +"set mail_check=60\n" +"set imap_keepalive=300\n" "\n" -"color indicator blue green\n" +"# IMAP account settings\n" +"set folder=imaps://andy@imap.mail.server/\n" +"set spoolfile=imaps://andy@imap.mail.server/\n" +"set record=imaps://andy@imap.mail.server/Sent\n" +"set postponed=imaps://andy@imap.mail.server/Drafts\n" "\n" -"color error red black\n" -"mono error bold\n" -"color status black cyan\n" -"mono status bold\n" -"color tree yellow blue\n" +"# use headercache for IMAP (make sure this is a directory for performance!)\n" +"set header_cache=/var/tmp/.mutt\n" "\n" -"color tilde brightmagenta blue\n" -"color body brightwhite blue \"[-a-z_0-9.]+@[-a-z_0-9.]+\"\n" -"mono body bold \"[-a-z_0-9.]+@[-a-z_0-9.]+\"\n" -"color body brightyellow black \"^Good signature\"\n" -"mono body bold \"^Good signature\"\n" -"color body brightwhite red \"^Bad signature from.*\"\n" -"mono body bold \"^Bad signature from.*\"\n" -"color normal white blue\n" -"color message green black\n" -"color attachment brightgreen blue\n" +"# mailboxes we want to monitor for new mail\n" +"mailboxes \"=\"\n" +"mailboxes \"=Lists\"\n" "\n" -"# End of file...but it can go on and on and on....:)\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):404 -msgid "" -"For the record, this is just a sample <path>.muttrc</path>. There are many " -"more options that you can configure, such as integration with GPG. Have a " -"look at <uri>http://www.dotfiles.com/index.php?app_id=27</uri> for more " -"examples and help." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):411 -msgid "You are now ready to test your <path>.muttrc</path>." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):415 -msgid "Testing .muttrc" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):415 -#, no-wrap -msgid "" -"\n" -"$ <i>mutt -y</i>\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):419 -msgid "" -"This should open Mutt with a menu showing the Mutt mailboxes that you " -"created in Test 2 when you ran the fetchmail command." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):424 -msgid "Type the ? for help in navigating the Mutt Mailboxes." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):433 -msgid "SMTP" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):437 -msgid "" -"The final step is setting up nbsmtp the 'No-Brainer SMTP' used to send mail " -"to your SMTP server. This setup is the easiest of all, as it only requires " -"adding an entry in your <path>.muttrc</path> file." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):443 -msgid "" -"domain: The domain you want nbsmtp to say it belongs to. This will almost " -"invariably be the same as the domain in your e-mail address." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):448 -msgid "" -"from@addr: This is the address you want nbsmtp to say the message is from. " -"Note that this can be different than the \"From:\" line in your MUA." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):453 -msgid "host: This is the smtp server you are sending to." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):457 -msgid "Adding SMTP support" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):457 -#, no-wrap -msgid "" +"# mailing lists we are on (these are regexps!)\n" +"subscribe \"gentoo-.*@gentoo\\\\.org\"\n" "\n" -"$ <i>nano -w .muttrc</i>\n" -"set sendmail=\"/usr/bin/nbsmtp -d isp.net -h smtp.isp.net -f urname@isp.net\"\n" +"# SMTP mailing configuration (for sending mail)\n" +"set smtp_url=smtp://mail.server/\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):462 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):240 msgid "" -"You are now ready to send a message. So in the Mutt pager or index hit the " -"<c>m</c> key to compose a test message to send to your e-mail address. Mutt " -"will use the value of the EDITOR or VISUAL for the composition editor unless " -"you set <c>editor=</c> in the <path>.muttrc</path>. When you are done " -"composing hit <c>y</c> to send your message. If there are no errors you will " -"see 'sending mail' followed by 'Mail sent.'" +"It is good practice to review all settings from the example above. There are " +"many more, and some preferences may actually not match yours. Keep that in " +"mind when you feel that Mutt at first doesn't really work the way you like." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):471 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):246 msgid "" -"Remember in <path>.muttrc</path> we have set where to save sent mail with " -"<c>set record=\"$HOME/MuttMail/sent\"</c>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):476 +"The example <path>.muttrc</path> above sets up an IMAP account, uses an SMTP " +"server to send mail, stores its cache in <path>/var/tmp/.mutt</path>, reads " +"the known address aliases (think of it as an address book) from <path>~/." +"aliases</path> and appends the signature from <path>~/.signature</path> when " +"composing new mail. For some IMAP servers it may be necessary to change the " +"spool, record and postponed directories, as the folders <path>Sent</path> " +"and <path>Drafts</path> may be under a folder called <path>INBOX</path>. " +"Simply trying this out with Mutt is the simplest way to figure this out." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):257 +msgid "" +"Once your <path>.muttrc</path> is setup, you are ready to launch Mutt by " +"just running <c>mutt</c>. If you entered a valid IMAP server url, Mutt will " +"prompt you for your password and afterwards load all messages for you. Note " +"that the first time entering your mailbox may take a while if you have quite " +"some messages, since Mutt's header cache is still empty. If this succeeds " +"you're in your IMAP mailbox ready to go." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):266 +msgid "" +"Navigation is intuitive, as is reading messages by just pressing the enter " +"key or space bar. Mutt is quite Vim alike in that it uses key strokes to " +"perform most of its actions. You best read Mutt's manual on the web to get " +"yourself known with all existing functions (or press ? in Mutt) and what key " +"they are bound to, or better, what key you like it to be bound to. Some " +"essential keys are <c>m</c> (for message) to start composing a new message, " +"<c>q</c> for quit, <c>r</c> for reply, <c>s</c> for save and <c>p</c> for " +"print." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):276 msgid "" -"Now to complete the test, run fetchmail again to get all your mail and " -"verify you have received the message you sent to your e-mail address. When " -"you find your test message, hit the <c>h</c> key to toggle a view of all the " -"headers and see the complete mail transfer path." +"One of the features that Mutt has that is still not in today's most savvy " +"email clients is the ability to display attachments inline through some " +"viewer. The auto_view directive in the .muttrc file tells Mutt which " +"attachments (based on their MIME-type) it should view inline. To figure out " +"how to do that, Mutt uses mailcap files to lookup how to display a certain " +"MIME-type. Usually the system wide mailcap file isn't sufficient here, so " +"you better start a <path>~/.mailcap</path> file to put items in there for " +"<c>copiousoutput</c> that Mutt can display inline." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(note):483 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):287 msgid "" -"There is one more program you probably want to add called urlview. This " -"extracts the urls in message texts and sends them to your browser." +"In the example <path>.muttrc</path> above <c>auto_view</c> is enabled for " +"<c>application/msword</c> and <c>application/pdf</c> files. These two show " +"the extreme usefulness of this capability, because it means meeting notes " +"sent as doc file now are perfectly fine readable without having to save the " +"attachment and open it in OpenOffice. Instead the text just shows up in the " +"message reader, that is, if you have a matching entry in your <path>~/." +"mailcap</path> file." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):488 -msgid "Getting urlview" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):297 +msgid "Example .mailcap file" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):488 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):297 #, no-wrap msgid "" "\n" -"# <i>emerge urlview</i>\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):492 -msgid "" -"Then create <path>~/.urlview</path> by copying the configuration file from " -"<path>/usr/share/doc/urlview*/</path> and setting your browser command." +"application/msword; antiword '%s'; copiousoutput; description=Word Document;\n" +"nametemplate=%s.doc\n" +"application/pdf; pdftotext '%s' -; copiousoutput; description=PDF Document;\n" +"nametemplate=%s.pdf\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):497 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):304 msgid "" -"You now have a powerful and highly customizable mail system. To take " -"advantage of its flexibility, read all the manuals and docs and find the " -"many user configuration files available on the web: search for " -"<path>procmailrc</path> and <path>muttrc</path>." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):509 -msgid "Authenticated SMTP" +"The above <path>.mailcap</path> example tells mutt what to do to \"view\" " +"<c>msword</c> and <c>pdf</c> files. For the former it should run a program " +"called <c>antiword</c> (emerge <c>app-text/antiword</c>), for the latter the " +"program <c>pdftotext</c> (emerge <c>app-text/poppler</c>). You can go wild " +"with these to for example display rendered HTML (give <c>app-text/" +"vilistextum</c> a try), render vcards, or show ASCII representation of " +"attached images. All you need to do is define how to call the program in " +"your <path>.mailcap</path>, and tell Mutt to try to view it inline using the " +"<c>auto_view</c> directive." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):511 -msgid "Using nbSMTP" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):514 -msgid "" -"If you need to pass a username and password to your SMTP server, you can " -"edit the <c>set sendmail</c> command in your <path>.muttrc</path> to include " -"<c>-U <username> -P <password></c>, like this:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):520 -msgid "Setting username and password for SMTP" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):520 -#, no-wrap -msgid "" -"\n" -"set sendmail=\"/usr/bin/nbsmtp -U <i>username</i> -P <i>password</i> -d isp.net -h smtp.isp.net -f urname@isp.net\"\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):524 -msgid "" -"If you do not want this information to be present in your <path>.muttrc</" -"path> file, you can also create a <path>.nbsmtprc</path> file in which you " -"include all information:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):530 -msgid "~/.nbsmtprc example" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):530 -#, no-wrap -msgid "" -"\n" -"auth_user = <i>username</i>\n" -"auth_pass = <i>password</i>\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):538 -msgid "Alternative: Using msmtp" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):541 -msgid "" -"<c>msmtp</c> is a simple alternative to <c>nbsmtp</c> with similar " -"possibilities." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):546 -msgid "Installing msmtp" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):546 -#, no-wrap -msgid "" -"\n" -"# <i>emerge msmtp</i>\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):550 -msgid "" -"Now login as a normal user and configure msmtp by creating a <path>~/." -"msmtprc</path> file, filling in your SMTP server's information. Remember to " -"set the permissions to a secure value!" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):556 -msgid "Configuring msmtp" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):556 -#, no-wrap -msgid "" -"\n" -"$ <i>nano -w .msmtprc</i>\n" -"account default\n" -"host <i>smtp.your_provider.net</i>\n" -"from <i>your_username@provider1.net</i>\n" -"<comment>#see man page for more auth options</comment>\n" -"auth login\n" -"user <i>your_username</i>\n" -"password <i>your_password</i>\n" -"<comment>#If your SMTP Server supports TLS encryption, uncomment the next line\n" -"#tls</comment>\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):569 -msgid "Now set the permissions of the file to a secure value:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):573 -msgid "Setting the permissions for the configuration file" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):573 -#, no-wrap -msgid "" -"\n" -"$ <i>chmod 600 .msmtprc</i>\n" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):577 -msgid "Finally, edit or add the following line to <path>.muttrc</path>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre:caption):581 -msgid "Using msmtp with Mutt" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(pre):581 -#, no-wrap -msgid "" -"\n" -"$ <i>nano -w .muttrc</i>\n" -"set sendmail=\"/usr/bin/msmtp\"\n" +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(title):320 +msgid "Conclusions" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):586 +#: ../../gentoo/xml/htdocs/doc/en//guide-to-mutt.xml(p):324 msgid "" -"Fire up <c>mutt</c> and send yourself a test email to see if it worked! See " -"the msmtp man page for more options and another example." +"Mutt is a very versatile console email client. If you like the concept, Mutt " +"can be altered to behave in nearly any way through its configuration. Search " +"the web to find others explaining how they did \"it\", or find one of the " +"many patches that exist to make Mutt do even more. Gentoo applies a couple " +"of very popular patches to Mutt, so make sure to check <c>mutt -v</c> if you " +"want something more to make sure it is not yet already at your disposal. " +"While learning Mutt is not necessarily easy, once it is in your fingers, it " +"can make your mail experience much faster and efficient than with other " +"clients. Searching for example is quite powerful if you know how to hit the " +"right flags and know which regular expression narrows your search down. " +"Enjoy Mutting!" msgstr "" #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL diff --git a/doc/gettext/ru/home-router-howto.xml.po b/doc/gettext/ru/home-router-howto.xml.po index 2afb7f1..a2969e8 100644 --- a/doc/gettext/ru/home-router-howto.xml.po +++ b/doc/gettext/ru/home-router-howto.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-12 06:12+0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -13,10 +13,6 @@ msgstr "" "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" -#: ../../gentoo/xml/htdocs/doc/en//home-router-howto.xml(guide:link):5 -msgid "/doc/en/home-router-howto.xml" -msgstr "/doc/ru/home-router-howto.xml" - #: ../../gentoo/xml/htdocs/doc/en//home-router-howto.xml(guide:lang):5 msgid "en" msgstr "" diff --git a/doc/gettext/ru/info-guide.xml.po b/doc/gettext/ru/info-guide.xml.po index 40c253a..28ecd78 100644 --- a/doc/gettext/ru/info-guide.xml.po +++ b/doc/gettext/ru/info-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:54+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//info-guide.xml(guide:link):5 -msgid "/doc/en/info-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//info-guide.xml(guide:lang):5 msgid "en" msgstr "ru" diff --git a/doc/gettext/ru/ipv6.xml.po b/doc/gettext/ru/ipv6.xml.po index 2a02340..1724c5f 100644 --- a/doc/gettext/ru/ipv6.xml.po +++ b/doc/gettext/ru/ipv6.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-08-02 23:45+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2011-01-26 16:58+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -96,11 +96,11 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(version):40 -msgid "6" +msgid "7" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(date):41 -msgid "2011-07-24" +msgid "2011-09-02" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):44 @@ -169,19 +169,19 @@ msgid "'make menuconfig' options" msgstr "Параметры make menuconfig" #: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):74 -#, no-wrap +#, fuzzy, no-wrap msgid "" "\n" -"Device Drivers --->\n" "Networking support --->\n" -"Networking options --->\n" -" <*> The IPv6 protocol (EXPERIMENTAL)\n" +" Networking options --->\n" +" <*> The IPv6 protocol --->\n" "<comment>(The IPv6 options beneath this one can be useful for many other applications,</comment>\n" "<comment>but should not be needed for a basic setup)</comment>\n" "\n" "<comment>(This option is only required if you are using ptrtd for 6to4 conversion)</comment>\n" -"[*] Network device support\n" -" <*> Universal TUN/TAP device driver support\n" +"Device Drivers --->\n" +" Network device support --->\n" +" <*> Universal TUN/TAP device driver support\n" msgstr "" "\n" "Device Drivers --->\n" diff --git a/doc/gettext/ru/jffnms.xml.po b/doc/gettext/ru/jffnms.xml.po index db1d28b..00e1e37 100644 --- a/doc/gettext/ru/jffnms.xml.po +++ b/doc/gettext/ru/jffnms.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:01+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//jffnms.xml(guide:link):5 -msgid "/doc/en/jffnms.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//jffnms.xml(guide:lang):5 msgid "en" msgstr "ru" diff --git a/doc/gettext/ru/kernel-config.xml.po b/doc/gettext/ru/kernel-config.xml.po index 984c3a1..d79c45d 100644 --- a/doc/gettext/ru/kernel-config.xml.po +++ b/doc/gettext/ru/kernel-config.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:02+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//kernel-config.xml(guide:link):5 -msgid "/doc/en/kernel-config.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//kernel-config.xml(title):6 msgid "Gentoo Linux Kernel Configuration Guide" msgstr "" diff --git a/doc/gettext/ru/kernel-upgrade.xml.po b/doc/gettext/ru/kernel-upgrade.xml.po index 260dd38..fc57400 100644 --- a/doc/gettext/ru/kernel-upgrade.xml.po +++ b/doc/gettext/ru/kernel-upgrade.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-08-02 23:45+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:01+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(guide:link):5 -msgid "/doc/en/kernel-upgrade.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):6 msgid "Gentoo Linux Kernel Upgrade Guide" msgstr "" @@ -41,11 +37,11 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(version):20 -msgid "1" +msgid "2" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(date):21 -msgid "2011-05-28" +msgid "2011-09-04" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):24 @@ -116,7 +112,7 @@ msgid "" "\n" "# <i>emerge -Dup world</i>\n" "Calculating dependencies ...done!\n" -"[ebuild NS ] sys-kernel/gentoo-sources-2.6.9-r2 [2.6.8-r5]\n" +"[ebuild NS ] sys-kernel/gentoo-sources-2.6.39-r3 [2.6.38-r6]\n" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(note):92 @@ -145,7 +141,7 @@ msgstr "" msgid "" "The kernel sources will then be installed into a subdirectory of <path>/usr/" "src</path>. In the above example, the new kernel sources will be installed " -"at <path>/usr/src/linux-2.6.9-gentoo-r2</path>." +"at <path>/usr/src/linux-2.6.39-gentoo-r3</path>." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):117 @@ -195,20 +191,20 @@ msgid "" "<comment>(See the list of available kernels)</comment>\n" "# <i>eselect kernel list</i>\n" "Available kernel symlink targets:\n" -" [1] linux-2.6.9-gentoo-r1\n" -" [2] linux-2.6.9-gentoo-r2 *\n" +" [1] linux-2.6.39-gentoo-r3\n" +" [2] linux-2.6.38-gentoo-r6 *\n" "<comment>(Select the correct kernel)</comment>\n" "# <i>eselect kernel set 1</i>\n" "<comment>(Verify the kernel was symlinked)</comment>\n" "# <i>eselect kernel list</i>\n" -" [1] linux-2.6.9-gentoo-r1 *\n" -" [2] linux-2.6.9-gentoo-r2\n" +" [1] linux-2.6.39-gentoo-r3 *\n" +" [2] linux-2.6.38-gentoo-r6\n" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):157 msgid "" "If you really want to do it yourself, the following example shows you how to " -"make the link point to <path>linux-2.6.9-gentoo-r2</path>:" +"make the link point to <path>linux-2.6.39-gentoo-r3</path>:" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):162 @@ -220,7 +216,7 @@ msgstr "" msgid "" "\n" "# <i>cd /usr/src</i>\n" -"# <i>ln -sfn linux-2.6.9-gentoo-r2 linux</i>\n" +"# <i>ln -sfn linux-2.6.39-gentoo-r3 linux</i>\n" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):172 @@ -335,7 +331,7 @@ msgid "" "\n" "# <i>make && make modules_install</i>\n" "# <i>mount /boot</i>\n" -"# <i>cp arch/i386/boot/bzImage /boot/bzImage-2.6.9-gentoo-r2</i>\n" +"# <i>cp arch/i386/boot/bzImage /boot/bzImage-2.6.39-gentoo-r3</i>\n" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):257 @@ -380,24 +376,49 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):303 -msgid "Rebooting into the new kernel" +msgid "Updating your module configuration" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):307 msgid "" +"If you have put specific module configuration entries in <path>/etc/conf.d/" +"modules</path>, then you might need to update the entries accordingly." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):313 +msgid "Sample /etc/conf.d/modules file" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre):313 +#, no-wrap +msgid "" +"\n" +"<comment># The following will only auto-load the ieee1394 module in 2.6.38-gentoo-r6 kernels</comment>\n" +"modules_2_6_38_gentoo_r6=\"ieee1394\"\n" +"\n" +"<comment># To support auto-loading on all possible versions, drop any reference to versions:</comment>\n" +"modules=\"ohci1394\"\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):326 +msgid "Rebooting into the new kernel" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):330 +msgid "" "Next, close all applications and reboot your system. If you followed the " "above instructions correctly, the boot loader menu should include an entry " "for the new kernel. Select the new kernel and let the system boot." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):313 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):336 msgid "" "Hopefully, your system successfully boots with the new kernel, and you can " "log in to resume whatever you were doing. If this is the case, then the " "upgrade is complete." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):319 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):342 msgid "" "If you made a mistake and the system fails to boot with the new kernel, " "reboot the system and select the entry from the boot loader that corresponds " @@ -408,18 +429,18 @@ msgid "" "driver for an audio device, Ethernet adapter, etc.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):334 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):357 msgid "Running multiple kernels" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):338 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):361 msgid "" "You may have noticed, that when installing the sources for your newer " "kernel, the sources for your existing kernel were not removed. This is by " "design -- it allows you to easily switch between running different kernels." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):344 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):367 msgid "" "Switching between multiple kernels is as simple as leaving the kernel " "sources under <path>/usr/src/</path> and leaving the <path>bzImage</path> " @@ -428,11 +449,11 @@ msgid "" "with a choice of which kernel to boot into." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):357 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):380 msgid "Removing older kernels" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):361 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):384 msgid "" "Continuing on from the last section, you may be happy with your new kernel " "and not have any need to keep older kernel versions around. To easily remove " @@ -441,25 +462,25 @@ msgid "" "Continuing the example using <c>gentoo-sources</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):369 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):392 msgid "Pruning old versions" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre):369 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre):392 #, no-wrap msgid "" "\n" "# <i>emerge -P gentoo-sources</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):373 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):396 msgid "" "In most cases, temporary files used during compilation will still remain " "under the appropriate source directory under <path>/usr/src</path>. It is " "safe to remove these using <c>rm</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):379 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):402 msgid "" "You can also safely delete any modules that were used by this kernel. This " "can be done by removing the appropriate directories under <path>/lib/modules/" @@ -467,7 +488,7 @@ msgid "" "to delete modules belonging to kernels that you still use!" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):386 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):409 msgid "" "Finally, you can mount your <path>/boot</path> partition and remove the " "<path>bzImage</path> file(s) for the kernel(s) you are pruning. You should " @@ -475,11 +496,11 @@ msgid "" "such kernel(s)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):398 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):421 msgid "Advanced: Using your old kernel .config to configure a new one" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):402 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):425 msgid "" "It is sometimes possible to save time by re-using the configuration file " "from your old kernel when configuring the new one. Note that this is " @@ -487,7 +508,7 @@ msgid "" "to be a reliable upgrade path." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):409 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):432 msgid "" "The only situation where this is appropriate is when upgrading from one " "Gentoo kernel revision to another. For example, the changes made between " @@ -500,7 +521,7 @@ msgid "" "disabled options that they really didn't want to." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):421 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):444 msgid "" "To reuse your old <path>.config</path>, you simply need to copy it over and " "then run <c>make oldconfig</c>. In the following example, we take the " @@ -508,11 +529,11 @@ msgid "" "<c>gentoo-sources-2.6.9-r2</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):428 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):451 msgid "Reusing your old config" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre):428 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre):451 #, no-wrap msgid "" "\n" @@ -521,11 +542,11 @@ msgid "" "# <i>make oldconfig</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):434 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre:caption):457 msgid "Reusing your old config with genkernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre):434 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(pre):457 #, no-wrap msgid "" "\n" @@ -534,7 +555,7 @@ msgid "" "# <i>genkernel all</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):440 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):463 msgid "" "At this point, you may be asked to produce answers for configuration options " "which have changed between the two versions. Once you have done that, you " @@ -542,7 +563,7 @@ msgid "" "the <c>menuconfig</c> configuration process." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):447 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):470 msgid "" "A much safer upgrading method is to copy your config as previously shown, " "and then simply run <c>make menuconfig</c>. This avoids the problems of " @@ -556,11 +577,11 @@ msgid "" "compile and install your kernel as normal." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):465 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(title):488 msgid "Problems after a kernel upgrade?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):469 +#: ../../gentoo/xml/htdocs/doc/en//kernel-upgrade.xml(p):492 msgid "" "With the rapid development of the Linux kernel, it is inevitable that some " "changes made from one kernel release to another may cause some problems. If " diff --git a/doc/gettext/ru/ldap-howto.xml.po b/doc/gettext/ru/ldap-howto.xml.po index e25a81c..9a1b610 100644 --- a/doc/gettext/ru/ldap-howto.xml.po +++ b/doc/gettext/ru/ldap-howto.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-04-24 14:32+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2011-01-24 14:09+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -22,6 +22,7 @@ msgid "Gentoo Guide to OpenLDAP Authentication" msgstr "Руководство по аутентификации с использованием OpenLDAP" #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(author:title):8 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(author:title):11 msgid "Author" msgstr "автор" @@ -33,7 +34,10 @@ msgstr "sj7trunks@pendulus.net" msgid "Benjamin Coles" msgstr "Benjamin Coles" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(author:title):11 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(mail:link):12 +msgid "swift" +msgstr "" + #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(author:title):14 #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(author:title):17 #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(author:title):20 @@ -41,14 +45,6 @@ msgstr "Benjamin Coles" msgid "Editor" msgstr "редактор" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(mail:link):12 -msgid "swift@gentoo.org" -msgstr "swift@gentoo.org" - -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(mail):12 -msgid "Sven Vermeulen" -msgstr "Sven Vermeulen" - #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(mail:link):15 msgid "tseng@gentoo.org" msgstr "tseng@gentoo.org" @@ -83,11 +79,11 @@ msgstr "" "группы компьютеров под управлением Gentoo." #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(version):36 -msgid "5" +msgid "6" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(date):37 -msgid "2011-04-17" +msgid "2011-08-15" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):40 @@ -304,12 +300,12 @@ msgid "Generate password" msgstr "Генерация пароля" #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):167 -#, no-wrap +#, fuzzy, no-wrap msgid "" "\n" "# <i>slappasswd</i>\n" -"New password: my-password\n" -"Re-enter new password: my-password\n" +"New password: <i>my-password</i>\n" +"Re-enter new password: <i>my-password</i>\n" "{SSHA}EzP6I82DZRnW+ou6lyiXHGxSpSOw2XO4\n" msgstr "" "\n" @@ -320,114 +316,90 @@ msgstr "" #: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):174 msgid "" -"Now edit the LDAP Server config at <path>/etc/openldap/slapd.conf</path>:" +"Now edit the LDAP Server config at <path>/etc/openldap/slapd.conf</path>. " +"Below we'll give a sample configuration file to get things started. For a " +"more detailed analysis of the configuration file, we suggest that you work " +"through the OpenLDAP Administrator's Guide." msgstr "" -"Отредактируем конфигурационный файл сервера OpenLDAP <path>/etc/openldap/" -"slapd.conf</path>:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):178 -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):417 -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):440 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):181 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):564 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):587 msgid "/etc/openldap/slapd.conf" msgstr "/etc/openldap/slapd.conf" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):178 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):181 #, no-wrap msgid "" "\n" -"<comment># Include the needed data schemes below core.schema</comment>\n" -"include /etc/openldap/schema/cosine.schema\n" -"include /etc/openldap/schema/inetorgperson.schema\n" -"include /etc/openldap/schema/nis.schema\n" -"\n" -"<comment>Uncomment modulepath and hdb module</comment>\n" -"# Load dynamic backend modules:\n" -"modulepath /usr/lib/openldap/openldap\n" -"# moduleload back_shell.so\n" -"# moduleload back_relay.so\n" -"# moduleload back_perl.so\n" -"# moduleload back_passwd.so\n" -"# moduleload back_null.so\n" -"# moduleload back_monitor.so\n" -"# moduleload back_meta.so\n" -"moduleload back_hdb.so\n" -"# moduleload back_dnssrv.so\n" -"\n" -"<comment># Uncomment sample access restrictions (Note: maintain indentation!)</comment>\n" -"access to dn.base=\"\" by * read\n" -"access to dn.base=\"cn=Subschema\" by * read\n" -"access to *\n" -" by self write\n" -" by users read\n" -" by anonymous auth\n" +"include\t/etc/openldap/schema/core.schema\n" +"include /etc/openldap/schema/cosine.schema\n" +"include /etc/openldap/schema/inetorgperson.schema\n" +"include /etc/openldap/schema/nis.schema\n" +"include\t/etc/openldap/schema/misc.schema\n" "\n" +"pidfile /var/run/openldap/slapd.pid\n" +"argsfile /var/run/openldap/slapd.args\n" "\n" -"<comment># BDB Database definition</comment>\n" +"serverID 0 <comment>Used in case of replication</comment>\n" +"loglevel 0\n" "\n" -"database hdb\n" -"suffix \"dc=genfic,dc=com\"\n" -"checkpoint 32 30 # <kbyte> <min>\n" -"rootdn \"cn=Manager,dc=genfic,dc=com\"\n" -"rootpw <i>{SSHA}EzP6I82DZRnW+ou6lyiXHGxSpSOw2XO4</i>\n" -"directory /var/lib/openldap-ldbm\n" -"index objectClass eq\n" -msgstr "" -"\n" -"<comment># Включайте дополнительные схемы после core.schema</comment>\n" -"include /etc/openldap/schema/cosine.schema\n" -"include /etc/openldap/schema/inetorgperson.schema\n" -"include /etc/openldap/schema/nis.schema\n" -"\n" -"<comment>Раскомментируйте modulepath и модуль hdb</comment>\n" -"# Load dynamic backend modules:\n" -"modulepath /usr/lib/openldap/openldap\n" -"# moduleload back_shell.so\n" -"# moduleload back_relay.so\n" -"# moduleload back_perl.so\n" -"# moduleload back_passwd.so\n" -"# moduleload back_null.so\n" -"# moduleload back_monitor.so\n" -"# moduleload back_meta.so\n" -"moduleload back_hdb.so\n" -"# moduleload back_dnssrv.so\n" -"\n" -"<comment># Раскомментируйте пример прав доступа (соблюдайте отступы!)</comment>\n" +"<comment>## Access Controls</comment>\n" "access to dn.base=\"\" by * read\n" "access to dn.base=\"cn=Subschema\" by * read\n" "access to *\n" -" by self write\n" -" by users read\n" -" by anonymous auth\n" -"\n" -"\n" -"<comment># Определения базы данных BDB</comment>\n" -"\n" -"database hdb\n" -"suffix \"dc=genfic,dc=com\"\n" -"checkpoint 32 30 # <kbyte> <min>\n" -"rootdn \"cn=Manager,dc=genfic,dc=com\"\n" -"rootpw <i>{SSHA}EzP6I82DZRnW+ou6lyiXHGxSpSOw2XO4</i>\n" -"directory /var/lib/openldap-ldbm\n" -"index objectClass eq\n" +" by self write\n" +" by users read\n" +" by anonymous read\n" +"\n" +"<comment>## Database definition</comment>\n" +"database hdb\n" +"suffix \"dc=genfic,dc=com\"\n" +"checkpoint 32 30\n" +"rootdn \"cn=Manager,dc=genfic,dc=com\"\n" +"rootpw \"{SSHA}EzP6I82DZRnW+ou6lyiXHGxSpSOw2XO4\" <comment># See earlier slappasswd command</comment>\n" +"directory \"/var/lib/openldap-ldbm\"\n" +"index objectClass eq\n" +"\n" +"<comment>## Synchronisation (pull from other LDAP server)</comment>\n" +"syncrepl rid=000\n" +" provider=ldap://ldap2.genfic.com\n" +" type=refreshAndPersist\n" +" retry=\"5 5 300 +\"\n" +" searchbase=\"dc=genfic,dc=com\"\n" +" attrs=\"*,+\"\n" +" bindmethod=\"simple\"\n" +" binddn=\"cn=ldapreader,dc=genfic,dc=com\"\n" +" credentials=\"ldapsyncpass\"\n" +"\n" +"index entryCSN eq\n" +"index entryUUID eq\n" +"\n" +"mirrormode TRUE\n" +"\n" +"overlay syncprov\n" +"syncprov-checkpoint 100 10\n" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):217 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):231 msgid "Next we edit the LDAP Client configuration file:" msgstr "Далее изменим конфигурационный файл клиента LDAP:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):221 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):235 msgid "/etc/openldap/ldap.conf" msgstr "/etc/openldap/ldap.conf" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):221 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):235 +#, fuzzy, no-wrap msgid "" "\n" "# <i>nano -w /etc/openldap/ldap.conf</i>\n" "<comment>(Add the following...)</comment>\n" "\n" "BASE dc=genfic, dc=com\n" -"URI ldap://auth.genfic.com:389/\n" +"URI ldap://ldap.genfic.com:389/ ldap://ldap1.genfic.com:389/ ldap://ldap2.genfic.com:389/\n" "TLS_REQCERT allow\n" +"TIMELIMIT 2\n" msgstr "" "\n" "# <i>vim /etc/openldap/ldap.conf</i>\n" @@ -437,38 +409,51 @@ msgstr "" "URI ldap://auth.genfic.com:389/\n" "TLS_REQCERT allow\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):230 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):245 +#, fuzzy msgid "" -"Now edit <path>/etc/conf.d/slapd</path> and uncomment the following OPTS " -"line:" +"Now edit <path>/etc/conf.d/slapd</path> and set the following OPTS line:" msgstr "" "Теперь отредактируем <path>/etc/conf.d/slapd</path>, расскоментировав " "следующую строку OPTS:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):234 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):249 msgid "/etc/conf.d/slapd" msgstr "/etc/conf.d/slapd" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):234 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):249 #, no-wrap msgid "" "\n" -"<comment># Note: we don't use cn=config here, so stay with this line:</comment>\n" -"OPTS=\"-F /etc/openldap/slapd.d -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'\"\n" +"OPTS=\"-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'\"\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):253 +msgid "Finally, create the <path>/var/lib/openldap-ldbm</path> structure:" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):257 +msgid "Preparing the openldap-ldbm location" msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):257 +#, no-wrap +msgid "" "\n" -"<comment># Примечание: мы не используем cn=config, так что оставим следующее:</comment>\n" -"OPTS=\"-F /etc/openldap/slapd.d -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'\"\n" +"~# <i>mkdir -p /var/lib/openldap-ldbm</i>\n" +"~# <i>chown ldap:ldap /var/lib/openldap-ldbm</i>\n" +"~# <i>chmod 700 /var/lib/openldap-ldbm</i>\n" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):239 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):263 msgid "Start slapd:" msgstr "Запуск slapd:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):243 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):267 msgid "Starting SLAPd" msgstr "Запуск SLAPd" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):243 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):267 #, no-wrap msgid "" "\n" @@ -477,15 +462,15 @@ msgstr "" "\n" "# <i>/etc/init.d/slapd start</i>\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):247 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):271 msgid "You can test with the following command:" msgstr "Проверить работоспособность конфигурации можно следующей командой:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):251 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):275 msgid "Test the SLAPd daemon" msgstr "Проверка работоспособности демона SLAPd" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):251 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):275 #, no-wrap msgid "" "\n" @@ -494,7 +479,7 @@ msgstr "" "\n" "# <i>ldapsearch -x -D \"cn=Manager,dc=genfic,dc=com\" -W</i>\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):255 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):279 msgid "" "If you receive an error, try adding <c>-d 255</c> to increase the verbosity " "and solve the issue you have." @@ -502,22 +487,101 @@ msgstr "" "В случае ошибки попробуйте добавить опцию <c>-d 255</c> для увеличения " "информативности сообщения об ошибке и исправьте её." -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):265 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):289 +msgid "Replication" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):291 +msgid "If you need high availability" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):294 +msgid "" +"If your environment requires high availability, then you need to setup " +"replication of changes across multiple LDAP systems. Replication within " +"OpenLDAP is, in this guide, set up using a specific replication account " +"(<c>ldapreader</c>) which has read rights on the primary LDAP server and " +"which pulls in changes from the primary LDAP server to the secundary." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):302 +msgid "" +"This setup is then mirrored, allowing the secundary LDAP server to act as a " +"primary. Thanks to OpenLDAP's internal structure, changes are not re-applied " +"if they are already in the LDAP structure." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):311 +msgid "Setting Up Replication" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):314 +msgid "" +"To setup replication, first setup a second OpenLDAP server, similarly as " +"above. However take care that, in the configuration file," +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(li):320 +msgid "" +"the <e>sync replication provider</e> is pointing to the <e>other</e> system" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(li):323 +msgid "the <e>serverID</e> of each OpenLDAP system is different" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):328 +msgid "" +"Next, create the synchronisation account. We will create an LDIF file (the " +"format used as data input for LDAP servers) and add it to each LDAP server:" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):333 +msgid "Creating the ldapreader account" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):333 +#, no-wrap +msgid "" +"\n" +"~# <i>slappasswd -s myreaderpassword</i>\n" +" {SSHA}XvbdAv6rdskp9HgFaFL9YhGkJH3HSkiM\n" +"\n" +"~# <i>cat ldapreader.ldif</i>\n" +"dn: cn=ldapreader,dc=genfic,dc=com\n" +"userPassword: {SSHA}XvbdAv6rdskp9HgFaFL9YhGkJH3HSkiM\n" +"objectClass: organizationalRole\n" +"objectClass: simpleSecurityObject\n" +"cn: ldapreader\n" +"description: LDAP reader used for synchronization\n" +"\n" +"~# <i>ldapadd -x -W -D \"cn=Manager,dc=genfic,dc=com\" -f ldapreader.ldif</i>\n" +"Password: <comment>enter the administrative password</comment>\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):354 msgid "Client Configuration" msgstr "Настройка клиента" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):267 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):356 msgid "Migrate existing data to ldap" msgstr "Перенос существующей базы пользователей в LDAP" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):270 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):359 +msgid "" +"Configuring OpenLDAP for centralized administration and management of common " +"Linux/Unix items isn't easy, but thanks to some tools and scripts available " +"on the Internet, migrating a system from a single-system administrative " +"point-of-view towards an OpenLDAP-based, centralized managed system isn't " +"hard either." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):367 +#, fuzzy msgid "" "Go to <uri link=\"http://www.padl.com/OSS/MigrationTools.html\">http://www." -"padl.com/OSS/MigrationTools.html</uri> and fetch the scripts there. " -"Configuration is stated on the page. We don't ship this anymore because the " -"scripts are a potential security hole if you leave them on the system after " -"porting. When you've finished migrating your data, continue to the next " -"section." +"padl.com/OSS/MigrationTools.html</uri> and fetch the scripts there. You'll " +"need the migration tools and the <c>make_master.sh</c> script." msgstr "" "Скачайте с адреса <uri link=\"http://www.padl.com/OSS/MigrationTools.html" "\">http://www.padl.com/OSS/MigrationTools.html</uri> необходимый набор " @@ -526,11 +590,123 @@ msgstr "" "переноса, они становятся потенциальной дырой в системе безопасности. После " "окончания переноса данных переходите к следующему разделу." -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):282 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):374 +msgid "" +"Next, extract the tools and copy the <c>make_master.sh</c> script inside the " +"extracted location:" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):379 +msgid "Extracting the MigrationTools" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):379 +#, no-wrap +msgid "" +"\n" +"~# <i>mktemp -d</i>\n" +"/tmp/tmp.zchomocO3Q\n" +"~# <i>cd /tmp/tmp.zchomocO3Q</i>\n" +"~# <i>tar xvzf /path/to/MigrationTools.tgz</i>\n" +"~# <i>mv /path/to/make_master.sh MigrationTools-47</i>\n" +"~# <i>cd MigrationTools-47</i>\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):388 +msgid "" +"The next step now is to migrate the information of your system to OpenLDAP. " +"The <c>make_master.sh</c> script will do this for you, after you have " +"provided it with the information regarding your LDAP structure and " +"environment." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):394 +msgid "At the time of writing, the tools require the following input:" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(th):400 +msgid "Input" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(th):401 +msgid "Description" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(th):402 +msgid "Example" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):405 +msgid "LDAP BaseDN" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):406 +msgid "The base location (root) of your tree" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):407 +msgid "dc=genfic,dc=com" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):410 +msgid "Mail domain" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):411 +msgid "Domain used in e-mail addresses" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):412 +msgid "genfic.com" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):415 +msgid "Mail host" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):416 +msgid "FQDN of your mail server infrastructure" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):417 +msgid "smtp.genfic.com" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):420 +msgid "LDAP Root DN" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):421 +msgid "Administrative account information for your LDAP structure" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):422 +#, fuzzy +msgid "cn=Manager,dc=genfic,dc=com" +msgstr "" +"\n" +"# <i>ldapsearch -x -D \"cn=Manager,dc=genfic,dc=com\" -W</i>\n" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):425 +msgid "LDAP Root Password" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(ti):426 +msgid "" +"Password for the administrative account, cfr earlier <c>slappasswd</c> " +"command" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):434 +msgid "" +"The tool will also ask you which accounts and settings you want to migrate." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):441 msgid "Configuring PAM" msgstr "Настройка PAM" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):285 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):444 msgid "" "First, we will configure PAM to allow LDAP authorization. Install <c>sys-" "auth/pam_ldap</c> so that PAM supports LDAP authorization, and <c>sys-auth/" @@ -543,11 +719,11 @@ msgstr "" "которого ваша система может получать от LDAP-серверов дополнительную " "информацию (с помощью <path>nsswitch.conf</path>)." -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):292 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):451 msgid "Installing pam_ldap and nss_ldap" msgstr "Установка pam_ldap и nss_ldap" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):292 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):451 #, no-wrap msgid "" "\n" @@ -556,7 +732,7 @@ msgstr "" "\n" "# <i>emerge pam_ldap nss_ldap</i>\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):296 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):455 msgid "" "Now add the following lines in the right places to <path>/etc/pam.d/system-" "auth</path>:" @@ -564,12 +740,12 @@ msgstr "" "Теперь добавьте следующие строки в соответствующих местах <path>/etc/pam.d/" "system-auth</path>:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):301 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):460 msgid "/etc/pam.d/system-auth" msgstr "/etc/pam.d/system-auth" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):301 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):460 +#, fuzzy, no-wrap msgid "" "\n" "<comment># Note: only add them. Don't kill stuff already in there or your box won't let you login again!</comment>\n" @@ -583,7 +759,7 @@ msgid "" "#%PAM-1.0\n" "\n" "auth required pam_env.so\n" -"auth sufficient pam_unix.so try_first_pass likeauth nullok\n" +"auth <i>sufficient</i> pam_unix.so try_first_pass likeauth nullok\n" "<i>auth sufficient pam_ldap.so use_first_pass</i>\n" "auth required pam_deny.so\n" "\n" @@ -591,7 +767,7 @@ msgid "" "account required pam_unix.so\n" "\n" "password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3\n" -"password sufficient pam_unix.so try_first_pass use_authtok nullok md5 shadow\n" +"password <i>sufficient</i> pam_unix.so try_first_pass use_authtok nullok md5 shadow\n" "<i>password sufficient pam_ldap.so use_authtok use_first_pass</i>\n" "password required pam_deny.so\n" "\n" @@ -629,17 +805,17 @@ msgstr "" "<i>session optional pam_ldap.so</i>\n" "\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):331 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):490 msgid "Now change <path>/etc/ldap.conf</path> to read:" msgstr "" "Теперь необходимо привести <path>/etc/ldap.conf</path> к следующему виду:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):335 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):494 msgid "/etc/ldap.conf" msgstr "/etc/ldap.conf" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):335 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):494 +#, fuzzy, no-wrap msgid "" "\n" "<comment>#host 127.0.0.1</comment>\n" @@ -647,20 +823,20 @@ msgid "" "\n" "suffix \"dc=genfic,dc=com\"\n" "<comment>#rootbinddn uid=root,ou=People,dc=genfic,dc=com</comment>\n" -"\n" -"uri ldap://auth.genfic.com/\n" -"pam_password exop\n" -"\n" +"bind_policy soft\n" +"bind_timelimit 2\n" "ldap_version 3\n" +"nss_base_group ou=Group,dc=genfic,dc=com\n" +"nss_base_hosts ou=Hosts,dc=genfic,dc=com\n" +"nss_base_passwd ou=People,dc=genfic,dc=com\n" +"nss_base_shadow ou=People,dc=genfic,dc=com\n" "pam_filter objectclass=posixAccount\n" "pam_login_attribute uid\n" "pam_member_attribute memberuid\n" -"nss_base_passwd ou=People,dc=genfic,dc=com\n" -"nss_base_shadow ou=People,dc=genfic,dc=com\n" -"nss_base_group ou=Group,dc=genfic,dc=com\n" -"nss_base_hosts ou=Hosts,dc=genfic,dc=com\n" -"\n" +"pam_password exop\n" "scope one\n" +"timelimit 2\n" +"uri ldap://ldap.genfic.com/ ldap://ldap1.genfic.com ldap://ldap2.genfic.com\n" msgstr "" "\n" "<comment>#host 127.0.0.1</comment>\n" @@ -683,7 +859,7 @@ msgstr "" "\n" "scope one\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):357 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):516 msgid "" "Next, copy over the (OpenLDAP) <path>ldap.conf</path> file from the server " "to the client so the clients are aware of the LDAP environment:" @@ -692,11 +868,11 @@ msgstr "" "path> с сервера на рабочие станции, чтобы клиенты могли использовать среду " "LDAP:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):362 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):521 msgid "Copying over the OpenLDAP ldap.conf" msgstr "Перенос конфигурационного файла ldap.conf" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):362 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):521 #, no-wrap msgid "" "\n" @@ -707,7 +883,7 @@ msgstr "" "<comment>(Замените 'ldap-server' на доменное имя вашего LDAP-сервера)</comment>\n" "# <i>scp ldap-server:/etc/openldap/ldap.conf /etc/openldap</i>\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):367 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):526 msgid "" "Finally, configure your clients so that they check the LDAP for system " "accounts:" @@ -715,11 +891,11 @@ msgstr "" "Последним шагом настроим клиентские компьютеры для проверки учётных записей " "пользователей через LDAP:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):372 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):531 msgid "/etc/nsswitch.conf" msgstr "/etc/nsswitch.conf" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):372 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):531 #, no-wrap msgid "" "\n" @@ -732,41 +908,18 @@ msgstr "" "group: files ldap\n" "shadow: files ldap\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):378 -msgid "To test the changes, type:" -msgstr "Для проверки работоспособности внесённых изменений введите:" - -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre:caption):382 -msgid "Testing LDAP Auth" -msgstr "Проверка аутентификации посредством LDAP" - -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):382 -#, no-wrap -msgid "" -"\n" -"# <i>getent passwd|grep 0:0</i>\n" -"\n" -"<comment>(You should get two entries back:)</comment>\n" -"root:x:0:0:root:/root:/bin/bash\n" -"root:x:0:0:root:/root:/bin/bash\n" -msgstr "" -"\n" -"# <i>getent passwd|grep 0:0</i>\n" -"\n" -"<comment>(Должны появиться две строки:)</comment>\n" -"root:x:0:0:root:/root:/bin/bash\n" -"root:x:0:0:root:/root:/bin/bash\n" - -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):390 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):537 +#, fuzzy msgid "" "If you noticed one of the lines you pasted into your <path>/etc/ldap.conf</" "path> was commented out (the <c>rootbinddn</c> line): you don't need it " "unless you want to change a user's password as superuser. In this case you " "need to echo the root password to <path>/etc/ldap.secret</path> in " "plaintext. This is <brite>DANGEROUS</brite> and should be chmoded to 600. " -"What I do is keep that file blank and when I need to change someones " -"password thats both in the ldap and <path>/etc/passwd</path> I put the pass " -"in there for 10 seconds while I change it and remove it when I'm done." +"What you might want to do is keep that file blank and when you need to " +"change someones password thats both in the ldap and <path>/etc/passwd</" +"path>, put the pass in there for 10 seconds while changing the users " +"password and remove it when done." msgstr "" "Как вы могли заметить, одна из строк, вставлявшихся в <path>/etc/ldap.conf</" "path>, была закомментирована ( <c>rootbinddn</c>): пока у вас не возникает " @@ -779,15 +932,15 @@ msgstr "" "тогда, когда мне нужно внести изменения одновременно в каталог LDAP и в " "<path>/etc/passwd</path>, оставляя его там на 10 секунд на время изменения." -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):406 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):553 msgid "LDAP Server Security Settings" msgstr "Настройки безопасности LDAP-сервера" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):408 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):555 msgid "OpenLDAP permissions" msgstr "Права доступа в OpenLDAP" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):411 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):558 msgid "" "If we take a look at <path>/etc/openldap/slapd.conf</path> you'll see that " "you can specify the ACLs (permissions if you like) of what data users can " @@ -798,7 +951,7 @@ msgstr "" "определяющие правила доступа), определяющие предоставляемый пользователям " "доступ к данным:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):417 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):564 #, no-wrap msgid "" "\n" @@ -819,7 +972,7 @@ msgstr "" "access to attrs=userPassword,gecos,description,loginShell\n" " by self write\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):427 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):574 msgid "" "This gives you access to everything a user should be able to change. If it's " "your information, then you got write access to it; if it's another user " @@ -835,7 +988,7 @@ msgstr "" "возрастания: <c>auth search read write</c> (аутентификация, поиск, чтение, " "запись)." -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):435 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):582 msgid "" "The next ACL is a bit more secure as it blocks normal users to read other " "people their shadowed password:" @@ -843,7 +996,7 @@ msgstr "" "Следующий набор правил доступа немного повышает безопасность, так как он " "блокирует возможность чтения хешей паролей других пользователей:" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):440 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(pre):587 #, no-wrap msgid "" "\n" @@ -872,7 +1025,7 @@ msgstr "" " by dn=\"uid=John,ou=People,dc=genfic,dc=com\" write\n" " by * search\n" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):454 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):601 msgid "" "This example gives root and John access to read/write/search for everything " "in the the tree below <path>dc=genfic,dc=com</path>. This also lets users " @@ -890,15 +1043,15 @@ msgstr "" "несколько правил доступа, но при этом необходимо учитывать порядок обработки " "— снизу вверх, поэтому верхние правила должны быть самыми строгими." -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):469 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):616 msgid "Working with OpenLDAP" msgstr "Работа с OpenLDAP" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):471 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):618 msgid "Maintaining the directory" msgstr "Администрирование каталога" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):474 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):621 #, fuzzy msgid "" "You can start using the directory to authenticate users in apache/proftpd/" @@ -910,11 +1063,11 @@ msgstr "" "предоставляющий удобный интерфейс управления. Также для решения этой задачи " "можно использовать phpldapadmin, diradm, jxplorer или lat." -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):485 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(title):632 msgid "Acknowledgements" msgstr "Благодарности" -#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):489 +#: ../../gentoo/xml/htdocs/doc/en//ldap-howto.xml(p):636 msgid "" "We would like to thank Matt Heler for lending us his box for the purpose of " "this guide. Thanks also go to the cool guys in #ldap @ irc.freenode.net" diff --git a/doc/gettext/ru/ltsp.xml.po b/doc/gettext/ru/ltsp.xml.po index c01ddc3..3b79d2b 100644 --- a/doc/gettext/ru/ltsp.xml.po +++ b/doc/gettext/ru/ltsp.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:03+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//ltsp.xml(guide:link):5 -msgid "/doc/en/ltsp.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//ltsp.xml(title):6 msgid "Gentoo - LTSP Guide" msgstr "" diff --git a/doc/gettext/ru/macos-guide.xml.po b/doc/gettext/ru/macos-guide.xml.po index 3756fb1..6aa86c9 100644 --- a/doc/gettext/ru/macos-guide.xml.po +++ b/doc/gettext/ru/macos-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:03+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//macos-guide.xml(guide:link):6 -msgid "/doc/en/macos-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//macos-guide.xml(guide:redirect):6 msgid "/proj/en/gentoo-alt/macos/" msgstr "" diff --git a/doc/gettext/ru/man-guide.xml.po b/doc/gettext/ru/man-guide.xml.po index 1e97cb9..3483ee8 100644 --- a/doc/gettext/ru/man-guide.xml.po +++ b/doc/gettext/ru/man-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:04+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//man-guide.xml(guide:link):5 -msgid "/doc/en/man-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//man-guide.xml(guide:lang):5 msgid "en" msgstr "ru" diff --git a/doc/gettext/ru/management-structure.xml.po b/doc/gettext/ru/management-structure.xml.po index 5e4de41..5856ec5 100644 --- a/doc/gettext/ru/management-structure.xml.po +++ b/doc/gettext/ru/management-structure.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:03+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//management-structure.xml(guide:link):5 -msgid "/doc/en/management-structure.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//management-structure.xml(title):6 msgid "Gentoo Top-Level Management Structure" msgstr "" diff --git a/doc/gettext/ru/mips-requirements.xml.po b/doc/gettext/ru/mips-requirements.xml.po index db448c4..d365752 100644 --- a/doc/gettext/ru/mips-requirements.xml.po +++ b/doc/gettext/ru/mips-requirements.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:04+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -31,6 +31,7 @@ msgid "Joshua Kinard" msgstr "Joshua Kinard" #: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(author:title):11 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(author:title):14 msgid "Editor" msgstr "редактор" @@ -42,187 +43,72 @@ msgstr "redhatter@gentoo.org" msgid "Stuart Longland" msgstr "Stuart Longland" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(abstract):15 -msgid "" -"This document provides an overview of the status of various MIPS-based " -"systems for installing Gentoo Linux. If you find errors or omissions please " -"email the maintainer or an editor." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(version):25 -msgid "1" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(mail:link):15 +msgid "mattst88" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(date):26 -msgid "2010-09-01" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(mail):15 +msgid "Matt Turner" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):29 -msgid "General Requirements" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):32 -msgid "System Requirements" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):35 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(abstract):18 msgid "" -"The exact requirements will largely depend on what you intend to use the " -"machine for and how you wish to go about installing Gentoo. The following " -"table should give you a rough idea." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):44 -msgid "Minimum" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):45 -msgid "Recommended" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):46 -msgid "Ideal" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):49 -msgid "RAM:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):50 -msgid "48~64MB" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):51 -msgid ">128MB" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):52 -msgid "~256MB" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):55 -msgid "HDD:" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):56 -msgid "4GB" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):57 -msgid ">8GB" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):58 -msgid "18GB" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):66 -msgid "A Note about serial consoles" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):69 -msgid "" -"If you lack an appropriate Framebuffer, you will be required to use serial " -"console. Serial console programs for linux include <c>minicom</c> and <c>xc</" -"c>, and for Windows, <c>HyperTerminal</c> and <c>Tera Term Pro</c>. If you " -"are running Windows, and intend to use HyperTerminal, it is advised that you " -"seek out an updated client from the program's website instead of the one " -"installed by default. An upgraded client provides much better serial support " -"than the default one installed by Windows." +"This document provides an overview of the status of various MIPS-based " +"systems for installing Gentoo Linux. If you find errors or omissions please " +"email the maintainer or an editor." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):82 -msgid "User Testimonies & Kernel Configurations" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(version):28 +msgid "2" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):85 -msgid "" -"As an aid to the project, a <uri link=\"http://stuartl.longlandclan.hopto." -"org/gentoo/mips/\">hardware support database</uri> has been set up. This " -"support database is intended to provide a quick and easy way to determine " -"how well certain configurations are supported. The system also allows people " -"to contribute their comments and kernel configs." +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(date):29 +msgid "2011-08-14" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):98 -msgid "Silicon Graphics Systems -- Stable" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):32 +msgid "Silicon Graphics Systems – Stable" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):102 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):36 msgid "" "The following systems are known to be very stable overall. Just about all " "the core hardware is supported in these systems, and there are very few " "outstanding stability issues at this time." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):111 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):45 msgid "IP22: Indy, Indigo 2 and Challenge S" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):118 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):52 msgid "<e>(on Indy and Challenge S)</e> R4000, R4400, R4600, R5000" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):121 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):55 msgid "<e>(on Indigo 2)</e> R4000, R4400" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):129 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):530 -msgid "Linux 2.4: <e>Stable</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):130 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):264 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):298 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):358 -msgid "Linux 2.6: <e>Experimental</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):136 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):537 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):63 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):361 msgid "32-bit: <e>Stable</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):137 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):271 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):305 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):365 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):64 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):148 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):167 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):212 msgid "64-bit: <e>Experimental</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):143 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):208 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):277 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):311 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):371 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):544 -msgid "o32: <e>Stable</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):144 -msgid "n32: <e>Experimental</e> (Only on Linux 2.6 R5000/RM5200)" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):145 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):210 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):279 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):313 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):373 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):546 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):582 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):628 -msgid "n64: <e>Not Available In Gentoo</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):151 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):70 msgid "" "At present, only the Newport (XL) graphics framebuffer is supported in " "Linux. Therefore on systems with other framebuffers, you will need to use " "serial console." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):156 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):75 msgid "" "The Challenge S has its RJ-45 connector on a daughter board (Mezz) linked " "with an unsupported SCSI adapter, a WD33C95A. In order for this network " @@ -231,214 +117,173 @@ msgid "" "get network connectivity via its AUI connector." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):163 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):82 msgid "" -"Indigo2 EISA Support is <e>highly</e> experimental. It isn't very well " -"tested and may not work with all hardware. Hardware that it is known to " -"function with is listed, and as more compatible hardware is discovered, it " -"will be added. Please note that hardware requiring DMA support is currently " -"not functional. This includes EISA/ISA-based soundcards. EISA Video cards " -"requiring an x86-compatible BIOS are also not functional." +"Indigo2 EISA Support isn't very well tested and may not work with all " +"hardware. Hardware that it is known to function with is listed, and as more " +"compatible hardware is discovered, it will be added. Please note that " +"hardware requiring DMA support is currently not functional. This includes " +"EISA/ISA-based soundcards. EISA Video cards requiring an x86-compatible BIOS " +"are also not functional." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):179 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):98 msgid "IP32: O2" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):186 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):105 msgid "<b>Stable:</b> R5000, RM5200" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):187 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):106 msgid "<b>Experimental:</b> RM7000" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):188 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):107 msgid "<b>Unsupported:</b> R10000" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):194 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):263 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):357 -msgid "Linux 2.4: <e>Unsupported in Kernel</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):195 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):531 -msgid "Linux 2.6: <e>Stable</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):201 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):270 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):304 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):364 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):113 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):147 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):166 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):211 msgid "32-bit: <e>Unsupported in Kernel</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):202 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):114 msgid "64-bit: <e>Stable</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):209 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):312 -msgid "n32: <e>Experimental</e> (Only on Linux 2.6)" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):216 -msgid "" -"The O2 RM7000 Processor support is limited in Linux currently, as it " -"requires a fairly recent kernel version (>2.6.7), and has several notable " -"issues. The first issue is a problem with SCSI at the moment, making the " -"internal disks unusable at the current time. The Level 3 (Tertiary) Cache is " -"also disabled due to there being no support for this cache in the linux " -"kernel." +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):124 +msgid "Silicon Graphics Systems – Experimental/Unstable" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):224 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):128 msgid "" -"Please be aware that this note only applies to the official SGI RM7000 " -"running at 350MHz, not the 600MHz RM7000 that can be assembled using an " -"RM5200 board. These \"modded\" CPU modules for O2 systems are not supported/" -"tested, although, in theory, they should be functional, but may suffer from " -"the same problems listed above." +"The systems listed here are known to run Linux, however in many cases, there " +"are known stability issues and major gaps in the hardware support. In short, " +"it will be a rough and bumpy ride." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):240 -msgid "Silicon Graphics Systems -- Experimental/Unstable" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):244 -msgid "" -"The systems listed here are known to run Linux... <e>HOWEVER</e>, in many " -"cases, there are known stability issues, and major gaps in the hardware " -"support. In short, it will be a rough and bumpy ride." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):253 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):137 msgid "IP27: Origin 200 and 2000" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):257 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):141 msgid "<b>Processor Options <e>(Experimental)</e>:</b> R10000, R12000" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):278 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):372 -msgid "n32: <e>Experimental</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):287 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):156 msgid "IP28: Indigo 2 Impact (a.k.a Indigo 2 R10k)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):291 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):160 msgid "<b>Processor Options <e>(Experimental)</e>:</b> R10000" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):297 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):566 -msgid "Linux 2.4: <e>Experimental</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):331 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):185 msgid "" "MIPS R10000 Microprocessor User's Manual (See <e>PDF Pages 51-55</e>) " "<uri>http://techpubs.sgi.com/library/manuals/2000/007-2490-001/" "pdf/007-2490-001.pdf</uri>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):336 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):190 msgid "" "Post to NetBSD sgimips Mailing List on 29 Jun 2000 <uri>http://mail-index." "netbsd.org/port-sgimips/2000/06/29/0006.html</uri>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):319 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):173 msgid "" "IP28 Indigo2 Impact support (classified as an Indigo2 system w/ an R10000 " -"Processor) is <e>very experimental</e>. Most of the work is currently being " -"done by Peter Fuerst, who maintains patches on his <uri link=\"http://www." -"pfrst.de/download.html\">website</uri>. This kernel is <e>NOT</e> intended " -"for stable, day-to-day use. The Indigo2 IP28 system suffers from an issue " -"known as <e>Speculative Execution</e>, a feature of the R10000 Processor " -"that is problematic on machines that are <e>Non Cache Coherent</e>, such as " -"the IP28 Indigo2 and on R10000/R12000-based IP32 O2 systems. Details on the " -"nature of Speculative Execution, and the issues it poses to the Indigo2 can " -"be found at the following URLs: <placeholder-1/>" +"Processor) is <e>very experimental</e>. Most of the work was done by Peter " +"Fuerst, who maintains patches on his <uri link=\"http://www.pfrst.de/" +"download.html\">website</uri>. This kernel is <e>not</e> intended for " +"stable, day-to-day use. The Indigo2 IP28 system suffers from an issue known " +"as <e>Speculative Execution</e>, a feature of the R10000 Processor that is " +"problematic on machines that are <e>Non Cache Coherent</e>, such as the IP28 " +"Indigo2 and on R10000/R12000-based IP32 O2 systems. Details on the nature of " +"Speculative Execution, and the issues it poses to the Indigo2 can be found " +"at the following URLs: <placeholder-1/>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):349 -msgid "IP30: Octane" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):203 +msgid "IP30: Octane – Dead" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):353 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):207 msgid "<b>Processor Options (Experimental):</b> R10000, R12000, R14000A" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):379 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):218 msgid "" -"Octane support in Linux should be regarded as experimental. Support for this " -"particular machine from SGI has been progressing quite well and the Linux " -"kernel functions reasonably well. The current status for this system may be " -"found on <uri link=\"http://www.linux-mips.org/~skylark/\">Stanislaw " -"Skowronek's page</uri>. Wider support in Gentoo for this system will be " -"available in the future, so watch this space closely for more details." +"Octane support in Linux should be regarded as broken. Stanislaw Skowronek " +"did the reverse engineering and bring up. <uri link=\"http://www.linux-mips." +"org/~skylark/\">His page</uri> is available but has not been updated since " +"October 2006." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):388 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):224 msgid "" "The serial ports on the Octane currently only support 9600 baud rate, 8-" "bits, no parity, 1 stop bit. Other baud rates do not currently work at " "present." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):402 -msgid "Silicon Graphics Systems -- Unsupported" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):229 +msgid "" +"Dead due to issues porting the IRQ handling to newer Linux kernels. Help is " +"welcome." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):242 +msgid "Silicon Graphics Systems – Unsupported" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):406 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):246 msgid "" "Just about all of these systems are totally unsupported at the kernel level " -"-- making a full Linux system totally impossible. Little is known about a " -"lot of the systems listed here -- therefore any support in the near future " -"is highly unlikely. You may wish to keep an eye on the <uri link=\"http://" -"www.linux-mips.org\">Linux/MIPS website</uri> for any news of ports -- " -"either that, or start your own. :-)" +"– making a full Linux system totally impossible. Little is known about " +"a lot of the systems listed here – therefore any support in the near " +"future is highly unlikely. You may wish to keep an eye on the <uri link=" +"\"http://www.linux-mips.org\">Linux/MIPS website</uri> for any news of ports " +"– either that, or start your own. :-)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):416 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):256 msgid "IP12: Iris Indigo (R3000 CPU)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):417 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):257 msgid "IP20: Iris Indigo (R4000 or R4400 CPU)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):418 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):258 msgid "IP26: Indigo 2 Power (R8000 CPU)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):419 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):259 msgid "IP34: Fuel (R14000A or R16000 CPU)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):420 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):260 msgid "IP35: Origin 3000 (R14000 or R14000A CPU)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):421 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):261 msgid "IP45: Origin 300 (R14000 CPU)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):422 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):262 msgid "IP53: Origin 350 & Tezro (R16000 CPU)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):430 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):270 msgid "Silicon Graphics Accessories" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):434 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):274 msgid "" "As with most systems, there is quite wide array of peripherals that one can " "obtain for Silicon Graphics systems. While a lot of these work in IRIX, " @@ -446,156 +291,122 @@ msgid "" "table lists the support for each device." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):443 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):283 msgid "Stable Support" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):444 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):284 msgid "Experimental Support" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):445 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(th):285 msgid "Unsupported/Untested" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):448 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):288 msgid "" "Indy/Indigo2: XL Graphics Card (Newport)<br/> Indy/Indigo2: SGI Seeq " "Ethernet 10Mbps<br/> Indy/Indigo2: WD33C93 SCSI<br/> Indy/Indigo2: HAL2 " "Sound/Audio<br/> Indy/Indigo2: Parallel Port<br/> Indy/Indigo2: Serial " "Port<br/> O2: SGI MACE Ethernet 10/100Mbps<br/> O2: Adaptec AIC7880 SCSI<br/" -"> O2: Serial Port<br/> Indigo2 ISA: Parallel Port Card (PC-Style)<br/> " -"Indigo2 ISA: NE2000 Compatible 10Mbps NIC (RTL8019)" +"> O2: Serial Port<br/> O2: GBE Framebuffer (4MB Framebuffer memory only!)<br/" +"> Indigo2 ISA: Parallel Port Card (PC-Style)<br/> Indigo2 ISA: NE2000 " +"Compatible 10Mbps NIC (RTL8019)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):461 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):302 msgid "" "Indy: I2C/VINO subsystem & IndyCam<br/> Indigo2 EISA: 3COM 3c597 " -"10/100Mbps<br/> O2: GBE Framebuffer<br/> O2: PCI Slot<br/> Octane: " -"Keyboard<br/> Octane: Mardi Gras (MGRAS) Graphics<br/> Octane: QLogic " -"ISP1040B SCSI<br/> Octane: RAD1 Audio<br/> Octane: SMP Support<br/> Octane: " -"V6/V8/V10/V12 Graphics (Odyssey)<br/> Origin: IOC3 Ethernet 10/100Mbps<br/> " +"10/100Mbps<br/> O2: PCI Slot<br/> Origin: IOC3 Ethernet 10/100Mbps<br/> " "Origin: QLogic ISP1020 SCSI<br/> O2 PCI: ALi 5273 USB 2.0 (Req. Kernel >" "=2.6.8.1)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):476 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(ti):310 msgid "" "(1)Indy/Indigo2: Impact & Extreme/XZ graphics chipsets<br/> Indy: Phobos " -"G130 10/100Mbps NIC<br/> Indigo2: GIO64 Slots<br/> Indigo2: Phobos G160 " -"10/100Mbps NIC<br/> Challenge S: WD33C95A SCSI Adapter/RJ-45 Daughter " -"Card<br/> O2: VICE Subsystem" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(note):487 -msgid "" -"(1) Work has begun on porting the ImpactSR to the Indigo2 Impact (IP28) " -"workstation. At the moment, it's early days, and the driver is not " -"functional yet, but this may change in the coming months.<br/> Likewise with " -"Extreme graphics... a few people were starting to look into writing drivers " -"for this chipset. Nothing has been released yet, but we may see something in " -"the not too distant future.<br/> We will update this page if such a driver " -"is released." +"G130 10/100Mbps NIC<br/> Indy ThunderLAN card<br/> Indigo2: GIO64 Slots<br/> " +"Indigo2: Phobos G160 10/100Mbps NIC<br/> Challenge S: WD33C95A SCSI Adapter/" +"RJ-45 Daughter Card<br/> O2: VICE Subsystem Octane: Keyboard<br/> Octane: " +"Mardi Gras (MGRAS) Graphics<br/> Octane: QLogic ISP1040B SCSI<br/> Octane: " +"RAD1 Audio<br/> Octane: SMP Support<br/> Octane: V6/V8/V10/V12 Graphics " +"(Odyssey)<br/>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):502 -msgid "Cobalt Servers -- Stable" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):333 +msgid "Cobalt Servers – Stable" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):506 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):337 msgid "" "The Cobalt servers are a set of machines all based around the QED RM523[01] " -"CPU. They came in two varieties, the RaQ -- a rackmounted model, and the " -"Qube, a small desktop model (1ft. cube). The big difference between these " -"systems and the SGI systems above, is that these systems are <e>little " +"CPU. They came in two varieties, the RaQ – a rackmounted model, and " +"the Qube, a small desktop model (1ft. cube). The big difference between " +"these systems and the SGI systems above, is that these systems are <e>little " "endian</e> (<c>mipsel</c>) as opposed to <e>big endian</e> (<c>mips</c>)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):514 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):345 msgid "" "These were also sold under an OEM arragement to other companies, examples of " "this are the Gateway Microserver (Qube 2) and the Seagate NasRaQ (RaQ 2)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):522 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):353 msgid "Qube/Raq 2800 (a.k.a Qube/Raq 2)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):526 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):357 msgid "<b>Processor:</b> QED RM5231 @ 250MHz" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):538 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):362 msgid "64-bit: <e>Highly Experimental</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):545 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):581 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):627 -msgid "n32: <e>Not Available In Gentoo</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):556 -msgid "Cobalt Servers -- Experimental" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):372 +msgid "Cobalt Servers – Experimental" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):558 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):374 msgid "Raq 2700 (a.k.a Raq 1)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):562 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):608 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):378 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):407 msgid "<b>Processor:</b> QED RM5230 @ 150MHz" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):567 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):613 -msgid "Linux 2.6: <e>Untested In Gentoo</e>" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):573 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):382 msgid "32-bit: <e>Experimental</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):574 -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):620 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):383 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):412 msgid "64-bit: <e>Untested In Gentoo</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):580 -msgid "o32: <e>Experimental</e>" +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):393 +msgid "Cobalt Servers – Unsupported" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):592 -msgid "Cobalt Servers -- Unsupported" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):594 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(title):395 msgid "Qube 2700 (a.k.a Qube 1)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):597 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(p):398 msgid "" "The Qube 2700 was the first of this whole subarchitecture. Unfortunately, it " "lacks a serial port, making installation at present, damn near impossible. " -"We're looking into ways we can support this system, but as none of the " -"developers have access to one of these machines, we have no way to test our " -"efforts. You may wish to have a look at <uri link=\"http://www.metzner.org/" -"projects/qube/\">Jan Metzner's page</uri> for more information." -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):612 -msgid "Linux 2.4: <e>Untested In Gentoo</e>" +"You may wish to have a look at <uri link=\"http://web.archive.org/" +"web/20060716160139/http://metzner.org/projects/qube/\"> Jan Metzner's page</" +"uri> for more information." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):619 +#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):411 msgid "32-bit: <e>Untested In Gentoo</e>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(li):626 -msgid "o32: <e>Untested In Gentoo</e>" -msgstr "" - #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL #: ../../gentoo/xml/htdocs/doc/en//mips-requirements.xml(None):0 msgid "translator-credits" diff --git a/doc/gettext/ru/mysql-howto.xml.po b/doc/gettext/ru/mysql-howto.xml.po index 7bfda66..06d3adf 100644 --- a/doc/gettext/ru/mysql-howto.xml.po +++ b/doc/gettext/ru/mysql-howto.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:04+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//mysql-howto.xml(guide:link):5 -msgid "/doc/en/mysql-howto.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//mysql-howto.xml(title):6 msgid "MySQL Startup Guide" msgstr "" diff --git a/doc/gettext/ru/mysql-upgrade-slotted.xml.po b/doc/gettext/ru/mysql-upgrade-slotted.xml.po index 73c4318..c2517a6 100644 --- a/doc/gettext/ru/mysql-upgrade-slotted.xml.po +++ b/doc/gettext/ru/mysql-upgrade-slotted.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:05+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//mysql-upgrade-slotted.xml(guide:link):5 -msgid "/doc/en/mysql-upgrade-slotted.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//mysql-upgrade-slotted.xml(title):6 msgid "\"Unslotting\" a slotted MySQL Installation" msgstr "" diff --git a/doc/gettext/ru/mysql-upgrading.xml.po b/doc/gettext/ru/mysql-upgrading.xml.po index e08a10a..8cc5adc 100644 --- a/doc/gettext/ru/mysql-upgrading.xml.po +++ b/doc/gettext/ru/mysql-upgrading.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:05+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//mysql-upgrading.xml(guide:link):5 -msgid "/doc/en/mysql-upgrading.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//mysql-upgrading.xml(title):6 msgid "Upgrade guide to MySQL 4.* or 5.0.*" msgstr "" diff --git a/doc/gettext/ru/nano-basics-guide.xml.po b/doc/gettext/ru/nano-basics-guide.xml.po index 5894e40..0b4c141 100644 --- a/doc/gettext/ru/nano-basics-guide.xml.po +++ b/doc/gettext/ru/nano-basics-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:05+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//nano-basics-guide.xml(guide:link):5 -msgid "/doc/en/nano-basics-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//nano-basics-guide.xml(title):7 msgid "Nano Basics Guide" msgstr "" diff --git a/doc/gettext/ru/new-upgrade-to-gentoo-1.4.xml.po b/doc/gettext/ru/new-upgrade-to-gentoo-1.4.xml.po index bf57997..7540399 100644 --- a/doc/gettext/ru/new-upgrade-to-gentoo-1.4.xml.po +++ b/doc/gettext/ru/new-upgrade-to-gentoo-1.4.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:05+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//new-upgrade-to-gentoo-1.4.xml(guide:link):7 -msgid "/doc/en/new-upgrade-to-gentoo-1.4.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//new-upgrade-to-gentoo-1.4.xml(title):9 msgid "Gentoo 1.4 Upgrade Guide" msgstr "" diff --git a/doc/gettext/ru/openafs.xml.po b/doc/gettext/ru/openafs.xml.po index 7fcb80a..6e148f7 100644 --- a/doc/gettext/ru/openafs.xml.po +++ b/doc/gettext/ru/openafs.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:06+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//openafs.xml(guide:link):6 -msgid "/doc/en/openafs.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//openafs.xml(title):7 msgid "Gentoo Linux OpenAFS Guide" msgstr "" diff --git a/doc/gettext/ru/openrc-migration.xml.po b/doc/gettext/ru/openrc-migration.xml.po index fd8578a..82ed3c0 100644 --- a/doc/gettext/ru/openrc-migration.xml.po +++ b/doc/gettext/ru/openrc-migration.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-08-02 23:45+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:06+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -51,11 +51,11 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(version):30 -msgid "11" +msgid "13" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(date):31 -msgid "2011-05-28" +msgid "2011-09-03" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):34 @@ -113,17 +113,18 @@ msgstr "" #: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):86 msgid "" -"OpenRC is primarily developed by <uri link=\"http://roy.marples.name/openrc" -"\">Roy Marples</uri> and supports all current Gentoo variations (i.e. Gentoo " -"Linux, Gentoo/FreeBSD, Gentoo Embedded, and Gentoo Vserver) and other " -"platforms such as FreeBSD and NetBSD." +"OpenRC was initially developed by <uri link=\"http://roy.marples.name/openrc" +"\">Roy Marples</uri> until 2010, and is now maintained by the <uri link=\"/" +"proj/en/base/openrc/\">Gentoo OpenRC Project</uri>. OpenRC supports all " +"current Gentoo variations (i.e. Gentoo Linux, Gentoo/FreeBSD, Gentoo " +"Embedded, and Gentoo Vserver) and other platforms such as FreeBSD and NetBSD." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):97 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):98 msgid "Migration to OpenRC" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):101 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):102 msgid "" "Migration to OpenRC is fairly straightforward; it will be pulled in as part " "of your regular upgrade process by your package manager. The most important " @@ -135,17 +136,17 @@ msgid "" "below to repair your system." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):112 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):113 msgid "" "Once you've finished updating your config files, there are a few things to " "verify prior to rebooting." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):120 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):121 msgid "/etc/conf.d/rc" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):123 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):124 msgid "" "<path>/etc/conf.d/rc</path> has been deprecated and any settings you have in " "there will need to be migrated to the appropriate settings in <path>/etc/rc." @@ -154,11 +155,11 @@ msgid "" "<path>/etc/conf.d/rc</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):134 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):135 msgid "Kernel modules" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):137 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):138 msgid "" "Normally, when you want certain kernel modules automatically loaded at boot, " "you place them into <path>/etc/modules.autoload.d/kernel-2.6</path> along " @@ -168,15 +169,15 @@ msgid "" "version." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):145 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):146 msgid "An example old style configuration would be:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):149 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):150 msgid "/etc/modules.autoload.d/kernel-2.6" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):149 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):150 #, no-wrap msgid "" "\n" @@ -184,15 +185,15 @@ msgid "" "cx88_dvb video_br=2\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):154 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):155 msgid "Converting the above example would result in the following:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):158 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):159 msgid "/etc/conf.d/modules" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):158 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):159 #, no-wrap msgid "" "\n" @@ -202,32 +203,32 @@ msgid "" "module_cx88_dvb_args_2_6=\"video_br=2\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):165 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):166 msgid "" "In the above examples, the modules and their parameters would only be passed " "to 2.6.x series kernels. The new configuration allows for fine grained " "control over the modules and parameters based on kernel version." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):171 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):172 msgid "" "The <b>module*</b> variables are not cumulative. The more version-specific " "variables will override the more general variables." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(note):176 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(note):177 msgid "Please note the difference between <b>module_</b> and <b>modules_</b>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):180 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):181 msgid "An in-depth example would be:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):184 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):185 msgid "detailed example of /etc/conf.d/modules" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):184 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):185 #, no-wrap msgid "" "\n" @@ -248,11 +249,11 @@ msgid "" "module_ieee1394_args=\"debug\" \n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):205 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):206 msgid "Boot runlevel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):208 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):209 msgid "" "The <c>boot</c> runlevel performs several important steps for every machine. " "For example, making sure your root filesystem is mounted read/write, that " @@ -261,43 +262,43 @@ msgid "" "boot." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):215 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):216 msgid "" "With OpenRC, volume management services for your block storage devices are " "no longer run automatically at boot. This includes lvm, raid, swap, device-" -"mapper (dm), dm-crypt, evms, and the like. You must ensure the appropriate " +"mapper (dm), dm-crypt, and the like. You must ensure the appropriate " "initscript for these services is in the <c>boot</c> runlevel, otherwise it's " "possible that your system will not boot!" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):223 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):224 msgid "" "While the OpenRC ebuild will attempt to do this migration for you, you " "should verify that it migrated all the volume management services properly:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):228 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):229 msgid "Display all services in boot runlevel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):228 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):229 #, no-wrap msgid "" "\n" "# <i>ls -l /etc/runlevels/boot/</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):232 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):233 msgid "" "If you don't see root, procfs, mtab, swap, and fsck in the above listing, " "perform the following to add them to the <c>boot</c> runlevel:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):237 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):238 msgid "Adding critical services to the boot runlevel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):237 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):238 #, no-wrap msgid "" "\n" @@ -308,17 +309,17 @@ msgid "" "# <i>rc-update add swap boot</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):245 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):246 msgid "" "If you know you use mdraid and lvm but do not see them above, you would run " "the following to add initscripts to the <c>boot</c> runlevel:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):250 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):251 msgid "Adding mdraid and lvm to the boot runlevel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):250 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):251 #, no-wrap msgid "" "\n" @@ -326,11 +327,11 @@ msgid "" "# <i>rc-update add lvm boot</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):258 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):259 msgid "Udev" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):261 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):262 msgid "" "OpenRC no longer starts <c>udev</c> by default, but it does need to be " "present in the <c>sysinit</c> runlevel to be started. The OpenRC ebuild " @@ -339,11 +340,11 @@ msgid "" "present:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):268 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):269 msgid "Verifying udev" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):268 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):269 #, no-wrap msgid "" "\n" @@ -352,26 +353,26 @@ msgid "" "/etc/init.d/udev\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):274 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):275 msgid "If <c>udev</c> is not listed, add it to the correct runlevel:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):278 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):279 msgid "Adding udev to the sysinit runlevel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):278 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):279 #, no-wrap msgid "" "\n" "# <i>rc-update add udev sysinit</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):285 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):286 msgid "Network" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):288 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):289 msgid "" "Due to baselayout and OpenRC being broken into two different packages, your " "net.eth0 initscript may disappear during the upgrade process. To replace " @@ -379,11 +380,11 @@ msgid "" "following:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):295 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):296 msgid "Adding back missing net.eth0 script" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):295 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):296 #, no-wrap msgid "" "\n" @@ -392,14 +393,14 @@ msgid "" "# <i>rc-update add net.eth0 default</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):301 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):302 msgid "" "If you are missing any other network initscripts, follow the instructions " "above to re-add them. Simply replace <c>eth0</c> with the name of your " "network device." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):307 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):308 msgid "" "Also, <path>/etc/conf.d/net</path> (oldnet) no longer uses bash-style arrays " "for configuration. Please review <path>/usr/share/doc/openrc-<version>/" @@ -408,11 +409,11 @@ msgid "" "for example a static IP assignment would change as follows:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):316 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):317 msgid "Old /etc/conf.d/net style" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):316 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):317 #, no-wrap msgid "" "\n" @@ -420,11 +421,11 @@ msgid "" "routes_eth0=( \"default via 192.168.1.100\" \"10.0.0.0/8 via 192.168.1.2\" )\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):321 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):322 msgid "New /etc/conf.d/net style" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):321 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):322 #, no-wrap msgid "" "\n" @@ -433,11 +434,11 @@ msgid "" "10.0.0.0/8 via 192.168.1.2\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):330 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):331 msgid "Clock" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):333 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):334 msgid "" "Clock settings have been renamed from <path>/etc/conf.d/clock</path> to your " "system's native tool for adjusting the clock. This means on Linux it will be " @@ -450,7 +451,7 @@ msgid "" "boot runlevel." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):345 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):346 msgid "" "Additionally, the <c>TIMEZONE</c> variable is no longer in this file. Its " "contents are instead found in the <path>/etc/timezone</path> file. If it " @@ -458,52 +459,52 @@ msgid "" "Please review both of these files to ensure their correctness." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):352 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):353 msgid "" "The proper value for this file is the path relative to your timezone from " "<path>/usr/share/zoneinfo</path>. For example, for someone living on the " "east coast of the United States, the following would be a correct setting:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):358 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):359 msgid "/etc/timezone" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):358 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):359 #, no-wrap msgid "" "\n" "America/New_York\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):365 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):366 msgid "XSESSION" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):368 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):369 msgid "" "The XSESSION variable is no longer found in <path>/etc/rc.conf</path>. " "Instead, you can set the XSESSION variable per-user in <path>~/.bashrc</" "path> (or equivalent), or system-wide in <path>/etc/env.d/</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):374 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):375 msgid "Here's an example of setting XSESSION for the whole system:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):378 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):379 msgid "Setting XSESSION system-wide" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):378 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):379 #, no-wrap msgid "" "\n" "# <i>echo 'XSESSION=\"Xfce4\"' > /etc/env.d/90xsession</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):382 -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):402 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):383 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):403 msgid "" "You must run <c>env-update</c> after creating a file in <path>/etc/env.d</" "path>, and then logout and login for it to take effect. If you set the " @@ -511,11 +512,11 @@ msgid "" "<c>source ~/.bashrc</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):392 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):393 msgid "EDITOR and PAGER" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):395 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):396 msgid "" "The EDITOR variable is no longer found in <path>/etc/rc.conf</path>. Both " "EDITOR and PAGER are set by default in <path>/etc/profile</path>. You should " @@ -523,11 +524,11 @@ msgid "" "create <path>/etc/env.d/99editor</path> and set the system default there." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):412 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):413 msgid "Boot log" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):415 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):416 msgid "" "Previously, you could log the boot process by using <c>app-admin/" "showconsole</c>. However, OpenRC now handles all logging internally, so " @@ -537,22 +538,22 @@ msgid "" "in <path>/var/log/rc.log</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):424 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):425 msgid "Enabling boot logging in /etc/rc.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):424 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):425 #, no-wrap msgid "" "\n" "rc_logger=\"YES\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):431 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):432 msgid "local.start and local.stop" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):434 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):435 msgid "" "With OpenRC, <path>/etc/conf.d/local.start</path> and <path>local.stop</" "path> are deprecated. During the migration to OpenRC, the files are moved to " @@ -560,11 +561,11 @@ msgid "" "stop</path>. OpenRC then executes those in alphabetic order." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):444 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):445 msgid "System sub-types: Virtualization special cases" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):447 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):448 msgid "" "In the early versions of OpenRC, we explictly detected multiple types of " "virtualization, and used that detection to note when certain init scripts " @@ -572,7 +573,7 @@ msgid "" "functions." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):454 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):455 msgid "" "However, as of the 0.7.0 release, you are required to explicitly configure " "the sub-type using the <b>rc_sys</b> variable in <path>/etc/rc.conf</path>. " @@ -581,132 +582,132 @@ msgid "" "within the virtual containers; The host node will have <b>rc_sys=\"\"</b>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):462 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):463 msgid "" "If you do not have any specific sub-type, please use the default of an empty " "string <b>\"\"</b>. If the variable is unset, you will be given a warning " "and we will attempt to use the old detection algorithm." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(note):468 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(note):469 msgid "" "If you do not know what value your system was using with the automatic " "detection, you should temporarily comment out the <b>rc_sys</b> variable and " "run the detection command, <c>rc -S</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):474 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):475 msgid "Setting system sub-type to none in /etc/rc.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):474 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):475 #, no-wrap msgid "" "\n" "rc_sys=\"\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):478 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):479 msgid "" "The detection algorithm had to be replaced with manual configuration due to " "the introduction of new sub-types and changes to the kernel that made prior " "detection unreliable." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):486 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):487 msgid "Subtype" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):487 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):488 msgid "Description" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):488 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):489 msgid "Notes" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):492 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):493 msgid "Default, no sub-type" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):493 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):494 msgid "Not the same as unset; FreeBSD, Linux & NetBSD" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):496 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):497 msgid "jail" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):497 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):498 msgid "FreeBSD jails" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):501 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):502 msgid "lxc" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):502 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):503 msgid "Linux Containers" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):503 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):504 msgid "Not auto-detected" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):506 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):507 msgid "openvz" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):507 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):508 msgid "Linux OpenVZ" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):511 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):512 msgid "prefix" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):512 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):513 msgid "Prefix" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):513 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):514 msgid "Not auto-detected; FreeBSD, Linux & NetBSD" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):516 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):517 msgid "vserver" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):517 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):518 msgid "Linux vserver" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):521 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):522 msgid "xen0" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):522 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):523 msgid "Xen0 Domain" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):523 -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):528 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):524 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):529 msgid "Linux & NetBSD" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):526 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):527 msgid "xenU" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):527 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):528 msgid "XenU Domain" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):535 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):536 msgid "Finishing up" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):538 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):539 msgid "" "Once you've finished updating your config files and initscripts, the last " "thing to do is <b>reboot</b>. This is necessary because system state " @@ -714,15 +715,15 @@ msgid "" "it with a fresh boot." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):550 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):551 msgid "Changed functionality" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):552 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):553 msgid "The pause action" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):555 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):556 msgid "" "Previously it was possible to temporarily stop a service without taking down " "all the depending services by using <c>/etc/init.d/service pause</c>. In " @@ -731,11 +732,11 @@ msgid "" "baselayout." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):566 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):567 msgid "rootfs entry in /etc/mtab" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):569 +#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):570 msgid "" "Previously, the initial <b>rootfs</b> entry was removed from <path>/etc/" "mtab</path>, and only the real root <path>/</path> entry was present. The " diff --git a/doc/gettext/ru/portage-utils.xml.po b/doc/gettext/ru/portage-utils.xml.po index c83c6ae..cfcdf93 100644 --- a/doc/gettext/ru/portage-utils.xml.po +++ b/doc/gettext/ru/portage-utils.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:06+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//portage-utils.xml(guide:link):5 -msgid "/doc/en/portage-utils.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//portage-utils.xml(title):7 msgid "Portage-utils" msgstr "" diff --git a/doc/gettext/ru/postgres-howto.xml.po b/doc/gettext/ru/postgres-howto.xml.po index cb4446d..5140026 100644 --- a/doc/gettext/ru/postgres-howto.xml.po +++ b/doc/gettext/ru/postgres-howto.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:06+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,16 +14,12 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(guide:link):5 -msgid "/doc/en/postgres-howto.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(guide:lang):5 msgid "en" msgstr "ru" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):6 -msgid "PostgreSQL Guide" +msgid "PostgreSQL Quick Start Guide" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(author:title):8 @@ -31,983 +27,1024 @@ msgid "Author" msgstr "автор" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(mail:link):9 -msgid "chriswhite@gentoo.org" -msgstr "chriswhite@gentoo.org" +#, fuzzy +msgid "titanofold@gentoo.org" +msgstr "neysx@gentoo.org" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(mail):9 -msgid "Chris White" -msgstr "Chris White" +msgid "Aaron W. Swenson" +msgstr "" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(author:title):11 msgid "Editor" msgstr "редактор" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(mail:link):12 -msgid "neysx@gentoo.org" +#, fuzzy +msgid "pgsql-bugs@gentoo.org" msgstr "neysx@gentoo.org" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(mail):12 -msgid "Xavier Neys" -msgstr "Xavier Neys" +msgid "Mikkel A. Clausen" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(abstract):15 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(abstract):16 msgid "" -"This guide is meant to show the basic setup of PostgreSQL. The setup " -"described here should be sufficient enough to use for basic web " -"appplications, and any other program that provides PostgreSQL support." +"This is a quick start guide to PostgreSQL. It covers emerging PostgreSQL and " +"configuring it. This is complementary to the official documentation, but " +"does not supplant it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(version):25 -msgid "1.2" -msgstr "1.2" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(version):26 +msgid "8" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(date):26 -msgid "2007-04-25" -msgstr "2007-04-25" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(date):27 +msgid "2011-08-08" +msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):29 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):30 msgid "Introduction" msgstr "Введение" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):31 -msgid "PostgreSQL introduction" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):32 +msgid "A Little Bit About PostgreSQL" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):35 +msgid "" +"<uri link=\"http://www.postgresql.org\">PostgreSQL</uri> is a free and open " +"source relational database management system (RDBMS). It supports such " +"things as transactions, schemata and foreign keys, and is often touted to " +"more strictly adhere to the SQL standards and to be more secure, by default, " +"than any other database, commercial or otherwise." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):34 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):43 msgid "" -"When talking to most developers about the different database solutions to " -"use, two major databases will usually form the answer. One would be " -"<c>MySQL</c>, and the other is what this document will refer to, " -"<c>PostgreSQL</c>. The advantages of one over the other is a somewhat long " -"winded debate, however it is just to say that PostgreSQL has had a more firm " -"grasp on true relational database structure than MySQL. Most of the standard " -"features such as <b>FOREIGN KEY</b> was only just added in MySQL 5. However, " -"whatever the case may be, this document assumes that you have selected " -"PostgreSQL as the database to use. The first place to start is the " -"<c>emerge</c> process. In the next section, the installation process through " -"emerge will be described, as well as the basic configuration." +"Visit the <uri link=\"http://www.postgresql.org/about/\">About</uri> page on " +"postgresql.org for more information." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):51 -msgid "PostgreSQL installation" +msgid "What This Article Will Cover" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):54 msgid "" -"To begin, we must first <c>emerge</c> the PostgreSQL package. To do so, run " -"the following code to first ensure that the options for it are properly set:" +"This article will guide you through the Gentoo specific steps to install the " +"PostgreSQL RDBMS." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):59 -msgid "Checking the PostgreSQL build options" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):59 +msgid "" +"The Ebuilds covered by this article are <uri link=\"http://packages.gentoo." +"org/package/dev-db/postgresql-docs\">dev-db/postgresql-docs</uri>, <uri link=" +"\"http://packages.gentoo.org/package/dev-db/postgresql-base\">dev-db/" +"postgresql-base</uri> and <uri link=\"http://packages.gentoo.org/package/dev-" +"db/postgresql-server\">dev-db/postgresql-server</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):59 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):68 msgid "" -"\n" -"# <i>emerge -pv postgresql</i>\n" -"\n" -"These are the packages that I would merge, in order:\n" -"\n" -"Calculating dependencies ...done!\n" -"[ebuild N ] dev-db/postgresql-8.0.4 -doc -kerberos +nls +pam +perl -pg-intdatetime +python +readline (-selinux) +ssl -tcl +xml +zlib 0 kB\n" +"This article assumes that you will be installing the latest, stable version " +"of PostgreSQL; at the time of this writing, the version was 9.0.3. Adjust " +"the commands in this article as necessary for your specific version." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):68 -msgid "Here's a list of what the different build options indicate:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(impo):74 +msgid "" +"The 8.2 branch will have its upstream support dropped in December of 2011. " +"Start planning your migration now." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):74 -msgid "USE Flag" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):82 +msgid "About the Ebuilds" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):75 -msgid "Meaning" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):85 +msgid "" +"The PostgreSQL ebuilds in Portage feature slotting based on the major " +"version. This allows you to have two major versions of PostgreSQL operating " +"simultaneously; 8.4 and 9.0 libraries and servers can be installed and serve " +"at the same time. This is useful in such circumstances where you need to " +"move data from an older database to a new database, or need to have a " +"production and a testing database on the same machine. Also, this prevents a " +"database, corresponding libraries or executables from being overwritten by " +"an incompatible update. That would require migration which is described in " +"this guide." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):78 -msgid "doc" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):96 +msgid "" +"Additionally, bug and security fixes, which are delivered via minor version " +"updates, can be applied without fear of corrupting the database or the " +"PostgreSQL installation itself; 9.0.2 can be updated to 9.0.3 as they are " +"guaranteed to be compatible and require no more interaction from you than to " +"emerge it and restart the server process — neither migration, " +"reconfiguration nor initialization are necessary." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):79 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):105 msgid "" -"This USE flag enables or disables the installation of documentation outside " -"of the standard man pages. The one good time to disable this option is if " -"you are low on space, or you have alternate methods of getting a hold of the " -"documentation (online, etc.)" +"Read the <uri link=\"http://www.postgresql.org/support/versioning" +"\">PostgreSQL Versioning Policy</uri> for more information." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):87 -msgid "kerberos" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):113 +msgid "What this Article Will Not Cover" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):88 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):116 msgid "" -"When connecting to the database, with this option enabled, the admin has the " -"option of using <c>kerberos</c> to authenticate their users/services to the " -"database." +"There is quite a bit that will not be covered. The <uri link=\"http://www." +"postgresql.org/docs/\">official documentation</uri> is somewhere in the " +"neighborhood of 2,000 pages. So, a lot of details will be left out in this " +"quick start guide. Only Gentoo specific issues will be covered and some " +"basic configuration guidelines." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):95 -msgid "nls" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):129 +msgid "Installation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):96 -msgid "" -"If this option is enabled, PostgreSQL can utilize translated strings for non-" -"English speaking users." +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):131 +msgid "The Obsolete Ebuilds" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):102 -msgid "pam" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):134 +msgid "" +"If you have any of the following ebuilds installed, then you have an older, " +"obsolete Gentoo installation of PostgreSQL and should migrate now: dev-db/" +"postgresql-libs, dev-db/postgresql-client, dev-db/libpq and/or dev-db/" +"postgresql." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):103 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):141 msgid "" -"If this option is enabled, and the admin configures the PostgreSQL " -"configuration file properly, users/services will be able to login to a " -"PostgreSQL database using <c>PAM</c> (Pluggable Authentication Module)." +"This article does cover <uri link=\"#oldmigration\">migrating</uri> from the " +"old ebuilds to the new ones." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):110 -msgid "perl" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):149 +msgid "USE Flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):111 -msgid "" -"If this option is enabled, <c>perl</c> bindings for PostgreSQL will be built." +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):154 +msgid "USE Flag" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):117 -msgid "pg-intdatetime" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):155 +msgid "Meaning" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):118 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):158 +msgid "doc" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):159 msgid "" -"If this option is enabled, PostgreSQL will support 64 bit integer date types." +"Include the <uri link=\"http://www.postgresql.org/docs/\">online " +"documentation</uri> to be stored on your system" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):124 -msgid "python" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):165 +msgid "kerberos" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):125 -msgid "" -"If this option is enabled, PostgreSQL will be built with <c>python</c> " -"bindings." +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):166 +msgid "Support for utilizing Kerberos for authentication." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):131 -msgid "readline" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):169 +msgid "ldap" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):132 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):170 msgid "" -"If this option is enabled, PostgreSQL will support <c>readline</c> style " -"command line editing. This includes command history and isearch." +"Support for utilizing LDAP authentication and connection parameter lookup." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):138 -msgid "selinux" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):175 +msgid "nls" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):139 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):176 msgid "" -"If this option is enabled, an <c>selinux</c> policy for PostgreSQL will be " -"installed." +"Enable the ability to display messages in a language other than English. " +"Used in conjunction with the Portage variable LINGUAS." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):145 -msgid "ssl" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):182 +msgid "pam" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):146 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):183 msgid "" -"If this option is enabled, PostgreSQL will utilize the <c>OpenSSL</c> " -"library to encrypt traffic between PostgreSQL clients and servers." +"Support for utilizing Pluggable Authentication Modules for authentication." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):152 -msgid "tcl" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):188 +msgid "perl" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):153 -msgid "If this option is enabled, PostgreSQL will build <c>tcl</c> bindings." +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):189 +msgid "" +"Enable support for using Perl to write functions and trigger procedures." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):158 -msgid "xml" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):194 +msgid "pg-intdatetime (Deprecated)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):159 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):195 msgid "" -"If this option is enabled, <c>XPATH</c> style xml support will be built. " -"More information on using xml support with PostgreSQL can be found on: <uri " -"link=\"http://www.throwingbeans.org/postgresql_and_xml.html\"> PostgreSQL " -"and XML</uri>." +"Use the newer, high resolution, 64-bit integer method for formatting " +"timestamps instead of the older, floating point method. Unless you had a " +"previous installation that utilized the deprecated method, leave this " +"enabled. (See note.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):167 -msgid "zlib" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):203 +msgid "pg_legacytimestamp" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):168 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):204 msgid "" -"This isn't really used by PostgreSQL itself, but by <c>pg_dump</c> to " -"compress the dumps it produces." +"Use the older, floating-point method for formatting timestamps instead of " +"the higher resolution 64-bit integer method. Unless you had a previous " +"installation that utilized this deprecated method, leave this USE flag " +"disabled. (See note.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):175 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):212 +msgid "python" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):213 msgid "" -"Once you've customized PostgreSQL to meet your specific needs, go ahead and " -"start the <c>emerge</c>:" +"Enable support for using Python to write functions and trigger procedures." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):180 -msgid "Emerge-ing PostgreSQL" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):218 +msgid "readline" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):180 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):219 msgid "" -"\n" -"# <i>emerge postgresql</i>\n" -"<comment>(Output shortened)</comment>\n" -">>> /usr/lib/libecpg.so.5 -> libecpg.so.5.0\n" -">>> /usr/bin/postmaster -> postgres\n" -" * Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell\n" -" *\n" -" * Execute the following command\n" -" * emerge --config =postgresql-8.0.4\n" -" * to setup the initial database environment.\n" -" *\n" -">>> Regenerating /etc/ld.so.cache...\n" -">>> dev-db/postgresql-8.0.4 merged.\n" +"You really want this enabled. Disabling removes command line editing and " +"history in psql." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):195 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):225 +msgid "selinux" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):226 msgid "" -"As shown by the einfo output, there is some post setup that must be done. " -"The next chapter will look at the actual configuration of PostgreSQL." +"Install respective SELinux policy. This can only be enabled by using the " +"SELinux profile." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):204 -msgid "PostgreSQL configuration" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):232 +msgid "ssl" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):206 -msgid "Setting up the initial database environment" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):233 +msgid "Enable support for SSL connections." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):209 -msgid "" -"As noted in the earlier <c>emerge</c> output, the initial database " -"environment must be setup. However, before this is done, one thing needs to " -"be considered. Unlike, say MySQL, PostgreSQL's \"root\" password is the " -"password of the actual user. However, only the user is created by the ebuild " -"<e>not</e> the password. So before we can begin, the password must be set " -"for the postgres user:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):236 +msgid "tcl" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):217 -msgid "Setting the password" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):237 +msgid "Enable support for using Tcl to write functions and trigger procedures." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):217 -#, no-wrap -msgid "" -"\n" -"# <i>passwd postgres</i>\n" -"New UNIX password:\n" -"Retype new UNIX password:\n" -"passwd: password updated successfully\n" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):242 +msgid "threads" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):224 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):243 msgid "" -"Now that this is set up, the creation of the initial database environment " -"can occur:" +"Make the client libraries thread-safe. The rest of your system must be " +"thread-safe as well." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):229 -msgid "Configuring the database environment with emerge --config" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):249 +msgid "uuid" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):229 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):250 msgid "" -"\n" -"# <i>emerge --config =postgresql-8.0.4</i>\n" -"\n" -"\n" -"Configuring pkg...\n" -"\n" -" * Creating the data directory ...\n" -" * Initializing the database ...\n" -"The files belonging to this database system will be owned by user \"postgres\".\n" -"This user must also own the server process.\n" -"\n" -"The database cluster will be initialized with locale C.\n" -"\n" -"fixing permissions on existing directory /var/lib/postgresql/data ... ok\n" -"creating directory /var/lib/postgresql/data/global ... ok\n" -"creating directory /var/lib/postgresql/data/pg_xlog ... ok\n" -"creating directory /var/lib/postgresql/data/pg_xlog/archive_status ... ok\n" -"creating directory /var/lib/postgresql/data/pg_clog ... ok\n" -"creating directory /var/lib/postgresql/data/pg_subtrans ... ok\n" -"creating directory /var/lib/postgresql/data/base ... ok\n" -"creating directory /var/lib/postgresql/data/base/1 ... ok\n" -"creating directory /var/lib/postgresql/data/pg_tblspc ... ok\n" -"selecting default max_connections ... 100\n" -"selecting default shared_buffers ... 1000\n" -"creating configuration files ... ok\n" -"creating template1 database in /var/lib/postgresql/data/base/1 ... ok\n" -"initializing pg_shadow ... ok\n" -"enabling unlimited row size for system tables ... ok\n" -"initializing pg_depend ... ok\n" -"creating system views ... ok\n" -"loading pg_description ... ok\n" -"creating conversions ... ok\n" -"setting privileges on built-in objects ... ok\n" -"creating information schema ... ok\n" -"vacuuming database template1 ... ok\n" -"copying template1 to template0 ... ok\n" -"\n" -"WARNING: enabling \"trust\" authentication for local connections\n" -"You can change this by editing pg_hba.conf or using the -A option the\n" -"next time you run initdb.\n" -"\n" -"Success. You can now start the database server using:\n" -"\n" -" /usr/bin/postmaster -D /var/lib/postgresql/data\n" -"or\n" -" /usr/bin/pg_ctl -D /var/lib/postgresql/data -l logfile start\n" -"\n" -" *\n" -" * You can use /etc/init.d/postgresql script to run PostgreSQL instead of pg_ctl.\n" -" *\n" +"Include support to generate a 128 bit random unique identifier. This is " +"useful for merging databases together so the chances of collisions become " +"extremely low." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):281 -msgid "" -"Now the initial database environment is setup. The next section will look at " -"verifying the install and setting up users to access the database." +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):257 +msgid "xml" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):289 -msgid "PostgreSQL database setup" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):258 +msgid "Enable SQL/XML support." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):292 -msgid "" -"Now that PostgreSQL is setup, it's a good idea at this point to verify the " -"installation. First, make sure the service starts up ok:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):261 +msgid "zlib" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):297 -msgid "Starting up the PostgreSQL service" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):262 +msgid "Support for compressed archives in pg_dump and pg_restore." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):297 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(note):266 msgid "" -"\n" -"# <i>/etc/init.d/postgresql start</i>\n" -"* Starting PostgreSQL ... [ ok ]\n" +"Flipping the 'pg-intdatetime' or the 'pg_legacytimestamp' will require you " +"to do a dump and restore if any of your databases utilize timestamps. The " +"two methods are incompatible with each other." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):302 -msgid "" -"Once this is verified working, it's also a good idea to add it to the " -"default runlevel so it starts at boot:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):275 +msgid "Start Emerging" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):307 -msgid "Adding to the default runlevel" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):278 +msgid "Emerging PostgreSQL server" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):307 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):278 #, no-wrap msgid "" "\n" -"# <i>rc-update add postgresql default</i>\n" -"* postgresql added to runlevel default\n" +"# <i>emerge -av dev-db/postgresql-server</i>\n" +"\n" +"[ebuild N ] dev-db/postgresql-docs-9.0.3 0 kB\n" +"[ebuild N ]dev-db/postgresql-base-9.0.3 USE=\"doc nls pam readline ssl zlib\n" +" -kerberos -ldap -pg_legacytimestamp -threads\" LINGUAS=\"-af -cs -de -es -fa -fr\n" +" -hr -hu -it -ko -nb -pl -pt_BR -ro -ru -sk -sl -sv -tr -zh_CN -zh_TW\" 0 kB\n" +"[ebuild N ] dev-db/postgresql-server-9.0.3 USE=\"doc nls perl python\n" +" -pg_legacytimestamp (-selinux) -tcl -uuid -xml\" LINGUAS=\"-af -cs -de -es -fa\n" +" -fr -hr -hu -it -ko -nb -pl -pt_BR -ro -ru -sk -sl -sv -tr -zh_CN -zh_TW\" 0 kB\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):312 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):290 msgid "" -"Now that the service has started, it's time to try setting up a test " -"database. To start out, let's create a test database by using the " -"<c>createdb</c> command. We'll also pass along the <c>-U</c> option to set " -"the user (it defaults to the current user name if you don't), and the <c>-W</" -"c> option to request the password we created earlier. Finally we give it the " -"name of the database we want to create:" +"You may receive a notice regarding that any of the above packages are " +"blocked by any or all of the following packages: dev-db/postgresql-libs, dev-" +"db/postgresql-client, dev-db/libpq or dev-db/postgresql. These packages are " +"<b>not maintained</b> and obsoleted. Refer to the section on <uri link=" +"\"#oldmigration\">migration</uri> for how to handle this situation." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):321 -msgid "Creating a database with createdb" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):301 +msgid "Preparing to Initialize the Database Cluster" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):321 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):304 msgid "" -"\n" -"$ <i>createdb -U postgres -W test</i>\n" -"Password:\n" -"CREATE DATABASE\n" +"Once the packages have finished emerging, you may want to edit <path>/etc/" +"conf.d/postgresql-9.0</path>. There are three lines that effect the defaults " +"of the server and <b>cannot</b> be changed later without deleting the " +"directory that contains the database cluster and reinitializing." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):311 +msgid "" +"<e>PGDATA</e> defines where to place the configuration files. <e>DATA_DIR</" +"e> defines where to create the database cluster and related files. " +"<e>PG_INITDB_OPTS</e> may contain any <uri link=\"http://www.postgresql.org/" +"docs/current/static/app-initdb.html\">extra options</uri> you would care to " +"set. The extra options are <b>not</b> required as the reasonable defaults " +"are, ahem, reasonable." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):327 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):320 msgid "" -"The database was successfully created, and we can confirm that the database " -"can run basic tasks. We'll go ahead and drop this database (remove it) with " -"the <c>dropdb</c> command:" +"In the following example, <e>PGDATA</e> states that the configuration files " +"are to be located in <path>/etc/postgresql-9.0/</path>. <e>DATA_DIR</e> " +"states that the database cluster should be installed to <path>/var/lib/" +"postgresql/9.0/data/</path>, which is the default. If you decide to stray " +"from the default, bear in mind that it is a <b>very good idea</b> to keep " +"the major version in the path. <e>PG_INITDB_OPTS</e> states that the default " +"locale should be <e>en_US.UTF-8</e>. That is, U.S. English ordering and " +"formatting, and UTF-8 character encoding." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):333 -msgid "Dropping a database with dropdb" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):331 +msgid "Example contents of /etc/conf.d/postgresql-8.4" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):333 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):331 #, no-wrap msgid "" "\n" -"$ <i>dropdb -U postgres -W test</i>\n" -"Password:\n" -"DROP DATABASE\n" +"<comment># Location of configuration files</comment>\n" +"PGDATA=\"/etc/postgresql-9.0/\"\n" +"\n" +"<comment># Where the data directory is located/to be created</comment>\n" +"DATA_DIR=\"/var/lib/postgresql/9.0/data\"\n" +"\n" +"<comment># Additional options to pass to initdb.\n" +"# See 'man initdb' for available options.</comment>\n" +"PG_INITDB_OPTS=\"--locale=en_US.UTF-8\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):339 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(note):343 msgid "" -"Right now, only the postgres user can run commands. Obviously this is not " -"the sort of setup one would like in a multi-user environment. The next " -"section will look at working with user accounts." +"This only determines the default locale and character encoding. You can " +"specify different locales and/or character encodings at database creation " +"time (<c>CREATE DATABASE</c>) in the same database cluster." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):348 -msgid "Setting up database user accounts" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):349 +msgid "" +"There are six locale options that can be set to override <e>--locale=</e>. " +"The following table lists the six options that, if used, are to be formatted " +"as: <c>--option=lo_LO.ENCODING</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):351 -msgid "" -"As mentioned earlier, having to login as the postgres user is somewhat " -"undesirable in a mult-user environment. In most cases there will be various " -"users and services accessing the server, and each have different permission " -"requirements. So, to handle this, the <c>createuser</c> command can be used. " -"This command is an alternative to running a few SQL queries, and is a lot " -"more flexible from an admin standpoint. We'll go ahead and create two users, " -"a 'superuser' that can add other users and administer the db, and a standard " -"user:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):357 +msgid "Option" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):361 -msgid "Setting up the superuser" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):358 +msgid "Effects" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):361 -#, no-wrap -msgid "" -"\n" -"<comment>(replace chris with the username you'd like to use)</comment>\n" -"$ <i>createuser -a -d -P -E -U postgres -W chris</i>\n" -"Enter password for new user:\n" -"Enter it again:\n" -"Password:\n" -"CREATE USER\n" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):361 +msgid "lc-collate" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):370 -msgid "" -"There, we've created the superuser. The command line option <c>-a</c> " -"specifies that this user can add other users. <c>-d</c> means that this user " -"can create databases. <c>-P</c> let's you enter a password for the user and " -"<c>-E</c> will encrypt it for security purposes. Now then, we'll test this " -"new user's permissions out by setting up our standard user:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):362 +msgid "String sort order" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):378 -msgid "Setting up the standard user" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):365 +msgid "lc-ctype" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):378 -#, no-wrap -msgid "" -"\n" -"<comment>(replace chris with the username you've just created)</comment>\n" -"$ <i>createuser -A -D -P -E -U chris -W testuser</i>\n" -"Enter password for new user:\n" -"Enter it again:\n" -"Password:\n" -"CREATE USER\n" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):366 +msgid "Character classification (What is a letter? Its upper-case equivalent?)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):387 -msgid "" -"Success! Our new user was created using the previously created superuser. " -"The <c>-A</c> and <c>-D</c> options do the opposite of <c>-a</c> and <c>-d</" -"c>, and instead deny the user the ability to create other users and " -"databases. Now that there are users to work with, the next chapter will look " -"at using the new database." +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):371 +msgid "lc-messages" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):399 -msgid "Using PostgreSQL" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):372 +msgid "Language of messages" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):401 -msgid "Setting up permissions" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):375 +msgid "lc-monetary" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):404 -msgid "" -"Now there is a user that can create databases and add other users, and the " -"main postgres user that can do anything. The user created earlier can " -"currently login to the server, and that's about it. In general, users need " -"to be able to insert data and retrieve data, and sometimes any other number " -"of tasks. So, for this new user to be able to do anything, they must be " -"setup with the proper permissions. This can easily be done by passing the " -"<c>-O</c> parameter to <c>createdb</c>. We'll start by making a new " -"database, <b>MyDB</b> with our superuser that will be owned by the previous " -"testuser:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):376 +msgid "Formatting of currency amounts" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):415 -msgid "Creating the MyDB database" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):379 +msgid "lc-numeric" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):415 -#, no-wrap -msgid "" -"\n" -"$ <i>createdb -O testuser -U chris -W MyDB</i>\n" -"Password:\n" -"CREATE DATABASE\n" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):380 +msgid "Formatting of numbers" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):421 -msgid "" -"Alright, now we have a new MyDB database, and a testuser that can access it. " -"To test this out, we'll login as the testuser to the new MyDB database. " -"We'll do this with the <c>psql</c> program. This program is what's used to " -"connect to the PostgreSQL database from command line. So connect to the new " -"database like so:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):383 +msgid "lc-time" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):429 -msgid "Logging into the MyDB database as the testuser" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):384 +msgid "Formatting of dates and times" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):429 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):388 msgid "" -"\n" -"$ <i>psql -U testuser -W MyDB</i>\n" -"Password:\n" -"Welcome to psql 8.0.4, the PostgreSQL interactive terminal.\n" -"\n" -"Type: \\copyright for distribution terms\n" -" \\h for help with SQL commands\n" -" \\? for help with psql commands\n" -" \\g or terminate with semicolon to execute query\n" -" \\q to quit\n" -"\n" -"MyDB=>\n" +"So, if you would like the default to be English, but you want messages in, " +"say, Swedish, then your <e>PG_INITDB_OPTS</e> would look like so:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):443 -msgid "" -"So, the testuser is now logged into the database, and can begin to initiate " -"some commands. To get a feel for using PostgreSQL, the next section will " -"take a look at some of the basic commands in navigating the <c>psql</c> " -"client." +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):393 +msgid "Example" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):452 -msgid "Basic PostgreSQL commands and creating a table" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):393 +#, no-wrap +msgid "" +"\n" +"PG_INITDB_OPTS=\"--locale=en_US.UTF-8 --lc-messages=sv_SE.UTF-8\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):455 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):397 msgid "" -"For those who are used to MySQL, this is somewhat of a definite read. This " -"is where PostgreSQL may get somewhat unique with regards to running " -"commands. To start, here is a list of some commands that will be discussed:" +"A complete list of language and character encodings supported by the server " +"can be found in the documentation, but your system must also support the " +"respective languages and character encodings. Compare the output of " +"<c>locale -a</c> to the <uri link=\"http://www.postgresql.org/docs/current/" +"static/multibyte.html\">encodings</uri> in the documentation." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):463 -msgid "Command" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):406 +msgid "" +"You can change your locale and encoding selections at database <uri link=" +"\"http://www.postgresql.org/docs/current/static/sql-createdatabase.html" +"\">creation time.</uri> In order to change the locale for a database after " +"you have created it, you must drop the database and start over again." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):464 -msgid "Usage" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):413 +msgid "Finalize the installation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(th):465 -msgid "MySQL Equivalent" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):413 +#, no-wrap +msgid "" +"\n" +"# <i>emerge --config dev-db/postgresql-server:9.0</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):468 -msgid "\\c[onnect] [DBNAME|- [USER]]" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):417 +msgid "" +"This will create the database cluster and store all the related server files " +"into <e>PGDATA</e> and <e>DATA_DIR</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):469 -msgid "Connects to another database" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):427 +msgid "Configuration" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):470 -msgid "USE DATABASE" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):429 +msgid "Where the Configuration Files are Located" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):473 -msgid "\\q" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):432 +msgid "" +"This time the focus is upon the files in the <e>PGDATA</e> directory, <path>/" +"etc/postgresql-9.0</path>, instead with primary focus on the " +"<path>postgresql.conf</path> and <path>pg_hba.conf</path> files." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):474 -msgid "Quit the <c>psql</c> client" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):441 +msgid "postgresql.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):475 -msgid "quit" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):444 +msgid "" +"This is the main configuration file. The line that you may find of immediate " +"interest is <e>listen_addresses</e>. This variable defines to which " +"addresses PostgreSQL will bind. By default, only localhost and the Unix " +"socket are bound. Changing <e>listen_addresses</e> is not enough to enable " +"remote connections. That will be covered in the next section. The <uri link=" +"\"http://www.postgresql.org/docs/current/static/runtime-config.html" +"\">official documentation</uri> is fairly easy to understand and is " +"exhaustive on all the settings available. It would behoove you to read that " +"in addition to what is covered here as some things may change." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):478 -msgid "\\i FILE" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):456 +msgid "" +"Of secondary interest is the logging destination. By default, everything is " +"logged to <path>postmaster.log</path> in the <e>DATA_DIR</e> directory. " +"There is an entire subsection of <path>postgresql.conf</path> that covers a " +"slew of options for how, what and where to log. The subsection is marked: " +"ERROR REPORTING AND LOGGING." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):479 -msgid "Run commands from <c>FILE</c>" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):464 +msgid "" +"Other than <e>listen_addresses</e> and the logging options, the rest of the " +"defaults in <path>postgresql.conf</path> are reasonable enough to get you " +"going." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):480 -msgid "source FILE" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):472 +msgid "pg_hba.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):483 -msgid "\\o [FILE]" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):475 +msgid "" +"The <path>pg_hba.conf</path> file states who is allowed to connect to the " +"database server and which authentication method must be used to establish " +"the connection. Again, the documentation is quite exhaustive on the settings " +"and what they all mean, but a few things are covered here for clarification." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):484 -msgid "Send query results to <c>FILE</c>" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):482 +msgid "Default pg_hba.conf" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):485 -msgid "INTO OUTFILE, but outputs everything (not just SELECTS)" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):482 +#, no-wrap +msgid "" +"\n" +"<comment># TYPE DATABASE USER CIDR-ADDRESS METHOD\n" +"\n" +"# \"local\" is for Unix domain socket connections only</comment>\n" +"local all all trust\n" +"<comment># IPv4 local connections:</comment>\n" +"host all all 127.0.0.1/32 trust\n" +"<comment># IPv6 local connections:</comment>\n" +"host all all ::1/128 trust\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):488 -msgid "\\d [NAME]" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):493 +msgid "" +"As has been mentioned before, by default the server is secure. Kind of. " +"There is only one database role that is available for log in by default: " +"<e>postgres</e>. And, the only way to initiate a connection to the database " +"is through the <path>/var/run/postgresql/.s.PGSQL.5432</path> Unix socket, " +"which is owned by the <e>postgres</e> system user and system group, or via " +"localhost. Now for the \"kind of\" bit: Any user on the system can make a " +"connection to the database through the localhost. Even as the <e>postgres</" +"e> database superuser." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):489 -msgid "Describe a database or table (as well as other items)" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):503 +msgid "" +"To make a connection through the Unix socket, however, the users — " +"including the users for other services such as <e>apache</e>— must be " +"in the <e>postgres</e> system group. Use <c>gpasswd -a <e>user</e> postgres</" +"c> to add <e>user</e> to the <e>postgres</e> group. Users not in the " +"<e>postgres</e> group will be rejected with \"Permission denied\"." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):490 -msgid "DESC(RIBE)" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(warn):511 +msgid "" +"Never disable the Unix socket entirely. The initscripts require access to it " +"in order to operate properly. The method can be changed freely." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):493 -msgid "\\db [PATTERN]" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):516 +msgid "" +"The <e>trust</e> method is what allows any user to log on as any user " +"without a password. It specifies just what it implies: Trust all connections " +"for the given type to the given database from the given database user (but " +"not the system user) from the given location without a password. This is " +"what allows any user on the system to log on as any user through the " +"localhost connection from the get go. This is not as dangerous as it seems, " +"but does pose a serious security risk in most circumstances." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):494 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):526 msgid "" -"List available tables that match <c>PATTERN</c> (all if no pattern is given)" +"The two methods you will most likely use are: <e>password</e> and <e>md5</" +"e>. The password method only specifies that a password is required to start " +"the connection and the password is sent \"in-the-clear\". This method is " +"fine when such information will never leave the machine, such as connecting " +"via the Unix socket or localhost. The md5 method is like password, but " +"protects the password by using an md5 hash. This is what you want to use " +"whenever the password is going to traverse a network." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(ti):498 -msgid "SHOW TABLES" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):536 +msgid "" +"At this point, this author would like to bring your attention to the last " +"two lines, four lines including comments, of the <path>pg_hba.conf</path> " +"file. PostgreSQL has native support for IPv6 regardless of your desires for " +"such support. Additionally, IPv4 addresses are automatically mapped to IPv6 " +"addresses, <e>i.e.</e>, 127.0.0.1 will be mapped to ::FFFF:127.0.0.1 and as " +"\"pure\" IPv6 ::FFFF:7F00:0001." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):502 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):545 msgid "" -"With the exception of <c>\\c[onnect]</c>, all the commands shown will be " -"used later on in the section. So right now the database is empty. That said, " -"we need to insert some data. The first step to inserting data, however, is " -"to put it in a table. Right now there are no tables in the database, so we " -"need to create one. This is done with the <c>CREATE TABLE</c> command. We'll " -"make a table of items. They will contain a Product ID, Description, and " -"price:" +"There seems to be some misunderstanding, though, as to how host names are " +"mapped to IP addresses. Let us take a look at the <path>/etc/hosts</path> " +"file." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):511 -msgid "Creating the products table" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):550 +msgid "Example /etc/hosts" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):511 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):550 #, no-wrap msgid "" "\n" -"MyDB=> CREATE TABLE products (\n" -"MyDB(> product_id SERIAL,\n" -"MyDB(> description TEXT,\n" -"MyDB(> price DECIMAL\n" -"MyDB(> );\n" -"NOTICE: CREATE TABLE will create implicit sequence \"products_product_id_seq\"\n" -"for serial column \"products.product_id\"\n" -"CREATE TABLE\n" +"<comment># IPv4 and IPv6 localhost aliases</comment>\n" +"127.0.0.1 localhost\n" +"::1 localhost\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):522 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):556 msgid "" -"You can ignore the NOTICE, it's perfectly harmless. Looking at the last line " -"of the function, <c>CREATE TABLE</c> seems to indicate that the command has " -"succeeded. However, let's go ahead and verify that the table was indeed " -"successfully created with the <c>\\d</c> command:" +"From the example above you can see that both an IPv4 and an IPv6 IP address " +"are mapped to localhost. When <c>psql</c> refers to this file, it will grab " +"the first match and use that as the address; in this case 127.0.0.1. When " +"PostgreSQL parses this, it will match the IPv6 formatted address as well, e." +"g. ::ffff:127.0.0.1. If, however, the IPv6 address appears first, then " +"<c>psql</c> will map to ::1 alone; ::1 is not the same as ::ffff:127.0.0.1. " +"As such, if you do not have ::1 as a permitted means of access, <c>psql</c> " +"will not be able to establish a connection. Furthermore, your kernel needs " +"to support the IPv6 protocol." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):529 -msgid "Looking at the newly created table" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):568 +msgid "" +"So, it is better to specify IP addresses alone to <c>psql</c> and in " +"<path>pg_hba.conf</path> rather than to rely on <path>/etc/hosts</path> to " +"be ordered properly, and it removes any doubt as to which IP addresses are " +"allowed or to which server you will connect." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):529 -#, no-wrap -msgid "" -"\n" -"MyDB=> <i>\\d products</i>\n" -" Table \"public.products\"\n" -" Column | Type | Modifiers\n" -"-------------+---------+------------------------------------------------------------------\n" -" product_id | integer | not null default nextval('public.products_product_id_seq'::text)\n" -" description | text |\n" -" price | numeric |\n" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):580 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):591 +msgid "Starting the Server" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):582 +msgid "Give It a Go!" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):539 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):585 msgid "" -"Indeed the table was successfully created. Now that the table is created, it " -"needs to be populated with data. The next section will look at populating " -"the database with data." +"Now start PostgreSQL and set the password for the database superuser " +"<e>postgres</e>. The commands are to be performed as 'root' in the following " +"code listing:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):548 -msgid "Inserting data into the database" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):591 +#, no-wrap +msgid "" +"\n" +"<comment>(Change 'trust' to 'password' for the localhost connections.)</comment>\n" +"# <i>nano -w /etc/postgresql-9.0/pg_hba.conf</i>\n" +"# <i>/etc/init.d/postgresql-9.0 start</i>\n" +"postgresql-9.0 | * Starting PostgreSQL ... [ ok ]\n" +"\n" +"<comment>(Open a connection to the server and set the password.)</comment>\n" +"# <i>psql -U postgres</i>\n" +"psql (9.0.3)\n" +"Type \"help\" for help.\n" +"\n" +"postgres=# <i>\\password</i>\n" +"Enter new password:\n" +"Enter it again:\n" +"postgres=# <i>\\q</i>\n" +"\n" +"<comment>(Change 'trust' to 'password' for the local connection.)</comment>\n" +"# <i>nano -w /etc/postgresql-9.0/pg_hba.conf</i>\n" +"# <i>/etc/init.d/postgresql-9.0 reload</i>\n" +"postgresql-9.0 | * Reloading PostgreSQL configuration ... [ ok ]\n" +"# <i>rc-update add postgresql-9.0 default</i>\n" +" * service postgresql-9.0 added to runlevel default\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):551 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):615 msgid "" -"This section will look at the two ways of populating the newly created table " -"with data. First let's look at the most basic command, <c>INSERT</c>:" +"At this point you are ready to continue on with the official <uri link=" +"\"http://www.postgresql.org/docs/current/static/tutorial.html\">PostgreSQL " +"Tutorial</uri>. The tutorial will guide you through creating roles, " +"databases, schemata and all that fun and useful stuff." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):556 -msgid "INSERT syntax" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):627 +msgid "Migrating PostgreSQL" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):556 -#, no-wrap -msgid "" -"\n" -"INSERT INTO [tablename] (column1,column2,column3) VALUES(value1,value2,value3)\n" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):629 +msgid "When You Need to Migrate" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):560 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):632 msgid "" -"<c>tablename</c> contains the name of the table to insert the data into. " -"(column1,column2,column3) lets you specify the specific columns to insert " -"the values into. VALUES(value1,value2,value3) is the listing of values. The " -"values are inserted into the same order as the columns (column1 gets value1, " -"column2 gets value2, column3 gets value3). These counts <e>must</e> be the " -"same. So let's go ahead and insert an item into the table:" +"There are only two reasons you would need to perform a migration: When " +"moving from one major version to another, <e>e.g.</e>, from PostgreSQL 8.4.7 " +"to 9.0.3, but not from 9.0.2 to 9.0.3; or when switching from the deprecated " +"floating-point timestamp format to the new 64-bit integer timestamp format." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(impo):569 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(note):639 msgid "" -"From working with databases for a long time, I personally recommend " -"specifying <c>INSERT</c> statements exactly as above. Developers often make " -"the mistake of using <c>INSERT INTO</c> without specifying columns. This is " -"unproductive, as if a new column gets added to the database, it will cause " -"in error if the value to column count is not the same. You should <e>always</" -"e> specify the columns unless you're 300% sure you'll never add a column." +"You will need to migrate your database when you move from the obsolete " +"ebuilds — dev-db/libpq, dev-db/postgresql, dev-db/postgresql-libs, and " +"dev-db/postgresql-client — to the new ebuilds — dev-db/" +"postgresql-docs, dev-db/postgresql-base and dev-db/postgresql-server." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):578 -msgid "Inserting data into the table" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):649 +msgid "Post-9.0 Migration" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):578 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):652 msgid "" -"\n" -"MyDB=> <i>INSERT INTO products (description,price) VALUES('A test product', 12.00);</i>\n" -"INSERT 17273 1\n" +"<e>pg_upgrade</e>, a new utility that comes along with 9.0 and later, " +"simplifies the migration process rather drastically." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):583 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):657 msgid "" -"The last line needs a bit of explaining. The return of an insert command is " -"an OID (Object Identifier) and the number of rows inserted. OID's are a bit " -"beyond the scope of this guide, and the <uri link=\"http://www.postgresql." -"org/docs/8.1/static/datatype-oid.html\">PostgreSQL manual</uri> has some " -"good information on it. Now, for a situation where you have 20,000 products, " -"these insert statements can be a little tedious. However, not all is lost. " -"The <c>COPY</c> command can be used to insert data into a table from a file " -"or stdin. In this example, let's assume that you have a csv (comma separated " -"values) file, which contains the product id, description, and price. The " -"file looks like this:" +"However, there are two caveats with using pg_upgrade. Firstly, it does not " +"support configuration files being in a different directory than where the " +"data is stored. This can be resolved by using symbolic links. Lastly, you " +"can only use it to migrate from a database from 8.3 or newer. If you have an " +"older database you will need to follow the <uri link=\"#pre90\">Pre-9.0 " +"Migration</uri> instructions." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):596 -msgid "products.csv" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):666 +msgid "Migrating with pg_upgrade" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):596 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):666 #, no-wrap msgid "" "\n" -"2,meat,6.79\n" -"3,soup,0.69\n" -"4,soda,1.79\n" +"<comment>(Stop the servers you're going to migrate from and to.)</comment>\n" +"# <i>/etc/init.d/postgresql-8.4 stop</i>\n" +"# <i>/etc/init.d/postgresql-9.0 stop</i>\n" +"# <i>ln -s /etc/postgresql-8.4/*.conf /var/lib/postgresql/8.4/data/</i>\n" +"# <i>ln -s /etc/postgresql-9.0/*.conf /var/lib/postgresql/9.0/data/</i>\n" +"\n" +"<comment>(Change the method of database user 'postgres' to trust on local\n" +"connections on all databases.)</comment>\n" +"# <i>nano -w /etc/postgresql-8.4/pg_hba.conf</i>\n" +"# <i>nano -w /etc/postgresql-9.0/pg_hba.conf</i>\n" +"\n" +"<comment>You may need to change the permissions of '/var/lib/postgresql/' before\n" +"you perform the next step.</comment>\n" +"# <i>su - postgres</i>\n" +"$ <i>pg_upgrade -u postgres \\\n" +" -d /var/lib/postgresql/8.4/data -D /var/lib/postgresql/9.0/data \\\n" +" -b /usr/lib/postgresql-8.4/bin -B /usr/lib/postgresql-9.0/bin</i>\n" +"<comment>(Perform the tasks pg_upgrade tells you to do , if any.)</comment>\n" +"$ <i>logout</i>\n" +"\n" +"<comment>(Remove the symbolic links we created earlier.)</comment>\n" +"# <i>rm /var/lib/postgresql/8.4/data/*.conf</i>\n" +"# <i>rm /var/lib/postgresql/9.0/data/*.conf</i>\n" +"# <i>/etc/init.d/postgresql-9.0 start</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):602 -msgid "Now we'll use the <c>COPY</c> command to populate our data:" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):696 +msgid "Pre-9.0 Migration: With the New Ebuilds" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(impo):606 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):699 msgid "" -"The <c>COPY FROM STDIN</c> command is used because only the postgres user " -"can insert data from a file (for obvious security reasons)." +"Because the new ebuilds feature a more advanced slotting method than the " +"previous ones, the downtime is quite minimal, most likely minutes rather " +"than hours." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):611 -msgid "Using COPY to populate the products table" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):611 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):705 msgid "" -"\n" -"MyDB=> <i>COPY products FROM STDIN WITH DELIMITER AS ',';</i>\n" -"Enter data to be copied followed by a newline.\n" -"End with a backslash and a period on a line by itself.\n" -">> <i>2,meat,6.79</i>\n" -">> <i>3,soup,0.69</i>\n" -">> <i>4,soda,1.79</i>\n" -">> <i>\\.</i>\n" +"In the following examples, it is assumed that you are using the default " +"locations and port settings, and that you are migrating from 8.3 to 8.4. " +"Adjust accordingly if you have deviated from the default." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):621 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):711 msgid "" -"Unfortunately, this line doesn't return the same status information as the " -"<c>INSERT INTO</c> statement. How do we know the data was inserted? The next " -"section will look at running queries to check our data." +"If you have not already done so, follow the <uri link=\"#installation" +"\">installation instructions</uri> before starting the migration. Such a " +"compile may hamper performance on the database server but it can keep going." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):630 -msgid "Using PostgreSQL queries" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):718 +msgid "" +"A couple of files need to be tweaked before beginning the migration. Edit " +"<e>PGPORT</e> in the <path>/etc/conf.d/postgresql-8.4</path> configuration " +"file to 6543. (Any port number other than what your old installation is " +"bound to will do.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):633 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):725 msgid "" -"This section will look at using the <c>SELECT</c> statement to view data in " -"our tables. The basic <c>SELECT</c> format looks like this:" +"Next, edit <path>/etc/postgresql-8.3/pg_hba.conf</path> so that only the " +"database superuser <e>postgres</e> can access the database cluster via the " +"Unix socket." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):638 -msgid "SELECT syntax" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):731 +msgid "Migrate with the New Ebuilds" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):638 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):731 #, no-wrap msgid "" "\n" -"SELECT (column1,column2|*) FROM (table) [WHERE (conditionals)]\n" +"# <i>cp -p /etc/postgresql-8.3/pg_hba.conf /etc/postgresql-8.4/</i>\n" +"\n" +"<comment>(The following should be safe. Read the documentation to be sure.)</comment>\n" +"# <i> cp -p /etc/postgresql-8.3/postgresql.conf /etc/postgresql-8.4/</i>\n" +"<comment>\n" +"(Don't forget to copy over any other configuration files that you may need.)\n" +"</comment>\n" +"# <i>/etc/init.d/postgresql-8.3 reload</i>\n" +"# <i>/etc/init.d/postgresql-8.4 start</i>\n" +"\n" +"<comment>(Begin piping the data from the old cluster to the new cluster.)</comment>\n" +"# <i>pg_dumpall -U postgres -p 5432 | psql -U postgres -d postgres -p 6543</i>\n" +"# <i>/etc/init.d/postgresql-8.3 stop</i>\n" +"# <i>/etc/init.d/postgresql-8.4 stop</i>\n" +"\n" +"<comment>(Edit PGPORT back to 5432.)</comment>\n" +"# <i>nano -w /etc/conf.d/postgresql-8.4</i>\n" +"\n" +"<comment>(Allow users access once more.)</comment>\n" +"# <i>nano -w /etc/postgresql-8.4/pg_hba.conf</i>\n" +"# <i>/etc/init.d/postgresql-8.4 start</i>\n" +"# <i>rc-update del postgresql-8.3 && rc-update add postgresql-8.4 default</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):642 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):756 msgid "" -"There are two ways to select columns. The first is using <c>*</c> to select " -"all columns, and the second is to specify a list of specific columns you " -"wish to see. The second is quite handy when you want to find a specific " -"column in a rather large list of them. Let's start out with using <c>SELECT</" -"c> with <c>*</c> to specify all columns:" +"Hopefully everything went according to plan and you have a successfully " +"updated server that contains precisely the same data, bit for bit, as the " +"old server." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):650 -msgid "Viewing the products table" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):764 +msgid "Pre-9.0 Migration: From the Obsolete Ebuilds" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):650 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):767 msgid "" -"\n" -"MyDB=> <i>SELECT * FROM products;</i>\n" -" product_id | description | price\n" -"------------+----------------+-------\n" -" 1 | A test product | 12.00\n" -" 2 | meat | 6.79\n" -" 3 | soup | 0.69\n" -" 4 | soda | 1.79\n" -"(4 rows)\n" +"You will need to schedule some downtime for your server. The old ebuilds " +"<b>cannot</b> be installed at the same time as the new ebuilds. As such, " +"assume that the server will have to be down for a few hours. Maybe for the " +"weekend, even." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):661 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):774 msgid "" -"As shown here, all the data we inserted earlier is indeed in the table. Now " -"let's say we only want to see the description and the price, and don't care " -"about the product id. In this case we'll use the column specific SELECT form:" +"Before starting, you will need to deny access to the server, so that no " +"changes are made. You may also want to backup your <path>postgresql.conf</" +"path> and <path>pg_hba.conf</path> and any other configuration file that you " +"deem important." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):667 -msgid "Viewing specific columns from the products table" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):781 +msgid "Steps to Migrate from the Obsolete Ebuilds" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):667 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):781 #, no-wrap msgid "" "\n" -"MyDB=> <i>SELECT description,price FROM products;</i>\n" -" description | price\n" -"----------------+-------\n" -" A test product | 12.00\n" -" meat | 6.79\n" -" soup | 0.69\n" -" soda | 1.79\n" -"(4 rows)\n" +"# <i>pg_dumpall -U postgres > backup_file</i>\n" +"# <i>/etc/init.d/postgresql stop</i>\n" +"# <i>emerge -C dev-db/postgresql dev-db/libpq dev-db/postgresql-client \\\n" +" dev-db/postgresql-client</i>\n" +"<comment>\n" +"(Follow the steps detailed in this article for installing and configuring the\n" +"server.)\n" +"</comment>\n" +"# <i>/etc/init.d/postgresql-8.4 start</i>\n" +"# <i>psql -f backup_file postgres</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):678 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):794 msgid "" -"Now only the product and price is shown, letting us focus on only the " -"important data. Now let's say that we want to see only the items that are " -"greater than $2.00. Here's where the <c>WHERE</c> clause comes in handy:" +"You may break some packages that were built against those packages, but once " +"you have installed dev-db/postgresql-base and/or dev-db/postgresql-server " +"you can run <c>revdep-rebuild</c> to reemerge any packages that may have " +"been broken." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):684 -msgid "Viewing specific rows from the products table" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):805 +msgid "Utilities" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):684 -#, no-wrap +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):807 +msgid "pgAdmin III" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):810 msgid "" -"\n" -"MyDB=> <i>SELECT description,price FROM products WHERE price > 2.00;</i>\n" -" description | price\n" -"----------------+-------\n" -" A test product | 12.00\n" -" meat | 6.79\n" -"(2 rows)\n" +"<uri link=\"http://www.pgadmin.org/\">pgAdmin III</uri> is a graphical " +"utility for managing PostgreSQL." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):820 +msgid "Troubleshooting" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):693 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):822 +msgid "Server Lacks Instrumentation Functions" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):825 msgid "" -"Now a listing of products over $2.00 is displayed, focusing the data even " -"more. These forms of querying for information are very powerful, and can " -"help create extremely useful reports." +"This problem is easy to solve. What is difficult about it is finding the " +"answer. What is required is an import from a file that already exists on the " +"storage drive: <path>adminpack.sql</path>. To resolve this issue, run this " +"command:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(title):702 -msgid "Conclusion" +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre:caption):832 +msgid "Command to Add Instrumentation Functions" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(p):705 +#: ../../gentoo/xml/htdocs/doc/en//postgres-howto.xml(pre):832 +#, no-wrap msgid "" -"This concludes the PostgreSQL Guide. A big thanks goes to Masatomo Nakano, " -"the previous Gentoo PostgreSQL maintainer for his help in answering my " -"questions. Any suggestions on this guide should be sent to " -"<mail>chriswhite@gentoo.org</mail>. For more extensive documentation, see " -"the <uri link=\"http://www.postgresql.org\">PostgreSQL website</uri>." +"\n" +"# <i>psql -U postgres --file /usr/share/postgresql-9.0/contrib/adminpack.sql</i>\n" msgstr "" #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL diff --git a/doc/gettext/ru/power-management-guide.xml.po b/doc/gettext/ru/power-management-guide.xml.po index c016c2f..9cd4579 100644 --- a/doc/gettext/ru/power-management-guide.xml.po +++ b/doc/gettext/ru/power-management-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-04-24 14:32+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:06+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -55,18 +55,29 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(version):27 -msgid "2" +msgid "4" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(date):28 -msgid "2011-03-02" +msgid "2011-08-17" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):31 msgid "Introduction" msgstr "Введение" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):35 +#. Remove this note after 6 months - ETA 01/02/2012 +#. By then, we can assume that OpenRC migrations are not that frequent +#. anymore and this note can be dropped. +#. ~ Sven Vermeulen +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(impo):41 +msgid "" +"Since the introduction of OpenRC, the <c>pmg_switch_runlevel.sh</c> script " +"needs to be updated. If you have issues after the OpenRC upgrade, please " +"update this script according to this guide." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):47 msgid "" "Capacity and lifetime of laptop batteries have improved much in the last " "years. Nevertheless modern processors consume much more energy than older " @@ -76,11 +87,11 @@ msgid "" "achieved applying intelligent Power Management policies." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):47 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):59 msgid "A Quick Overview" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):50 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):62 msgid "" "Please notice that this guide describes Power Management for <e>laptops</e>. " "While some sections might also suite for <e>servers</e>, others do not and " @@ -88,13 +99,13 @@ msgid "" "server unless you really know what you are doing." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):57 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):69 msgid "" "As this guide has become rather long, here's a short overview helping you to " "find your way through it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):62 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):74 msgid "" "The <uri link=\"#doc_chap2\">Prerequisites</uri> chapter talks about some " "requirements that should be met before any of the following device " @@ -114,23 +125,23 @@ msgid "" "\"#doc_chap8\">Troubleshooting</uri> lists common pitfalls." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):83 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):95 msgid "Power Budget For Each Component" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(figure:link):87 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(figure:link):99 msgid "/images/energy-budget.png" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(figure:short):87 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(figure:short):99 msgid "Which component consumes how much energy?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(figure:caption):87 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(figure:caption):99 msgid "Power budget for each component" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):89 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):101 msgid "" "Nearly every component can operate in different states - off, sleep, idle, " "active to name a few - consuming a different amount of energy. Major parts " @@ -140,11 +151,11 @@ msgid "" "can achieve much more." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):102 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):114 msgid "Prerequisites" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):106 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):118 msgid "" "Before discussing the details of making individual devices Power Management " "aware, make sure certain requirements are met. After controlling BIOS " @@ -155,11 +166,11 @@ msgid "" "e> comes in handy." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):118 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):130 msgid "The BIOS Part" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):121 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):133 msgid "" "First have a look into your BIOS Power Management settings. The best way is " "to combine BIOS and operating system policies, but for the moment it's " @@ -168,11 +179,11 @@ msgid "" "you configured everything else." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):132 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):144 msgid "Setting USE Flags" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):135 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):147 msgid "" "Please check that the <c>acpi</c> USE flag is set in <path>/etc/make.conf</" "path>. Other USE flags that might be interesting for your system are <c>apm</" @@ -182,19 +193,19 @@ msgid "" "c> flag in <c>emerge</c>, see <c>man emerge</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):147 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):159 #, fuzzy msgid "Configuring The Kernel" msgstr "Конфигурация ядра" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):150 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):162 msgid "" "ACPI (Advanced Configuration and Power Interface) support in the kernel is " "still work in progress. Using a recent kernel will make sure you'll get the " "most out of it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):156 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):168 msgid "" "There are different kernel sources in Portage. I'd recommend using <c>gentoo-" "sources</c> or <c>tuxonice-sources</c>. The latter contains patches for " @@ -203,11 +214,11 @@ msgid "" "options:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):163 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):175 msgid "Minimum kernel setup for Power Management (Kernel 2.6)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):163 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):175 #, no-wrap msgid "" "\n" @@ -248,14 +259,14 @@ msgid "" " <*> <i>CPUFreq driver for your processor</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):201 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):213 msgid "" "Decide yourself whether you want to enable Software Suspend, and Sleep " "States (see below). If you own an ASUS, Medion, IBM Thinkpad or Toshiba " "laptop, enable the appropriate section." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):207 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):219 msgid "" "The kernel has to know how to enable CPU frequency scaling on your " "processor. As each type of CPU has a different interface, you've got to " @@ -265,7 +276,7 @@ msgid "" "unsure which one to take." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):215 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):227 msgid "" "Compile your kernel, make sure the right modules get loaded at startup and " "boot into your new ACPI-enabled kernel. Next run <c>emerge sys-power/acpid</" @@ -276,11 +287,11 @@ msgid "" "startup. You'll soon see how to use it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):225 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):237 msgid "Installing acpid" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):225 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):237 #, no-wrap msgid "" "\n" @@ -289,11 +300,11 @@ msgid "" "# <i>rc-update add acpid default</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):234 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):246 msgid "Creating A \"battery\" Runlevel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):237 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):249 msgid "" "The default policy will be to enable Power Management only when needed - " "running on batteries. To make the switch between AC and battery convenient, " @@ -301,7 +312,7 @@ msgid "" "stopping Power Management." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):244 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):256 msgid "" "You can safely skip this section if you don't like the idea of having " "another runlevel. However, skipping this step will make the rest a bit " @@ -309,11 +320,11 @@ msgid "" "exists." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):250 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):262 msgid "Creating a battery runlevel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):250 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):262 #, no-wrap msgid "" "\n" @@ -321,25 +332,25 @@ msgid "" "# <i>cp -a default battery</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):255 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):267 msgid "" "Finished. Your new runlevel <c>battery</c> contains everything like " "<c>default</c>, but there is no automatic switch between both yet. Time to " "change it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):264 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):276 msgid "Reacting On ACPI Events" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):267 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):279 msgid "" "Typical ACPI events are closing the lid, changing the power source or " "pressing the sleep button. An important event is changing the power source, " "which should cause a runlevel switch. A small script will take care of it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):273 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):285 msgid "" "First you need a script which changes the runlevel to <c>default</c> " "respectively <c>battery</c> depending on the power source. The script uses " @@ -347,18 +358,18 @@ msgid "" "the package is installed on your system." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):280 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):292 msgid "Installing pm-utils" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):280 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):292 #, no-wrap msgid "" "\n" "# <i>emerge pm-utils</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):284 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):296 msgid "" "You are now able to determine the power source by executing <c>on_ac_power " "&& echo AC available || echo Running on batteries</c> in a shell. " @@ -366,49 +377,57 @@ msgid "" "etc/acpi/actions/pmg_switch_runlevel.sh</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):291 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):303 msgid "/etc/acpi/actions/pmg_switch_runlevel.sh" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):291 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):303 #, no-wrap msgid "" "\n" "#!/bin/bash\n" "\n" -"<comment># BEGIN configuration</comment>\n" +"# BEGIN configuration\n" "RUNLEVEL_AC=\"default\"\n" "RUNLEVEL_BATTERY=\"battery\"\n" -"<comment># END configuration</comment>\n" +"\n" +"if [ -x /usr/bin/logger ]; then\n" +" LOGGER=\"/usr/bin/logger -s -p daemon.info -t /etc/acpi/actions/pmg_switch_runlevel.sh\"\n" +"else\n" +" LOGGER=\"/bin/echo\"\n" +"fi\n" +"\n" +"ON_AC_POWER=/usr/bin/on_ac_power\n" +"# END configuration\n" "\n" "\n" "if [ ! -d \"/etc/runlevels/${RUNLEVEL_AC}\" ]\n" "then\n" -" logger \"${0}: Runlevel ${RUNLEVEL_AC} does not exist. Aborting.\"\n" +" ${LOGGER} \"${0}: Runlevel ${RUNLEVEL_AC} does not exist. Aborting.\"\n" " exit 1\n" "fi\n" "\n" "if [ ! -d \"/etc/runlevels/${RUNLEVEL_BATTERY}\" ]\n" "then\n" -" logger \"${0}: Runlevel ${RUNLEVEL_BATTERY} does not exist. Aborting.\"\n" +" ${LOGGER} \"${0}: Runlevel ${RUNLEVEL_BATTERY} does not exist. Aborting.\"\n" " exit 1\n" "fi\n" "\n" -"if on_ac_power\n" +"if ${on_ac_power}\n" "then\n" -" if [[ \"$(</var/lib/init.d/softlevel)\" != \"${RUNLEVEL_AC}\" ]]\n" +" if [[ \"$(rc-status --runlevel)\" != \"${RUNLEVEL_AC}\" ]]\n" " then\n" -" logger \"Switching to ${RUNLEVEL_AC} runlevel\"\n" -" /sbin/rc ${RUNLEVEL_AC}\n" +" ${LOGGER} \"Switching to ${RUNLEVEL_AC} runlevel\"\n" +" /sbin/rc ${RUNLEVEL_AC}\n" " fi\n" -"elif [[ \"$(</var/lib/init.d/softlevel)\" != \"${RUNLEVEL_BATTERY}\" ]]\n" +"elif [[ \"$(rc-status --runlevel)\" != \"${RUNLEVEL_BATTERY}\" ]]\n" "then\n" -" logger \"Switching to ${RUNLEVEL_BATTERY} runlevel\"\n" +" ${LOGGER} \"Switching to ${RUNLEVEL_BATTERY} runlevel\"\n" " /sbin/rc ${RUNLEVEL_BATTERY}\n" "fi\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):326 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):346 msgid "" "Dont forget to run <c>chmod +x /etc/acpi/actions/pmg_switch_runlevel.sh</c> " "to make the script executable. The last thing that needs to be done is " @@ -419,28 +438,28 @@ msgid "" "different on yours." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):336 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):356 msgid "Determining ACPI events for changing the power source" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):336 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):356 #, no-wrap msgid "" "\n" "# <i>tail -f /var/log/messages | grep \"ACPI event\"</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):340 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):360 msgid "" "Run the command above and pull the power cable. You should see something " "like this:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):345 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):365 msgid "Sample output for power source changes" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):345 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):365 #, no-wrap msgid "" "\n" @@ -448,7 +467,7 @@ msgid "" "[Tue Sep 20 17:39:06 2005] ACPI event \"battery BAT0 00000080 00000001\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):350 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):370 msgid "" "The interesting part is the quoted string after <c>ACPI event</c>. It will " "be matched by the event line in the files you are going to create below. " @@ -456,11 +475,11 @@ msgid "" "long as any event is generated, runlevel changing will work." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):357 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):377 msgid "/etc/acpi/events/pmg_ac_adapter" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):357 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):377 #, no-wrap msgid "" "\n" @@ -470,11 +489,11 @@ msgid "" "action=/etc/acpi/actions/pmg_switch_runlevel.sh %e\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):364 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):384 msgid "/etc/acpi/events/pmg_battery" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):364 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):384 #, no-wrap msgid "" "\n" @@ -484,22 +503,22 @@ msgid "" "action=/etc/acpi/actions/pmg_switch_runlevel.sh %e\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):371 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):391 msgid "Finally acpid has to be restarted to recognize the changes." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):375 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):395 msgid "Finishing runlevel switching with acpid" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):375 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):395 #, no-wrap msgid "" "\n" "# <i>/etc/init.d/acpid restart</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):379 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):399 msgid "" "Give it a try: Plug AC in and out and watch syslog for the \"Switching to AC " "mode\" or \"Switching to battery mode\" messages. See the <uri link=" @@ -507,7 +526,7 @@ msgid "" "detect the power source correctly." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):386 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):406 msgid "" "Due to the nature of the event mechanism, your laptop will boot into " "runlevel <c>default</c> regardless of the AC/battery state. This is fine " @@ -516,33 +535,35 @@ msgid "" "with the parameter <c>softlevel=battery</c>, but it's likely to forget " "choosing it. A better way is faking an ACPI event in the end of the boot " "process and letting <path>pmg_switch_runlevel.sh</path> script decide " -"whether a runlevel change is necessary. Open <path>/etc/conf.d/local.start</" -"path> in your favourite editor and add these lines:" +"whether a runlevel change is necessary. Create a <path>/etc/local.d/battery." +"start</path> file with the following contents:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):398 -msgid "Runlevel adjustment at boot time by editing local.start" +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):418 +msgid "Runlevel adjustment at boot time through local.d/battery.start" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):398 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):418 #, no-wrap msgid "" "\n" +"#!/bin/sh\n" "<comment># Fake acpi event to switch runlevel if running on batteries</comment>\n" "/etc/acpi/actions/pmg_switch_runlevel.sh \"battery/battery\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):403 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):424 msgid "" -"Prepared like this you can activate Power Management policies for individual " -"devices." +"Don't forget to mark the file as executable (<c>chmod +x /etc/local.d/" +"battery.start</c>). Prepared like this you can activate Power Management " +"policies for individual devices." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):413 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):435 msgid "CPU Power Management" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):417 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):439 msgid "" "Mobile processors can operate at different frequencies. Some allow changing " "voltage as well. Most of the time your CPU doesn't need to run at full speed " @@ -550,17 +571,17 @@ msgid "" "decrease." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):427 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):449 msgid "Some Technical Terms" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):430 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):452 msgid "" "CPU frequency scaling brings up some technical terms that might be unknown " "to you. Here's a quick introduction." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):435 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):457 msgid "" "First of all, the kernel has to be able to change the processor's frequency. " "The <b>CPUfreq processor driver</b> knows the commands to do it on your CPU. " @@ -579,7 +600,7 @@ msgid "" "scaling_setspeed</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):452 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):474 msgid "" "This doesn't sound like dynamic frequency changes yet and in fact it isn't. " "Dynamics however can be accomplished with various approaches. For example, " @@ -589,11 +610,11 @@ msgid "" "enable or disable dynamic frequency changes depending on power source." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):464 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):486 msgid "Setting The Frequency" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):467 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):489 msgid "" "Decreasing CPU speed and voltage has two advantages: On the one hand less " "energy is consumed, on the other hand there is thermal improvement as your " @@ -602,24 +623,24 @@ msgid "" "between performance loss and energy saving." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):475 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):497 msgid "" "Not every laptop supports frequency scaling. If unsure, have a look at the " "list of supported processors in the <uri link=" "\"#doc_chap8\">Troubleshooting</uri> section to verify yours is supported." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):481 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):503 msgid "" "It's time to test whether CPU frequency changing works. Let's install " "another tool: <c>sys-power/cpufrequtils</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):486 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):508 msgid "Checking CPU frequency" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):486 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):508 #, no-wrap msgid "" "\n" @@ -627,15 +648,15 @@ msgid "" "# <i>cpufreq-info</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):491 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):513 msgid "Here is an example output:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):495 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):517 msgid "Sample output from cpufreq-info" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):495 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):517 #, no-wrap msgid "" "\n" @@ -653,7 +674,7 @@ msgid "" " current CPU frequency is 1.40 GHz.\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):510 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):532 msgid "" "Now play around with <c>cpufreq-set</c> to make sure frequency switching " "works. Run <c>cpufreq-set -g ondemand</c> for example to activate the " @@ -662,7 +683,7 @@ msgid "" "\"#doc_chap8\">Troubleshooting section</uri> in the end of this guide." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):518 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):540 msgid "" "<c>cpufrequtils</c> can operate in an automatic mode (when you use the " "<b>ondemand</b> governor), you can also switch to the <b>userspace</b> " @@ -671,11 +692,11 @@ msgid "" "<b>performance</b> and <b>powersave</b> governors, respectively." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):526 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):548 msgid "Changing CPU speeds" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):526 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):548 #, no-wrap msgid "" "\n" @@ -688,11 +709,11 @@ msgid "" "# <i>cpufreq-set -f 2.00ghz</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):539 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):561 msgid "Other CPU Speed Utilities" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):542 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):564 msgid "" "While <c>cpufrequtils</c> may be the best all-around program, there are some " "other choices available in Portage. The following table gives a quick " @@ -702,55 +723,55 @@ msgid "" "for programs that provide a GUI for easy configuration and changes." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):553 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):575 msgid "Name" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):554 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):576 msgid "Category" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):555 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):577 msgid "Switch decision" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):556 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):578 msgid "Kernel governors" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):557 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):579 msgid "Further governors" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):558 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(th):580 msgid "Comments" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):561 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):583 msgid "'ondemand' governor" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):562 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):576 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):584 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):598 msgid "Kernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):563 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):577 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):592 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):618 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):642 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):585 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):599 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):614 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):640 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):664 msgid "CPU load" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):564 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):565 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):578 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):579 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):586 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):587 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):600 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):601 msgid "N.A." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):566 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):588 msgid "" "Chooses maximal frequency on CPU load and slowly steps down when the CPU is " "idle. Further tuning through files in <path>/sys/devices/system/cpu/cpu0/" @@ -758,11 +779,11 @@ msgid "" "if governor switching or similar is desired." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):575 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):597 msgid "'conservative' governor" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):580 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):602 msgid "" "Unlike the ondemand governor, conversative doesn't jump to maximum frequency " "when CPU load is high, but increases the frequency step by step. Further " @@ -771,65 +792,65 @@ msgid "" "switching or similar is desired." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):590 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):612 msgid "http://mnm.uib.es/~gallir/cpudyn/" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):590 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):612 msgid "cpudyn" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):591 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):602 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):617 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):630 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):641 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):613 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):624 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):639 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):652 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):663 msgid "Daemon" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):593 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):615 msgid "Performance, powersave" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):594 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):616 msgid "Dynamic" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):595 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):617 msgid "" "Also supports disk standby - notice however that <e>laptop mode</e> in most " "cases will do a better job." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):601 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):623 msgid "http://sourceforge.net/projects/cpufreqd/" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):601 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):623 msgid "cpufreqd" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):603 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):625 msgid "Battery state, CPU load, temperature, running programs and more" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):604 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):666 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):626 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):688 msgid "All available" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):605 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):619 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):632 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):643 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):627 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):641 #: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):654 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):655 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):656 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):667 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):665 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):676 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):677 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):678 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):689 msgid "None" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):606 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):628 msgid "" "Sophisticated (but somewhat complicated) setup. Extendible through plugins " "like sensor monitoring (lm_sensors) or coordinating some NVidia based " @@ -837,95 +858,95 @@ msgid "" "controlled manually at runtime." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):615 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):637 msgid "http://www.deater.net/john/powernowd.html" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):615 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):637 msgid "powernowd" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):620 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):642 msgid "Passive, sine, aggressive" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):621 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):643 msgid "Supports SMP." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):628 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):650 msgid "http://projects.simpledesigns.com.pl/project/ncpufreqd/" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):628 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):650 msgid "ncpufreqd" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):631 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):653 msgid "Temperature" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):633 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):655 msgid "Powersave, performance" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):634 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):656 msgid "" "Toggles the used governor between performance and powersave depending on " "system temperature. Very useful on laptops with notorious heat problems." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):640 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):662 msgid "http://www.goop.org/~jeremy/speedfreq/" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):640 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):662 msgid "speedfreq" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):644 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):666 msgid "Dynamic, powersave, performance, fixed speed" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):645 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):667 msgid "" "Easy to configure with a nice client/server interface. Requires a 2.6 " "kernel. Unmaintained, broken and thus removed from Portage. Please switch to " "cpufreqd if you're still using it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):652 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri:link):674 msgid "http://cpuspeedy.sourceforge.net/" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):652 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(uri):674 msgid "gtk-cpuspeedy" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):653 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):664 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):675 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):686 msgid "Graphical" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):657 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):679 msgid "" "Gnome application, a graphical tool to set CPU frequency manually. It does " "not offer any automation." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):663 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):685 msgid "klaptopdaemon" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):665 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):687 msgid "Battery state" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):668 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(ti):690 msgid "KDE only, 'ondemand' governor required for dynamic frequency scaling." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):674 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):696 msgid "" "While adjusting the frequency to the current load looks simple at a first " "glance, it's not such a trivial task. A bad algorithm can cause switching " @@ -933,22 +954,22 @@ msgid "" "frequency to an unnecessary high level." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):681 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):703 msgid "Which one to choose? If you have no idea about it, try <c>cpufreqd</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):685 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):707 msgid "Installing cpufreqd" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):685 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):707 #, no-wrap msgid "" "\n" "# <i>emerge cpufreqd</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):689 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):711 msgid "" "<c>cpufreqd</c> can be configured by editing <path>/etc/cpufreqd.conf</" "path>. The default one that ships with cpufreqd may look a bit confusing. I " @@ -957,11 +978,11 @@ msgid "" "Earlier versions have a different syntax for the config file." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):697 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):719 msgid "/etc/cpufreqd.conf (cpufreqd-2.0.0 and later)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):697 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):719 #, no-wrap msgid "" "\n" @@ -1022,17 +1043,17 @@ msgid "" "[/Rule]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):755 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):777 msgid "" "Now you can start the cpufreqd daemon. Add it to the <c>default</c> and " "<c>battery</c> runlevel as well." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):760 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):782 msgid "Starting cpufreqd" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):760 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):782 #, no-wrap msgid "" "\n" @@ -1040,7 +1061,7 @@ msgid "" "# <i>/etc/init.d/cpufreqd start</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):765 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):787 msgid "" "Sometimes it can be desirable to select another policy than the daemon " "chooses, for example when battery power is low, but you know that AC will be " @@ -1050,52 +1071,52 @@ msgid "" "<c>cpufreqd-set dynamic</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):774 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):796 msgid "" "Do not run more than one of the above programs at the same time. It may " "cause confusion like switching between two frequencies all the time." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):782 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):804 msgid "Verifying the result" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):785 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):807 msgid "" "The last thing to check is that your new policies do a good job. An easy way " "to do so is monitoring CPU speed while working with your laptop:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):790 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):812 msgid "Monitoring CPU speed" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):790 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):812 #, no-wrap msgid "" "\n" "# <i>watch grep \\\"cpu MHz\\\" /proc/cpuinfo</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):794 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):816 msgid "" "If <path>/proc/cpuinfo</path> doesn't get updated (see <uri link=" "\"#doc_chap8\">Troubleshooting</uri>), monitor the CPU frequency with <c>sys-" "apps/x86info</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):800 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):822 msgid "Alternative CPU speed monitoring" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):800 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):822 #, no-wrap msgid "" "\n" "# <i>watch x86info -mhz</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):804 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):826 msgid "" "Depending on your setup, CPU speed should increase on heavy load, decrease " "on no activity or just stay at the same level. When using <c>cpufreqd</c> " @@ -1103,11 +1124,11 @@ msgid "" "additional information about what's happening reported to <c>syslog</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):816 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):838 msgid "LCD Power Management" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):820 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):842 msgid "" "As you can see in <uri link=\"#doc_chap1_fig1\">figure 1.1</uri>, the LCD " "display consumes the biggest part of energy (might not be the case for non-" @@ -1116,11 +1137,11 @@ msgid "" "offer the possibility to control the backlight dimming." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):831 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):853 msgid "Standby settings" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):834 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):856 msgid "" "The first thing to check is the standby/suspend/off timings of the display. " "As this depends heavily on your windowmanager, I'll let you figure it out " @@ -1130,11 +1151,11 @@ msgid "" "modify <path>/etc/X11/xorg.conf</path> similar to this:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):843 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):865 msgid "LCD suspend settings in X.org" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):843 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):865 #, no-wrap msgid "" "\n" @@ -1155,11 +1176,11 @@ msgid "" "EndSection\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):864 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):886 msgid "Backlight dimming" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):867 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):889 msgid "" "Probably more important is the backlight dimming. If you have access to the " "dimming settings via a tool, write a small script that dims the backlight in " @@ -1170,7 +1191,7 @@ msgid "" "<c>thinkpad_acpi</c> (formerly called <c>ibm_acpi</c>) as described below." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):877 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):899 msgid "" "Support for setting brightness is marked experimental in thinkpad_acpi. It " "accesses hardware directly and may cause severe harm to your system. Please " @@ -1178,39 +1199,45 @@ msgid "" "website</uri>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):884 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):906 msgid "" "To be able to set the brightness level, the thinkpad_acpi module has to be " "loaded with the experimental parameter." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):889 -msgid "automatically loading the thinkpad_acpi module" +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):911 +msgid "Automatically loading the thinkpad_acpi module" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):889 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):911 #, no-wrap msgid "" "\n" "<comment>(Please read the warnings above before doing this!)</comment>\n" +"\n" "# <i>echo \"options thinkpad_acpi experimental=1\" >> /etc/modprobe.d/thinkpad_acpi</i>\n" "# <i>update-modules</i>\n" -"# <i>echo thinkpad_acpi >> /etc/modules.autoload.d/kernel-2.6</i>\n" +"# <i>nano /etc/conf.d/modules</i>\n" +"<comment># Autoload the thinkpad_acpi module</comment>\n" +"modules_2_6=\"thinkpad_acpi\"\n" +"<comment># Parameters for the thinkpad_acpi module</comment>\n" +"modules_thinkpad_acpi_args_2_6=\"experimental=1\"\n" +"\n" "# <i>modprobe thinkpad_acpi</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):897 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):925 msgid "" "This should work without error messages and a file <path>/proc/acpi/ibm/" "brightness</path> should be created after loading the module. An init script " "will take care of choosing the brightness according to the power source." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):904 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):932 msgid "/etc/conf.d/lcd-brightness" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):904 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):932 #, no-wrap msgid "" "\n" @@ -1224,11 +1251,11 @@ msgid "" "BRIGHTNESS_BATTERY=4\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):915 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):943 msgid "/etc/init.d/lcd-brightness" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):915 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):943 #, no-wrap msgid "" "\n" @@ -1268,17 +1295,17 @@ msgid "" "}\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):952 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):980 msgid "" "When done, make sure brightness is adjusted automatically by adding it to " "the battery runlevel." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):957 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):985 msgid "Enabling automatic brightness adjustment" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):957 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):985 #, no-wrap msgid "" "\n" @@ -1287,11 +1314,11 @@ msgid "" "# <i>rc</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):968 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):996 msgid "Disk Power Management" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):972 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1000 msgid "" "Hard disks consume less energy in sleep mode. Therefore it makes sense to " "activate power saving features whenever the hard disk is not used for a " @@ -1305,29 +1332,29 @@ msgid "" "second alternative." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):987 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1015 msgid "Increasing idle time - laptop-mode" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):990 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1018 msgid "" "Recent 2.6 kernels include the so-called <c>laptop-mode</c>. When activated, " "dirty buffers are written to disk on read calls or after 10 minutes (instead " "of 30 seconds). This minimizes the time the hard disk needs to be spun up." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):996 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1024 msgid "Automated start of laptop-mode" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):996 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1024 #, no-wrap msgid "" "\n" "# <i>emerge laptop-mode-tools</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1000 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1028 msgid "" "<c>laptop-mode-tools</c> has its configuration file in <path>/etc/laptop-" "mode/laptop-mode.conf</path>. Adjust it the way you like it, it's well " @@ -1335,7 +1362,7 @@ msgid "" "automatically." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1007 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1035 msgid "" "Recent versions (1.11 and later) of laptop-mode-tools include a new tool " "<c>lm-profiler</c>. It will monitor your system's disk usage and running " @@ -1345,11 +1372,11 @@ msgid "" "<c>battery</c> runlevels (recommended)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1016 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1044 msgid "Sample output from running lm-profiler" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1016 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1044 #, no-wrap msgid "" "\n" @@ -1365,17 +1392,17 @@ msgid "" "[4296900.482000] reiserfs/0\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1029 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1057 msgid "" "After profiling your system for ten minutes, lm-profiler will present a list " "of services which might have caused disk accesses during that time." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1034 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1062 msgid "lm-profiler suggests to disable some services" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1034 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1062 #, no-wrap msgid "" "\n" @@ -1386,7 +1413,7 @@ msgid "" "Do you want to disable this service in battery mode? [y/N]: <i>n</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1042 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1070 msgid "" "To disable atd as suggested in the example above, you would run <c>rc-update " "del atd battery</c>. Be careful not to disable services that are needed for " @@ -1395,11 +1422,11 @@ msgid "" "needed." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1053 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1081 msgid "Limiting Write Accesses" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1056 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1084 msgid "" "If you don't want to use laptop-mode, you must take special care to disable " "services that write to your disk frequently - <c>syslogd</c> is a good " @@ -1410,29 +1437,29 @@ msgid "" "when needed." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1066 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1094 msgid "Disabling cups in battery mode" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1066 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1094 #, no-wrap msgid "" "\n" "# <i>rc-update del cupsd battery</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1070 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1098 msgid "" "You can also use <c>lm-profiler</c> from laptop-mode-tools (see above) to " "find services to disable. Once you eliminated all of them, go on with " "configuring hdparm." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1079 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1107 msgid "hdparm" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1082 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1110 msgid "" "The second possibility is using <c>hdparm</c>. Skip this if you are using " "laptop-mode. Otherwise, edit <path>/etc/conf.d/hdparm</path> and add the " @@ -1440,18 +1467,18 @@ msgid "" "is called <b>hda</b>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1089 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1117 msgid "Using /etc/conf.d/hdparm for disk standby" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1089 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1117 #, no-wrap msgid "" "\n" "hda_args=\"-q -S12\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1093 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1121 msgid "" "This will activate power management for your hard drive. If you ever want to " "deactivate power management, you can edit <path>/etc/conf.d/hdparm</path> " @@ -1459,7 +1486,7 @@ msgid "" "hda</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1099 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1127 msgid "" "See <c>man hdparm</c> for the options. Though you can always start " "<c>hdparm</c> manually when you are on battery power by running <c>/etc/init." @@ -1468,35 +1495,35 @@ msgid "" "automatically enable power management." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1107 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1135 msgid "Automate disk standby settings" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1107 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1135 #, no-wrap msgid "" "\n" "# <i>rc-update add hdparm battery</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(impo):1111 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(impo):1139 msgid "" "Be careful with sleep/spin down settings of your hard drive. Setting it to " "small values might wear out your drive and lose warranty." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1119 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1147 msgid "Other tricks" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1122 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1150 msgid "" "Another possibility is to deactivate swap in battery mode. Before writing a " "swapon/swapoff switcher, make sure there is enough RAM and swap isn't used " "heavily, otherwise you'll be in big problems." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1128 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1156 msgid "" "If you don't want to use laptop-mode, it's still possible to minimize disk " "access by mounting certain directories as <c>tmpfs</c> - write accesses are " @@ -1509,18 +1536,18 @@ msgid "" "your kernel and add a line to <path>/etc/fstab</path> like this:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1140 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1168 msgid "Editing /etc/fstab to make /tmp even more volatile" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1140 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1168 #, no-wrap msgid "" "\n" "none /tmp tmpfs size=32m 0 0\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):1144 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):1172 msgid "" "Pay attention to the size parameter and modify it for your system. If you're " "unsure, don't try this at all, it can become a performance bottleneck " @@ -1530,15 +1557,15 @@ msgid "" "compiling..." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1157 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1185 msgid "Power Management For Other Devices" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1159 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1187 msgid "Graphics Cards" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1162 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1190 msgid "" "In case you own an ATI graphics card supporting PowerPlay (dynamic clock " "scaling for the graphics processing unit GPU), you can activate this feature " @@ -1547,11 +1574,11 @@ msgid "" "feature will lead to crashes on some systems." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1170 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1198 msgid "Enabling ATI PowerPlay support in X.org" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1170 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1198 #, no-wrap msgid "" "\n" @@ -1561,40 +1588,40 @@ msgid "" "EndSection\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1180 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1208 msgid "Wireless Power Management" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1183 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1211 msgid "" "Wireless LAN cards consume quite a bit of energy. Put them in Power " "Management mode just like your hard drives." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):1188 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):1216 msgid "" "This script assumes your wireless interface is called <c>wlan0</c>; replace " "this with the actual name of your interface." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1193 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1221 msgid "" "Add the following option to <path>/etc/conf.d/net</path> to automatically " "enable power management for your wireless card:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1198 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1226 msgid "Automated WLAN Power Management" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1198 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1226 #, no-wrap msgid "" "\n" "iwconfig_wlan0=\"power on\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1202 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1230 msgid "" "See <c>man iwconfig</c> for details and more options like the period between " "wakeups or timeout settings. If your driver and access point support " @@ -1602,11 +1629,11 @@ msgid "" "energy." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1211 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1239 msgid "USB Power Management" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1214 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1242 msgid "" "There are two problems with USB devices regarding energy consumption: First, " "devices like USB mice, digital cameras or USB sticks consume energy while " @@ -1618,11 +1645,11 @@ msgid "" "state</path> files in <path>/sys</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1225 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1253 msgid "Enabling USB suspend support in the kernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1225 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1253 #, no-wrap msgid "" "\n" @@ -1632,49 +1659,49 @@ msgid "" " [*] USB suspend/resume (EXPERIMENTAL)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1237 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1265 msgid "Sleep States: sleep, standby, and suspend to disk" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1241 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1269 msgid "ACPI defines different sleep states. The more important ones are" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(li):1246 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(li):1274 msgid "S1 aka Standby" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(li):1247 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(li):1275 msgid "S3 aka Suspend to RAM aka Sleep" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(li):1248 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(li):1276 msgid "S4 aka Suspend to Disk aka Hibernate" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1251 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1279 msgid "" "They can be called whenever the system is not in use, but a shutdown is not " "wanted due to the long boot time." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1259 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1287 msgid "Sleep (S3)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1262 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1290 msgid "" "The ACPI support for these sleep states is marked experimental for good " "reason. APM sleep states seem to be more stable, however you can't use APM " "and ACPI together." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1268 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1362 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1296 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1390 msgid "Kernel configuration for the various suspend types" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1268 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1296 #, no-wrap msgid "" "\n" @@ -1683,24 +1710,24 @@ msgid "" " [*] Suspend to RAM and standby \n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1274 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1302 msgid "" "Once your kernel is properly configured, you can use the <c>hibernate-" "script</c> to activate suspend or sleep mode. Let's install that first." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1280 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1308 msgid "Installing the hibernate-script" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1280 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1308 #, no-wrap msgid "" "\n" "# <i>emerge hibernate-script</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1284 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1312 msgid "" "Some configuration has to be done in <path>/etc/hibernate</path>. The " "default package introduces a few configuration files for each sleep state. " @@ -1708,7 +1735,7 @@ msgid "" "conf</path>; make sure this file is properly set up for your system." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1291 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1319 msgid "" "To configure sleep, edit <path>sysfs-ram.conf</path> in <path>/etc/" "hibernate</path>. <c>UseSysfsPowerState mem</c> is already setup correctly, " @@ -1719,31 +1746,31 @@ msgid "" "scripts to avoid timeouts." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):1301 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(note):1329 msgid "" "For more information on setting up sleep states, read <c>man hibernate.conf</" "c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1306 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1334 msgid "" "Ready? Now is the last chance to backup any data you want to keep after " "executing the next command. Notice that you probably have to hit a special " "key like <c>Fn</c> to resume from sleep." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1312 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1340 msgid "Calling sleep" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1312 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1340 #, no-wrap msgid "" "\n" "# <i>hibernate-ram</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1316 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1344 msgid "" "If you're still reading, it seems to work. You can also setup standby (S1) " "in a similar way by editing <path>sysfs-ram.conf</path> and changing " @@ -1751,25 +1778,25 @@ msgid "" "the more interesting sleep states due to greater energy savings however." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1326 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1354 msgid "Hibernate (S4)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1329 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1357 msgid "" "This section introduces hibernation, where a snapshot of the running system " "is written to disk before powering off. On resume, the snapshot is loaded " "and you can go on working at exactly the point you called hibernate before." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):1335 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):1363 msgid "" "Don't exchange non hot-pluggable hardware when suspended. Don't attempt to " "load a snapshot with a different kernel image than the one it was created " "with. Shutdown any NFS or samba server/client before hibernating." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1341 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1369 msgid "" "There are two different implementations for S4. The original one is swsusp, " "then there is the newer tuxonice (formerly suspend2) with a nicer interface " @@ -1779,7 +1806,7 @@ msgid "" "Suspend-to-Disk (pmdisk), a fork of swsusp, but it has been merged back." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1351 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1379 msgid "" "TuxOnIce is not included in the mainline kernel yet, therefore you either " "have to patch your kernel sources with the patches provided by <uri link=" @@ -1787,11 +1814,11 @@ msgid "" "sources</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1358 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1386 msgid "The kernel part for both swusp and TuxOnIce is as follows:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1362 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1390 #, no-wrap msgid "" "\n" @@ -1812,7 +1839,7 @@ msgid "" " [*] Replace swsusp by default\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1380 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1408 msgid "" "The configuration for swsusp is rather easy. If you didn't store the " "location of your swap partition in the kernel config, you can also pass it " @@ -1822,43 +1849,43 @@ msgid "" "the boot process." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1389 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1417 msgid "Invalidating swsusp images during the boot process" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1389 -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1431 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1417 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1459 #, no-wrap msgid "" "\n" "# <i>rc-update add hibernate-cleanup boot</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1393 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1421 msgid "" "To activate hibernate with swsusp, use the hibernate script and set " "<c>UseSysfsPowerState disk</c> in <path>/etc/hibernate/sysfs-disk</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):1398 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(warn):1426 msgid "" "Backup your data before doing this. Run <c>sync</c> before executing one of " "the commands to have cached data written to disk. First try it outside of X, " "then with X running, but not logged in." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1404 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1432 msgid "" "If you experience kernel panics due to uhci or similar, try to compile USB " "support as module and unload the modules before sending your laptop to sleep " "mode. There are configuration options for this in <path>common.conf</path>" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1410 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1438 msgid "Hibernating with swsusp" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1410 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1438 #, no-wrap msgid "" "\n" @@ -1867,13 +1894,13 @@ msgid "" "# <i>hibernate</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1416 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1444 msgid "" "The following section discusses the setup of TuxOnIce including fbsplash " "support for a nice graphical progress bar during suspend and resume." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1421 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1449 msgid "" "The first part of the configuration is similar to the configuration of " "swsusp. In case you didn't store the location of your swap partition in the " @@ -1884,22 +1911,22 @@ msgid "" "boot process." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1431 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1459 msgid "Invalidating TuxOnIce images during the boot process" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1435 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1463 msgid "" "Now edit <path>/etc/hibernate/tuxonice.conf</path>, enable the <c>TuxOnIce</" "c> options you need. Do not enable the <c>fbsplash</c> options in <c>common." "conf</c> just yet." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1441 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1469 msgid "Hibernating with TuxOnIce" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1441 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1469 #, no-wrap msgid "" "\n" @@ -1908,7 +1935,7 @@ msgid "" "# <i>hibernate</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1447 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1475 msgid "" "Please configure <c>fbsplash</c> now if you didn't do already. To enable " "fbsplash support during hibernation, the <c>sys-apps/tuxonice-userui</c> " @@ -1916,11 +1943,11 @@ msgid "" "USE flag." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1453 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1481 msgid "Installing tuxonice-userui" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1453 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1481 #, no-wrap msgid "" "\n" @@ -1928,24 +1955,24 @@ msgid "" "# <i>emerge tuxonice-userui</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1458 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1486 msgid "" "The ebuild tells you to make a symlink to the theme you want to use. For " "example, to use the <c>livecd-2005.1</c> theme, run the following command:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1463 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1491 msgid "Using the livecd-2005.1 theme during hibernation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1463 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1491 #, no-wrap msgid "" "\n" "# <i>ln -sfn /etc/splash/livecd-2005.1 /etc/splash/tuxonice</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1467 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1495 msgid "" "If you don't want a black screen in the first part of the resume process, " "you have to add the <c>tuxoniceui_fbsplash</c> tool to your initrd image. " @@ -1954,11 +1981,11 @@ msgid "" "that." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1474 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1502 msgid "Adding tuxoniceui_fbsplash to an initrd image" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1474 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1502 #, no-wrap msgid "" "\n" @@ -1972,7 +1999,7 @@ msgid "" "# <i>find . | cpio --quiet --dereference -o -H newc | gzip -9 > /boot/fbsplash-tuxonice-emergence-1024x768</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1485 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1513 msgid "" "Afterwards adjust <path>grub.conf</path> (or <path>lilo.conf</path>) so that " "your TuxOnIce kernel uses <path>/boot/fbsplash-tuxonice-emergence-1024x768</" @@ -1980,34 +2007,34 @@ msgid "" "setup correctly." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1492 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1520 msgid "Test run for fbsplash hibernation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1492 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1520 #, no-wrap msgid "" "\n" "# <i>tuxoniceui_fbsplash -t</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1496 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1524 msgid "" "Afterwards open <path>/etc/hibernate/common.conf</path> and activate the " "fbsplash options. Execute <c>hibernate</c> and enjoy." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1506 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1534 msgid "Troubleshooting" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1510 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1538 msgid "" "<e>Q:</e> I'm trying to change the CPU frequency, but <path>/sys/devices/" "system/cpu/cpu0/cpufreq/scaling_governor</path> does not exist." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1516 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1544 msgid "" "<e>A:</e> Make sure your processor supports CPU frequency scaling and you " "chose the right CPUFreq driver for your processor. Here is a list of " @@ -2022,26 +2049,26 @@ msgid "" "Performance States\" are available to the ACPI/BIOS interface)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1529 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1557 msgid "" "<e>Q:</e> My laptop supports frequency scaling, but <path>/sys/devices/" "system/cpu/cpu0/cpufreq/</path> is empty." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1534 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1562 msgid "" "<e>A:</e> Look for ACPI related error messages with <c>dmesg | grep ACPI</" "c>. Try to update the BIOS, especially if a broken DSDT is reported. You can " "also try to fix it yourself (which is beyond the scope of this guide)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1540 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1568 msgid "" "<e>Q:</e> My laptop supports frequency scaling, but according to <path>/proc/" "cpuinfo</path> the speed never changes." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1545 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1573 msgid "" "<e>A:</e> Probably you have activated symmetric multiprocessing support " "(CONFIG_SMP) in your kernel. Deactivate it and it should work. Some older " @@ -2050,13 +2077,13 @@ msgid "" "mhz</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1552 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1580 msgid "" "<e>Q:</e> I can change the CPU frequency, but the range is not as wide as in " "another OS." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1557 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1585 msgid "" "<e>A:</e> You can combine frequency scaling with ACPI throttling to get a " "lower minimum frequency. Notice that throttling doesn't save much energy and " @@ -2067,47 +2094,47 @@ msgid "" "proc/acpi/processor/CPU/throttling</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1567 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1595 msgid "" "<e>Q:</e> When configuring the kernel, powersave, performance and userspace " "governors show up, but that ondemand thing is missing. Where do I get it?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1572 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1600 msgid "" "<e>A:</e> The ondemand governor is only included in recent kernel sources. " "Try updating them." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1577 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1605 msgid "<e>Q:</e> Battery life time seems to be worse than before." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1581 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1609 msgid "" "<e>A:</e> Check your BIOS settings. Maybe you forgot to re-enable some of " "the settings." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1586 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1614 msgid "" "<e>Q:</e> My battery is charged, but KDE reports there would be 0% left and " "immediately shuts down." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1591 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1619 msgid "" "<e>A:</e> Check that battery support is compiled into your kernel. If you " "use it as a module, make sure the module is loaded." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1596 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1624 msgid "" "<e>Q:</e> My system logger reports things like \"logger: ACPI group " "battery / action battery is not defined\"." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1601 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1629 msgid "" "<e>A:</e> This message is generated by the <path>/etc/acpi/default.sh</path> " "script that is shipped with acpid. You can safely ignore it. If you like to " @@ -2115,47 +2142,47 @@ msgid "" "default.sh</path> as shown below:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1608 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1636 msgid "Disabling warnings about unknown acpi events" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1608 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1636 #, no-wrap msgid "" "\n" " *) # logger \"ACPI action $action is not defined\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1612 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1640 msgid "<e>Q:</e> I have a Dell Inspiron 51XX and I don't get any ACPI events." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1616 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1644 msgid "" "<e>A:</e> This seems to be a kernel bug. Read on <uri link=\"http://bugme." "osdl.org/show_bug.cgi?id=1752\">here</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1621 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1649 msgid "" "<e>Q:</e> I activated the <c>DynamicClocks</c> option in <path>xorg.conf</" "path> and now X.org crashes / the screen stays black / my laptop doesn't " "shutdown properly." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1627 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1655 msgid "" "<e>A:</e> This happens on some systems. You have to disable " "<c>DynamicClocks</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1632 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1660 msgid "" "<e>Q:</e> I want to use TuxOnIce, but it tells me my swap partition is too " "small. Resizing is not an option." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1637 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1665 msgid "" "<e>A:</e> If there is enough free space on your system, you can use the " "filewriter instead of the swapwriter. The <c>hibernate-script</c> supports " @@ -2163,33 +2190,33 @@ msgid "" "Documentation/power/tuxonice.txt</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1644 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1672 msgid "" "<e>Q:</e> I just bought a brand new battery, but it only lasts for some " "minutes! What am I doing wrong?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1649 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1677 msgid "" "<e>A:</e> First follow your manufacturer's advice on how to charge the " "battery correctly." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1654 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1682 msgid "<e>Q:</e> The above didn't help. What should I do then?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1658 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1686 msgid "" "<e>A:</e> Some batteries sold as \"new\" are in fact old ones. Try the " "following:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1662 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1690 msgid "Querying battery state" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1662 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1690 #, no-wrap msgid "" "\n" @@ -2198,17 +2225,17 @@ msgid "" "last full capacity: 41830 mWh\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1668 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1696 msgid "" "If the \"last full capacity\" differs significantly from the design " "capacity, your battery is probably broken. Try to claim your warranty." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1673 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1701 msgid "<e>Q:</e> My problem is not listed above. Where should I go next?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1677 +#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1705 msgid "" "<e>A:</e> Don't fear to contact me, <mail link=\"earthwings@gentoo.org" "\">Dennis Nienhüser</mail>, directly. The <uri link=\"http://forums.gentoo." diff --git a/doc/gettext/ru/rsync.xml.po b/doc/gettext/ru/rsync.xml.po index c404f19..0af58b0 100644 --- a/doc/gettext/ru/rsync.xml.po +++ b/doc/gettext/ru/rsync.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:08+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//rsync.xml(guide:link):5 -msgid "/doc/en/rsync.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//rsync.xml(guide:lang):5 msgid "en" msgstr "ru" diff --git a/doc/gettext/ru/source_mirrors.xml.po b/doc/gettext/ru/source_mirrors.xml.po index 4402378..8e8ef6c 100644 --- a/doc/gettext/ru/source_mirrors.xml.po +++ b/doc/gettext/ru/source_mirrors.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-05-18 19:18+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:09+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(guide:link):5 -msgid "/doc/en/source_mirrors.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):7 msgid "Gentoo Linux Source Mirrors Policy" msgstr "" diff --git a/doc/gettext/ru/sudo-guide.xml.po b/doc/gettext/ru/sudo-guide.xml.po index 1bbd173..00c6b9b 100644 --- a/doc/gettext/ru/sudo-guide.xml.po +++ b/doc/gettext/ru/sudo-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:09+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(guide:link):7 -msgid "/doc/en/sudo-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):8 msgid "Gentoo Sudo(ers) Guide" msgstr "" @@ -43,12 +39,12 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(version):25 -msgid "1.6" -msgstr "1.6" +msgid "2" +msgstr "" #: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(date):26 -msgid "2006-07-14" -msgstr "2006-07-14" +msgid "2011-08-13" +msgstr "" #: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):29 msgid "About Sudo" @@ -73,27 +69,25 @@ msgid "" "application. If you would set the setuid bit, any user would be able to run " "this application (or any user of a certain group, depending on the " "permissions used). You can (and probably even should) require the user to " -"provide a password when he wants to execute the application and you can even " -"fine-tune the permissions based on the user's location: logged on from the " -"system itself or through SSH from a remote site." +"provide a password when he wants to execute the application." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):55 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):53 msgid "Logging Activity" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):58 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):56 msgid "" "One additional advantage of <c>sudo</c> is that it can log any attempt " "(successful or not) to run an application. This is very useful if you want " "to track who made that one fatal mistake that took you 10 hours to fix :)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):67 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):65 msgid "Configuring Sudo" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):70 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):68 msgid "" "The <c>sudo</c> configuration is managed by the <path>/etc/sudoers</path> " "file. This file should never be edited through <c>nano /etc/sudoers</c> " @@ -101,18 +95,18 @@ msgid "" "want to alter this file, you should use <c>visudo</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):77 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):75 msgid "" "This tool makes sure that no two system administrators are editing this file " "at the same time, preserves the permissions on the file and performs some " "syntax checking to make sure you make no fatal mistakes in the file." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):86 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):84 msgid "About this Guide" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):89 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):87 msgid "" "This guide is meant as a quick introduction. The <c>sudo</c> package is a " "lot more powerful than what is described in this guide. It has special " @@ -121,58 +115,62 @@ msgid "" "in instead of the keyboard, ...), etc." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):97 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):95 msgid "" "Please read the <c>sudo</c> and <c>sudoers</c> manual pages for more " "information." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):107 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):105 msgid "Sudoers Syntax" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):109 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):107 msgid "Basic Syntax" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):112 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):110 msgid "" "The most difficult part of <c>sudo</c> is the <path>/etc/sudoers</path> " "syntax. The basic syntax is like so:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):117 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):115 msgid "Basic /etc/sudoers syntax" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):117 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):115 #, no-wrap msgid "" "\n" "user host = commands\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):121 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):119 msgid "" "This syntax tells <c>sudo</c> that the user, identified by <e>user</e> and " -"logged on through the system <e>host</e> can execute any of the commands " -"listed in <e>commands</e> as the root user. A more real-life example might " -"make this more clear: allow the user <e>swift</e> to execute <c>emerge</c> " -"if he is logged on from the system (not through SSH):" +"logged in on the system <e>host</e> can execute any of the commands listed " +"in <e>commands</e> as the root user. A more real-life example might make " +"this more clear: allow the user <e>swift</e> to execute <c>emerge</c> if he " +"is logged in on localhost:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):129 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):127 msgid "Live /etc/sudoers examples" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):129 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):127 #, no-wrap msgid "" "\n" "swift localhost = /usr/bin/emerge\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):133 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(note):131 +msgid "The hostname must match what the <c>hostname</c> command returns." +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):135 msgid "" "A <brite>big warning</brite> is in place though: do not allow a user to run " "an application that can allow people to elevate privileges. For instance, " @@ -183,25 +181,25 @@ msgid "" msgstr "" #. Wrappers are no real advantage here either, see #71750 -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):146 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):148 msgid "" "The user name can also be substituted with a group name - in this case you " "should start the group name with a <c>%</c> sign. For instance, to allow any " "one in the <c>wheel</c> group to execute <c>emerge</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):152 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):154 msgid "Allowing the wheel group members to execute emerge" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):152 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):154 #, no-wrap msgid "" "\n" "%wheel localhost = /usr/bin/emerge\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):156 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):158 msgid "" "You can extend the line to allow for several commands (instead of making a " "single entry for each command). For instance, to allow the same user to not " @@ -209,18 +207,18 @@ msgid "" "root:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):162 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):164 msgid "Multiple commands" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):162 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):164 #, no-wrap msgid "" "\n" "swift localhost = /usr/bin/emerge, /usr/bin/ebuild, /usr/sbin/emerge-webrsync\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):166 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):168 msgid "" "You can also specify a precise command and not only the tool itself. This is " "useful to restrict the use of a certain tool to a specified set of command " @@ -229,15 +227,15 @@ msgid "" "sudoers file. Note that these are <e>not</e> regular expressions." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):174 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):176 msgid "Let us put this to the test:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):178 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):180 msgid "Attempt to update the system using sudo" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):178 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):180 #, no-wrap msgid "" "\n" @@ -253,14 +251,14 @@ msgid "" "Password: <comment>(Enter the user password, not root!)</comment>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):191 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):193 msgid "" "The password that <c>sudo</c> requires is the user's own password. This is " "to make sure that no terminal that you accidentally left open to others is " "abused for malicious purposes." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):197 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):199 msgid "" "You should know that <c>sudo</c> does not alter the <c>${PATH}</c> variable: " "any command you place after <c>sudo</c> is treated from <e>your</e> " @@ -268,22 +266,22 @@ msgid "" "path> he should provide the full path to <c>sudo</c>, like so:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):204 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):206 msgid "Using the full path to a tool" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):204 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):206 #, no-wrap msgid "" "\n" "$ <i>sudo /usr/sbin/emerge-webrsync</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):211 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):213 msgid "Using Aliases" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):214 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):216 msgid "" "In larger environments having to enter all users over and over again (or " "hosts, or commands) can be a daunting task. To ease the administration of " @@ -291,11 +289,11 @@ msgid "" "declare aliases is quite simple:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):221 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):223 msgid "Declaring aliases in /etc/sudoers" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):221 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):223 #, no-wrap msgid "" "\n" @@ -304,7 +302,7 @@ msgid "" "Cmnd_Alias cmndalias = command1, command2, ...\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):227 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):229 msgid "" "One alias that always works, for any position, is the <c>ALL</c> alias (to " "make a good distinction between aliases and non-aliases it is recommended to " @@ -312,41 +310,41 @@ msgid "" "<c>ALL</c> alias is an alias to all possible settings." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):234 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):236 msgid "" "A sample use of the <c>ALL</c> alias to allow <e>any</e> user to execute the " "<c>shutdown</c> command if he is logged on locally is:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):239 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):241 msgid "Allowing any user to execute shutdown" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):239 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):241 #, no-wrap msgid "" "\n" "ALL localhost = /sbin/shutdown\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):243 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):245 msgid "" "Another example is to allow the user <c>swift</c> to execute the <c>emerge</" "c> command as root, regardless of where he is logged in from:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):248 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):250 msgid "Allowing a user to run an application regardless of his location" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):248 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):250 #, no-wrap msgid "" "\n" "swift ALL = /usr/bin/emerge\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):252 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):254 msgid "" "More interesting is to define a set of users who can run software " "administrative applications (such as <c>emerge</c> and <c>ebuild</c>) on the " @@ -354,11 +352,11 @@ msgid "" "user, except root!" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):258 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):260 msgid "Using aliases for users and commands" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):258 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):260 #, no-wrap msgid "" "\n" @@ -371,11 +369,11 @@ msgid "" "<i>PASSWORDMAINTAINERS</i> localhost = <i>PASSWORDCOMMANDS</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):271 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):273 msgid "Non-Root Execution" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):274 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):276 msgid "" "It is also possible to have a user run an application as a different, non-" "root user. This can be very interesting if you run applications as a " @@ -384,34 +382,34 @@ msgid "" "killing zombie processes)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):281 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):283 msgid "" "Inside <path>/etc/sudoers</path> you list the user(s) in between <c>(</" "c> and <c>)</c> before the command listing:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):286 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):288 msgid "Non-root execution syntax" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):286 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):288 #, no-wrap msgid "" "\n" "users hosts = (run-as) commands\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):290 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):292 msgid "" "For instance, to allow <c>swift</c> to run the <c>kill</c> tool as the " "<c>apache</c> or <c>gorg</c> user:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):295 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):297 msgid "Non-root execution example" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):295 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):297 #, no-wrap msgid "" "\n" @@ -420,35 +418,35 @@ msgid "" "swift ALL = (apache, gorg) KILL\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):301 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):303 msgid "" "With this set, the user can run <c>sudo -u</c> to select the user he " "wants to run the application as:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):306 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):308 msgid "Running pkill as the apache user" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):306 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):308 #, no-wrap msgid "" "\n" "$ <i>sudo -u apache pkill apache</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):310 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):312 msgid "" "You can set an alias for the user to run an application as using the " "<c>Runas_Alias</c> directive. Its use is identical to the other <c>_Alias</" "c> directives we have seen before." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):319 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):321 msgid "Passwords and Default Settings" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):322 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):324 msgid "" "By default, <c>sudo</c> asks the user to identify himself using his own " "password. Once a password is entered, <c>sudo</c> remembers it for 5 " @@ -456,35 +454,35 @@ msgid "" "entering his password." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):329 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):331 msgid "" "Of course, this behavior can be changed: you can set the <c>Defaults:</c> " "directive in <path>/etc/sudoers</path> to change the default behavior for a " "user." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):335 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):337 msgid "For instance, to change the default 5 minutes to 0 (never remember):" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):339 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):341 msgid "Changing the timeout value" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):339 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):341 #, no-wrap msgid "" "\n" "Defaults:swift timestamp_timeout=0\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):343 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):345 msgid "" "A setting of <c>-1</c> would remember the password indefinitely (until the " "system reboots)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):348 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):350 msgid "" "A different setting would be to require the password of the user that the " "command should be run as and not the users' personal password. This is " @@ -493,76 +491,76 @@ msgid "" "<c>sudo</c> fails) to <c>2</c> instead of the default 3:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):356 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):358 msgid "Requiring the root password instead of the user's password" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):356 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):358 #, no-wrap msgid "" "\n" "Defaults:john runaspw, passwd_tries=2\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):360 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):362 msgid "" "Another interesting feature is to keep the <c>DISPLAY</c> variable set so " "that you can execute graphical tools:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):365 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):367 msgid "Keeping the DISPLAY variable alive" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):365 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):367 #, no-wrap msgid "" "\n" "Defaults:john env_keep=DISPLAY\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):369 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):371 msgid "" "You can change dozens of default settings using the <c>Defaults:</c> " "directive. Fire up the <c>sudo</c> manual page and search for <c>Defaults</" "c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):374 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):376 msgid "" "If you however want to allow a user to run a certain set of commands without " "providing any password whatsoever, you need to start the commands with " "<c>NOPASSWD:</c>, like so:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):380 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):382 msgid "Allowing emerge to be ran as root without asking for a password" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):380 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):382 #, no-wrap msgid "" "\n" "swift localhost = NOPASSWD: /usr/bin/emerge\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):389 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):391 msgid "Using Sudo" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):391 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):393 msgid "Listing Privileges" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):394 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):396 msgid "To inform yourself what your capabilities are, run <c>sudo -l</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):398 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):400 msgid "Listing capabilities" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):398 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):400 #, no-wrap msgid "" "\n" @@ -576,7 +574,7 @@ msgid "" " (apache) /bin/kill\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):409 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):411 msgid "" "If you have any command in <path>/etc/sudoers</path> that does not require " "you to enter a password, it will not require a password to list the entries " @@ -584,11 +582,11 @@ msgid "" "remembered." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):418 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(title):420 msgid "Prolonging the Password Timeout" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):421 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):423 msgid "" "By default, if a user has entered his password to authenticate himself to " "<c>sudo</c>, it is remembered for 5 minutes. If the user wants to prolong " @@ -597,18 +595,18 @@ msgid "" "again." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):428 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre:caption):430 msgid "Prolonging the password timeout" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):428 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(pre):430 #, no-wrap msgid "" "\n" "$ <i>sudo -v</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):432 +#: ../../gentoo/xml/htdocs/doc/en//sudo-guide.xml(p):434 msgid "The inverse is to kill the time stamp using <c>sudo -k</c>." msgstr "" diff --git a/doc/gettext/ru/uml.xml.po b/doc/gettext/ru/uml.xml.po index f443e97..93d9209 100644 --- a/doc/gettext/ru/uml.xml.po +++ b/doc/gettext/ru/uml.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:09+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//uml.xml(guide:link):6 -msgid "/doc/en/uml.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//uml.xml(title):7 msgid "Gentoo Linux Developer's guide to system testing with User-Mode Linux" msgstr "" diff --git a/doc/gettext/ru/usb-guide.xml.po b/doc/gettext/ru/usb-guide.xml.po index 90654ba..adb8462 100644 --- a/doc/gettext/ru/usb-guide.xml.po +++ b/doc/gettext/ru/usb-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:09+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//usb-guide.xml(guide:link):5 -msgid "/doc/en/usb-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//usb-guide.xml(title):6 msgid "Gentoo Linux USB Guide" msgstr "" diff --git a/doc/gettext/ru/vdr-guide.xml.po b/doc/gettext/ru/vdr-guide.xml.po index 9ac9b1b..18df5b0 100644 --- a/doc/gettext/ru/vdr-guide.xml.po +++ b/doc/gettext/ru/vdr-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:10+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//vdr-guide.xml(guide:link):5 -msgid "/doc/en/vdr-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//vdr-guide.xml(title):6 msgid "Gentoo Linux VDR Guide" msgstr "" diff --git a/doc/gettext/ru/vi-guide.xml.po b/doc/gettext/ru/vi-guide.xml.po index 4a4021e..a69e7d0 100644 --- a/doc/gettext/ru/vi-guide.xml.po +++ b/doc/gettext/ru/vi-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:10+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(guide:link):5 -msgid "/doc/en/vi-guide.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(title):6 msgid "Learning vi -- the \"cheatsheet\" technique" msgstr "" @@ -63,12 +59,12 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(version):23 -msgid "1.1.7" -msgstr "1.1.7" +msgid "2" +msgstr "" #: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(date):24 -msgid "2005-07-21" -msgstr "2005-07-21" +msgid "2011-08-15" +msgstr "" #: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(title):27 msgid "Getting Started" @@ -770,59 +766,84 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(p):717 -msgid "" -"If you want to use vi as your default editor make the following change to " -"<path>/etc/rc.conf</path>:" +msgid "If you want to use vi as your default editor, use <c>eselect</c>:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(pre:caption):722 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(pre:caption):721 msgid "Setting vi as the default editor" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(pre):722 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(pre):721 +#, no-wrap +msgid "" +"\n" +"~# <i>eselect editor list</i>\n" +"Available targets for the EDITOR variable:\n" +" [1] /bin/nano\n" +" [2] /bin/ed\n" +" [3] /usr/bin/ex\n" +" [4] /usr/bin/vi\n" +" [ ] (free form)\n" +"\n" +"~# <i>eselect editor set 4</i>\n" +"Setting EDITOR to /usr/bin/vi ...\n" +">>> Regenerating /etc/ld.so.cache...\n" +"Run \". /etc/profile\" to update the variable in your shell.\n" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(p):736 +msgid "" +"If you want to set this for your user only instead of system wide, set the " +"<c>EDITOR</c> variable in your <path>~/.bashrc</path>:" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(pre:caption):741 +msgid "Setting vi as the users' editor" +msgstr "" + +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(pre):741 #, no-wrap msgid "" "\n" -"<comment>(Set EDITOR to your preferred editor.)</comment>\n" -"#EDITOR=\"/bin/nano\"\n" -"EDITOR=\"/usr/bin/vim\"\n" -"#EDITOR=\"/usr/bin/emacs\"\n" +"~$ <i>vi ~/.bashrc</i>\n" +"<comment>(...)</comment>\n" +"export EDITOR=\"/usr/bin/vi\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(title):732 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(title):750 msgid "Resources" msgstr "Ссылки" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(p):735 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(p):753 msgid "" "Here are some resources you may find helpful as you continue to learn more " "about vi:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(li):741 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(li):759 msgid "" "<uri link=\"http://www.thomer.com/thomer/vi/vi.html\">The vi Lovers Home " "Page</uri>, an excellent resource for all things vi" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(li):745 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(li):763 msgid "" "<uri link=\"http://www.vim.org/\">The vim homepage</uri> is the place to go " "for all your vim needs" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(li):749 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(li):767 msgid "" "If you're looking for a good, old-fashioned book, <uri link=\"http://www." "oreilly.com/catalog/vi6/\">Learning the vi Editor, 6th Edition</uri> would " "be an excellent choice. Contains good coverage of vi and vi clones." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(title):760 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(title):778 msgid "About this document" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(p):763 +#: ../../gentoo/xml/htdocs/doc/en//vi-guide.xml(p):781 msgid "" "The original version of this article was first published on IBM " "developerWorks, and is property of Westtech Information Services. This " diff --git a/doc/gettext/ru/vserver-howto.xml.po b/doc/gettext/ru/vserver-howto.xml.po index 8566e4a..de6a63f 100644 --- a/doc/gettext/ru/vserver-howto.xml.po +++ b/doc/gettext/ru/vserver-howto.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:10+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -14,10 +14,6 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//vserver-howto.xml(guide:link):5 -msgid "/doc/en/vserver-howto.xml" -msgstr "" - #: ../../gentoo/xml/htdocs/doc/en//vserver-howto.xml(guide:redirect):5 msgid "/proj/en/vps/vserver-howto.xml" msgstr "" diff --git a/doc/gettext/ru/xen-guide.xml.po b/doc/gettext/ru/xen-guide.xml.po index cc16dde..cf31dac 100644 --- a/doc/gettext/ru/xen-guide.xml.po +++ b/doc/gettext/ru/xen-guide.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-08-02 23:45+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 01:10+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" @@ -43,48 +43,47 @@ msgid "This guide describes how to start using Xen on your Gentoo system" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(version):23 -msgid "5" +msgid "6" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(date):24 -msgid "2011-06-07" +msgid "2011-08-29" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):27 -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):58 -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):384 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):57 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):383 msgid "Introduction" msgstr "Введение" #: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):31 msgid "" -"The <uri link=\"http://www.xensource.com/\">Xen</uri> technology allows you " -"to run multiple operating systems on a single physical system, govern " -"resource consumption and even migrate domains (which are the virtual " -"environments in which a guest operating system runs) from one Xen-powered " -"system to another. Xen requires the host operating system to support Xen " -"(which, in this case, will be a Linux kernel) but guest operating systems " -"can run unmodified <e>if</e> your hardware supports Intel Virtualization " -"Technology (VT-x) or AMD Virtualization Technology (SVM). Otherwise your " -"guest operating systems must also support Xen." +"The <uri link=\"http://www.xen.org/\">Xen</uri> technology allows you to run " +"multiple operating systems on a single physical system, govern resource " +"consumption and even migrate domains (which are the virtual environments in " +"which a guest operating system runs) from one Xen-powered system to another. " +"Xen requires the host operating system to support Xen (which, in this case, " +"will be a Linux kernel) but guest operating systems can run unmodified " +"<e>if</e> your hardware supports Intel Virtualization Technology (VT-x) or " +"AMD Virtualization Technology (SVM). Otherwise your guest operating systems " +"must also support Xen." msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):42 msgid "" "This guide will talk you through the configuration steps necessary to get " "Xen up and running on Gentoo Linux. We will not discuss Xen itself (the Xen " -"project has <uri link=\"http://www.cl.cam.ac.uk/research/srg/netos/xen/" -"readmes/user\">decent documentation</uri> available) nor will we talk about " -"specialized setups that might be very interesting for Xen setups but are not " -"Xen-related (like exporting Portage through NFS, booting Linux using PXE, " -"etc.)" +"project has <uri link=\"http://xen.org/support/documentation.html\">decent " +"documentation</uri> available) nor will we talk about specialized setups " +"that might be very interesting for Xen setups but are not Xen-related (like " +"exporting Portage through NFS, booting Linux using PXE, etc.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):56 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):55 msgid "Preparing Domain0" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):61 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):60 msgid "" "<e>Domain0</e> is the primary domain under Xen, hosting the host operating " "system which governs all other domains. In this chapter we will prepare an " @@ -93,11 +92,11 @@ msgid "" "other Xen domains." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):72 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):71 msgid "Rebuilding the Gentoo Installation?" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):75 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):74 msgid "" "A dramatic change that might be necessary is to rebuild the entire Gentoo " "installation with a different <c>CFLAGS</c> setting. Guest operating systems " @@ -108,18 +107,18 @@ msgid "" "will still be able to use Xen." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(impo):85 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(impo):84 msgid "" "It is advised that, if you change your <c>CFLAGS</c> and build your system " "with a gcc lower than version 4, you do not have <c>-Os</c> set as it has " "been reported to produce broken code." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):91 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):90 msgid "Editing the CFLAGS and rebuild the Gentoo installation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):91 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):90 #, no-wrap msgid "" "\n" @@ -131,38 +130,38 @@ msgid "" "~# <i>emerge -e world</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):100 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):99 msgid "" "If you boot your system using an initial ramdisk (initrd) you need to " "rebuild the initrd as well (which is best done by running all steps you " "would do when you rebuild your kernel)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):109 -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):117 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):108 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):116 msgid "Installing Xen" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):112 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):111 msgid "" "Xen actually contains many components, so you'll need to install a few " "packages." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):117 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):116 #, no-wrap msgid "" "\n" "~# <i>emerge xen xen-tools xen-sources</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):124 -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):206 -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):259 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):123 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):205 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):258 msgid "Building the Kernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):127 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):126 msgid "" "Next we'll build the Linux kernel with Xen support. This kernel, whose " "sources are available at <path>/usr/src/linux-2.6.x.z-xen</path>, will be " @@ -174,7 +173,7 @@ msgid "" "communicate directly with the hardware." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):138 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):137 msgid "" "Of course, don't forget to select <c>Xen-compatible</c> at <c>Processor type " "and features</c>. If you're wondering about networking: each interface in a " @@ -184,11 +183,11 @@ msgid "" "NAT, etc.)" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):147 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):146 msgid "Enabling Xen Support for i386 Kernels" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):147 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):146 #, no-wrap msgid "" "\n" @@ -196,11 +195,11 @@ msgid "" " Subarchitecture Type (Xen-compatible)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):152 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):151 msgid "Enabling Xen Support for x86_64 Kernels" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):152 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):151 #, no-wrap msgid "" "\n" @@ -210,11 +209,11 @@ msgid "" " [*] Support for hot-pluggable CPUs\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):159 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):158 msgid "Domain-0 Kernel Config" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):159 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):158 #, no-wrap msgid "" "\n" @@ -239,11 +238,11 @@ msgid "" " Xen version compatibility (3.0.4 and later)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):181 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):180 msgid "Domain-U Kernel Config" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):181 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):180 #, no-wrap msgid "" "\n" @@ -265,14 +264,14 @@ msgid "" " Xen version compatibility (3.0.4 and later)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):200 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):199 msgid "" "A nice hint is to have the kernel make process store its intermediate object " "files elsewhere so that you can reuse the same kernel tree to build " "different configurations:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):206 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):205 #, no-wrap msgid "" "\n" @@ -282,7 +281,7 @@ msgid "" "~# <i>make O=~/build/dom0 && make O=~/build/dom0 modules_install</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):213 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):212 msgid "" "Once the kernel is built you'll find the kernel image immediately in the " "build directory (not inside <path>arch/</path> or any other directory) " @@ -293,11 +292,11 @@ msgid "" "should boot. For instance, for GRUB:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):223 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):222 msgid "GRUB Configuration for Xen" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):223 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):222 #, no-wrap msgid "" "\n" @@ -307,24 +306,24 @@ msgid "" "module /boot/kernel-2.6.x.y-xen0 root=/dev/hda3\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):230 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):229 msgid "" "Now reboot your system into Xen. Once you are booted, you need to load the " "Xen daemon:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):235 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):234 msgid "Loading the Xen daemon" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):235 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):234 #, no-wrap msgid "" "\n" "~# <i>/etc/init.d/xend start</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):239 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):238 msgid "" "Now check if you can do whatever you normally do on your system. If this is " "the case, you can edit your bootloader configuration to always boot into Xen " @@ -332,7 +331,7 @@ msgid "" "automatically next time you boot." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(note):246 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(note):245 msgid "" "If you wish to start guest domains automatically on boot add <c>xendomains</" "c> to the default runlevel as well and create a symlink in <path>/etc/xen/" @@ -340,11 +339,11 @@ msgid "" "start." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):257 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):256 msgid "Creating an Unpriviledged Domain" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):262 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):261 msgid "" "Go to the Xen-powered Linux kernel source and update the configuration. It " "is wise to keep as many topics as possible similar to the main kernel except " @@ -354,11 +353,11 @@ msgid "" "this is <path>/mnt/data/xen/kernel</path>):" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):271 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):270 msgid "Building the guest kernel" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):271 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):270 #, no-wrap msgid "" "\n" @@ -366,18 +365,18 @@ msgid "" "~# <i>cp ~/build/domU/vmlinuz /mnt/data/xen/kernel/kernel-2.6.x.y-xen</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):276 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):275 msgid "" "It is also possible to create a single kernel image for both the " "administrative domain and the unpriviledged domain. More information about " "this can be found in the Xen user manual." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):285 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):284 msgid "Creating the Domain Disks" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):288 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):287 msgid "" "For best performance, it is best to dedicate a partition (or logical volume) " "to a domain rather than a file based filesystem. However, if you are going " @@ -385,18 +384,18 @@ msgid "" "advantages (especially regarding maintenance)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):295 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):294 msgid "" "You can create a file based filesystem using <c>dd</c> and <c>mke2fs</c> (or " "any other file system creation tool). For instance, to create a 2Gbyte ext3 " "filesystem:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):301 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):300 msgid "Creating a file based filesystem" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):301 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):300 #, no-wrap msgid "" "\n" @@ -404,11 +403,11 @@ msgid "" "~# <i>mke2fs -j /mnt/data/xen/disks/ext3root.img</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):309 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):308 msgid "Configuring a Domain" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):312 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):311 msgid "" "Next we create a Xen configuration file for a domain. You can store these " "configuration files where you want, for instance at <path>/mnt/data/xen/" @@ -416,11 +415,11 @@ msgid "" "Gentoo environment which uses the disk image we created previously:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):320 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):319 msgid "Creating a domain configuration file" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):320 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):319 #, no-wrap msgid "" "\n" @@ -434,17 +433,17 @@ msgid "" "root = \"/dev/sda1 ro\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):331 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):330 msgid "" "If you are using a block device (such as an lvm volume or partition) for the " "disk use 'phy:' instead of 'file:' and leave off /dev. For example:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):336 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):335 msgid "Using a block device" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):336 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):335 #, no-wrap msgid "" "\n" @@ -455,33 +454,33 @@ msgid "" "disk = [ 'phy:sdb6,sda1,w' ]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):344 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):343 msgid "You can find example configuration files in <path>/etc/xen</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):351 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):350 msgid "Launching the New Domain" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):354 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):353 msgid "" "Now we're all set and we can launch the new domain. If the disk image " "contained an operating system, we could just create and attach the domain " "using the <c>xm</c> command (Xen manager):" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):360 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):359 msgid "Creating and starting a new domain" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):360 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):359 #, no-wrap msgid "" "\n" "~# <i>xm create /mnt/data/xen/configs/gentoo -c</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):364 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):363 msgid "" "The domain would be booted inside the terminal in which you executed the " "command. However, in our case, the disk image is empty so the domain won't " @@ -489,7 +488,7 @@ msgid "" "install Gentoo as you're used to." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):371 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):370 msgid "" "If you want to disconnect from the domain, press <path>Ctrl+]</path>. You " "can always reconnect to the domains' console using <c>xm console gentoo</c>. " @@ -497,17 +496,17 @@ msgid "" "access the domain otherwise (for instance, through SSH)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):382 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):381 msgid "Networking on Unpriviledged Domains" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):387 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):386 msgid "" "Xen supports at least two ways of configuring your (virtual) network: " "<e>routed</e> and <e>bridged</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):392 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):391 msgid "" "When selecting the <e>routed</e> approach, the interface inside your " "unpriviledged domain is connected to the virtual interface on your " @@ -519,7 +518,7 @@ msgid "" "specific routing rules." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):403 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):402 msgid "" "When selecting the <e>bridged</e> approach, your default network interface " "on the administrative domain becomes a bridge which accepts connections to " @@ -527,11 +526,11 @@ msgid "" "has." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):412 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):411 msgid "Regular Routed Interfaces" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):415 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):414 msgid "" "Before you set up the interface on your unpriviledged domain, make sure that " "Xen's <path>netloop</path> and <path>netbk</path> drivers are loaded. A " @@ -541,12 +540,12 @@ msgid "" "c> instruction to it." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):424 -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):480 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):423 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):479 msgid "Configuring a virtual interface" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):424 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):423 #, no-wrap msgid "" "\n" @@ -556,7 +555,7 @@ msgid "" "vif = [ 'ip=192.168.1.101, vifname=veth1' ]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):431 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):430 msgid "" "In the above example, the interface will be created for the unpriviledged " "domain (in which it will be called <path>eth0</path>) and Xen will ensure " @@ -564,7 +563,7 @@ msgid "" "through interface <path>veth1</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):438 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):437 msgid "" "This doesn't mean that the virtual <path>eth0</path> interface will " "automatically have IP 192.168.1.101 assigned to it, but rather that, if you " @@ -572,18 +571,18 @@ msgid "" "domain and thus cannot be reached." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):445 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):444 msgid "" "Now edit <path>/etc/xen/xend-config.sxp</path> as follows to select routed " "network configuration:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):450 -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):492 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):449 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):491 msgid "Editing xend-config.sxp" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):450 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):449 #, no-wrap msgid "" "\n" @@ -598,11 +597,11 @@ msgid "" "(vif-script vif-route)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):465 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):464 msgid "Bridged Interfaces" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):468 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):467 msgid "" "Unlike the routed interfaces you now need to load the <path>netloop</path> " "driver with <c>nloopbacks=1</c> (or higher) as the additional loopback " @@ -611,11 +610,11 @@ msgid "" "(<path>bridge</path> module if build as such)." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):476 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):475 msgid "Now edit your virtual domain and add the <c>vif</c> construct:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):480 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):479 #, no-wrap msgid "" "\n" @@ -625,13 +624,13 @@ msgid "" "vif = [ 'ip=192.168.1.101, vifname=veth0' ]\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):487 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):486 msgid "" "Next edit <path>/etc/xen/xend-config.sxp</path> as follows to select bridged " "network configuration:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):492 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):491 #, no-wrap msgid "" "\n" @@ -646,7 +645,7 @@ msgid "" "<i>#</i> (vif-script vif-route)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):504 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):503 msgid "" "By default, the bridge will contain whatever interface is configured to be " "the default interface (the device that is listed under the default route " @@ -654,11 +653,11 @@ msgid "" "<path>xend-config.sxp</path> as follows:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):511 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):510 msgid "Editing xend-config.sxp to change bridge configuration" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):511 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):510 #, no-wrap msgid "" "\n" @@ -668,63 +667,55 @@ msgid "" "(network-script <i>'</i>network-bridge <i>netdev=eth0 bridge=xenbr0 vifnum=0'</i>)\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):518 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):517 msgid "" "Once the configuration is done, restart the <c>xend</c> init script to have " "Xen build the bridge:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):523 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):522 msgid "Restarting the xend daemon" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):523 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):522 #, no-wrap msgid "" "\n" "~# <i>/etc/init.d/xend restart</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):531 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):530 msgid "Further Resources" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):533 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):532 msgid "Xen Documentation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):538 -msgid "http://bits.xensource.com/Xen/docs/user.pdf" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):538 -msgid "Xen Users' Manual (PDF)" -msgstr "" - -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):542 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):537 msgid "http://www.xen.org/support/documentation.html" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):542 -msgid "Xen Community Documentation" +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):537 +msgid "Official Xen documentation" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):546 -msgid "http://wiki.xensource.com/xenwiki/" +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):541 +msgid "http://wiki.xen.org/" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):546 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):541 msgid "Xen Wiki" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):553 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):548 msgid "Xen Tools" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(li):557 +#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(li):552 msgid "" -"<uri link=\"http://virt-manager.et.redhat.com/\">app-emulation/virt-manager</" -"uri> is a graphical tool for administering virtual machines" +"<uri link=\"http://virt-manager.org/\">app-emulation/virt-manager</uri> is a " +"graphical tool for administering virtual machines" msgstr "" #. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL diff --git a/doc/gettext/ru/xorg-config.xml.po b/doc/gettext/ru/xorg-config.xml.po index 3a080d7..3d41e99 100644 --- a/doc/gettext/ru/xorg-config.xml.po +++ b/doc/gettext/ru/xorg-config.xml.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-03-23 21:19+0500\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2009-10-18 05:15+0600\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -39,11 +39,11 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(version):25 -msgid "7" +msgid "10" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(date):26 -msgid "2011-03-23" +msgid "2011-09-02" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):29 @@ -110,7 +110,7 @@ msgid "" msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):89 -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):323 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):326 msgid "Installing Xorg" msgstr "" @@ -240,15 +240,16 @@ msgstr "" #: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):187 msgid "" "For newer AMD/ATI cards (<uri link=\"/doc/en/ati-faq.xml\">RadeonHD 2000 and " -"up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have " -"installed <c>radeon-ucode</c>, configure your kernel as shown:" +"up</uri>), you will need to emerge <c>radeon-ucode</c> or <c>linux-firmware</" +"c>. Once you have installed one of these packages, configure your kernel as " +"shown:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):193 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):194 msgid "AMD/ATI settings" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):193 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):194 #, no-wrap msgid "" "\n" @@ -264,14 +265,16 @@ msgid "" " radeon/JUNIPER_me.bin radeon/JUNIPER_pfp.bin radeon/JUNIPER_rlc.bin\n" " radeon/REDWOOD_me.bin radeon/REDWOOD_pfp.bin \n" " radeon/REDWOOD_rlc.bin) External firmware blobs\n" -" <comment># Radeon HD 6200/6300 aka. Ontario/Zacate:</comment>\n" -" (radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO_rlc.bin) External\n" -" firmware blobs\n" +" <comment># Radeon HD 6000 series Fusion APUs:</comment>\n" +" (radeon/PALM_me.bin radeon/PALM_pfp.bin radeon/SUMO2_me.bin\n" +" radeon/SUMO2_pfp.bin radeon/SUMO_me.bin radeon/SUMO_pfp.bin\n" +" radeon/SUMO_rlc.bin) External firmware blobs\n" " <comment># Radeon HD 6400-6900 aka. Northern Islands:</comment>\n" " (radeon/BARTS_mc.bin radeon/BARTS_me.bin radeon/BARTS_pfp.bin\n" " radeon/BTC_rlc.bin radeon/CAICOS_mc.bin radeon/CAICOS_me.bin\n" -" radeon/CAICOS_pfp.bin radeon/TURKS_mc.bin radeon/TURKS_me.bin\n" -" radeon/TURKS_pfp.bin) External firmware blobs\n" +" radeon/CAICOS_pfp.bin radeon/CAYMAN_mc.bin radeon/CAYMAN_me.bin\n" +" radeon/CAYMAN_pfp.bin radeon/CAYMAN_rlc.bin radeon/TURKS_mc.bin\n" +" radeon/TURKS_me.bin radeon/TURKS_pfp.bin) External firmware blobs\n" " (/lib/firmware/) Firmware blobs root directory\n" "\n" "<comment>(Enable Radeon KMS support)</comment>\n" @@ -282,31 +285,31 @@ msgid "" " [*] Enable modesetting on radeon by default\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):224 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):227 msgid "" "Old Radeon cards (X1900 series and older) don't need the <c>radeon-ucode</c> " "package or any firmware configuration. Just enable the Direct Rendering " "Manager and ATI Radeon modesetting." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):230 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):233 msgid "" "Now that you're done setting up KMS, continue with preparing <path>/etc/make." "conf</path> in the next section." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):238 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):241 msgid "make.conf configuration" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):241 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):244 msgid "" "Now that your kernel is prepared, you have to configure two important " "variables in the <path>/etc/make.conf</path> file before you can install " "Xorg." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):246 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):249 msgid "" "The first variable is <c>VIDEO_CARDS</c>. This is used to set the video " "drivers that you intend to use and is usually based on the kind of video " @@ -315,7 +318,7 @@ msgid "" "open-source drivers." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):254 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):257 msgid "" "You may also try the proprietary drivers from nVidia and AMD/ATI, <c>nvidia</" "c> and <c>fglrx</c> respectively. However, setting up the proprietary " @@ -325,19 +328,19 @@ msgid "" "you should choose, refer to these guides for more information." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):263 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):266 msgid "" "The <c>intel</c> driver may be used for desktops or laptops with common " "Intel integrated graphics chipsets." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):268 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):271 msgid "" "<c>VIDEO_CARDS</c> may contain more than one driver, each separated with a " "space." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):273 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):276 msgid "" "The second variable is <c>INPUT_DEVICES</c> and is used to determine which " "drivers are to be built for input devices. In most cases setting it to " @@ -346,17 +349,17 @@ msgid "" "<c>INPUT_DEVICES</c>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):281 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):284 msgid "" "Now you should decide which drivers you will use and add necessary settings " "to the <path>/etc/make.conf</path> file:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):286 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):289 msgid "Sample make.conf entries" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):286 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):289 #, no-wrap msgid "" "\n" @@ -368,7 +371,7 @@ msgid "" "VIDEO_CARDS=\"radeon\"\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):295 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):298 msgid "" "If the suggested settings don't work for you, you should run <c>emerge -pv " "xorg-drivers</c>, check all the options available and choose those which " @@ -376,11 +379,11 @@ msgid "" "Synaptics touchpad, and a Radeon video card." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):302 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):305 msgid "Displaying all the driver options available" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):302 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):305 #, no-wrap msgid "" "\n" @@ -400,12 +403,12 @@ msgid "" "0 kB\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):319 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):322 msgid "" "After setting all the necessary variables you can install the Xorg package." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):323 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):326 #, no-wrap msgid "" "\n" @@ -415,7 +418,7 @@ msgid "" "# <i>emerge xorg-server</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):330 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):333 msgid "" "You could install the <c>xorg-x11</c> metapackage instead of the more " "lightweight <c>xorg-server</c>. Functionally, <c>xorg-x11</c> and <c>xorg-" @@ -424,17 +427,17 @@ msgid "" "many different languages. They're not necessary for a working desktop." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):338 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):341 msgid "" "When the installation is finished, you will need to re-initialise some " "environment variables before you continue:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):343 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):346 msgid "Re-initialising the environment variables" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):343 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):346 #, no-wrap msgid "" "\n" @@ -442,18 +445,18 @@ msgid "" "# <i>source /etc/profile</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):353 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):356 msgid "Configuring Xorg" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):357 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):360 msgid "" "The X server is designed to work out-of-the-box, with no need to manually " "edit Xorg's configuration files. It should detect and configure devices such " "as displays, keyboards, and mice." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):363 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):366 msgid "" "You should first try <uri link=\"#using_startx\">starting X</uri> without " "editing any configuration files. If Xorg won't start, or there's some other " @@ -461,11 +464,11 @@ msgid "" "section." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):372 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):375 msgid "The xorg.conf.d directory" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):375 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):378 msgid "" "Configuring files in <path>xorg.conf.d</path> should be seen as a \"last " "resort\" option. It really desirable to run without any special " @@ -473,7 +476,7 @@ msgid "" "then read on." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):381 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):384 msgid "" "The configuration files of Xorg are stored in <path>/etc/X11/xorg.conf.d/</" "path>. Each file is given a unique name and ends in <path>.conf</path>. If " @@ -483,7 +486,7 @@ msgid "" "may help you organize them." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):390 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):393 msgid "" "Xorg provides example configurations in <path>/usr/share/doc/xorg-server-" "${version}/xorg.conf.example.bz2</path>. You can use these to create your " @@ -494,11 +497,11 @@ msgid "" "guide." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):403 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):406 msgid "Using startx" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):406 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):409 msgid "" "Now try <c>startx</c> to start up your X server. <c>startx</c> is a script " "that executes an <e>X session</e>; that is, it starts the X server and some " @@ -506,13 +509,13 @@ msgid "" "using the following logic:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):414 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):417 msgid "" "If a file named <path>.xinitrc</path> exists in the home directory, it will " "execute the commands listed there." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):418 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):421 msgid "" "Otherwise, it will read the value of the XSESSION variable and will execute " "one of the sessions available in <path>/etc/X11/Sessions/</path> " @@ -524,25 +527,25 @@ msgid "" "Remember to run <c>env-update</c> after changing <path>90xsession</path>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):431 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):434 msgid "Starting X" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):431 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):434 #, no-wrap msgid "" "\n" "$ <i>startx</i>\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):435 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):438 msgid "" "If you haven't yet installed a window manager, all you'll see is a black " "screen. Since this can also be a sign that something's wrong, you may want " "to emerge <c>twm</c> and <c>xterm</c><e>only to test X</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):441 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):444 msgid "" "Once those two programs are installed, run <c>startx</c> again. A few " "<c>xterm</c> windows should appear, making it easier to verify that X is " @@ -551,15 +554,15 @@ msgid "" "need them once you've setup a proper desktop environment." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):454 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):457 msgid "Tweaking X settings" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):456 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):459 msgid "Setting your Resolution" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):459 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):462 msgid "" "If you feel that the screen resolution is wrong, you will need to check two " "sections in your <path>xorg.conf.d</path> configuration. First of all, you " @@ -569,7 +572,7 @@ msgid "" "information in the second section, <e>Monitor</e>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):468 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):471 msgid "" "Now let us change the resolution. In the next example from <path>/etc/X11/" "xorg.conf.d/40-monitor.conf</path> we add the <c>PreferredMode</c> line so " @@ -581,11 +584,11 @@ msgid "" "in the <c>Monitor</c> section." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):479 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):482 msgid "Changing the Monitor section" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):479 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):482 #, no-wrap msgid "" "\n" @@ -601,15 +604,15 @@ msgid "" "EndSection\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):495 msgid "Run X (<c>startx</c>) to discover it uses the resolution you want." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):499 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):502 msgid "Multiple monitors" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):502 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):505 msgid "" "You can configure more than one monitor in <path>/etc/X11/xorg.conf.d/</" "path>. All you have to do is give each monitor an identifer, then list its " @@ -618,11 +621,11 @@ msgid "" "VGA monitor as the right-hand screen:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):510 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):513 msgid "Configuring multiple monitors" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):510 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):513 #, no-wrap msgid "" "\n" @@ -642,22 +645,22 @@ msgid "" "EndSection\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):530 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):533 msgid "Configuring your keyboard" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):533 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):536 msgid "" "To setup X to use an international keyboard, you just have to create the " "appropriate config file in <path>/etc/X11/xorg.conf.d/</path>. This example " "features a Czech keyboard layout:" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):539 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):542 msgid "Using an international keyboard" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):539 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):542 #, no-wrap msgid "" "\n" @@ -675,7 +678,7 @@ msgid "" "EndSection\n" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):554 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):557 msgid "" "The \"terminate\" command (<c>terminate:ctrl_alt_bksp</c>) lets you kill the " "X session by using the Ctrl-Alt-Backspace key combination. This will, " @@ -687,11 +690,11 @@ msgid "" "you were working on." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):567 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):570 msgid "Finishing up" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):570 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):573 msgid "" "Run <c>startx</c> and be happy about the result. Congratulations, you now " "(hopefully) have a working Xorg on your system. The next step is to install " @@ -701,33 +704,33 @@ msgid "" "Desktop Documentation Resources</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):584 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):587 msgid "Resources" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):586 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):589 msgid "Creating and editing config files" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):589 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):592 msgid "" "First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet " "complete references about the syntax used by these configuration files. Be " "sure to have them open on a terminal when you edit your configuration files!" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):595 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):598 msgid "" "There are also many online resources on editing config files in <path>/etc/" "X11/</path>. We only list few of them here; be sure to <uri link=\"http://" "www.google.com\">Google</uri> for more." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):604 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):607 msgid "Other resources" msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):607 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):610 msgid "" "More information about installing and configuring various graphical desktop " "environments and applications can be found in the <uri link=\"/doc/en/?" @@ -735,14 +738,14 @@ msgid "" "documentation." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):614 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):617 msgid "" "If you're upgrading to <c>xorg-server</c> 1.9 from an earlier version, then " "be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.9-" "upgrade-guide.xml\">migration guide</uri>." msgstr "" -#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):621 +#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):624 msgid "" "X.org provides many <uri link=\"http://www.x.org/wiki/FAQ\">FAQs</uri> on " "their website, in addition to their other documentation." diff --git a/doc/gettext/ru/zsh.xml.po b/doc/gettext/ru/zsh.xml.po index 6e24f24..404096d 100644 --- a/doc/gettext/ru/zsh.xml.po +++ b/doc/gettext/ru/zsh.xml.po @@ -2,21 +2,18 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-10-21 23:56+0600\n" +"POT-Creation-Date: 2011-09-05 14:12+0600\n" "PO-Revision-Date: 2010-02-09 00:59+0500\n" "Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n" "Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\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" +"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" "X-Generator: Lokalize 1.0\n" -#: ../../gentoo/xml/htdocs/doc/en//zsh.xml(guide:link):5 -msgid "/doc/en/zsh.xml" -msgstr "/doc/ru/zsh.xml" - #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(guide:lang):5 msgid "en" msgstr "ru" @@ -68,8 +65,15 @@ msgid "Peter Weller" msgstr "Peter Weller" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(abstract):21 -msgid "This guide shows how to install and configure zsh quickly. After reading this document you will be able use many zsh features such as advanced tab-completion, command correction and prompt management." -msgstr "В данном руководстве описывается быстрая установка и настройка zsh. После прочтения данного документа вы сможете использовать различные возможности zsh, такие как расширенное дополнение по табуляции, исправление команд и настройка строки приглашения." +msgid "" +"This guide shows how to install and configure zsh quickly. After reading " +"this document you will be able use many zsh features such as advanced tab-" +"completion, command correction and prompt management." +msgstr "" +"В данном руководстве описывается быстрая установка и настройка zsh. После " +"прочтения данного документа вы сможете использовать различные возможности " +"zsh, такие как расширенное дополнение по табуляции, исправление команд и " +"настройка строки приглашения." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(version):31 msgid "2" @@ -88,8 +92,14 @@ msgid "Installing zsh" msgstr "Установка zsh" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):40 -msgid "To install <c>zsh</c> under Gentoo, we need to emerge the <c>app-shells/zsh</c> (zsh itself) and <c>app-shells/zsh-completion</c> (zsh completion scripts) packages." -msgstr "Для того, чтобы установить <c>zsh</c> в системе Gentoo, необходимо установить пакеты <c>app-shells/zsh</c> (сам zsh) и <c>app-shells/zsh-completion</c> (сценарии дополнения)." +msgid "" +"To install <c>zsh</c> under Gentoo, we need to emerge the <c>app-shells/zsh</" +"c> (zsh itself) and <c>app-shells/zsh-completion</c> (zsh completion " +"scripts) packages." +msgstr "" +"Для того, чтобы установить <c>zsh</c> в системе Gentoo, необходимо " +"установить пакеты <c>app-shells/zsh</c> (сам zsh) и <c>app-shells/zsh-" +"completion</c> (сценарии дополнения)." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):46 msgid "Emerging zsh" @@ -109,8 +119,13 @@ msgid "Entering zsh" msgstr "Вход в zsh" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):56 -msgid "When you start <c>zsh</c> for the first time, you get the following message. You can skip this menu as we will create an init file later in this guide." -msgstr "При первом запуске <c>zsh</c> вы получите следующее сообщение. Данное меню можно пропустить, поскольку в данном руководстве мы зададим настройки самостоятельно." +msgid "" +"When you start <c>zsh</c> for the first time, you get the following message. " +"You can skip this menu as we will create an init file later in this guide." +msgstr "" +"При первом запуске <c>zsh</c> вы получите следующее сообщение. Данное меню " +"можно пропустить, поскольку в данном руководстве мы зададим настройки " +"самостоятельно." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):61 msgid "Skipping the initial config" @@ -166,16 +181,30 @@ msgid "Introduction" msgstr "Введение" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):91 -msgid "To start zsh for a single session, run <c>zsh</c>. For a more permanent solution, please refer to the chapter on <uri link=\"#savingsettings\">Saving settings</uri>. After the installation, <c>zsh</c> seems to be very simple and rather limited in the area of functionality. To change this, several configuration changes need to be performed." -msgstr "Для того, чтобы запустить сессию zsh, введите команду <c>zsh</c>. Для постоянного решения, обратитесь к главе <uri link=\"#savingsettings\">Сохранение настроек</uri>. После установки <c>zsh</c> выглядит очень простой и даже ограниченной по функциональности. Чтобы изменить это, необходимо внести несколько изменений в настройки." +msgid "" +"To start zsh for a single session, run <c>zsh</c>. For a more permanent " +"solution, please refer to the chapter on <uri link=\"#savingsettings" +"\">Saving settings</uri>. After the installation, <c>zsh</c> seems to be " +"very simple and rather limited in the area of functionality. To change this, " +"several configuration changes need to be performed." +msgstr "" +"Для того, чтобы запустить сессию zsh, введите команду <c>zsh</c>. Для " +"постоянного решения, обратитесь к главе <uri link=\"#savingsettings" +"\">Сохранение настроек</uri>. После установки <c>zsh</c> выглядит очень " +"простой и даже ограниченной по функциональности. Чтобы изменить это, " +"необходимо внести несколько изменений в настройки." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(title):102 msgid "Advanced Tab-completion" msgstr "Расширенное дополнение по Tab" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):105 -msgid "To enable the famous <c>zsh</c> tab-completion system, you need to run the following commands:" -msgstr "Для включения знаменитой системы дополнений по Tab <c>zsh</c>, необходимо выполнить следующие команды:" +msgid "" +"To enable the famous <c>zsh</c> tab-completion system, you need to run the " +"following commands:" +msgstr "" +"Для включения знаменитой системы дополнений по Tab <c>zsh</c>, необходимо " +"выполнить следующие команды:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):110 msgid "Enabling completion" @@ -193,8 +222,12 @@ msgstr "" "% <i>compinit</i>\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):115 -msgid "Default completion style is quite plain and ugly. If you want to improve its appearance, enter the following commands:" -msgstr "Стиль дополнения по умолчанию достаточно прост и неудобен. Если вы хотите улучшить его поведение, введите следующие команды:" +msgid "" +"Default completion style is quite plain and ugly. If you want to improve its " +"appearance, enter the following commands:" +msgstr "" +"Стиль дополнения по умолчанию достаточно прост и неудобен. Если вы хотите " +"улучшить его поведение, введите следующие команды:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):120 msgid "Completion style improvements" @@ -216,7 +249,8 @@ msgid "Command correction" msgstr "Исправление команд" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):131 -msgid "It is also a good idea to enable the auto-correction of the commands typed:" +msgid "" +"It is also a good idea to enable the auto-correction of the commands typed:" msgstr "Также неплохо включить автокоррекцию вводимых команд:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):135 @@ -237,8 +271,13 @@ msgid "Prompts" msgstr "Строка приглашения" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):145 -msgid "The prompt may seem quite boring however, but we can fix it easily in several steps. First, we need to initialize advanced prompt support:" -msgstr "Строка может показаться скучной, но мы можем это запросто исправить в несколько приемов. Для начала нам необходимо включить поддержку улучшенной строки приглашения:" +msgid "" +"The prompt may seem quite boring however, but we can fix it easily in " +"several steps. First, we need to initialize advanced prompt support:" +msgstr "" +"Строка может показаться скучной, но мы можем это запросто исправить в " +"несколько приемов. Для начала нам необходимо включить поддержку улучшенной " +"строки приглашения:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):150 msgid "Enabling advanced prompts" @@ -256,8 +295,12 @@ msgstr "" "% <i>promptiniy</i>\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):155 -msgid "Available prompts samples may be printed via the <c>prompt -p</c> command. Now we can activate our favorite one:" -msgstr "Увидеть список возможных образцов строк приглашения можно командой <c>prompt -p</c>. Теперь мы можем выбрать наиболее понравившийся:" +msgid "" +"Available prompts samples may be printed via the <c>prompt -p</c> command. " +"Now we can activate our favorite one:" +msgstr "" +"Увидеть список возможных образцов строк приглашения можно командой <c>prompt " +"-p</c>. Теперь мы можем выбрать наиболее понравившийся:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):160 msgid "Choosing a sample prompt" @@ -275,12 +318,22 @@ msgstr "" "% <i>prompt gentoo</i>\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(note):165 -msgid "If you're playing around with the different prompts, and you don't want to see a sample of every one, you can use <c>prompt -l</c> to list the prompts available." -msgstr "Если вы рассматриваете различные строки приглашения, и не хотите видеть вывод всех образцов, используйте команду <c>prompt -l<c> — она покажет список доступных строк приглашения." +msgid "" +"If you're playing around with the different prompts, and you don't want to " +"see a sample of every one, you can use <c>prompt -l</c> to list the prompts " +"available." +msgstr "" +"Если вы рассматриваете различные строки приглашения, и не хотите видеть " +"вывод всех образцов, используйте команду <c>prompt -l<c> — она покажет " +"список доступных строк приглашения." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):171 -msgid "Another option is to create your own prompt. To do this you will need to set the PS1 environment variable." -msgstr "Другой вариант — это создание своей строки приглашения. Для этого вам необходимо настроить переменную окружения PS1." +msgid "" +"Another option is to create your own prompt. To do this you will need to set " +"the PS1 environment variable." +msgstr "" +"Другой вариант — это создание своей строки приглашения. Для этого вам " +"необходимо настроить переменную окружения PS1." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):176 msgid "A simple custom prompt" @@ -298,8 +351,14 @@ msgstr "" "[Тестовое приглашение] >\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):181 -msgid "While it is good to be able to create a custom text prompt, zsh also provides many escape sequences that allow system information to be inserted into the prompt. Some of the escape sequences available are:" -msgstr "Для создания собственной строки ввода в zsh есть большое количество управляющих символов для вставки различной информации в строку приглашения. Ниже перечислены некоторые из них:" +msgid "" +"While it is good to be able to create a custom text prompt, zsh also " +"provides many escape sequences that allow system information to be inserted " +"into the prompt. Some of the escape sequences available are:" +msgstr "" +"Для создания собственной строки ввода в zsh есть большое количество " +"управляющих символов для вставки различной информации в строку приглашения. " +"Ниже перечислены некоторые из них:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(th):189 msgid "Sequence" @@ -398,8 +457,12 @@ msgid "Your current tty" msgstr "Текущий терминал (tty)" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):238 -msgid "These escape sequences may simply be inserted into the environment variable, PS1, and zsh will parse them automatically." -msgstr "Эти управляющие последовательности можно просто включить в переменную среды PS1, и zsh обработает их автоматически." +msgid "" +"These escape sequences may simply be inserted into the environment variable, " +"PS1, and zsh will parse them automatically." +msgstr "" +"Эти управляющие последовательности можно просто включить в переменную среды " +"PS1, и zsh обработает их автоматически." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):243 msgid "A more complex prompt" @@ -421,8 +484,14 @@ msgid "History" msgstr "История" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):254 -msgid "Unfortunately, the default zsh configuration in Gentoo does not include command history support. As working with a shell without history is very frustrating, we should enter the following commands:" -msgstr "К сожалению, стандартная конфигурация в Gentoo не включает поддержку истории команд. А так как работать в командной строке без поддержки истории очень грустно, следует использовать следующие команды:" +msgid "" +"Unfortunately, the default zsh configuration in Gentoo does not include " +"command history support. As working with a shell without history is very " +"frustrating, we should enter the following commands:" +msgstr "" +"К сожалению, стандартная конфигурация в Gentoo не включает поддержку истории " +"команд. А так как работать в командной строке без поддержки истории очень " +"грустно, следует использовать следующие команды:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):260 msgid "Basic history configuration" @@ -447,31 +516,26 @@ msgstr "" #. does not work #. <p> -#. It is very comfortable to search commands in history using the up/down -#. arrow +#. It is very comfortable to search commands in history using the up/down arrow #. keys, especially after typing the few first letters of the desired command. #. </p> -#. +#. #. <p> #. To enable this feature, enter the following commands: #. </p> -#. +#. #. <pre caption="Setting context searching"> -#. % <i>bindkey `tput kcuu1` history-beginning-search-backward >/dev/null -#. 2>&1</i> -#. % <i>bindkey `tput kcud1` history-beginning-search-forward >/dev/null -#. 2>&1 </i> +#. % <i>bindkey `tput kcuu1` history-beginning-search-backward >/dev/null 2>&1</i> +#. % <i>bindkey `tput kcud1` history-beginning-search-forward >/dev/null 2>&1 </i> #. </pre> -#. +#. #. <p> #. To try the above feature, try the following commands: #. </p> -#. -#. TODO: use commands that *are* in the history, i.e. commands from above -#. samples -#. -#. <pre caption="History searching based on the first letters of the -#. commands"> +#. +#. TODO: use commands that *are* in the history, i.e. commands from above samples +#. +#. <pre caption="History searching based on the first letters of the commands"> #. <comment>(Do not press Enter after typing)</comment> #. % <i>vim /etc/</i> #. <comment>(Now press up arrow key)</comment> @@ -480,8 +544,14 @@ msgstr "" #. % <i>vim /etc/X11/xorg.conf</i> #. </pre> #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):299 -msgid "To prevent history from recording duplicated entries (such as <c>ls -l</c> entered many times during single shell session), you can set the <c>hist_ignore_all_dups</c> option:" -msgstr "Для того, чтобы в истории не сохранялись дублирующие команды (такие как <c>ls -l</c> вводимая много раз в течение одной сессии), вы можете установить параметр <c>hist_ignore_all_dups</c>:" +msgid "" +"To prevent history from recording duplicated entries (such as <c>ls -l</c> " +"entered many times during single shell session), you can set the " +"<c>hist_ignore_all_dups</c> option:" +msgstr "" +"Для того, чтобы в истории не сохранялись дублирующие команды (такие как " +"<c>ls -l</c> вводимая много раз в течение одной сессии), вы можете " +"установить параметр <c>hist_ignore_all_dups</c>:" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):305 msgid "Setting ignoring of duplicates" @@ -497,8 +567,12 @@ msgstr "" "% <i>setopt hist_ignore_all_dups</i>\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):309 -msgid "A useful trick to prevent particular entries from being recorded into a history by preceding them with at least one space." -msgstr "Еще один полезный трюк — не записывать определённые команды в историю. Для этого перед ней нужно поставить хотя бы один пробел." +msgid "" +"A useful trick to prevent particular entries from being recorded into a " +"history by preceding them with at least one space." +msgstr "" +"Еще один полезный трюк — не записывать определённые команды в историю. Для " +"этого перед ней нужно поставить хотя бы один пробел." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):314 msgid "Preventing particular entry from being recorded" @@ -524,8 +598,13 @@ msgid "Miscellaneous settings" msgstr "Различные настройки" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):327 -msgid "You can set the <c>autocd</c> option if you want to avoid tedious typing of <c>cd</c> command while changing current directory (for example <c>/etc</c> instead of <c>cd /etc</c>)." -msgstr "Для того, чтобы не вводить команду <c>cd</c> лишний раз (например <c>/etc</c>вместо <c>cd /etc</c>), можно установить параметр <c>autocd</c>." +msgid "" +"You can set the <c>autocd</c> option if you want to avoid tedious typing of " +"<c>cd</c> command while changing current directory (for example <c>/etc</c> " +"instead of <c>cd /etc</c>)." +msgstr "" +"Для того, чтобы не вводить команду <c>cd</c> лишний раз (например <c>/etc</" +"c>вместо <c>cd /etc</c>), можно установить параметр <c>autocd</c>." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):333 msgid "Setting autocd option" @@ -541,8 +620,14 @@ msgstr "" "% <i>setopt autocd</i>\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):337 -msgid "If standard bash-like globbing does not satisfy you, <c>extendedglob</c> option may be set to enable extended globbing (one similar to regular expressions)." -msgstr "Если стандартная bash-like подстановка не устраивает вас, можно воспользоваться параметром <c>extendedglob</c> для установки режима расширенной подстановки (аналогично регулярным выражениям)." +msgid "" +"If standard bash-like globbing does not satisfy you, <c>extendedglob</c> " +"option may be set to enable extended globbing (one similar to regular " +"expressions)." +msgstr "" +"Если стандартная bash-like подстановка не устраивает вас, можно " +"воспользоваться параметром <c>extendedglob</c> для установки режима " +"расширенной подстановки (аналогично регулярным выражениям)." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):343 msgid "Setting extended globbing" @@ -558,8 +643,12 @@ msgstr "" "% <i>setopt extendedglob</i>\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):347 -msgid "When option above is set, you are able to use extended globbing queries such as <c>cp ^*.(tar|bz2|gz)</c>." -msgstr "Когда вышеописанная опция установлена, вы можете использовать расширенные подстановки, такие как <c>cp ^*.(tar|bz2|qz)</c>." +msgid "" +"When option above is set, you are able to use extended globbing queries such " +"as <c>cp ^*.(tar|bz2|gz)</c>." +msgstr "" +"Когда вышеописанная опция установлена, вы можете использовать расширенные " +"подстановки, такие как <c>cp ^*.(tar|bz2|qz)</c>." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(title):357 msgid "Saving settings" @@ -570,8 +659,18 @@ msgid "Saving zsh settings" msgstr "Сохранение настроек zsh" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):362 -msgid "Once we have customized <c>zsh</c> the way we like it, it is a good idea to save these options as the <c>zsh</c> defaults for the system. One possible way to achieve this is to write our settings in the <path>/etc/zsh/zshrc</path> script. Alternatively, we could make them the defaults for our account only be editing <path>~/.zshrc</path>." -msgstr "Для того, чтобы не повторять настройку <c>zsh</c> при каждом запуске, логично установить данные параметры по умолчанию для систем. Один из способов достичь этого — записать их в сценарий <path>/etc/zsh/zshrc</path>. Другой вариант — сделать настройки по умолчанию только для текущей учётной записи, отредактировав <path>~/.zshrc</path>." +msgid "" +"Once we have customized <c>zsh</c> the way we like it, it is a good idea to " +"save these options as the <c>zsh</c> defaults for the system. One possible " +"way to achieve this is to write our settings in the <path>/etc/zsh/zshrc</" +"path> script. Alternatively, we could make them the defaults for our account " +"only be editing <path>~/.zshrc</path>." +msgstr "" +"Для того, чтобы не повторять настройку <c>zsh</c> при каждом запуске, " +"логично установить данные параметры по умолчанию для систем. Один из " +"способов достичь этого — записать их в сценарий <path>/etc/zsh/zshrc</path>. " +"Другой вариант — сделать настройки по умолчанию только для текущей учётной " +"записи, отредактировав <path>~/.zshrc</path>." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):370 msgid "An example zshrc" @@ -620,7 +719,9 @@ msgstr "Вариант для пользователей с правами root" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):396 msgid "We can change shell for given user with <c>usermod</c> command." -msgstr "Мы можем изменить оболочку для заданного пользователя с помощью команды <c>usermod</c>." +msgstr "" +"Мы можем изменить оболочку для заданного пользователя с помощью команды " +"<c>usermod</c>." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):400 msgid "Switching to zsh permanently using usermod" @@ -640,8 +741,16 @@ msgid "Alternative for non-root users" msgstr "Вариант для пользователей без прав root" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):410 -msgid "If your system administrator (despite gentle requests, that is) refuses to set the shell to zsh for you, you can set <c>bash</c> to execute <c>zsh</c> on startup, all you need to do is make a slight modification to your <path>~/.bashrc</path>." -msgstr "Если ваш системный администратор (несмотря на ваши вежливые запросы) отказывается сменить вам оболочку на zsh, вы можете при запуске установить в <c>bash</c> запуск <c>zsh</c>. Для этого необходимы легкие изменения в сценарии <path>~/.bashrc</path>." +msgid "" +"If your system administrator (despite gentle requests, that is) refuses to " +"set the shell to zsh for you, you can set <c>bash</c> to execute <c>zsh</c> " +"on startup, all you need to do is make a slight modification to your " +"<path>~/.bashrc</path>." +msgstr "" +"Если ваш системный администратор (несмотря на ваши вежливые запросы) " +"отказывается сменить вам оболочку на zsh, вы можете при запуске установить в " +"<c>bash</c> запуск <c>zsh</c>. Для этого необходимы легкие изменения в " +"сценарии <path>~/.bashrc</path>." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):417 msgid "Sample ~/.bashrc" @@ -659,8 +768,16 @@ msgstr "" "exec zsh\n" #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(p):422 -msgid "Another method of changing shells is to use the <c>chsh</c> command (a utility used to change a user's login shell). A normal user may only change the login shell for his own account. As root, you can change the login shell of any user." -msgstr "Другой метод изменения оболочки — использовать команду <c>chsh</c> (утилиту для изменения оболочки, в которую загружается пользователь). Обычный пользователь может сменить оболочку лишь для своей учетной записи. Будучи пользователем root, вы можете сменить оболочку для любого пользователя." +msgid "" +"Another method of changing shells is to use the <c>chsh</c> command (a " +"utility used to change a user's login shell). A normal user may only change " +"the login shell for his own account. As root, you can change the login shell " +"of any user." +msgstr "" +"Другой метод изменения оболочки — использовать команду <c>chsh</c> (утилиту " +"для изменения оболочки, в которую загружается пользователь). Обычный " +"пользователь может сменить оболочку лишь для своей учетной записи. Будучи " +"пользователем root, вы можете сменить оболочку для любого пользователя." #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(pre:caption):428 msgid "Switching to zsh permanently using chsh" @@ -677,8 +794,7 @@ msgstr "" "<comment>(Замените \"username\" на свою учетную запись)</comment>\n" "$ <i>chsh -s /bin/zsh username</i>\n" -#. Place here names of translator, one per line. Format should be NAME; ROLE; -#. E-MAIL +#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL #: ../../gentoo/xml/htdocs/doc/en//zsh.xml(None):0 msgid "translator-credits" msgstr "Alexander Scherbakov (neocrust@gmail.com)" |