summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzamat H. Hackimov <azamat.hackimov@gmail.com>2011-03-02 17:33:51 +0500
committerAzamat H. Hackimov <azamat.hackimov@gmail.com>2011-03-02 17:33:51 +0500
commit762645c9c94484b90618c77837442af6fba07a31 (patch)
treedf71f3aabc66bfe5d5b4a407ff02efe923271472 /doc/gettext/ru
parentl10n: Updated Russian (ru) translation to 97% (diff)
downloadgentoo-doc-translations-762645c9c94484b90618c77837442af6fba07a31.tar.gz
gentoo-doc-translations-762645c9c94484b90618c77837442af6fba07a31.tar.bz2
gentoo-doc-translations-762645c9c94484b90618c77837442af6fba07a31.zip
Sync with g.org
Diffstat (limited to 'doc/gettext/ru')
-rw-r--r--doc/gettext/ru/ati-faq.xml.po140
-rw-r--r--doc/gettext/ru/dri-howto.xml.po186
-rw-r--r--doc/gettext/ru/gentoo-amd64-faq.xml.po11
-rw-r--r--doc/gettext/ru/gentoo-freebsd.xml.po12
-rw-r--r--doc/gettext/ru/gentoo-ppc-faq.xml.po20
-rw-r--r--doc/gettext/ru/gentoo-x86-quickinstall-after-reboot.xml.po13
-rw-r--r--doc/gettext/ru/ipv6.xml.po507
-rw-r--r--doc/gettext/ru/mailfilter-guide.xml.po830
-rw-r--r--doc/gettext/ru/openrc-migration.xml.po236
-rw-r--r--doc/gettext/ru/power-management-guide.xml.po102
-rw-r--r--doc/gettext/ru/printing-howto.xml.po8
-rw-r--r--doc/gettext/ru/quick-samba-howto.xml.po415
-rw-r--r--doc/gettext/ru/virt-mail-howto.xml.po281
-rw-r--r--doc/gettext/ru/xen-guide.xml.po198
-rw-r--r--doc/gettext/ru/xfce-config.xml.po9
-rw-r--r--doc/gettext/ru/xorg-config.xml.po224
16 files changed, 1552 insertions, 1640 deletions
diff --git a/doc/gettext/ru/ati-faq.xml.po b/doc/gettext/ru/ati-faq.xml.po
index 47f9289..56d2ed0 100644
--- a/doc/gettext/ru/ati-faq.xml.po
+++ b/doc/gettext/ru/ati-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-03-02 17:28+0500\n"
"PO-Revision-Date: 2009-10-18 05:00+0600\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -63,35 +63,34 @@ msgstr "Joshua Saddler"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(abstract):21
msgid ""
"This FAQ should help users avoid some common installation and configuration "
-"issues related to DRI and X11 for ATI boards."
+"issues related to DRI and X11 for AMD/ATI boards."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(version):30
-msgid "3"
+msgid "5"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(date):31
-#, fuzzy
-msgid "2010-08-02"
-msgstr "2008-07-06"
+msgid "2011-03-01"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):34
msgid "Hardware Support"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):36
-msgid "Is my ATI board supported?"
+msgid "Is my AMD/ATI board supported?"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):39
msgid ""
-"Many ATI boards (but not all) are supported by <uri link=\"http://www."
+"Many AMD/ATI boards (but not all) are supported by <uri link=\"http://www."
"freedesktop.org/Software/xorg\">xorg-x11</uri>, at least for the 2D "
"accelerated features. The 3D support is provided either by xorg-x11, or by "
-"ATI's <uri link=\"http://mirror.ati.com/support/drivers/linux/radeon-linux."
-"html\">closed source drivers</uri>. ATI's closed source driver only supports "
-"R600 and newer GPUs. Older GPUs will use the mature open source xorg-x11 "
-"driver."
+"AMD's <uri link=\"http://www.amd.com/us/products/technologies/ati-catalyst/"
+"Pages/catalyst.aspx\">closed source drivers</uri>. AMD's closed source "
+"driver only supports R600 and newer GPUs. Older GPUs will use the mature "
+"open source xorg-x11 driver."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(th):51
@@ -140,7 +139,8 @@ msgid "R300, R400"
msgstr "R300, R400"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):72
-msgid "Radeon 9500 - x850"
+#, fuzzy
+msgid "Radeon 9500 - X850"
msgstr "Radeon 9500 - x850"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):76
@@ -148,8 +148,9 @@ msgid "R500"
msgstr "R500"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):77
-msgid "Radeon X1300 and higher"
-msgstr "Radeon X1300 и выше"
+#, fuzzy
+msgid "Radeon X1300 - X1950"
+msgstr "Radeon 9500 - x850"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):81
msgid "R600"
@@ -164,7 +165,8 @@ msgstr "серия Radeon HD 2000"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):88
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):93
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):98
-msgid "ATI DRI, xorg"
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):103
+msgid "AMD DRI, xorg"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):86
@@ -177,8 +179,8 @@ msgid "RadeonHD 3000 series"
msgstr "серия Radeon HD 3000"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):91
-msgid "RV770"
-msgstr "RV770"
+msgid "RV770 (R700)"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):92
#, fuzzy
@@ -192,170 +194,188 @@ msgstr "R100"
#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):97
#, fuzzy
-msgid "RadeonHD 5000 series, \"Evergreen\""
+msgid "RadeonHD 5000 series"
+msgstr "серия Radeon HD 2000"
+
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):101
+msgid "R900"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(ti):102
+#, fuzzy
+msgid "RadeonHD 6000 series"
msgstr "серия Radeon HD 2000"
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):105
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(note):107
+msgid ""
+"The <uri link=\"http://www.x.org/wiki/RadeonFeature\">Radeon Feature Matrix</"
+"uri> at x.org lists the open source driver support level for each part of "
+"the graphics card hardware."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):116
msgid ""
"I have an All-In-Wonder/Vivo board. Are the multimedia features supported?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):110
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):121
msgid ""
"You don't need to use anything special for the board's multimedia features; "
"<c>x11-drivers/xf86-video-ati</c> will work just fine."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):118
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):129
msgid "I'm not using an x86-based architecture. What are my options?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):121
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):132
msgid ""
"X11 support on the PPC or Alpha platforms is quite similar to x86 X11 "
-"support. However, ATI's closed source Catalyst drivers are not supported on "
-"the PPC or Alpha, so you will have to use the open source drivers. The "
+"support. However, AMD/ATI's closed source Catalyst drivers are not supported "
+"on the PPC or Alpha, so you will have to use the open source drivers. The "
"Catalyst drivers are only available for x86 and AMD64. The open source xorg-"
"x11 drivers should work well on all architectures."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(impo):129
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(impo):140
msgid ""
"To enable agpgart support for certain old AMD64 chipsets, you have to "
"disable support for the K8 IOMMU."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):137
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):148
msgid "I have a laptop. Is my ATI Mobility model supported?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):140
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):151
msgid ""
"It should be, but you may have a configuration issue due to the OEM PCI id "
"that such chips may have. In such cases, you may have to write the "
"configuration file yourself."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):151
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):162
msgid "Installation"
msgstr "Установка"
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):153
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):164
msgid "Packages"
msgstr "Пакеты"
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):156
-msgid "There are two ways of getting drivers for your ATI card:"
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):167
+msgid "There are two ways of getting drivers for your AMD/ATI card:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(li):161
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(li):172
msgid "The <c>xorg-x11</c> ebuild provides the X11 implementation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(li):162
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(li):173
msgid ""
-"The <c>ati-drivers</c> ebuild provides the ATI closed source X drivers and "
+"The <c>ati-drivers</c> ebuild provides the AMD closed source X drivers and "
"kernel modules"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):168
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):179
msgid ""
-"If you want to use ATI's <e>internal</e> agpgart support instead of the "
+"If you want to use AMD/ATI's <e>internal</e> agpgart support instead of the "
"Linux kernel one, the agpgart driver and the chip set specific driver (in "
"your kernel configuration) must be built as modules or not at all."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(note):174
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(note):185
msgid ""
"Please read the <uri link=\"/doc/en/dri-howto.xml\">Hardware Acceleration "
-"Guide</uri> for more information on installing drivers for your ATI graphics "
-"card."
+"Guide</uri> for more information on installing drivers for your AMD/ATI "
+"graphics card."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):183
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):194
msgid "Configuration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):186
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):197
msgid ""
"You may not need to manually create <path>xorg.conf</path> or modify it. Try "
"running without it first. You can also use the Xorg auto configuration "
"option:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre:caption):191
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre:caption):202
msgid "Autoconfiguring X"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre):191
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre):202
#, no-wrap
msgid ""
"\n"
"# <i>X -configure</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):195
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):206
msgid ""
"For more information on how to get a basic <c>xorg.conf</c> configuration "
"file, please refer to the <uri link=\"/doc/en/xorg-config.xml\">Gentoo X "
"Server HowTo</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(note):201
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(note):212
msgid ""
"PPC, AMD64, and x86 users can use the <c>xac</c> stand-alone X configuration "
"tool by emerging <c>x11-misc/xac</c>, but isn't required."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(note):206
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(note):217
msgid ""
"You can use <c>aticonfig</c> if you have installed the <c>ati-drivers</c> "
"package."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(impo):211
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(impo):222
msgid ""
"If you're using <c>ati-drivers</c>, then you'll need to disable <c>radeonfb</"
"c> (and probably any other framebuffer drivers) in your kernel config, as it "
"conflicts with the built-in framebuffer in <c>ati-drivers</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):220
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):231
msgid "Switching to OpenGL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):223
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):234
msgid ""
-"Once X is installed, configured, and running, it can use the ATI OpenGL "
+"Once X is installed, configured, and running, it can use the AMD/ATI OpenGL "
"libraries:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre:caption):228
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre:caption):239
msgid "Running eselect"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre):228
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(pre):239
#, no-wrap
msgid ""
"\n"
"# <i>eselect opengl set ati</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):236
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(title):247
msgid "More Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):240
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):251
msgid ""
"Please read the <uri link=\"/doc/en/dri-howto.xml\">Hardware Acceleration "
-"Guide</uri> for more information on configuring your ATI graphics card."
+"Guide</uri> for more information on configuring your AMD/ATI graphics card."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):245
+#: ../../gentoo/xml/htdocs/doc/en//ati-faq.xml(p):256
msgid ""
-"More information on Gentoo Linux and the ATI Radeon binary drivers can be "
-"found on the <uri link=\"http://odin.prohosting.com/wedge01/gentoo-radeon-"
-"faq.html\">Wedge Unofficial Gentoo ATI Radeon FAQ</uri>."
+"More information on Gentoo Linux and the AMD/ATI Radeon binary drivers can "
+"be found on the <uri link=\"http://odin.prohosting.com/wedge01/gentoo-radeon-"
+"faq.html\">Wedge Unofficial Gentoo ATI Radeon FAQ</uri>, and on the <uri "
+"link=\"http://wiki.cchtml.com/index.php/Main_Page\">Unofficial AMD Linux "
+"Driver Wiki</uri>."
msgstr ""
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
diff --git a/doc/gettext/ru/dri-howto.xml.po b/doc/gettext/ru/dri-howto.xml.po
index 84b7247..efa4690 100644
--- a/doc/gettext/ru/dri-howto.xml.po
+++ b/doc/gettext/ru/dri-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-03-02 17:28+0500\n"
"PO-Revision-Date: 2009-10-18 05:09+0600\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -48,14 +48,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(version):27
-#, fuzzy
-msgid "1.13"
-msgstr "1.11"
+msgid "2"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(date):28
-#, fuzzy
-msgid "2009-12-14"
-msgstr "2008-09-10"
+msgid "2011-03-01"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):31
msgid "Introduction"
@@ -85,18 +83,20 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):54
msgid ""
-"In many cases, both binary and open-source drivers exist. Open-source "
+"In many cases, both binary and open-source drivers exist. Open source "
"drivers are preferable since we're using Linux and open source is one of its "
-"underlying principles. Sometimes, binary drivers are the only option, like "
-"with nVidia's cards. Binary drivers include <c>x11-drivers/nvidia-drivers</"
-"c> for nVidia cards and <c>x11-drivers/ati-drivers</c> for ATI cards."
+"underlying principles. Sometimes, binary drivers are the only option, "
+"especially if your graphics card is so new that open source drivers have not "
+"yet been written to support its features. Binary drivers include <c>x11-"
+"drivers/nvidia-drivers</c> for nVidia cards and <c>x11-drivers/ati-drivers</"
+"c> for AMD/ATI cards."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):65
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):66
msgid "What is DRI?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):68
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):69
msgid ""
"The <uri link=\"http://dri.freedesktop.org/wiki/\">Direct Rendering "
"Infrastructure</uri>, also known as the DRI, is a framework for allowing "
@@ -106,102 +106,96 @@ msgid ""
"implementations."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):79
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):80
msgid "What is the DRM and how does it relate to regular Xorg?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):82
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):83
msgid ""
"The DRM (Direct Rendering Manager) is an <e>enhancement</e> to Xorg that "
"adds 3D acceleration for cards by adding the kernel module necessary for "
"direct rendering."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):91
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):92
msgid "Purpose"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):94
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):95
msgid ""
"This guide is for people who can't get direct rendering working with just "
"Xorg. The DRM works for the following drivers:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):100
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):101
msgid "3dfx"
msgstr "3dfx"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):101
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):102
msgid "intel"
msgstr "intel"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):102
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):103
msgid "matrox"
msgstr "matrox"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):103
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):104
+msgid "nouveau"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):105
msgid "rage128"
msgstr "rage128"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):104
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):106
msgid "radeon"
msgstr "radeon"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):105
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):107
msgid "mach64"
msgstr "mach64"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):106
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):108
msgid "sis300"
msgstr "sis300"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):107
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(li):109
msgid "via"
msgstr "via"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):110
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):112
msgid ""
"See the <uri link=\"http://dri.freedesktop.org/\">DRI homepage</uri> for "
"more info and documentation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):118
-msgid "Feedback"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):121
-msgid ""
-"With suggestions, questions, etc., e-mail <mail link=\"dberkholz@gentoo.org"
-"\">Donnie Berkholz</mail>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):131
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):122
msgid "Install Xorg and configure your kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):133
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):124
msgid "Install Xorg"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):136
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):127
msgid ""
"Please read our <uri link=\"/doc/en/xorg-config.xml\">Xorg Configuration "
"Guide</uri> to get Xorg up and running."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):144
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):135
msgid "Configure your kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):147
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):138
msgid "Probe for your chipset and enable just that one."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):151
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):142
msgid "Checking your AGP chipset"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):151
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):142
#, no-wrap
msgid ""
"\n"
@@ -210,7 +204,7 @@ msgid ""
"<comment>(Your output may not match the above due to different hardware.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):157
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):148
msgid ""
"If your chipset is not supported by the kernel you might have some succes by "
"passing <c>agp=try_unsupported</c> as a kernel parameter. This will use "
@@ -218,17 +212,17 @@ msgid ""
"bootloader configuration file!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):164
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):155
msgid ""
"Most, if not all, kernels should have these options. This was configured "
"using a standard <c>gentoo-sources</c> kernel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):169
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):160
msgid "Configuring the kernel"
msgstr "Конфигурация ядра"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):169
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):160
#, no-wrap
msgid ""
"\n"
@@ -239,11 +233,11 @@ msgid ""
"# <i>make menuconfig</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):177
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):168
msgid "make menuconfig options"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):177
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):168
#, no-wrap
msgid ""
"\n"
@@ -259,46 +253,46 @@ msgid ""
" &lt;M&gt; <comment>(Select your graphics card from the list)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):193
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):184
msgid "Compile and install your kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):196
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):187
msgid "Compiling and installing kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):196
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):187
#, no-wrap
msgid ""
"\n"
"# <i>make &amp;&amp; make modules_install</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):200
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):191
msgid ""
"Don't forget to set up <path>grub.conf</path> or <path>lilo.conf</path> and "
"run <c>/sbin/lilo</c> if you use LILO."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):210
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):201
msgid "Configure direct rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):212
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):203
msgid "Configure Xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):215
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):206
msgid ""
"Open <path>/etc/X11/xorg.conf</path> with your favorite text editor and edit "
"it to enable DRI and GLX."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):220
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):211
msgid "xorg.conf"
msgstr "xorg.conf"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):220
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):211
#, no-wrap
msgid ""
"\n"
@@ -320,22 +314,22 @@ msgid ""
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):242
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):233
msgid "Changes to modules.autoload.d"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):245
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):236
msgid ""
"You will need to add the module name that your card uses to <path>/etc/"
"modules.autoload.d/kernel-2.6</path> to ensure that the module is loaded "
"automatically when the system starts up."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):251
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):242
msgid "Editing /etc/modules.autoload.d/kernel-2.6"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):251
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):242
#, no-wrap
msgid ""
"\n"
@@ -343,21 +337,21 @@ msgid ""
"intel-agp\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):256
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):247
msgid ""
"If you compiled <c>agpgart</c> as a module, you will also need to add it to "
"<path>/etc/modules.autoload.d/kernel-2.6</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):266
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):257
msgid "Test 3D acceleration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):268
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):259
msgid "Reboot to the new kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):271
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):262
msgid ""
"Reboot your computer to your new kernel and login as a normal user. It's "
"time to see if you have direct rendering and how good it is. <c>glxinfo</c> "
@@ -365,11 +359,11 @@ msgid ""
"it is installed before you attempt to run these commands."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):278
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):269
msgid "Testing rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):278
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):269
#, no-wrap
msgid ""
"\n"
@@ -385,7 +379,7 @@ msgid ""
"possible.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):291
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):282
msgid ""
"FPS may be limited by your screen's refresh rate, so keep this in mind if "
"<c>glxgears</c> reports only about 70-100 FPS. <c>games-fps/ut2004-demo</c> "
@@ -393,11 +387,11 @@ msgid ""
"performance results."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):301
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):292
msgid "Get the most out of direct rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):304
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):295
msgid ""
"If you want to set more features, for performance or other reasons, check "
"out the <uri link=\"http://dri.freedesktop.org/wiki/FeatureMatrix\">feature "
@@ -405,38 +399,38 @@ msgid ""
"net/doc/dri_driver_features.phtml\">features listing</uri> on Sourceforge."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):317
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):308
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):319
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):310
msgid "It doesn't work. I don't have rendering, and I can't tell why."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):322
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):313
msgid ""
"Try <c>modprobe radeon</c> before you start the X server (replace <c>radeon</"
"c> with the name of your driver). Also, try building agpgart into the kernel "
"instead of as a module."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):331
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):322
msgid ""
"When I startx, I get this error: \"[drm] failed to load kernel module agpgart"
"\""
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):334
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):325
msgid ""
"That's because you compiled agpgart into the kernel instead of as a module. "
"Ignore it unless you're having problems."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):342
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):333
msgid "I have a Radeon, and I want TV-Out."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):345
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):336
msgid ""
"The drivers originally developed by the <uri link=\"http://gatos.sf.net"
"\">GATOS</uri> project have been merged into Xorg's codebase. You don't need "
@@ -444,34 +438,34 @@ msgid ""
"just fine."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):355
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):346
msgid ""
"It doesn't work. My card is so incredibly new and cool that it isn't "
"supported at all."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):361
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):352
msgid ""
-"Try out the binary drivers. For <c>ati-drivers</c>, a listing is at "
-"<uri>http://support.amd.com/us/gpudownload/Pages/index.aspx</uri>. If those "
-"don't support it, use fbdev. It's slow, but it works."
+"Try out the binary drivers. For AMD cards, use <c>ati-drivers</c>; a listing "
+"is at <uri>http://support.amd.com/us/gpudownload/Pages/index.aspx</uri>. If "
+"those don't support it, use fbdev. It's slow, but it works."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):370
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):361
msgid "I have a PCI card and it doesn't work. Help!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):373
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):364
msgid ""
"Edit <path>/etc/X11/xorg.conf</path>. In section \"Device\" enable "
"ForcePCIMode."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):377
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):368
msgid "Enabling ForcePCIMode"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):377
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):368
#, no-wrap
msgid ""
"\n"
@@ -480,26 +474,34 @@ msgstr ""
"\n"
"Option \"ForcePCIMode\" \"True\"\n"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):386
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):377
msgid "References"
msgstr "Ссылки"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):391
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):382
msgid "http://forums.gentoo.org/viewtopic.php?t=46681"
msgstr "http://forums.gentoo.org/viewtopic.php?t=46681"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):392
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):383
msgid "http://forums.gentoo.org/viewtopic.php?t=29264"
msgstr "http://forums.gentoo.org/viewtopic.php?t=29264"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):393
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):384
msgid "http://dri.freedesktop.org/"
msgstr "http://dri.freedesktop.org/"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):394
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):385
msgid "http://www.retinalburn.net/linux/dri_status.html"
msgstr "http://www.retinalburn.net/linux/dri_status.html"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):391
+msgid "Feedback"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):394
+msgid "With suggestions, questions, etc., e-mail <mail link=\"dberkholz\"/>."
+msgstr ""
+
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(None):0
msgid "translator-credits"
diff --git a/doc/gettext/ru/gentoo-amd64-faq.xml.po b/doc/gettext/ru/gentoo-amd64-faq.xml.po
index 9f047ac..bdd0690 100644
--- a/doc/gettext/ru/gentoo-amd64-faq.xml.po
+++ b/doc/gettext/ru/gentoo-amd64-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-03-02 17:28+0500\n"
"PO-Revision-Date: 2010-01-11 17:54+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -67,13 +67,12 @@ msgid "This is the Gentoo Linux/AMD64 Frequently Asked Questions"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-amd64-faq.xml(version):32
-msgid "2"
+msgid "3"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-amd64-faq.xml(date):33
-#, fuzzy
-msgid "2010-07-18"
-msgstr "2009-06-18"
+msgid "2011-03-02"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-amd64-faq.xml(title):36
msgid "Questions"
@@ -401,7 +400,7 @@ msgstr ""
#, no-wrap
msgid ""
"\n"
-"# <i>echo \"category/packagename **\" &gt;&gt; /etc/portage/package.keywords</i>\n"
+"# <i>echo \"category/packagename **\" &gt;&gt; /etc/portage/package.accept_keywords</i>\n"
"# <i>emerge packagename</i>\n"
msgstr ""
diff --git a/doc/gettext/ru/gentoo-freebsd.xml.po b/doc/gettext/ru/gentoo-freebsd.xml.po
index d151eb0..10afec9 100644
--- a/doc/gettext/ru/gentoo-freebsd.xml.po
+++ b/doc/gettext/ru/gentoo-freebsd.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-03-02 17:28+0500\n"
"PO-Revision-Date: 2010-01-11 17:54+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -107,11 +107,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-freebsd.xml(version):43
-msgid "3"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-freebsd.xml(date):44
-msgid "2010-08-08"
+msgid "2011-03-02"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-freebsd.xml(title):47
@@ -519,9 +519,9 @@ msgstr ""
msgid ""
"The <c>~x86-fbsd</c> keyword does not yet fully cover the same tree as "
"<c>~x86</c>, but please <e>do not</e> put <c>~x86</c> in ACCEPT_KEYWORDS. "
-"Rather use <path>/etc/portage/package.keywords</path> to test packages, and "
-"report working packages on <uri link=\"http://bugs.gentoo.org/enter_bug.cgi?"
-"product=Gentoo%2FAlt\">Bugzilla</uri>."
+"Rather use <path>/etc/portage/package.accept_keywords</path> to test "
+"packages, and report working packages on <uri link=\"http://bugs.gentoo.org/"
+"enter_bug.cgi?product=Gentoo%2FAlt\">Bugzilla</uri>."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-freebsd.xml(p):366
diff --git a/doc/gettext/ru/gentoo-ppc-faq.xml.po b/doc/gettext/ru/gentoo-ppc-faq.xml.po
index 4c94448..b20bf86 100644
--- a/doc/gettext/ru/gentoo-ppc-faq.xml.po
+++ b/doc/gettext/ru/gentoo-ppc-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-03-02 17:28+0500\n"
"PO-Revision-Date: 2010-02-09 00:55+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-faq.xml(guide:link):5
-msgid "/doc/en/gentoo-ppc-faq.xml"
-msgstr ""
-
#: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-faq.xml(title):6
msgid "Gentoo Linux/PowerPC Frequently Asked Questions"
msgstr ""
@@ -73,12 +69,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-faq.xml(version):33
-msgid "1.41"
-msgstr "1.41"
+msgid "2"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-faq.xml(date):34
-msgid "2009-04-15"
-msgstr "2009-04-15"
+msgid "2011-03-02"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-faq.xml(title):37
msgid "Questions"
@@ -1041,8 +1037,8 @@ msgstr ""
msgid ""
"If your package hasn't yet been tested on PPC, you'll need to first mark the "
"ebuild with the ppc keyword. This is done using the ekeyword tool which is "
-"part of the gentoolkit-dev package. To mark the ebuild ppc and regenerate "
-"the manifest file so that it reflects the changes:"
+"part of the <c>gentoolkit-dev</c> package. To mark the ebuild ppc and "
+"regenerate the manifest file so that it reflects the changes:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-faq.xml(pre:caption):838
@@ -1100,7 +1096,7 @@ msgstr ""
#, no-wrap
msgid ""
"\n"
-"$ <i>echo \"=app-foo/bar-1.0 ~ppc\" &gt; /etc/portage/package.keywords</i>\n"
+"$ <i>echo \"=app-foo/bar-1.0\" &gt; /etc/portage/package.accept_keywords</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-ppc-faq.xml(note):872
diff --git a/doc/gettext/ru/gentoo-x86-quickinstall-after-reboot.xml.po b/doc/gettext/ru/gentoo-x86-quickinstall-after-reboot.xml.po
index 2a4f98a..ae3c86c 100644
--- a/doc/gettext/ru/gentoo-x86-quickinstall-after-reboot.xml.po
+++ b/doc/gettext/ru/gentoo-x86-quickinstall-after-reboot.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-03-02 17:28+0500\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,13 +15,12 @@ msgstr ""
"X-Generator: Lokalize 1.0\n"
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-after-reboot.xml(version):7
-msgid "5"
+msgid "6"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-after-reboot.xml(date):8
-#, fuzzy
-msgid "2010-10-13"
-msgstr "2008-03-30"
+msgid "2011-02-16"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-after-reboot.xml(title):11
msgid "Finalizing the Installation"
@@ -125,8 +124,8 @@ msgid ""
"\n"
"mybox ~ # <i>emerge -vpe world</i>\n"
"<comment>(Portage displays the packages and their USE flags, as an example, let's\n"
-"disable ipv6 and fortran, and enable unicode)</comment>\n"
-"mybox ~ # <i>echo 'USE=\"nptl nptlonly -ipv6 -fortran unicode\"' &gt;&gt; /etc/make.conf</i>\n"
+"disable fortran, and enable ipv6 and unicode)</comment>\n"
+"mybox ~ # <i>echo 'USE=\"nptl nptlonly ipv6 -fortran unicode\"' &gt;&gt; /etc/make.conf</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall-after-reboot.xml(p):86
diff --git a/doc/gettext/ru/ipv6.xml.po b/doc/gettext/ru/ipv6.xml.po
index ad69af1..e19b129 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: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-03-02 17:28+0500\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"
@@ -10,7 +10,8 @@ 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"
@@ -80,16 +81,19 @@ msgid "nightmorph"
msgstr "nightmorph"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(abstract):27
-msgid "This guide shows how to setup IPv6 on a Gentoo system. This includes establishing a tunnel with a tunnel broker, some basic DNS configuration and configuring clients to use the system to connect to IPv6 addresses."
+msgid ""
+"This guide shows how to setup IPv6 on a Gentoo system. This includes "
+"establishing a tunnel with a tunnel broker, some basic DNS configuration and "
+"configuring clients to use the system to connect to IPv6 addresses."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(version):37
-msgid "3"
-msgstr "3"
+msgid "4"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(date):38
-msgid "2010-08-11"
-msgstr "2010-08-11"
+msgid "2011-03-02"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):41
msgid "Preliminaries"
@@ -100,8 +104,13 @@ msgid "Basic Kernel Configuration"
msgstr "Базовая конфигурация ядра"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):46
-msgid "Any of the 2.6 kernel trees availables in Gentoo will easily support IPv6 connections. The new USAGI IPv6 stack is integrated to the kernel since Linux 2.6.0."
-msgstr "В любом доступном в Gentoo ядре из ветки 2.6 есть поддержка соединений IPv6. Новый стек IPv6 USAGI был интегрирован в ядро начиная с Linux 2.6.0."
+msgid ""
+"Any of the 2.6 kernel trees availables in Gentoo will easily support IPv6 "
+"connections. The new USAGI IPv6 stack is integrated to the kernel since "
+"Linux 2.6.0."
+msgstr ""
+"В любом доступном в Gentoo ядре из ветки 2.6 есть поддержка соединений IPv6. "
+"Новый стек IPv6 USAGI был интегрирован в ядро начиная с Linux 2.6.0."
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):52
msgid "Emerging a kernel"
@@ -117,8 +126,12 @@ msgstr ""
"# <i>emerge gentoo-sources</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):56
-msgid "Now we are ready to enter the kernel source directory and begin our actual kernel configuration."
-msgstr "Теперь мы готовы войти в каталог с исходными кодами ядра и произвести конфигурацию ядра."
+msgid ""
+"Now we are ready to enter the kernel source directory and begin our actual "
+"kernel configuration."
+msgstr ""
+"Теперь мы готовы войти в каталог с исходными кодами ядра и произвести "
+"конфигурацию ядра."
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):61
msgid "Configuring the Linux Kernel"
@@ -136,8 +149,12 @@ msgstr ""
"# <i>make menuconfig</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(note):66
-msgid "This assumes the symlink <path>/usr/src/linux</path> points to the sources you will be using."
-msgstr "Предполагается что символическая ссылка <path>/usr/src/linux</path> указывает на используемые вами исходники."
+msgid ""
+"This assumes the symlink <path>/usr/src/linux</path> points to the sources "
+"you will be using."
+msgstr ""
+"Предполагается что символическая ссылка <path>/usr/src/linux</path> "
+"указывает на используемые вами исходники."
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):71
msgid "'make menuconfig' options"
@@ -175,11 +192,17 @@ msgid "Testing IPv6 Support"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):90
-msgid "After enabling the recommended options, recompile your kernel and reboot into your new IPv6-enabled kernel."
+msgid ""
+"After enabling the recommended options, recompile your kernel and reboot "
+"into your new IPv6-enabled kernel."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):95
-msgid "If you don't already have <b>iproute2</b> installed, we urge you to do it now. iproute2 is a network configuration suite that contains <c>ip</c>, the famous replacement for <c>ifconfig</c>, <c>route</c>, <c>iptunnel</c> and others..."
+msgid ""
+"If you don't already have <b>iproute2</b> installed, we urge you to do it "
+"now. iproute2 is a network configuration suite that contains <c>ip</c>, the "
+"famous replacement for <c>ifconfig</c>, <c>route</c>, <c>iptunnel</c> and "
+"others..."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):101
@@ -196,7 +219,10 @@ msgstr ""
"# <i>emerge sys-apps/iproute2</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(warn):105
-msgid "Use of ifconfig can cause serious headaches if you have multiple tunnel devices. You have to remove the tunnels in backorder, which means that the latest created must be removed first. You have been warned!"
+msgid ""
+"Use of ifconfig can cause serious headaches if you have multiple tunnel "
+"devices. You have to remove the tunnels in backorder, which means that the "
+"latest created must be removed first. You have been warned!"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):111
@@ -219,7 +245,10 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):123
-msgid "Before going any further, make sure that you add <e>ipv6</e> to your list of USE variables in <path>make.conf</path>, so that future emerges of packages will include IPv6 support."
+msgid ""
+"Before going any further, make sure that you add <e>ipv6</e> to your list of "
+"USE variables in <path>make.conf</path>, so that future emerges of packages "
+"will include IPv6 support."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):134
@@ -231,7 +260,11 @@ msgid "Basic Configuration"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):139
-msgid "Most ISPs still do not offer any native IPv6 connections. To get around this limitation, there are several \"tunnel brokers\" around the globe that offer free IPv6 tunnels. This will allow you to tunnel all your IPv6 connections through an IPv4 connection."
+msgid ""
+"Most ISPs still do not offer any native IPv6 connections. To get around this "
+"limitation, there are several \"tunnel brokers\" around the globe that offer "
+"free IPv6 tunnels. This will allow you to tunnel all your IPv6 connections "
+"through an IPv4 connection."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(th):147
@@ -305,19 +338,31 @@ msgid "Australia/South Pacific"
msgstr "Автстралия/Южная часть Тихого океана"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):170
-msgid "Below are two examples for setting up a tunnel with two popular North American tunnels, Hurricane Electric (applies for non-heartbeat tunnels from sixxs.net as well) and Freenet6."
+msgid ""
+"Below are two examples for setting up a tunnel with two popular North "
+"American tunnels, Hurricane Electric (applies for non-heartbeat tunnels from "
+"sixxs.net as well) and Freenet6."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):182
-msgid "Hurricane Electric (HE for short) offers free IPv6 tunnels and allocates a /64 block of addresses for you. It also allows configuration of reverse DNS. Getting a tunnel from HE is as easy as going to <uri>http://www.tunnelbroker.net/</uri> and filling out a one page form."
+msgid ""
+"Hurricane Electric (HE for short) offers free IPv6 tunnels and allocates "
+"a /64 block of addresses for you. It also allows configuration of reverse "
+"DNS. Getting a tunnel from HE is as easy as going to <uri>http://www."
+"tunnelbroker.net/</uri> and filling out a one page form."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(note):189
-msgid "Registration includes listing information like your address and phone number."
+msgid ""
+"Registration includes listing information like your address and phone number."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):194
-msgid "After you have a tunnel approved and have a /64 block allocated, you can configure your Gentoo box. HE provides sample configurations based on ifconfig and the iproute utilities. The following two examples assume you have the following configuration:"
+msgid ""
+"After you have a tunnel approved and have a /64 block allocated, you can "
+"configure your Gentoo box. HE provides sample configurations based on "
+"ifconfig and the iproute utilities. The following two examples assume you "
+"have the following configuration:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):203
@@ -353,7 +398,9 @@ msgid "2001:470:1F00:296::/64"
msgstr "2001:470:1F00:296::/64"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):216
-msgid "Using the iproute2 package and the <c>ip</c> command, you would do the following:"
+msgid ""
+"Using the iproute2 package and the <c>ip</c> command, you would do the "
+"following:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):221
@@ -377,7 +424,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):241
-msgid "<uri link=\"http://gogonet.gogo6.com/\">Freenet6</uri> is another free tunnel broker. Optional registration only requires a username and a valid email address. They have chosen to turn the tunnel management into a client/server setup and have created the <c>gateway6</c> client. The client is available in Portage. To install it do:"
+msgid ""
+"<uri link=\"http://gogonet.gogo6.com/\">Freenet6</uri> is another free "
+"tunnel broker. Optional registration only requires a username and a valid "
+"email address. They have chosen to turn the tunnel management into a client/"
+"server setup and have created the <c>gateway6</c> client. The client is "
+"available in Portage. To install it do:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):249
@@ -394,7 +446,12 @@ msgstr ""
"# <i>emerge gateway6</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):253
-msgid "Now if you chose to connect with authentification, you need to configure <c>gateway6</c> by editing <path>/etc/gateway6/gw6c.conf</path>. You should only have to change the <e>userid</e> and <e>passwd</e> fields to match those assigned from Freenet6 and change the gateway server. Below is a sample config file."
+msgid ""
+"Now if you chose to connect with authentification, you need to configure "
+"<c>gateway6</c> by editing <path>/etc/gateway6/gw6c.conf</path>. You should "
+"only have to change the <e>userid</e> and <e>passwd</e> fields to match "
+"those assigned from Freenet6 and change the gateway server. Below is a "
+"sample config file."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):261
@@ -423,7 +480,10 @@ msgid "Testing your connection"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):276
-msgid "Now that your tunnel is configured, you can test your connection. The easiest way to do this is to use the <c>ping6</c> utility and try to ping an IPv6 host."
+msgid ""
+"Now that your tunnel is configured, you can test your connection. The "
+"easiest way to do this is to use the <c>ping6</c> utility and try to ping an "
+"IPv6 host."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):282
@@ -462,7 +522,10 @@ msgstr ""
"rtt min/avg/max/mdev = 277.040/281.041/290.046/4.699 ms\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):297
-msgid "Further work is currently in progress to add better IPv6 support to the network init scripts. If you'd like to know the status of this and/or help out, email <mail link=\"latexer@gentoo.org\">latexer@gentoo.org</mail>."
+msgid ""
+"Further work is currently in progress to add better IPv6 support to the "
+"network init scripts. If you'd like to know the status of this and/or help "
+"out, email <mail link=\"latexer@gentoo.org\">latexer@gentoo.org</mail>."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):309
@@ -474,7 +537,12 @@ msgid "Re-emerging packages"
msgstr "Переустановка пакетов"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):315
-msgid "Unless you had <e>USE=\"ipv6\"</e> in your <path>/etc/make.conf</path> previously, you probably need to re-emerge a bunch of packages to compile in IPv6 support for them. To get a list of all the installed packages which are affected by USE flag changes, use Portage's <c>--newuse</c> (<c>-N</c>) option:"
+msgid ""
+"Unless you had <e>USE=\"ipv6\"</e> in your <path>/etc/make.conf</path> "
+"previously, you probably need to re-emerge a bunch of packages to compile in "
+"IPv6 support for them. To get a list of all the installed packages which are "
+"affected by USE flag changes, use Portage's <c>--newuse</c> (<c>-N</c>) "
+"option:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):322
@@ -491,11 +559,17 @@ msgstr ""
"# <i>emerge -uDNav world</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):326
-msgid "If you have changed a lot of USE flags, the list could be quite long. It's suggested to keep your system up-to-date, so it won't hurt if you recompile all affected packages."
+msgid ""
+"If you have changed a lot of USE flags, the list could be quite long. It's "
+"suggested to keep your system up-to-date, so it won't hurt if you recompile "
+"all affected packages."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(note):332
-msgid "Some packages detect IPv6 support automagically and hence have no ipv6 USE flag. Thus not all packages, which should support IPv6, will support it if you have not compiled it with an IPv6 enabled kernel."
+msgid ""
+"Some packages detect IPv6 support automagically and hence have no ipv6 USE "
+"flag. Thus not all packages, which should support IPv6, will support it if "
+"you have not compiled it with an IPv6 enabled kernel."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):342
@@ -503,7 +577,9 @@ msgid "IPv6 Specific Packages"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):345
-msgid "There are a few packages which specifically deal with IPv6 items. Most of these are located in <path>/usr/portage/net-misc</path>."
+msgid ""
+"There are a few packages which specifically deal with IPv6 items. Most of "
+"these are located in <path>/usr/portage/net-misc</path>."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(th):351
@@ -547,7 +623,12 @@ msgid "IPv6 and DNS"
msgstr "IPv6 и DNS"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):378
-msgid "Just as DNS for IPv4 uses A records, DNS for IPv6 uses AAAA records. (This is because IPv4 is an address space of 2^32 while IPv6 is an address space of 2^128). For reverse DNS, the INT standard is deprecated but still widely supported. ARPA is the latest standard. Support for the ARPA format will be described here."
+msgid ""
+"Just as DNS for IPv4 uses A records, DNS for IPv6 uses AAAA records. (This "
+"is because IPv4 is an address space of 2^32 while IPv6 is an address space "
+"of 2^128). For reverse DNS, the INT standard is deprecated but still widely "
+"supported. ARPA is the latest standard. Support for the ARPA format will be "
+"described here."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):390
@@ -555,11 +636,18 @@ msgid "BIND configuration"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):393
-msgid "Recent versions of BIND include excellent IPv6 support. This section will assume you have at least minimal knowledge about the configuration and use of BIND. We will assume you are not running bind in a chroot. If you are, simply append the chroot prefix to most of the paths in the following section."
+msgid ""
+"Recent versions of BIND include excellent IPv6 support. This section will "
+"assume you have at least minimal knowledge about the configuration and use "
+"of BIND. We will assume you are not running bind in a chroot. If you are, "
+"simply append the chroot prefix to most of the paths in the following "
+"section."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):401
-msgid "First you need to add entries for both forward and reverse DNS zone files in <path>/etc/bind/named.conf</path>."
+msgid ""
+"First you need to add entries for both forward and reverse DNS zone files in "
+"<path>/etc/bind/named.conf</path>."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):406
@@ -591,7 +679,8 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):427
-msgid "Now we must create those zone files and add entries for all of our hosts:"
+msgid ""
+"Now we must create those zone files and add entries for all of our hosts:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):432
@@ -658,11 +747,17 @@ msgid "DJBDNS configuration"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):471
-msgid "There are currently some third-party patches to DJBDNS available at <uri>http://www.fefe.de/dns/</uri> that allow it to do IPv6 nameserving. DJBDNS can be installed with these patches by emerging it with <e>ipv6</e> in your USE variables."
+msgid ""
+"There are currently some third-party patches to DJBDNS available at "
+"<uri>http://www.fefe.de/dns/</uri> that allow it to do IPv6 nameserving. "
+"DJBDNS can be installed with these patches by emerging it with <e>ipv6</e> "
+"in your USE variables."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(warn):478
-msgid "Not all record types are support yet with these patches. In particular, NS and MX records are not supported."
+msgid ""
+"Not all record types are support yet with these patches. In particular, NS "
+"and MX records are not supported."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):483
@@ -679,7 +774,10 @@ msgstr ""
"# <i>emerge djbdns</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):487
-msgid "After djbdns is installed, it can be setup by running <c>tinydns-setup</c> and answering a few questions about which IP addresses to bind to, where to install tinydns, etc."
+msgid ""
+"After djbdns is installed, it can be setup by running <c>tinydns-setup</c> "
+"and answering a few questions about which IP addresses to bind to, where to "
+"install tinydns, etc."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):493
@@ -696,7 +794,10 @@ msgstr ""
"# <i>tinydns-setup</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):497
-msgid "Assuming we've installed <c>tinydns</c> into <path>/var/tinydns</path>, we can now edit <path>/var/tinydns/root/data</path>. This file will contain all the data needed to get tinydns handling DNS for your IPv6 delegation."
+msgid ""
+"Assuming we've installed <c>tinydns</c> into <path>/var/tinydns</path>, we "
+"can now edit <path>/var/tinydns/root/data</path>. This file will contain all "
+"the data needed to get tinydns handling DNS for your IPv6 delegation."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):503
@@ -719,7 +820,15 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):515
-msgid "Lines prefixed with a <c>6</c> will have both an AAAA and a PTR record created. Those prefixed with a <c>3</c> will only have an AAAA record created. Besides manually editing the <path>data</path> file, you can use the scripts <c>add-host6</c> and <c>add-alias6</c> to add new entries. After changes are made to the <path>data</path> file, you simply need to run <c>make</c> from <path>/var/tinydns/root</path>. This will create <path>/var/tinydns/root/data.cfb</path>, which tinydns will use as its source of information for DNS requests."
+msgid ""
+"Lines prefixed with a <c>6</c> will have both an AAAA and a PTR record "
+"created. Those prefixed with a <c>3</c> will only have an AAAA record "
+"created. Besides manually editing the <path>data</path> file, you can use "
+"the scripts <c>add-host6</c> and <c>add-alias6</c> to add new entries. After "
+"changes are made to the <path>data</path> file, you simply need to run "
+"<c>make</c> from <path>/var/tinydns/root</path>. This will create <path>/var/"
+"tinydns/root/data.cfb</path>, which tinydns will use as its source of "
+"information for DNS requests."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):531
@@ -731,7 +840,10 @@ msgid "Configure routing"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):536
-msgid "Further configuration is required if we want to use our system as a router for other clients wishing to connect to the outside world with IPv6. We need to enable forwarding of IPv6 packets. We can do this in one of two ways."
+msgid ""
+"Further configuration is required if we want to use our system as a router "
+"for other clients wishing to connect to the outside world with IPv6. We need "
+"to enable forwarding of IPv6 packets. We can do this in one of two ways."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):543
@@ -752,11 +864,15 @@ msgstr ""
"# <i>sysctl -w net.ipv6.conf.all.forwarding=1</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(warn):549
-msgid "The <c>radvd</c> init script explained in the next chapter enables (and disables) forwarding, making the next step unnecessary."
+msgid ""
+"The <c>radvd</c> init script explained in the next chapter enables (and "
+"disables) forwarding, making the next step unnecessary."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):554
-msgid "To enable forwarding at boot, you'll need to edit <path>/etc/sysctl.conf</path> and add the following line."
+msgid ""
+"To enable forwarding at boot, you'll need to edit <path>/etc/sysctl.conf</"
+"path> and add the following line."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):559
@@ -772,11 +888,20 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):564
-msgid "Traffic should now be forwarded from this box through the tunnel we've established with our broker."
+msgid ""
+"Traffic should now be forwarded from this box through the tunnel we've "
+"established with our broker."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):569
-msgid "To assign IPv6 addresses to clients, the IPv6 specification allows for both stateless and stateful IP assignment. Stateless assignment uses a process called Router Advertisement and allows clients to obtain an IP and a default route by simply bringing an interface up. It is called \"stateless\" because there is no record of IPs assigned and the host they are assigned to. Stateful assignment is handled by DHCPv6. It is \"stateful\" because the server keeps a state of the clients who've requested IPs and received them."
+msgid ""
+"To assign IPv6 addresses to clients, the IPv6 specification allows for both "
+"stateless and stateful IP assignment. Stateless assignment uses a process "
+"called Router Advertisement and allows clients to obtain an IP and a default "
+"route by simply bringing an interface up. It is called \"stateless\" because "
+"there is no record of IPs assigned and the host they are assigned to. "
+"Stateful assignment is handled by DHCPv6. It is \"stateful\" because the "
+"server keeps a state of the clients who've requested IPs and received them."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):584
@@ -784,7 +909,9 @@ msgid "Stateless Configuration"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):587
-msgid "Stateless configuration is easily accomplished using the Router Advertisement Daemon, or <c>radvd</c>."
+msgid ""
+"Stateless configuration is easily accomplished using the Router "
+"Advertisement Daemon, or <c>radvd</c>."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):592
@@ -801,7 +928,11 @@ msgstr ""
"# <i>emerge radvd</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):596
-msgid "After having emerged <c>radvd</c>, we need to create <path>/etc/radvd/radvd.conf</path> that contains information about what IP block to assign IPs from. Here is a sample <path>radvd.conf</path> file using the prefix we've been assigned from our tunnel broker."
+msgid ""
+"After having emerged <c>radvd</c>, we need to create <path>/etc/radvd/radvd."
+"conf</path> that contains information about what IP block to assign IPs "
+"from. Here is a sample <path>radvd.conf</path> file using the prefix we've "
+"been assigned from our tunnel broker."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):603
@@ -829,11 +960,15 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(warn):620
-msgid "Make sure the interface on the first line is correct so you broadcast router advertisement to your intranet and not to your ISP!"
+msgid ""
+"Make sure the interface on the first line is correct so you broadcast router "
+"advertisement to your intranet and not to your ISP!"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):625
-msgid "Further information is available in <c>man radvd.conf</c>. We can now start <c>radvd</c> and set it to start at boot."
+msgid ""
+"Further information is available in <c>man radvd.conf</c>. We can now start "
+"<c>radvd</c> and set it to start at boot."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):630
@@ -856,7 +991,9 @@ msgid "Stateful Configuration"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):642
-msgid "If you'd like to use stateful configuration, you'll need to install and configure dhcpv6."
+msgid ""
+"If you'd like to use stateful configuration, you'll need to install and "
+"configure dhcpv6."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):647
@@ -873,7 +1010,9 @@ msgstr ""
"# <i>emerge dhcpv6</i>\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):651
-msgid "Next we must configure the DHCPv6 server by editing <path>/etc/dhcp6s.conf</path>."
+msgid ""
+"Next we must configure the DHCPv6 server by editing <path>/etc/dhcp6s.conf</"
+"path>."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):656
@@ -955,7 +1094,11 @@ msgid "Using radvd"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):698
-msgid "Clients behind this router should now be able to connect to the rest of the net via IPv6. If using radvd, configuring hosts should be as easy as bringing the interface up. (This is probably already done by your net.ethX init scripts)."
+msgid ""
+"Clients behind this router should now be able to connect to the rest of the "
+"net via IPv6. If using radvd, configuring hosts should be as easy as "
+"bringing the interface up. (This is probably already done by your net.ethX "
+"init scripts)."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):705
@@ -994,7 +1137,10 @@ msgid "Using DHCPv6"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):725
-msgid "If your router is set up to use DHCPv6, your clients will also need to have the <c>net-misc/dhcpv6</c> package installed. After having done this, you need to configure your client by editing <path>/etc/dhcp6c.conf</path>."
+msgid ""
+"If your router is set up to use DHCPv6, your clients will also need to have "
+"the <c>net-misc/dhcpv6</c> package installed. After having done this, you "
+"need to configure your client by editing <path>/etc/dhcp6c.conf</path>."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):731
@@ -1021,292 +1167,77 @@ msgstr ""
"};\n"
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):745
-msgid "Using 6to4 Conversion"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):747
-msgid "Basic principles"
-msgstr "Основные принципы"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):750
-msgid "6to4 conversion can be used if you want to have hosts that talk to IPv4 hosts over a purely IPv6 connection. Thus you can have an entirely IPv6 internal network, with one host dealing with connecting to the outside IPv4/IPv6 world."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):761
-msgid "DNS configuration"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):764
-msgid "To get 6to4 conversion working, a DNS proxy, <c>totd</c>, needs to be configured that will send you AAAA records for sites that really only have A records. These AAAA records will point to IPv6 addresses which don't actually exist, but which will get routed through a 6to4 proxy."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):771
-msgid "First, install <c>totd</c>:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):775
-msgid "Installing totd"
-msgstr "Установка totd"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):775
-#, no-wrap
-msgid ""
-"\n"
-"# <i>emerge totd</i>\n"
-msgstr ""
-"\n"
-"# <i>emerge totd</i>\n"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):779
-msgid "Next, we need to setup <path>/etc/totd.conf</path> with some basic configuration information."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):784
-msgid "Sample /etc/totd.conf"
-msgstr "Пример /etc/totd.conf"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):784
-#, no-wrap
-msgid ""
-"\n"
-"<comment>(Points to a real DNS nameserver)</comment>\n"
-"forwarder 192.168.0.2 port 53\n"
-"<comment>(What prefix to put before faked AAAA records)</comment>\n"
-"prefix 3ffe:abcd:1234:9876::\n"
-"<comment>(What port to run totd on)</comment>\n"
-"port 5005\n"
-"<comment>(What PID file to use)</comment>\n"
-"pidfile /var/run/totd.pid\n"
-"<comment>(Actually do 6to4 stuff)</comment>\n"
-"stf\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(note):797
-msgid "<c>totd</c> must be set to use a port different than port 53 if another nameserver is running on the same machine."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):806
-msgid "6to4 proxy"
-msgstr "6to4-прокси"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):809
-msgid "<c>ptrtd</c> will be used as a 6to4 proxy, enabling connections between the internal IPv6 host and the outside IPv4 host."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):814
-msgid "Installing ptrtd"
-msgstr "Установка ptrtd"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):814
-#, no-wrap
-msgid ""
-"\n"
-"# <i>emerge ptrtd</i>\n"
-msgstr ""
-"\n"
-"# <i>emerge ptrtd</i>\n"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):818
-msgid "We now need to configure <c>ptrtd</c>, telling it what fake prefix (the one we setup <c>totd</c> to use) to create proxy connections for. Edit <path>/etc/conf.d/ptrtd</path> and set <c>IPV6_PREFIX</c>. This should be the same prefix as was configured with <c>totd</c>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):825
-msgid "Sample /etc/ptrtd.conf"
-msgstr "Пример /etc/ptrtd.conf"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):825
-#, no-wrap
-msgid ""
-"\n"
-"IPV6_PREFIX=\"3ffe:abcd:1234:9876::\"\n"
-msgstr ""
-"\n"
-"IPV6_PREFIX=\"3ffe:abcd:1234:9876::\"\n"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):829
-msgid "You can now start totd, and enable it to start at boot."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):833
-msgid "Starting totd"
-msgstr "Запуск totd"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):833
-#, no-wrap
-msgid ""
-"\n"
-"# <i>/etc/init.d/totd start</i>\n"
-"# <i>rc-update add totd default</i>\n"
-msgstr ""
-"\n"
-"# <i>/etc/init.d/totd start</i>\n"
-"# <i>rc-update add totd default</i>\n"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):842
-msgid "Client configuration and testing"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):845
-msgid "Clients may now be configured to connect to both IPv4 and IPv6 hosts through an IPv6 only connection. Assuming that the clients are already receiving an IP address from radvd, we simply need to add a new DNS resolver entry, and add a default route for those \"fake addresses\". First, add an entry at the top of your <path>/etc/resolv.conf</path> pointing to the machine running <c>totd</c>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):854
-msgid "/etc/resolv.conf sample"
-msgstr "Пример /etc/resolv.conf"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):854
-#, no-wrap
-msgid ""
-"\n"
-"nameserver 2001:470:1f00:296::1 <comment>(The server running totd)</comment>\n"
-msgstr ""
-"\n"
-"nameserver 2001:470:1f00:296::1 <comment># (Сервер, на котором работает totd)</comment>\n"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):858
-msgid "To test name resolution, request an AAAA record for a known IPv4 only site."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):863
-msgid "Testing name resolution"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):863
-#, no-wrap
-msgid ""
-"\n"
-"# <i>dig aaaa google.com</i>\n"
-";; ANSWER SECTION:\n"
-"google.com. 300 IN AAAA 3ffe:abcd:1234:9876::d8ef:3364\n"
-"google.com. 300 IN AAAA 3ffe:abcd:1234:9876::d8ef:3564\n"
-msgstr ""
-"\n"
-"# <i>dig aaaa google.com</i>\n"
-";; ANSWER SECTION:\n"
-"google.com. 300 IN AAAA 3ffe:abcd:1234:9876::d8ef:3364\n"
-"google.com. 300 IN AAAA 3ffe:abcd:1234:9876::d8ef:3564\n"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):870
-msgid "We will now add a default route for all addresses prefixed with our chosen fake prefix."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):875
-msgid "Adding the default route"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):875
-#, no-wrap
-msgid ""
-"\n"
-"<comment>(Assuming your IPv6 interface is eth0)</comment>\n"
-"# <i>ip route add 3ffe:abcd:1234:9876::/64 via 2001:470:1f00:296::1 dev eth0</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):880
-msgid "Finally, use <c>ping6</c> to ping google.com at it's fake IPv6 location."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre:caption):884
-msgid "Testing 6to4"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(pre):884
-#, no-wrap
-msgid ""
-"\n"
-"# <i>ping6 -c 2 google.com</i>\n"
-"PING 3ffe:abcd:1234:9876::d8ef:3364(3ffe:abcd:1234:9876::d8ef:3364) 56 data bytes\n"
-"64 bytes from 3ffe:abcd:1234:9876::d8ef:3364: icmp_seq=1 ttl=54 time=0.106 ms\n"
-"64 bytes from 3ffe:abcd:1234:9876::d8ef:3364: icmp_seq=2 ttl=54 time=0.090 ms\n"
-"\n"
-"--- 3ffe:abcd:1234:9876::d8ef:3364 ping statistics ---\n"
-"2 packets transmitted, 2 received, 0% packet loss, time 1000ms\n"
-"rtt min/avg/max/mdev = 0.090/0.098/0.106/0.008 ms\n"
-msgstr ""
-"\n"
-"# <i>ping6 -c 2 google.com</i>\n"
-"PING 3ffe:abcd:1234:9876::d8ef:3364(3ffe:abcd:1234:9876::d8ef:3364) 56 data bytes\n"
-"64 bytes from 3ffe:abcd:1234:9876::d8ef:3364: icmp_seq=1 ttl=54 time=0.106 ms\n"
-"64 bytes from 3ffe:abcd:1234:9876::d8ef:3364: icmp_seq=2 ttl=54 time=0.090 ms\n"
-"\n"
-"--- 3ffe:abcd:1234:9876::d8ef:3364 ping statistics ---\n"
-"2 packets transmitted, 2 received, 0% packet loss, time 1000ms\n"
-"rtt min/avg/max/mdev = 0.090/0.098/0.106/0.008 ms\n"
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(note):895
-msgid "The router running <c>ptrtd</c> is actually replying, but this at least tells us things are working."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(title):905
msgid "Other Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):909
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):749
msgid "There are many excellent resources online pertaining to IPv6."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(th):914
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(th):754
msgid "Websites"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(th):914
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(th):754
msgid "Resources"
msgstr "Ссылки"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):916
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):756
msgid "http://www.ipv6.org/"
msgstr "http://www.ipv6.org/"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):916
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):756
msgid "www.ipv6.org"
msgstr "www.ipv6.org"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):917
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):757
msgid "General IPv6 Information"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):920
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):760
msgid "http://www.linux-ipv6.org/"
msgstr "http://www.linux-ipv6.org/"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):920
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):760
msgid "www.linux-ipv6.org/"
msgstr "www.linux-ipv6.org/"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):921
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):761
msgid "USAGI Project"
msgstr "Проект USAGI"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):924
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):764
msgid "http://www.deepspace6.net/"
msgstr "http://www.deepspace6.net/"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):924
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):764
msgid "www.deepspace6.net"
msgstr "www.deepspace6.net"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):925
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):765
msgid "Linux/IPv6 site"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):936
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri:link):776
msgid "http://www.kame.net/"
msgstr "http://www.kame.net/"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):936
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(uri):776
msgid "www.kame.net"
msgstr "www.kame.net"
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):937
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(ti):777
msgid "*BSD implementation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):941
-msgid "On IRC, you can try <c>#ipv6</c> on <uri link=\"http://www.freenode.net/\">Freenode</uri>. You can connect to the Freenode servers using an IPv6 enabled client by connecting to <b>irc.ipv6.freenode.net</b>."
+#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(p):781
+msgid ""
+"On IRC, you can try <c>#ipv6</c> on <uri link=\"http://www.freenode.net/"
+"\">Freenode</uri>. You can connect to the Freenode servers using an IPv6 "
+"enabled client by connecting to <b>irc.ipv6.freenode.net</b>."
msgstr ""
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
#: ../../gentoo/xml/htdocs/doc/en//ipv6.xml(None):0
msgid "translator-credits"
msgstr ""
-
diff --git a/doc/gettext/ru/mailfilter-guide.xml.po b/doc/gettext/ru/mailfilter-guide.xml.po
index 0f05b51..a15073e 100644
--- a/doc/gettext/ru/mailfilter-guide.xml.po
+++ b/doc/gettext/ru/mailfilter-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-03-02 17:28+0500\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,89 +14,85 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.0\n"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(guide:link):6
-msgid "/doc/en/mailfilter-guide.xml"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):7
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):6
msgid "Gentoo mailfiltering gateway guide"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(author:title):9
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(author:title):8
msgid "Author"
msgstr "автор"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail:link):10
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail:link):9
msgid "jaervosz@gentoo.org"
msgstr "jaervosz@gentoo.org"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail):10
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail):9
msgid "Sune Kloppenborg Jeppesen"
msgstr "Sune Kloppenborg Jeppesen"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(author:title):12
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(author:title):11
msgid "Contributor"
msgstr "участник"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail:link):13
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail:link):12
msgid "gentoo@hilli.dk"
msgstr "gentoo@hilli.dk"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail):13
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail):12
msgid "Jens Hilligsøe"
msgstr "Jens Hilligsøe"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(author:title):15
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(author:title):14
msgid "Editor"
msgstr "редактор"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail:link):16
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail:link):15
msgid "nightmorph@gentoo.org"
msgstr "nightmorph@gentoo.org"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail):16
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(mail):15
msgid "Joshua Saddler"
msgstr "Joshua Saddler"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(abstract):19
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(abstract):18
msgid ""
"This guide is step-by-step guide for installing spam fighting technologies "
"for Postfix. Among them Amavisd-new using Spamassassin and ClamAV, "
"greylisting and SPF."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(version):29
-msgid "0.14"
-msgstr "0.14"
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(version):28
+msgid "1"
+msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(date):30
-msgid "2007-08-02"
-msgstr "2007-08-02"
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(date):29
+msgid "2011-03-02"
+msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):33
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1296
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1521
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):32
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1283
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1508
msgid "Introduction"
msgstr "Введение"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):37
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):36
msgid ""
"This guide describe step by step how to install a spam and virus filtering "
"mail gateway. It is quite simple to adopt this to a single server solution."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):45
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):44
msgid "The big picture"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):48
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):47
msgid ""
"This document describe how to setup a spam filtering mail gateway with "
"multiple domains. This server is meant to run in front of the mail servers "
"actually keeping the mail accounts i.e. Microsoft Exchange or Lotus Notes."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):55
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):54
msgid ""
"In this setup applications with good security records and readable "
"configuration files have been chosen. The email MTA is postfix which has a "
@@ -107,7 +103,7 @@ msgid ""
"which in turn will forward the mail to the next mail server."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):65
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):64
msgid ""
"Amavisd-new is a content filtering framework utilizing helper applications "
"for virus filtering and spam filtering. In this setup we will be using two "
@@ -117,7 +113,7 @@ msgid ""
"Razor2 and DCC."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):73
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):72
msgid ""
"Unlike many other spam fighting technologies like RBLs and others "
"Spamassassin does not simply accept or reject a given email based on one "
@@ -126,37 +122,37 @@ msgid ""
"score is based on the following tests:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):81
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):80
msgid "Bayesian filtering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):82
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):81
msgid "Static rules based on regular expressions"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):85
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):84
msgid "RBLs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):86
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):85
msgid "Razor2"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):87
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2106
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):86
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2093
msgid "Pyzor"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):88
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):236
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):87
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):235
msgid "DCC"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):83
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):82
msgid "Distributed and collaborative networks: <placeholder-1/>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):93
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):92
msgid ""
"The first part (chapters 1 to 4) of the guide will describe the basic setup "
"of a mailfiltering gateway. The next chapters can be implemented "
@@ -164,26 +160,26 @@ msgid ""
"describe how to:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):100
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):99
msgid ""
"setup special IMAP folders for learning of the Bayesian filter and for "
"delivery of false positives"
msgstr ""
#. <li>setup log analyzers to create daily reports</li>
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):107
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):106
msgid "setup greylisting with Postfix"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):108
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):107
msgid "setup Amavisd-new to use a MySQL backend for user preferences"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):109
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):108
msgid "setup Spamassassin to use a MySQL backend for AWL and Bayes data"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):112
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):111
msgid ""
"The IMAP folders will be using the maildir format. Having each mail in a "
"separate file makes handling much simpler. If you're using mbox I propose to "
@@ -191,13 +187,13 @@ msgid ""
"tools with <c>emerge courier-imap</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):119
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):118
msgid ""
"A planned fifth part will contain various tips regarding performance and "
"things you may want to know (running chrooted, postfix restrictions, etc.)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):124
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):123
msgid ""
"Delegating responsibility to third parties is not without risks. You have to "
"know and trust these third parties. In this setup only the decision to "
@@ -206,7 +202,7 @@ msgid ""
"by a single authority except perhaps Spamassassins own static rules."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):132
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):131
msgid ""
"When rejecting spam mails at the MTA level you have to be very careful when "
"selecting the RBL's you want to use, i.e. SpamCop is a bad RBL to use at the "
@@ -218,12 +214,12 @@ msgid ""
"html\">The Spam Problem: Moving Beyond RBLs</uri>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):146
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1572
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):145
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1559
msgid "Preparations"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):149
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):148
msgid ""
"Before you start make sure that you have a working Postfix installation "
"where you can send and receive mails also you need a backend mailserver. If "
@@ -234,28 +230,28 @@ msgid ""
"Documentation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):163
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):162
msgid "Installing the programs needed"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):167
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):166
msgid ""
"We start out by installing the most important programs: Amavisd-new, "
"Spamassassin and ClamAV."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):172
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):171
msgid "Installing Amavis, Spamassassin and Clamav"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):172
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):171
#, no-wrap
msgid ""
"\n"
"# <i>emerge amavisd-new spamassassin clamav </i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):176
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):175
msgid ""
"As previously mentioned you should already have a working <c>postfix</c> "
"instance running on the box. Basically this shouldn't be much more than "
@@ -263,30 +259,30 @@ msgid ""
"working."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):186
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):204
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):185
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):203
msgid "Setting up DNS"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):189
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):188
msgid ""
"If you're not setting up a gateway server but have the mailboxes on the same "
"server you only have to create the MX-Record."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):194
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):193
msgid ""
"While the programs are emerging fire up another shell and create the needed "
"DNS records."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):199
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):198
msgid ""
"Start out by creating a <c>MX</c> record for the mail gateway and an <c>A</"
"c> record for the next destination."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):204
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):203
#, no-wrap
msgid ""
"\n"
@@ -298,74 +294,74 @@ msgid ""
"mail A ms.ip.add.here\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):213
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):212
msgid ""
"Some ADSL providers might block port 25 and force you to relay mail through "
"one of their servers. Typically you have to create a secondary MX-Record "
"like <c>MX 20 backup-mx.some-isp.tld</c>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):222
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):221
msgid "Opening the firewall"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):225
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):224
msgid ""
"In addition to allowing normal mail traffic you have to allow a few services "
"through your firewall to allow the network checks to communicate with the "
"servers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(th):233
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(th):232
msgid "Application"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(th):233
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(th):232
msgid "Protocol"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(th):233
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(th):232
msgid "Port"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):236
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):235
msgid "UDP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):236
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):235
msgid "6277"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):239
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):238
msgid "Razor(outgoing ping)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):239
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):242
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):238
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):241
msgid "TCP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):239
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):238
msgid "7"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):242
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):241
msgid "Razor"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):242
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(ti):241
msgid "2703"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):246
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):245
msgid "Razor uses pings to discover what servers are closest to it."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):253
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):252
msgid "Configuring Postfix"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):256
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):255
msgid ""
"First we have to tell <c>postfix</c> to listen on port 10025 and we remove "
"most of the restrictions as they have already been applied by the "
@@ -374,11 +370,11 @@ msgid ""
"to add the following at the end of <path>/etc/postfix/master.cf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):264
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):263
msgid "Changing the master.cf file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):264
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):263
#, no-wrap
msgid ""
"\n"
@@ -414,7 +410,7 @@ msgid ""
"#-o content_filter=</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):297
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):296
msgid ""
"The <c>smtp-amavis</c> line specifies that a maximum of two of these "
"processes may run at any time. If you need a greater degree of concurrency "
@@ -425,7 +421,7 @@ msgid ""
"and heavy swapping, which leads to drastically reduced performance."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):307
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):306
msgid ""
"If you want to reject spam early on in the process you can use the Before-"
"Queue (proxy) method instead of the filter method. If you uncomment the "
@@ -434,42 +430,42 @@ msgid ""
"concurrent connections are limited to the number of amavisd instances."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):316
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):315
msgid "The Before-Queue(proxy) method is still not properly tested."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):320
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):319
msgid ""
"If you, for any reason whatsoever, want to send mail from this box and don't "
"want it scanned, add another postfix instance by uncommenting the last two "
"lines and substitute with a proper IP."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):326
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):325
msgid ""
"The file <path>master.cf</path> tells the postfix master program how to run "
"each individual postfix process. More info with <c>man 8 master</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):332
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):331
msgid ""
"Next we need the main <c>postfix</c> instance listening on port 25 to filter "
"the mail through <c>amavisd-new</c> listening on port 10024."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):337
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):336
msgid ""
"We also need to set the next hop destination for mail. Tell Postfix to "
"filter all mail through an external content filter and enable explicit "
"routing to let Postfix know where to forward the mail to."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):343
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):985
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):342
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):984
msgid "Modifying /etc/postfix/main.cf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):343
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):342
#, no-wrap
msgid ""
"\n"
@@ -489,7 +485,7 @@ msgid ""
"relay_domains = $transport_maps\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):360
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):359
msgid ""
"Postfix has a lot of options set in <path>main.cf</path>. For further "
"explanation of the file please consult <c>man 5 postconf</c> or the same "
@@ -497,25 +493,25 @@ msgid ""
"Configuration Parameters</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):367
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):366
msgid ""
"The format of the <path>transport</path> file is the normal Postfix hash "
"file. Mail to the domain on the left hand side is forwarded to the "
"destination on the right hand side."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):373
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):372
msgid "/etc/postfix/transport"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):373
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):372
#, no-wrap
msgid ""
"\n"
"mydomain.tld smtp:mail.mydomain.tld\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):377
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):376
msgid ""
"After we have edited the file we need to run the <c>postmap</c> command. "
"Postfix does not actually read this file so we have to convert it to the "
@@ -524,14 +520,14 @@ msgid ""
"Postfix as it will automatically pick up the changes."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):385
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):384
msgid ""
"If the next hop mail server is not listening on the standard SMTP port 25 "
"you can tell postfix to use a given port number, like <c>smtp:mail.mydomain."
"tld:25000</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):391
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):390
msgid ""
"If your first attempts to send mail result in messages bouncing, you've "
"likely made a configuration error somewhere. Try temporarily enabling "
@@ -541,11 +537,11 @@ msgid ""
"is disabled or removed."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):400
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):399
msgid "Enabling soft_bounce"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):400
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):399
#, no-wrap
msgid ""
"\n"
@@ -553,17 +549,17 @@ msgid ""
"# <i>/etc/init.d/postfix reload</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):405
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):404
msgid ""
"Once you've finished creating a working configuration, be sure to disable or "
"remove <c>soft_bounce</c> and reload postfix."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):413
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):412
msgid "Configuring Amavisd-new"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):416
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):415
msgid ""
"Amavisd-new is used to handle all the filtering and allows you to easily "
"glue together severel different technologies. Upon reception of a mail "
@@ -572,36 +568,36 @@ msgid ""
"scanners and finally it will filter the mail using SpamAssassin."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):424
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):423
msgid "Amavisd-new itself has a number of extra features:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):429
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):428
msgid ""
"it identifies dangerous file attachments and has policies to handle them"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):435
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):434
msgid "whitelists"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):436
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):435
msgid "blacklists"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):437
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):436
msgid "spam score thresholds"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):438
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):437
msgid "virus and spam policies"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):432
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(li):431
msgid "per-user, per-domain and system-wide policies for: <placeholder-1/>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):443
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):442
msgid ""
"Apart from <c>postfix</c> and <c>freshclam</c> we will run all applications "
"as the user <c>amavis</c>."
@@ -616,15 +612,15 @@ msgstr ""
#. # <i>chown amavis:amavis /var/amavis</i>
#. # <i>chmod 750 /var/amavis</i>
#. </pre>
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):466
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):465
msgid "Edit the following lines in <path>/etc/amavisd.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):470
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):469
msgid "Editing /etc/amavisd.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):470
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):469
#, no-wrap
msgid ""
"\n"
@@ -653,7 +649,7 @@ msgid ""
"$final_spam_destiny = D_DISCARD; # (defaults to D_BOUNCE)\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):496
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):495
msgid ""
"With this line <c>$sa_tag2_level_deflt = 5;</c> you set the Spamassassin "
"spam score to 5. This might be a bit low. As you might have noticed the "
@@ -662,17 +658,17 @@ msgid ""
"false positives choose <c>6.3</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):504
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):503
msgid ""
"Create a quarantine directory for the virus mails as we don't want these "
"delivered to our users."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):509
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):508
msgid "Create a quarantine directory for the virus mails"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):509
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):508
#, no-wrap
msgid ""
"\n"
@@ -681,15 +677,15 @@ msgid ""
"# <i>chmod 750 /var/amavis/virusmails</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):515
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):514
msgid "Amavisd-new offers finer policy tuning by using policy banks."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):522
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):521
msgid "Configuring ClamAV"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):525
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):524
msgid ""
"As virus scanner we use ClamAV as it has a fine detection rate comparable "
"with commercial offerings, it is very fast and it is Open Source Software. "
@@ -698,11 +694,11 @@ msgid ""
"<path>/etc/clamd.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):533
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):532
msgid "Edit /etc/clamd.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):533
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):532
#, no-wrap
msgid ""
"\n"
@@ -723,22 +719,22 @@ msgid ""
"ScanArchive\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):551
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):550
msgid "Also remember to remove the Example directive to make ClamAV work"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):555
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):554
msgid ""
"ClamAV comes with the <c>freshclam</c> deamon dedicated to periodical checks "
"of virus signature updates. Instead of updating virus signatures twice a day "
"we will make <c>freshclam</c> update virus signatures every two hours."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):561
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):560
msgid "Edit /etc/freshclam.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):561
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):560
#, no-wrap
msgid ""
"\n"
@@ -754,17 +750,17 @@ msgid ""
"DatabaseMirror db.XY.clamav.net\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):574
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):573
msgid ""
"Start <c>clamd</c> with <c>freshclam</c> using the init scripts by modifying "
"<path>/etc/conf.d/clamd</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):579
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):578
msgid "Modifying /etc/conf.d/clamd"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):579
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):578
#, no-wrap
msgid ""
"\n"
@@ -772,17 +768,17 @@ msgid ""
"FRESHCLAM_OPTS=\"-d\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):584
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):583
msgid ""
"At last modify <path>amavisd.conf</path> with the new location of the socket."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):589
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1087
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):588
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1086
msgid "Modifying /etc/amavisd.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):589
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):588
#, no-wrap
msgid ""
"\n"
@@ -793,16 +789,16 @@ msgid ""
" qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):597
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):596
msgid ""
"Do NOT modify the <c>$unix_socketname</c> unless you know what you're doing."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):604
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):603
msgid "Configuring Vipul's Razor"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):607
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):606
msgid ""
"Razor2 is a collaborative and distributed spam checksum network. Install it "
"with <c>emerge razor</c> and create the needed configuration files. Do this "
@@ -810,11 +806,11 @@ msgid ""
"create</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):614
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):613
msgid "Creating the required configuration files"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):614
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):613
#, no-wrap
msgid ""
"\n"
@@ -830,33 +826,33 @@ msgid ""
"# <i>usermod -s /bin/false amavis</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):630
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):629
msgid "Configuring Distributed Checksum Clearinghouse (dcc)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):633
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):632
msgid ""
"Like Razor2, dcc is a collaborative and distributed spam checksum network. "
"Its philosopy is to count the number of recipients of a given mail "
"identifying each mail with a fuzzy checksum."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):639
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):638
msgid "Installing DCC"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):639
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):638
#, no-wrap
msgid ""
"\n"
"# <i>emerge dcc</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):646
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):645
msgid "Configuring Spamassassin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):649
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):648
msgid ""
"Amavis is using the Spamassassin Perl libraries directly so there is no need "
"to start the service. Also this creates some confusion about the "
@@ -865,11 +861,11 @@ msgid ""
"amavisd.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):657
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):656
msgid "Create /etc/mail/spamassassin/local.cf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):657
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):656
#, no-wrap
msgid ""
"\n"
@@ -892,29 +888,29 @@ msgid ""
"bayes_path /var/amavis/.spamassassin/bayes\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):677
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):676
msgid ""
"With Spamassassin version 3.1 you have to enable DCC, Razor2 by uncommenting "
"the corresponding lines in <path>v310.pre</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):682
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):681
msgid ""
"You can find inspiration for your <path>local.cf</path> file by trying the "
"<uri link=\"http://www.yrex.com/spam/spamconfig.php\">SpamAssassin "
"Configuration Generator</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):688
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):687
msgid ""
"You might also want to switch the <c>ok_languages</c> and <c>ok_locales</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):697
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):696
msgid "Every good rule has good exceptions as well"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):701
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):700
msgid ""
"Once mail really starts passing through this mail gateway you will probably "
"discover that the above setup is not perfect. Maybe some of your customers "
@@ -923,29 +919,29 @@ msgid ""
"conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):709
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):708
msgid "Modifying amavisd.conf to do sitewide scoring"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):709
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):708
#, no-wrap
msgid ""
"\n"
"read_hash(\"/var/amavis/sender_scores_sitewide\"),\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):713
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):712
msgid ""
"In the <path>sender_scores_sitewide</path> file you put complete email "
"addresses or just the domian parts and then note a positive/negative score "
"to add to the spam score."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):719
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):718
msgid "whitelist_sender example"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):719
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):718
#, no-wrap
msgid ""
"\n"
@@ -955,41 +951,41 @@ msgid ""
".example.net 1.0\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):726
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):725
msgid "See <path>/etc/amavisd.conf</path> for more examples."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):730
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):729
msgid ""
"Placing these addresses outside <path>amavisd.conf</path> is a cleaner and "
"safer solution."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):735
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):734
msgid ""
"Alternatively it can be done in Spamassassin's configuration file <path>/etc/"
"mail/spamassassin/local.cf</path> but I think it is cleaner to do it in "
"<path>/etc/amavisd.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):741
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):740
msgid ""
"In a later chapter I will show how to implement per-user policies using "
"MySQL."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):746
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):745
msgid ""
"While waiting for a better method you can add the following to <path>amavisd."
"conf</path> to bypass spam checks for <c>postmaster</c> and <c>abuse</c> "
"mailboxes."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):752
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):751
msgid "By pass spam filters for all postmaster and abuse mails"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):752
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):751
#, no-wrap
msgid ""
"\n"
@@ -999,7 +995,7 @@ msgid ""
"));\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(impo):759
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(impo):758
msgid ""
"While we are at it we should <e>never</e> automatically discard mails to the "
"<c>postmaster</c> or the <c>abuse</c> accounts. See <uri link=\"http://www."
@@ -1009,11 +1005,11 @@ msgid ""
"ignorant.org</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):773
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):772
msgid "Adding more rules"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):777
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):776
msgid ""
"If you want to use more rules provided by the SARE Ninjas over at the <uri "
"link=\"http://www.rulesemporium.com/\">SpamAssassin Rules Emporium</uri> you "
@@ -1021,31 +1017,31 @@ msgid ""
"in Spamassassin."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):784
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):783
msgid ""
"A brief guide to using SARE rulesets with <c>sa-update</c> can be found <uri "
"link=\"http://daryl.dostech.ca/sa-update/sare/sare-sa-update-howto.txt"
"\">here</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):794
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):793
msgid "Testing and finishing up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):796
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):795
msgid "Testing the setup"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):799
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):798
msgid ""
"Now before you start <c>freshclam</c> you can manually verify that it works."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):803
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):802
msgid "Testing freshclam"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):803
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):802
#, no-wrap
msgid ""
"\n"
@@ -1060,23 +1056,23 @@ msgid ""
"Database updated (21370 signatures) from database.clamav.net (193.1.219.100).\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):815
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):814
msgid ""
"Now you have updated virus definitions and you know that <path>freshclam."
"conf</path> is working properly."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):820
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):819
msgid ""
"Test freshclam and amavisd from the cli and amavisd testmails. Start "
"<c>clamd</c> and <c>amavis</c> with the following commands:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):825
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):824
msgid "Start amavisd and clamd and reload postfix configuration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):825
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):824
#, no-wrap
msgid ""
"\n"
@@ -1085,59 +1081,59 @@ msgid ""
"# <i>/etc/init.d/postfix reload</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):831
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):830
msgid ""
"If everything went well <c>postfix</c> should now be listening for mails on "
"port 25 and for reinjected mails on port 10024. To verify this check your "
"log file."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):836
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):835
msgid "Checking log files"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):836
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):835
#, no-wrap
msgid ""
"\n"
"# <i>tail -f /var/log/mail.log</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):840
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):839
msgid ""
"Depending on your log settings the correct path might be <path>/var/log/"
"messages</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):845
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):844
msgid ""
"Now if no strange messages appear in the log file it is time for a new test."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):850
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):849
msgid ""
"Use <c>netcat</c> to manually connect to <c>amavisd</c> on port 10024 and "
"<c>postfix</c> on port 10025."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):855
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):854
msgid ""
"Netcat can be used as an advanced replacement for <c>telnet</c>. Install it "
"with <c>emerge netcat</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):860
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):859
msgid ""
"For some unknown reason you can not complete a manual mail injection to "
"<c>amavisd</c> with netcat. Use <c>telnet</c> instead."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):865
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):864
msgid ""
"Manually checking that amavisd and postfix are listning to the new ports"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):865
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):864
#, no-wrap
msgid ""
"\n"
@@ -1149,22 +1145,22 @@ msgid ""
"220 example.com ESMTP Postfix\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):874
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):873
msgid ""
"If you want to see the complete output from amavisd-new start <c>amavisd "
"debug-sa</c> as the <c>amavis</c> user and send a mail. For this to work you "
"might have to change the default shell in <path>/etc/passwd</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):881
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):880
msgid "Add <c>amavisd</c> and <c>clamd</c> to the <c>default</c> runlevel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):885
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):884
msgid "Add amavisd and clamd to the default runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):885
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):884
#, no-wrap
msgid ""
"\n"
@@ -1172,13 +1168,13 @@ msgid ""
"# <i>rc-update add amavisd default</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):890
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):889
msgid ""
"We do not add <c>spamd</c> to the default runlevel as <c>amavisd</c> uses "
"the Spamassassin Perl libraries directly."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):895
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):894
msgid ""
"You might notice <c>Net::Server: Couldn't POSIX::setuid to ... []</c> lines "
"in your log. According to <uri link=\"http://www.ijs.si/software/amavisd/"
@@ -1188,29 +1184,29 @@ msgid ""
"a string <c>0 but true</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(impo):905
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(impo):904
msgid ""
"If you enabled login for amavis remember to set back the login shell in "
"<path>/etc/passwd</path> to <c>/bin/false</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):915
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):914
msgid "Autolearning and sidelining emails"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):917
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):916
msgid "Creating the spamtrap user"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):920
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):919
msgid "Create the spamtrap account and directories."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):924
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):923
msgid "Create spamtrap account"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):924
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):923
#, no-wrap
msgid ""
"\n"
@@ -1221,22 +1217,22 @@ msgid ""
"# <i>passwd spamtrap</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):932
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):931
msgid ""
"If you manually want to check some of the mails to ensure that you have no "
"false positives you can use the following <c>procmail</c> recipe to sideline "
"spam found into different mail folders."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):941
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):940
msgid "Creating .procmailrc"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):944
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):943
msgid "Creating /home/spamtrap/.procmailrc"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):944
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):943
#, no-wrap
msgid ""
"\n"
@@ -1264,43 +1260,43 @@ msgid ""
"./\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):969
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):968
msgid ""
"If your mail server is going to receive a lot of mail you should NOT use the "
"likely-spam recipe. Instead set <c>$sa_tag2_level_deflt</c> high enough to "
"avoid false positives and filter it directly to <c>$SPAM_FOLDER</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):976
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):975
msgid ""
"If you haven't already installed <c>procmail</c> do it with <c>emerge "
"procmail</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):981
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):980
msgid "Now make sure that Postfix uses <c>procmail</c> to deliver mail."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):985
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):984
#, no-wrap
msgid ""
"\n"
"mailbox_command = /usr/bin/procmail -a \"DOMAIN\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):992
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):991
msgid "Create mailfolders"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):995
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):994
msgid "Now we will create shared folders for ham and spam."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):999
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):998
msgid "Create the necessary mailfolders"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):999
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):998
#, no-wrap
msgid ""
"\n"
@@ -1311,18 +1307,18 @@ msgid ""
"# <i>maildirmake -s write -f redeliver /var/amavis/.maildir/Bayes</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1007
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1006
msgid ""
"Amavisd-new needs to be able to read these files as well as all mailusers. "
"Therefore we add all the relevant users to the mailuser group along with "
"amavis."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1012
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1011
msgid "Setting the proper permissions"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1012
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1011
#, no-wrap
msgid ""
"\n"
@@ -1335,56 +1331,56 @@ msgid ""
"# <i>chmod g+rx /var/amavis/.maildir/Bayes/</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1022
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1021
msgid ""
"This grants members of the <c>mailusers</c> groups access to <c>amavis</c> "
"mail."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1027
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1026
msgid ""
"This makes the spam and ham folders writable but not readable. This way "
"users can safely submit their ham without anyone else being able to read it."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1032
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1031
msgid "Then run the following command as the <c>spamtrap</c> user:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1036
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1035
msgid "Adding the shared folders to the users mailfolder"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1036
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1035
#, no-wrap
msgid ""
"\n"
"$ <i>maildirmake --add Bayes=/var/amavis/.maildir/Bayes $HOME/.maildir</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1040
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1039
msgid ""
"We have to give the group read permissions on the <path>Bayes</path> folder "
"in order for the mail client to be able to see the subdirectories used by "
"IMAP."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1049
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1048
msgid "Adding cron jobs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1052
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1051
msgid ""
"Now run <c>crontab -u amavis -e</c> to edit the amavis crontab to enable "
"automatic learning of the Bayes filter every hour."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1057
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1128
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1056
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1115
msgid "amavis crontab"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1057
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1056
#, no-wrap
msgid ""
"\n"
@@ -1395,11 +1391,11 @@ msgid ""
" /dev/null 2&gt;&amp;1\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1065
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1064
msgid "<c>amavis</c> has to be a member of the <c>cron</c> group to run crons."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1070
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1069
msgid ""
"It seems like the shared maildir folders will make <c>sa-learn</c> examine "
"all messages twice. This should not be a problem. The output will also show "
@@ -1407,18 +1403,18 @@ msgid ""
"examined."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1079
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1805
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1078
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1792
msgid "Modifying amavisd.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1082
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1081
msgid ""
"Now modify amavis to redirect spam emails to the <c>spamtrap</c> account and "
"keep spamheaders."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1087
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1086
#, no-wrap
msgid ""
"\n"
@@ -1426,50 +1422,38 @@ msgid ""
"$spam_quarantine_to = \"spamtrap\\@$myhostname\";\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1095
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1094
msgid "Redelivering false positives"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1098
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1097
msgid ""
"If you set the spam score very low like we do you will probably have some "
"false positives. These are filtered into the folder <path>likely-spam</"
"path>. These are manually reviewed and any false positive is moved to the "
"<path>redeliver</path> mailfolder. From there it is first fed through <c>sa-"
-"learn --ham</c> and then redelivered with all headers intact using a patched "
-"version of <uri link=\"http://www.engelschall.com/sw/smtpclient/"
-"\">smtpclient</uri> by Ralf S. Engelschall."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1109
-msgid ""
-"The original version 1.0.0 of <c>smtpclient</c> is already in Portage "
-"however to keep all headers intact we use a modified version. Here is how "
-"you install the revised version:"
+"learn --ham</c> and then redelivered with all headers intact using <uri link="
+"\"http://www.engelschall.com/sw/smtpclient/\">smtpclient</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1115
-msgid "Installing revised smtpclient"
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1106
+msgid "Installing smtpclient"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1115
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1106
#, no-wrap
msgid ""
"\n"
-"<comment>(Switch to your portage OVERLAY)</comment>\n"
-"# <i>wget http://home.coming.dk/files/smtpclient.tar.gz</i>\n"
-"# <i>tar xzf smtpclient.tar.gz</i>\n"
-"# <i>echo \"mail-client/smtpclient ~x86\" &gt;&gt; /etc/portage/package.keywords</i>\n"
-"# <i>echo \"mail-client/smtpclient fullheaders\" &gt;&gt; /etc/portage/package.use</i>\n"
+"# <i>echo \"mail-client/smtpclient\" &gt;&gt; /etc/portage/package.accept_keywords</i>\n"
"# <i>emerge smtpclient</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1124
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1111
msgid ""
"Check for mails in the <path>redeliver</path> folder every minute using cron."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1128
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1115
#, no-wrap
msgid ""
"\n"
@@ -1480,18 +1464,18 @@ msgid ""
" -name \"[0-9]*\" -exec /usr/local/bin/redeliver.pl {} \\;\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1136
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1123
msgid ""
"Now we only have to copy the <c>redeliver.pl</c> file to <path>/usr/local/"
"bin/</path>. <uri link=\"http://home.coming.dk/files/redeliver.pl\">Download "
"it</uri> or use the version below."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1143
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1130
msgid "redeliver.pl"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1143
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1130
#, no-wrap
msgid ""
"\n"
@@ -1552,22 +1536,22 @@ msgid ""
"}\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1204
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1191
msgid "Cleaning up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1207
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1194
msgid ""
"We don't want to keep mail forever so we use <c>tmpwatch</c> to clean up "
"regularily. Emerge it with <c>emerge tmpwatch</c>. Only <c>root</c> is able "
"to run <c>tmpwatch</c> so we have to edit the <c>root</c> crontab."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1213
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1200
msgid "Modifying root crontab"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1213
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1200
#, no-wrap
msgid ""
"\n"
@@ -1578,12 +1562,12 @@ msgid ""
"15 0 * * * /usr/sbin/tmpwatch -c -f -d --quiet 168 /var/amavis/.maildir/Bayes/\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1294
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2072
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1281
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2059
msgid "Greylisting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1299
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1286
msgid ""
"Greylisting is one of the newer weapons in the spam fighting arsenal. As the "
"name implies it is much like whitelisting and blacklisting. Each time an "
@@ -1595,13 +1579,13 @@ msgid ""
"identify the spam."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1311
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1298
msgid ""
"If your ISP blocks incoming traffic on port 25 and relays all mail to you "
"through their own mail server greylisting will not work."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1316
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1303
msgid ""
"Postfix 2.1 come with a simple Perl greylisting policy server that "
"implements such a scheme. However it suffers from unpredictable results when "
@@ -1611,7 +1595,7 @@ msgid ""
"and then I will show how to configure the more robust replacement."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1326
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1313
msgid ""
"There are other greylisting policy servers for Postfix around (such as <uri "
"link=\"http://www.gasmi.net/gld.html\">Gld</uri>, which is in Portage, and "
@@ -1619,27 +1603,27 @@ msgid ""
"support database backends, auto whitelisting and other neat features."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1336
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1323
msgid "Simple greylisting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1339
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1326
msgid ""
"If you prefer to use the improved greylisting with postgrey you can safely "
"skip this section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1344
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1331
msgid ""
"We need the file <path>greylist.pl</path> but unfortunately the ebuild does "
"not install it as default."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1349
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1336
msgid "Getting greylist.pl"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1349
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1336
#, no-wrap
msgid ""
"\n"
@@ -1648,17 +1632,17 @@ msgid ""
"# <i>cp postfix-2.1.0/examples/smtpd-policy/greylist.pl /usr/bin/</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1355
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1342
msgid ""
"Now we have the file in place we need to create the directory to hold the "
"greylisting database:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1360
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1347
msgid "Creating directory for the greylisting database"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1360
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1347
#, no-wrap
msgid ""
"\n"
@@ -1666,7 +1650,7 @@ msgid ""
"# <i>chown nobody /var/mta</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1365
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1352
msgid ""
"Do not create the greylisting database directory on a partition that might "
"run out of space. While postfix can recover from no-space-left situations "
@@ -1675,22 +1659,22 @@ msgid ""
"receive mail at all until you delete the file by hand."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1377
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1364
msgid "Configuring greylisting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1380
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1367
msgid ""
"Now that we have all this ready all that is left is to add it to the postfix "
"configuration. First we add the necessary information to the <path>master."
"cf</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1386
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1373
msgid "Modifying master.cf to use greylisting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1386
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1373
#, no-wrap
msgid ""
"\n"
@@ -1698,19 +1682,19 @@ msgid ""
" user=nobody argv=/usr/bin/perl /usr/bin/greylist.pl\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1391
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1378
msgid ""
"The postfix spawn daemon normally kills its child processes after 1000 "
"seconds but this is too short for the greylisting process so we have to "
"increase the timelimit in <path>main.cf</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1397
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1481
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1384
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1468
msgid "Modifying main.cf to use greylisting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1397
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1384
#, no-wrap
msgid ""
"\n"
@@ -1722,21 +1706,21 @@ msgid ""
"greylist = check_policy_service unix:private/policy-greylist\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1406
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1393
msgid ""
"Be sure to specify <c>check_sender_access</c> AFTER "
"<c>reject_unauth_destination</c> or else your system could become an open "
"mail relay."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1412
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1399
msgid ""
"The greylist database gets polluted quickly with bogus addresses. It helps "
"if you protect greylist lookups with other restrictions that reject unknown "
"senders and/or recipients."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1418
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1405
msgid ""
"We don't want to use greylisting for all domains but only for those "
"frequently abused by spammers. After all it will delay mail delivery. A list "
@@ -1746,11 +1730,11 @@ msgid ""
"sender_access</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1427
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1414
msgid "Format of sender_access"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1427
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1414
#, no-wrap
msgid ""
"\n"
@@ -1759,15 +1743,15 @@ msgid ""
"bigfoot.com greylist\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1433
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1420
msgid "If you want a more extensive list:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1437
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1424
msgid "Adding all domains to sender_access"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1437
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1424
#, no-wrap
msgid ""
"\n"
@@ -1775,60 +1759,60 @@ msgid ""
"# <i>cat sender-domain-validate.in | sort | awk {'print $1 \"\\t\\t greylist\"'} &gt; /etc/postfix/sender_access</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1442
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1429
msgid "Now we only have to initialize the <path>sender_access</path> database:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1447
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1434
msgid "Initialize sender_access"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1447
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1434
#, no-wrap
msgid ""
"\n"
"# <i>postmap /etc/postfix/sender_access</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1451
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1438
msgid "Now the setup of simple greylisting is complete."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1455
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(warn):1442
msgid ""
"I tried this on one box handling thousands of mails daily and the results "
"were almost a complete disaster. After four days the box was bogged down "
"with hundreds of old <c>greylist.pl</c> processes."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1464
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1451
msgid "Configuring improved greylisting with postgrey"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1467
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1454
msgid ""
"You can install the enhanced greylisting policy server with a simple "
"<c>emerge</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1472
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1459
msgid "Installing postgrey"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1472
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1459
#, no-wrap
msgid ""
"\n"
"# <i>emerge postgrey</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1476
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1463
msgid ""
"After installing <c>postgrey</c> we have to edit <path>main.cf</path>. "
"Changes are almost exactly like the built in greylisting."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1481
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1468
#, no-wrap
msgid ""
"\n"
@@ -1839,27 +1823,27 @@ msgid ""
"greylist = check_policy_service inet:127.0.0.1:10030\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1489
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1476
msgid ""
"The Postfix SMTPD_POLICY_README only uses <c>restriction_classes</c> but "
"that does not appear to work."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1494
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1481
msgid ""
"If you want to greylist everything instead add <c>check_policy_service "
"inet:127.0.0.1:10030</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1499
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1486
msgid "Finally, start the server and add it to the proper runlevel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1503
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1490
msgid "Starting postgrey"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1503
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1490
#, no-wrap
msgid ""
"\n"
@@ -1867,7 +1851,7 @@ msgid ""
"# <i>rc-update add postgrey default</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1508
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1495
msgid ""
"Some people like to get their mail fast and thus greylisting is worthless. "
"However if you employ a backup mail server you can safely setup greylisting "
@@ -1875,24 +1859,24 @@ msgid ""
"third of the spam received."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1519
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1506
msgid "SPF (Sender Policy Framework)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1524
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1511
msgid ""
"SPF allows domain owners to state in their DNS records which IP addressess "
"should be allowed to send mails from their domain. This will prevent "
"spammers from spoofing the <c>Return-Path</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1530
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1517
msgid ""
"If your ISP blocks incoming traffic on port 25 and relays all mail to you "
"through their own mail server SPF will not work."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1535
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1522
msgid ""
"First domain owners have to create a special <c>TXT</c> DNS record. Then an "
"SPF-enabled MTA can read this and if the mail originates from a server that "
@@ -1900,61 +1884,61 @@ msgid ""
"entry could look like this:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1542
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1529
msgid "Example SPF record"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1542
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1529
#, no-wrap
msgid ""
"\n"
"example.com. IN TXT \"v=spf1 a mx ptr -all\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1546
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1533
msgid ""
"The <c>-all</c> means to reject all mail by default but allow mail from the "
"<c>A</c>(<c>a</c>), <c>MX</c>(<c>mx</c>) and <c>PTR</c>(<c>ptr</c>) DNS "
"records. For more info consult further resources below."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1553
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1540
msgid ""
"If you relay outgoing mail through your ISP you will have to add: <c>include:"
"yourisp.com</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1558
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1545
msgid ""
"Spamassassin 3.0 has support for SPF, however it is not enabled by default "
"and the new policy daemon in Postfix supports SPF so let's install SPF "
"support for Postfix."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1564
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1551
msgid ""
"If you want to use SPF with Spamassassin instead simply <c>emerge&nbsp;dev-"
"perl/Mail-SPF-Query</c> and restart Amavisd-new."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1575
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1562
msgid ""
"First you have to install Postfix 2.1 as described above. When you have "
"fetched the source grab the <path>spf.pl</path> with:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1581
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1568
msgid "Installing spf.pl"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1581
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1568
#, no-wrap
msgid ""
"\n"
"# <i>cp postfix-&lt;version&gt;/examples/smtpd-policy/spf.pl /usr/local/bin/</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1585
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1572
msgid ""
"The <path>spf.pl</path> coming with Postfix is slightly buggy so find and "
"uncomment the following line: <c>push @HANDLERS, \"sender_permitted_from\"; "
@@ -1963,34 +1947,34 @@ msgid ""
"link=\"http://spf.pobox.com/postfix-policyd.txt\">development version</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1594
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1581
msgid ""
"This Perl script also needs some Perl libraries that are not in portage but "
"it is still quite simple to install them:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1599
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1586
msgid "Installing the needed Perl libraries"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1599
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1586
#, no-wrap
msgid ""
"\n"
"# <i>emerge Mail-SPF-Query Net-CIDR-Lite Sys-Hostname-Long</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1603
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1590
msgid ""
"Now that we have everything in place all we need is to configure Postfix to "
"use this new policy."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1608
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1595
msgid "Modifying master.cf to use SPF"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1608
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1595
#, no-wrap
msgid ""
"\n"
@@ -1998,17 +1982,17 @@ msgid ""
" user=nobody argv=/usr/bin/perl /usr/local/bin/spf.pl\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1613
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1600
msgid ""
"Now add the SPF check in <path>main.cf</path>. Properly configured SPF "
"should do no harm so we could check SPF for all domains:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1618
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1605
msgid "Modifying main.cf to use SPF"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1618
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1605
#, no-wrap
msgid ""
"\n"
@@ -2016,37 +2000,37 @@ msgid ""
"check_policy_service unix:private/policy-spf\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1623
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1610
msgid ""
"If you're experiencing problems with SPF, e.g. when using <c>fetchmail</c>, "
"you might want to enable SPF for certain domains only."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1633
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1620
msgid "Configuring amavisd-new to use MySQL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1635
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1622
msgid "Configuring MySQL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1638
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1625
msgid ""
"This has not been tested on versions higher than 2.2. Feedback is welcome :)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1642
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1629
msgid ""
"For large domains the default values you can set in <path>amavisd.conf</"
"path> might not suit all users. If you configure amavisd-new with MySQL "
"support you can have individual settings for users or groups of users."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1649
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1636
msgid "Creating the MySQL database and user"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1649
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1636
#, no-wrap
msgid ""
"\n"
@@ -2061,18 +2045,18 @@ msgid ""
"mysql&gt; <i>use maildb;</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1661
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1648
msgid ""
"Now that the database is created we'll need to create the necessary tables. "
"You can cut and paste the following into the mysql prompt:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1666
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1859
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1653
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1846
msgid "MySQL table layout"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1666
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1653
#, no-wrap
msgid ""
"\n"
@@ -2131,27 +2115,27 @@ msgid ""
" );\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1722
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1709
msgid ""
"If you have problems using copy/paste you might have to copy this somewhere "
"else and clean out the unneeded characters."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1727
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1714
msgid ""
"Lookups trying to match email are done with raw (rfc2821-unquoted and "
"unbracketed) addresses as a key, i.e.: <c>John \"Funny\" Smith@example.com</"
"c>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1733
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1720
msgid ""
"Lookups are performed in the following order: <c>SQL</c>, <c>LDAP</c>, "
"<c>hash</c>, <c>ACL</c>, <c>regexp</c>, <c>constant</c>. The first that "
"returns a definitive answer (not <c>undef/NULL</c>) stops the search."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1739
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1726
msgid ""
"If you wish to use whitelisting and blacklisting you must add the sender and "
"receiver to <c>mailadr</c> after which you create the relation between the "
@@ -2159,17 +2143,17 @@ msgid ""
"c>) or blacklisting (<c>B</c>)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1746
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1733
msgid ""
"Now that we have created the tables let's insert a test user and a test "
"policy:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1751
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1738
msgid "Create test user and test policy"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1751
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1738
#, no-wrap
msgid ""
"\n"
@@ -2201,32 +2185,32 @@ msgid ""
" spam_kill_level =10.0;\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1780
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1767
msgid "Copy this to somewhere else and adjust to suit your own environment."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1784
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1771
msgid ""
"<c>local</c> should be set to <c>Y</c> otherwise the mail will not be "
"scanned for spam."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1789
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1776
msgid ""
"This inserts a test user and a Test policy. Adjust these examples to fit "
"your needs. Further explanation of the configuration names can be found in "
"<path>amavisd.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1798
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1785
msgid "Configuring amavisd to use MySQL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1801
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1788
msgid "Now that MySQL is ready we need to tell amavis to use it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1805
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1792
#, no-wrap
msgid ""
"\n"
@@ -2245,11 +2229,11 @@ msgid ""
" ' ORDER BY mailaddr.priority DESC';\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1826
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1813
msgid "Configuring Spamassassin to use MySQL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1830
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1817
msgid ""
"As of Spamassassin 3.0 it is possible to store the Bayes and AWL data in a "
"MySQL database. We will use MySQL as the backend as it can generally "
@@ -2258,17 +2242,17 @@ msgid ""
"this."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1837
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1824
msgid ""
"First start out by creating the new MySQL user and then create the needed "
"tables."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1842
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1829
msgid "Creating the new MySQL database and user"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1842
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1829
#, no-wrap
msgid ""
"\n"
@@ -2283,13 +2267,13 @@ msgid ""
"mysql&gt; <i>use dbname;</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1854
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1841
msgid ""
"Now that the database is created we'll create the necessary tables. You can "
"cut and paste the following into the mysql prompt:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1859
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1846
#, no-wrap
msgid ""
"\n"
@@ -2349,45 +2333,45 @@ msgid ""
" ) TYPE=MyISAM;\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(impo):1916
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(impo):1903
msgid "The <c>INSERT</c> line is needed otherwise Spamassassin will not work."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1921
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1908
msgid ""
"This is also available in the source tarball in the files <path>awl_mysql."
"sql</path> and <path>bayes_mysql.sql</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1929
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1916
msgid "Configuring Spamassassin to use the MySQL backend"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1932
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1919
msgid ""
"If you have an old Bayes database in the DBM database and want to keep it "
"follow these instructions:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1937
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1924
msgid "Converting Bayes data from a DBM Database"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1944
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1931
msgid ""
"Note that the last step should only be performed after the MySQL database "
"and <path>secrets.cf</path> have been updated."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1949
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1936
msgid "Now give Spamassassin the required info:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1953
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1940
msgid "Modifying /etc/mail/spamassassin/secrets.cf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1953
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1940
#, no-wrap
msgid ""
"\n"
@@ -2404,77 +2388,77 @@ msgid ""
"user_awl_sql_password another_very_secret_password\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1967
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1954
msgid "Next, change its permissions for proper security:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1971
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre:caption):1958
msgid "Changing permissions"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1971
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(pre):1958
#, no-wrap
msgid ""
"\n"
"# <i>chmod 400 /etc/mail/spamassassin/secrets.cf</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1975
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1962
msgid ""
"To create a very secret password use <c>emerge app-admin/makepasswd</c> and "
"<c>makepasswd -chars=8</c>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1980
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1967
msgid "Now all you have to do is <c>/etc/init.d/amavisd restart</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1989
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1976
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1991
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2100
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1978
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2087
msgid "Amavisd-new"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1994
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1981
msgid ""
"To troubleshoot Amavisd-new start out by stopping it with <c>/etc/init.d/"
"amavisd stop</c> and then start it manually in the foreground with "
"<c>amavisd debug</c> and watch it for anomalies in the output."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2003
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2099
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):1990
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2086
msgid "Spamassassin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):2006
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):1993
msgid ""
"To troubleshoot Spamassassin you can filter an email through it with "
"<c>spamassassin -D &lt; mail</c>. To ensure that the headers are intact you "
"can move it from another machine with IMAP."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):2012
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(note):1999
msgid ""
"If you need to troubleshoot you have to enable login for the user <c>amavis</"
"c> by changing the login shell in <path>/etc/passwd</path> to <path>/bin/"
"bash</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):2018
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):2005
msgid ""
"If you want you can make get the same information and more with Amavisd-new "
"using <c>amavisd debug-sa</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2026
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2013
msgid "Getting help"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):2029
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):2016
msgid ""
"If you need help a good place to go is the amavis-user mailing list. Before "
"postting a question try searching the <uri link=\"http://marc.theaimsgroup."
@@ -2483,145 +2467,145 @@ msgid ""
"net/lists/listinfo/amavis-user\">Amavis User mailing list</uri>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):2039
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(p):2026
msgid ""
"If your question is specific to SpamAssassin, DCC, Razor, or Postfix, please "
"refer to their respective home pages listed below."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2049
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2036
msgid "Resources"
msgstr "Ссылки"
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2051
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2038
msgid "For further information"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2056
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2043
msgid "http://www.ijs.si/software/amavisd/INSTALL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2056
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2043
msgid "Amavisd-new INSTALL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2060
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2047
msgid "http://www.ijs.si/software/amavisd/README.postfix"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2060
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2047
msgid "Amavisd-new Postfix README"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2064
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2051
msgid "http://www.ijs.si/software/amavisd/amavisd-new-docs.html#pbanks"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2064
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2051
msgid "Amavisd-new Policy bank documentation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2068
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2055
msgid "http://spamassassin.apache.org/full/3.0.x/dist/sql/README"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2068
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2055
msgid "Spamassassin SQL README"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2072
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2059
msgid "http://www.greylisting.org"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2075
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2062
msgid "http://www.postfix.org/FILTER_README.html"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2075
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2062
msgid "Postfix SMTPD_POLICY_README"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2079
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2066
msgid "http://www.unixwiz.net/techtips/postfix-HELO.html"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2079
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2066
msgid "Blocking spammers with Postfix HELO controls"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2083
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2070
msgid "http://www.linuxjournal.com/article.php?sid=7327"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2083
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2070
msgid "SPF Overview"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2087
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2074
msgid "http://jimsun.linxnet.com/misc/postfix-anti-UCE.txt"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2087
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2074
msgid "Jim Seymour's Postfix Anti-UCE Cheat Sheet"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2095
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2082
msgid "General resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2099
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2086
msgid "http://www.spamassassin.org"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2100
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2087
msgid "http://www.ijs.si/software/amavisd/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2102
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2089
msgid "http://www.ijs.si/software/amavisd/amavisd-new-docs.html"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2102
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2089
msgid "Amavisd-new documentation bits and pieces"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2105
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2092
msgid "http://razor.sourceforge.net/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2105
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2092
msgid "Vipuls's Razor"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2106
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2093
msgid "http://pyzor.sourceforge.net/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2108
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2095
msgid "http://www.rhyolite.com/anti-spam/dcc/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2108
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2095
msgid "Distributed Checksum Clearinghouse"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2112
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2099
msgid "http://www.renaissoft.com/projects/maia/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2112
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2099
msgid "Maia Mailguard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2120
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(title):2107
msgid "Other howtos"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2125
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri:link):2112
msgid "http://www.flakshack.com/anti-spam/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2125
+#: ../../gentoo/xml/htdocs/doc/en//mailfilter-guide.xml(uri):2112
msgid ""
"Fairly-Secure Anti-SPAM Gateway Using OpenBSD, Postfix, Amavisd-new, "
"SpamAssassin, Razor and DCC"
diff --git a/doc/gettext/ru/openrc-migration.xml.po b/doc/gettext/ru/openrc-migration.xml.po
index ffffe68..b98f448 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-01-21 01:40+0500\n"
+"POT-Creation-Date: 2011-03-02 17:28+0500\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//openrc-migration.xml(guide:link):5
-msgid "/doc/en/openrc-migration.xml"
-msgstr ""
-
#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):6
msgid "Baselayout and OpenRC Migration Guide"
msgstr ""
@@ -66,11 +62,11 @@ msgstr ""
msgid "Background"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):38
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):37
msgid "What's baselayout?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):41
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):40
msgid ""
"Baselayout provides a basic set of files that are necessary for all systems "
"to function properly, such as <path>/etc/hosts</path>. It also provides the "
@@ -78,11 +74,11 @@ msgid ""
"path>, <path>/usr</path>, <path>/home</path> directories)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):53
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):51
msgid "What's OpenRC?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):56
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):54
msgid ""
"OpenRC is a dependency-based rc system that works with whatever init is "
"provided by the system, normally <path>/sbin/init</path>. However, it is "
@@ -91,11 +87,11 @@ msgid ""
"FreeBSD init provided by <c>sys-freebsd/freebsd-sbin</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):69
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):66
msgid "So why migrate?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):72
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):69
msgid ""
"Originally Gentoo's rc system was built into baselayout 1 and written "
"entirely in bash. This led to several limitations. For example, certain "
@@ -104,7 +100,7 @@ msgid ""
"the rc system to bloat over time."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):79
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):76
msgid ""
"Additionally, as Gentoo expanded to other platforms like Gentoo/FreeBSD and "
"Gentoo Embedded, it became impossible to require a bash-based rc system. "
@@ -115,7 +111,7 @@ msgid ""
"into its own package. Thus we have OpenRC."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):89
+#: ../../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 "
@@ -123,11 +119,11 @@ msgid ""
"platforms such as FreeBSD and NetBSD."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):102
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):97
msgid "Migration to OpenRC"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):108
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):101
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 "
@@ -139,17 +135,17 @@ msgid ""
"below to repair your system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):119
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):112
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):129
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):120
msgid "/etc/conf.d/rc"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):132
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):123
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."
@@ -158,11 +154,11 @@ msgid ""
"<path>/etc/conf.d/rc</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):145
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):134
msgid "Kernel modules"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):148
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):137
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 "
@@ -172,15 +168,15 @@ msgid ""
"version."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):156
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):145
msgid "An example old style configuration would be:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):160
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):149
msgid "/etc/modules.autoload.d/kernel-2.6"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):160
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):149
#, no-wrap
msgid ""
"\n"
@@ -188,15 +184,15 @@ msgid ""
"cx88_dvb video_br=2\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):165
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):154
msgid "Converting the above example would result in the following:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):169
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):158
msgid "/etc/conf.d/modules"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):169
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):158
#, no-wrap
msgid ""
"\n"
@@ -206,32 +202,32 @@ msgid ""
"module_cx88_dvb_args_2_6=\"video_br=2\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):176
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):165
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):182
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):171
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):187
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(note):176
msgid "Please note the difference between <b>module_</b> and <b>modules_</b>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):191
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):180
msgid "An in-depth example would be:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):195
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):184
msgid "detailed example of /etc/conf.d/modules"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):195
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):184
#, no-wrap
msgid ""
"\n"
@@ -252,11 +248,11 @@ msgid ""
"module_ieee1394_args=\"debug\" \n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):218
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):205
msgid "Boot runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):221
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):208
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 "
@@ -265,7 +261,7 @@ msgid ""
"boot."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):228
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):215
msgid ""
"With OpenRC, volume management services for your block storage devices are "
"no longer run automatically at boot. This includes lvm, raid, swap, device-"
@@ -274,34 +270,34 @@ msgid ""
"possible that your system will not boot!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):236
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):223
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):241
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):228
msgid "Display all services in boot runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):241
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):228
#, no-wrap
msgid ""
"\n"
"# <i>ls -l /etc/runlevels/boot/</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):245
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):232
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):250
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):237
msgid "Adding critical services to the boot runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):250
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):237
#, no-wrap
msgid ""
"\n"
@@ -312,17 +308,17 @@ msgid ""
"# <i>rc-update add swap boot</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):258
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):245
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):263
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):250
msgid "Adding mdraid and lvm to the boot runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):263
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):250
#, no-wrap
msgid ""
"\n"
@@ -330,11 +326,11 @@ msgid ""
"# <i>rc-update add lvm boot</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):273
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):258
msgid "Udev"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):261
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 "
@@ -343,11 +339,11 @@ msgid ""
"present:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):283
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):268
msgid "Verifying udev"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):283
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):268
#, no-wrap
msgid ""
"\n"
@@ -356,37 +352,37 @@ msgid ""
"/etc/init.d/udev\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):289
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):274
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):293
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):278
msgid "Adding udev to the sysinit runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):293
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):278
#, no-wrap
msgid ""
"\n"
"# <i>rc-update add udev sysinit</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):302
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):285
msgid "Network"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):305
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):288
msgid ""
"Due to baselayout and OpenRC being broken into two different packages, your "
"net.eth0 initscript may disappear during the upgrade process. To replace "
"this initscript please perform the following:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):311
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):294
msgid "Adding back missing net.eth0 script"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):311
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):294
#, no-wrap
msgid ""
"\n"
@@ -394,14 +390,14 @@ msgid ""
"# <i>ln -s net.lo net.eth0</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):316
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):299
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):322
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):305
msgid ""
"Also, <path>/etc/conf.d/net</path> (oldnet) no longer uses bash-style arrays "
"for configuration. Please review <path>/usr/share/doc/openrc-&lt;version&gt;/"
@@ -410,11 +406,11 @@ msgid ""
"for example a static IP assignment would change as follows:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):331
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):314
msgid "Old /etc/conf.d/net style"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):331
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):314
#, no-wrap
msgid ""
"\n"
@@ -422,11 +418,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):336
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):319
msgid "New /etc/conf.d/net style"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):336
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):319
#, no-wrap
msgid ""
"\n"
@@ -435,11 +431,11 @@ msgid ""
"10.0.0.0/8 via 192.168.1.2\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):347
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):328
msgid "Clock"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):350
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):331
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 "
@@ -452,7 +448,7 @@ msgid ""
"boot runlevel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):362
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):343
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 "
@@ -460,52 +456,52 @@ msgid ""
"Please review both of these files to ensure their correctness."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):369
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):350
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):375
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):356
msgid "/etc/timezone"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):375
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):356
#, no-wrap
msgid ""
"\n"
"America/New_York\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):384
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):363
msgid "XSESSION"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):387
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):366
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):393
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):372
msgid "Here's an example of setting XSESSION for the whole system:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):397
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):376
msgid "Setting XSESSION system-wide"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):397
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):376
#, no-wrap
msgid ""
"\n"
"# <i>echo 'XSESSION=\"Xfce4\"' &gt; /etc/env.d/90xsession</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):401
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):423
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):380
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):400
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 "
@@ -513,11 +509,11 @@ msgid ""
"<c>source ~/.bashrc</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):413
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):390
msgid "EDITOR and PAGER"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):416
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):393
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 "
@@ -525,11 +521,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):435
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):410
msgid "Boot log"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):438
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):413
msgid ""
"Previously, you could log the boot process by using <c>app-admin/"
"showconsole</c>. However, OpenRC now handles all logging internally, so "
@@ -539,22 +535,22 @@ msgid ""
"in <path>/var/log/rc.log</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):447
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):422
msgid "Enabling boot logging in /etc/rc.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):447
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):422
#, no-wrap
msgid ""
"\n"
"rc_logger=\"YES\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):456
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):429
msgid "System sub-types: Virtualization special cases"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):459
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):432
msgid ""
"In the early versions of OpenRC, we explictly detected multiple types of "
"virtualization, and used that detection to note when certain init scripts "
@@ -562,7 +558,7 @@ msgid ""
"functions."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):466
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):439
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>. "
@@ -571,140 +567,140 @@ msgid ""
"within the virtual containers; The host node will have <b>rc_sys=\"\"</b>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):474
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(impo):447
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):480
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(note):453
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):486
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre:caption):459
msgid "Setting system sub-type to none in /etc/rc.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):486
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(pre):459
#, no-wrap
msgid ""
"\n"
"rc_sys=\"\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):490
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):463
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):496
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):469
msgid "Subtype"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):497
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):470
msgid "Description"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):498
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(th):471
msgid "Notes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):502
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):475
msgid "Default, no sub-type"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):503
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):476
msgid "Not the same as unset; FreeBSD, Linux &amp; NetBSD"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):506
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):479
msgid "jail"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):507
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):480
msgid "FreeBSD jails"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):511
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):484
msgid "lxc"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):512
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):485
msgid "Linux Containers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):513
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):486
msgid "Not auto-detected"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):516
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):489
msgid "openvz"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):517
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):490
msgid "Linux OpenVZ"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):521
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):494
msgid "prefix"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):522
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):495
msgid "Prefix"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):523
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):496
msgid "Not auto-detected; FreeBSD, Linux &amp; NetBSD"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):526
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):499
msgid "uml"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):527
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):500
msgid "Usermode Linux"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):531
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):504
msgid "vserver"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):532
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):505
msgid "Linux vserver"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):536
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):509
msgid "xen0"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):537
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):510
msgid "Xen0 Domain"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):538
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):543
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):511
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):516
msgid "Linux &amp; NetBSD"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):541
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):514
msgid "xenU"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):542
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(ti):515
msgid "XenU Domain"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):552
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):523
msgid "Finishing up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):555
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):526
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 "
@@ -712,15 +708,15 @@ msgid ""
"it with a fresh boot."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):568
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):538
msgid "Changed functionality"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):572
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):540
msgid "The pause action"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):575
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):543
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 "
@@ -729,11 +725,11 @@ msgid ""
"baselayout."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):588
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(title):554
msgid "rootfs entry in /etc/mtab"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):591
+#: ../../gentoo/xml/htdocs/doc/en//openrc-migration.xml(p):557
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/power-management-guide.xml.po b/doc/gettext/ru/power-management-guide.xml.po
index 57cf38d..6c5de0f 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: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-03-02 17:28+0500\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,14 +55,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(version):27
-#, fuzzy
-msgid "1.47"
-msgstr "1.44"
+msgid "2"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(date):28
-#, fuzzy
-msgid "2010-07-18"
-msgstr "2009-08-11"
+msgid "2011-03-02"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):31
msgid "Introduction"
@@ -1927,29 +1925,27 @@ msgstr ""
msgid ""
"\n"
"# <i>echo \"sys-apps/tuxonice-userui fbsplash\" &gt;&gt; /etc/portage/package.use</i>\n"
-"<comment>(It may be marked ~arch, so first it must be keyworded)</comment>\n"
-"# <i>echo \"sys-apps/tuxonice-userui\" &gt;&gt; /etc/portage/package.keywords</i>\n"
"# <i>emerge tuxonice-userui</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1460
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1458
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):1465
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1463
msgid "Using the livecd-2005.1 theme during hibernation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1465
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1463
#, 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):1469
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1467
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. "
@@ -1958,11 +1954,11 @@ msgid ""
"that."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1476
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1474
msgid "Adding tuxoniceui_fbsplash to an initrd image"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1476
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1474
#, no-wrap
msgid ""
"\n"
@@ -1976,7 +1972,7 @@ msgid ""
"# <i>find . | cpio --quiet --dereference -o -H newc | gzip -9 &gt; /boot/fbsplash-tuxonice-emergence-1024x768</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1487
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1485
msgid ""
"Afterwards adjust <path>grub.conf</path> (or <path>lilo.conf</path>) so that "
"your TuxOnIce kernel uses <path>/boot/fbsplash-tuxonice-emergence-1024x768</"
@@ -1984,34 +1980,34 @@ msgid ""
"setup correctly."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1494
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1492
msgid "Test run for fbsplash hibernation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1494
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1492
#, no-wrap
msgid ""
"\n"
"# <i>tuxoniceui_fbsplash -t</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1498
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1496
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):1508
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(title):1506
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1512
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1510
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):1518
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1516
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 "
@@ -2026,26 +2022,26 @@ msgid ""
"Performance States\" are available to the ACPI/BIOS interface)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1531
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1529
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):1536
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1534
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):1542
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1540
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):1547
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1545
msgid ""
"<e>A:</e> Probably you have activated symmetric multiprocessing support "
"(CONFIG_SMP) in your kernel. Deactivate it and it should work. Some older "
@@ -2054,13 +2050,13 @@ msgid ""
"mhz</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1554
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1552
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):1559
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1557
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 "
@@ -2071,47 +2067,47 @@ msgid ""
"proc/acpi/processor/CPU/throttling</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1569
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1567
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):1574
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1572
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):1579
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1577
msgid "<e>Q:</e> Battery life time seems to be worse than before."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1583
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1581
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):1588
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1586
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):1593
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1591
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):1598
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1596
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):1603
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1601
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 "
@@ -2119,47 +2115,47 @@ msgid ""
"default.sh</path> as shown below:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1610
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1608
msgid "Disabling warnings about unknown acpi events"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1610
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1608
#, no-wrap
msgid ""
"\n"
" *) # logger \"ACPI action $action is not defined\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1614
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1612
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):1618
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1616
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):1623
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1621
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):1629
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1627
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):1634
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1632
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):1639
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1637
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 "
@@ -2167,33 +2163,33 @@ msgid ""
"Documentation/power/tuxonice.txt</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1646
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1644
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):1651
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1649
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):1656
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1654
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):1660
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1658
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):1664
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre:caption):1662
msgid "Querying battery state"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1664
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(pre):1662
#, no-wrap
msgid ""
"\n"
@@ -2202,17 +2198,17 @@ msgid ""
"last full capacity: 41830 mWh\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1670
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1668
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):1675
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1673
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):1679
+#: ../../gentoo/xml/htdocs/doc/en//power-management-guide.xml(p):1677
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/printing-howto.xml.po b/doc/gettext/ru/printing-howto.xml.po
index 4efc329..d657cc8 100644
--- a/doc/gettext/ru/printing-howto.xml.po
+++ b/doc/gettext/ru/printing-howto.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-02-14 21:36+0500\n"
+"POT-Creation-Date: 2011-03-02 17:28+0500\n"
"PO-Revision-Date: 2010-02-09 01:07+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -44,11 +44,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(version):25
-msgid "4"
+msgid "5"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(date):26
-msgid "2011-02-14"
+msgid "2011-03-02"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):29
@@ -876,7 +876,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(li):682
msgid ""
"An IPP printer requires a <c>ipp://hostname/printers/printername</c> or "
-"<c>http://hostname:631/ipp/queue</c> syntax."
+"<c>http://hostname:631/printers/printername</c> syntax."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):693
diff --git a/doc/gettext/ru/quick-samba-howto.xml.po b/doc/gettext/ru/quick-samba-howto.xml.po
index 4a9c41b..c756ade 100644
--- a/doc/gettext/ru/quick-samba-howto.xml.po
+++ b/doc/gettext/ru/quick-samba-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-03-02 17:28+0500\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,66 +14,62 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.0\n"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(guide:link):5
-msgid "/doc/en/quick-samba-howto.xml"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):7
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):6
msgid "Gentoo Samba3/CUPS HOWTO"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author:title):9
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author:title):12
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author:title):8
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author:title):11
msgid "Author"
msgstr "автор"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author):9
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author):8
msgid "Andreas \"daff\" Ntaflos"
msgstr "Andreas \"daff\" Ntaflos"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail:link):13
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail:link):12
msgid "joshua@sungentoo.homeunix.com"
msgstr "joshua@sungentoo.homeunix.com"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail):13
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail):12
msgid "Joshua Preston"
msgstr "Joshua Preston"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author:title):15
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(author:title):14
msgid "Editor"
msgstr "редактор"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail:link):16
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail:link):15
msgid "nightmorph@gentoo.org"
msgstr "nightmorph@gentoo.org"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail):16
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(mail):15
msgid "Joshua Saddler"
msgstr "Joshua Saddler"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(abstract):19
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(abstract):18
msgid ""
"Setup, install and configure a Samba server under Gentoo that shares files "
"and printers without the need to install drivers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(version):28
-msgid "1.26"
-msgstr "1.26"
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(version):27
+msgid "2"
+msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(date):29
-msgid "2009-01-25"
-msgstr "2009-01-25"
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(date):28
+msgid "2011-03-02"
+msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):32
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):31
msgid "Introduction to this HOWTO"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):34
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):33
msgid "Purpose"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):37
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):36
msgid ""
"This HOWTO is designed to help you move a network from many different "
"clients speaking different languages, to many different machines that speak "
@@ -81,14 +77,14 @@ msgid ""
"technologies, come together in a productive, happily coexisting environment."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):44
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):43
msgid ""
"Following the directions outlined in this HOWTO should give you an excellent "
"step towards a peaceful cohabitation between Windows, and virtually all "
"known variations of *nix."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):50
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):49
msgid ""
"This HOWTO originally started not as a HOWTO, but as a FAQ. It was intended "
"to explore the functionality and power of the Gentoo system, portage and the "
@@ -101,19 +97,19 @@ msgid ""
"Samba."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):61
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):60
msgid ""
"This HOWTO will describe how to share files and printers between Windows PCs "
"and *nix PCs. It will also show you how to mount and manipulate shares."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):66
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):65
msgid ""
"There are a few topics that will be mentioned, but are out of the scope of "
"this HOWTO. These will be noted as they are presented."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):71
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):70
msgid ""
"This HOWTO is based on a compilation and merge of an excellent HOWTO "
"provided in the <uri link=\"http://forums.gentoo.org\">Gentoo forums</uri> "
@@ -121,19 +117,19 @@ msgid ""
"The link to this discussion is provided below for your reference:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):80
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):79
msgid "http://forums.gentoo.org/viewtopic.php?t=110931"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):80
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):79
msgid "HOWTO CUPS+Samba: printing from Windows &amp; Linux"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):88
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):87
msgid "Before you use this guide"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):91
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):90
msgid ""
"There are a several other guides for setting up CUPS and/or Samba, please "
"read them as well, as they may tell you things left out of this HOWTO "
@@ -143,145 +139,145 @@ msgid ""
"here."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):102
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):101
msgid "Brief Overview"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):105
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):104
msgid ""
"After presenting the various USE flags, the following list will outline all "
"of the topics covered as they are presented:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):113
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):112
msgid "Install and configure Samba"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):114
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):121
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):113
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):120
msgid "Install and configure CUPS"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):115
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):114
msgid "Adding the printer to CUPS"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):116
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):115
msgid "Adding the PS drivers for the Windows clients"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):111
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):110
msgid "On the Samba server: <placeholder-1/>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):122
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):121
msgid "Configuring a default printer"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):123
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):122
msgid "Mounting a Windows or Samba share"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):119
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):118
msgid "On the Unix clients: <placeholder-1/>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):128
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):127
msgid "Configuring the printer"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):129
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):128
msgid "Accessing Samba shares"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):126
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):125
msgid "On the Windows Clients: <placeholder-1/>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):137
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):136
msgid "Requirements"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):140
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):139
msgid "We will need the following:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):145
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):144
msgid "net-fs/samba"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):146
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):145
msgid "net-print/cups (built with the <c>ppds</c> USE flag)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):147
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):146
msgid "net-print/hplip (if you have an HP printer)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):148
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):147
msgid "A kernel of sorts (2.6)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):149
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):148
msgid "A printer (PS or non-PS)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):150
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):149
msgid ""
"A working network (home/office/etc) consisting of more than one machine)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):155
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):154
msgid ""
"The main package we use here is <c>net-fs/samba</c>, however, you will need "
"a kernel with CIFS support enabled in order to mount a Samba or Windows "
"share from another computer. CUPS will be emerged if it is not already."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):166
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):165
msgid "Getting acquainted with Samba"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):168
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):167
msgid "The USE Flags"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):171
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):170
msgid ""
"Before emerging anything, take a look at some of the various USE flags "
"available to Samba."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):176
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):175
msgid "Samba uses the following USE Variables:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):176
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):175
#, no-wrap
msgid ""
"\n"
"kerberos acl cups ldap pam readline python winbind\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):180
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):179
msgid ""
"Depending on the network topology and the specific requirements of the "
"server, the USE flags outlined below will define what to include or exclude "
"from the emerging of Samba."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(th):189
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(th):188
msgid "Description"
msgstr "Описание"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):193
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):192
msgid ""
"Include support for Kerberos. The server will need this if it is intended to "
"join an existing domain or Active Directory. See the note below for more "
"information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):201
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):200
msgid ""
"Enables Access Control Lists. The ACL support in Samba uses a patched ext2/"
"ext3, or SGI's XFS in order to function properly as it extends more detailed "
@@ -289,14 +285,14 @@ msgid ""
"schemas."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):210
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):209
msgid ""
"This enables support for the Common Unix Printing System. This provides an "
"interface allowing local CUPS printers to be shared to other systems in the "
"network."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):218
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):217
msgid ""
"Enables the Lightweight Directory Access Protocol (LDAP). If Samba is "
"expected to use Active Directory, this option must be used. This would be "
@@ -305,7 +301,7 @@ msgid ""
"functioning of this option."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):228
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):227
msgid ""
"Include support for pluggable authentication modules (PAM). This provides "
"the ability to authenticate users on the Samba Server, which is required if "
@@ -313,19 +309,19 @@ msgid ""
"along with this option."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):237
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):236
msgid ""
"Link Samba against libreadline. This is highly recommended and should "
"probably not be disabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):244
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):243
msgid ""
"Python bindings API. Provides an API that will allow Python to interface "
"with Samba."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):251
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(ti):250
msgid ""
"Winbind allows for a unified logon within a Samba environment. It uses a "
"Unix implementation of Windows RPC calls, PAM and the name service switch "
@@ -333,43 +329,43 @@ msgid ""
"work as Unix users on a Unix system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):260
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):259
msgid ""
"A couple of things worth mentioning about the USE flags and different Samba "
"functions include:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):266
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):265
msgid ""
"ACLs on ext2/3 are implemented through extended attributes (EAs). EA and ACL "
"kernel options for ext2 and/or ext3 will need to be enabled (depending on "
"which file system is being used - both can be enabled)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):275
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):274
msgid "http://www.bluelightning.org/linux/samba_acl_howto/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):276
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):275
msgid "http://www.wlug.org.nz/HowtoSamba3AndActiveDirectory"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):271
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):270
msgid ""
"While Active Directory, ACL, and PDC functions are out of the intended scope "
"of this HOWTO, you may find these links as helpful to your cause: "
"<placeholder-1/>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):286
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):285
msgid "Server Software Installation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):288
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):287
msgid "Emerging Samba"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):291
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):290
msgid ""
"First of all: be sure that all your hostnames resolve correctly. Either have "
"a working domain name system running on your network or appropriate entries "
@@ -377,57 +373,57 @@ msgid ""
"hostnames don't point to the correct machines."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):298
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):297
msgid ""
"Hopefully now you can make an assessment of what you'll actually need in "
"order to use Samba with your particular setup. The setup used for this HOWTO "
"is:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):304
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):303
msgid "cups"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):305
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):304
msgid "readline"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):306
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):305
msgid "pam"
msgstr "pam"
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):309
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):308
msgid ""
"To optimize performance, size and the time of the build, the USE flags are "
"specifically included or excluded."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):314
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):313
msgid ""
"First, add <c>ppds</c> to your USE flags to make sure that when CUPS is "
"built, it has proper foomatic support:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):319
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):318
msgid "Adding ppds"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):319
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):318
#, no-wrap
msgid ""
"\n"
"# <i>echo \"net-print/cups ppds\" &gt;&gt; /etc/portage/package.use</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):323
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):322
msgid "Now, emerge Samba:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):327
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):326
msgid "Emerge Samba"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):327
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):326
#, no-wrap
msgid ""
"\n"
@@ -435,38 +431,38 @@ msgid ""
"# <i>emerge net-fs/samba</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):332
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):331
msgid "This will emerge Samba and CUPS."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):339
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):338
msgid "Emerging net-print/hplip"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):342
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):341
msgid "You only need to emerge this if you use an HP printer."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):346
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):345
msgid "Emerge hplip"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):346
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):345
#, no-wrap
msgid ""
"\n"
"# <i>emerge net-print/hplip</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):355
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):354
msgid "Server Configuration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):357
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):356
msgid "Configuring Samba"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):360
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):359
msgid ""
"The main Samba configuration file is <path>/etc/samba/smb.conf</path>. It is "
"divided in sections indicated by [sectionname]. Comments are either # or ;. "
@@ -476,11 +472,11 @@ msgid ""
"the Samba Web site or any of the numerous Samba books available."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):369
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):368
msgid "A Sample /etc/samba/smb.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):369
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):368
#, no-wrap
msgid ""
"\n"
@@ -565,7 +561,7 @@ msgid ""
"path = /home/samba/public\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(warn):451
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(warn):450
msgid ""
"If you like to use Samba's guest account to do anything concerning printing "
"from Windows clients: don't set <c>guest only = yes</c> in the <c>[global]</"
@@ -577,17 +573,17 @@ msgid ""
"certainly protect you from a lot of problems."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):462
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):461
msgid ""
"Now create the directories required for the minimum configuration of Samba "
"to share the installed printer throughout the network."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):467
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):466
msgid "Create the directories"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):467
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):466
#, no-wrap
msgid ""
"\n"
@@ -596,18 +592,18 @@ msgid ""
"# <i>mkdir /home/samba/public</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):473
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):472
msgid ""
"At least one Samba user is required in order to install the printer drivers "
"and to allow users to connect to the printer. Users must exist in the "
"system's <path>/etc/passwd</path> file."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):479
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):478
msgid "Creating the users"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):479
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):478
#, no-wrap
msgid ""
"\n"
@@ -617,23 +613,23 @@ msgid ""
"# <i>smbpasswd -a username</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):486
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):485
msgid ""
"The Samba passwords need not be the same as the system passwords in <path>/"
"etc/passwd</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):491
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):490
msgid ""
"You will also need to update <path>/etc/nsswitch.conf</path> so that Windows "
"systems can be found easily using NetBIOS:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):496
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):495
msgid "Editing /etc/nsswitch.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):496
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):495
#, no-wrap
msgid ""
"\n"
@@ -642,11 +638,11 @@ msgid ""
"hosts: files dns <i>wins</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):505
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):504
msgid "Configuring CUPS"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):508
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):507
msgid ""
"This is a little more complicated. CUPS' main config file is <path>/etc/cups/"
"cupsd.conf</path>. It's structure is similar to Apache's <path>httpd.conf</"
@@ -654,11 +650,11 @@ msgid ""
"the directives that need to be changed:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):515
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):514
msgid "/etc/cups/cupsd.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):515
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):514
#, no-wrap
msgid ""
"\n"
@@ -697,18 +693,18 @@ msgid ""
"&lt;/Location&gt;\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):551
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):550
msgid ""
"Edit <path>/etc/cups/mime.convs</path> to uncomment some lines. The changes "
"to <path>mime.convs</path> and <path>mime.types</path> are needed to make "
"CUPS print Microsoft Office document files."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):557
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):556
msgid "/etc/cups/mime.convs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):557
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):556
#, no-wrap
msgid ""
"\n"
@@ -716,15 +712,15 @@ msgid ""
"application/octet-stream application/vnd.cups-raw 0\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):562
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):561
msgid "Edit <path>/etc/cups/mime.types</path> to uncomment some lines."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):566
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):565
msgid "/etc/cups/mime.types"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):566
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):565
#, no-wrap
msgid ""
"\n"
@@ -732,15 +728,15 @@ msgid ""
"application/octet-stream\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):571
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):570
msgid "CUPS needs to be started on boot, and started immediately."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):575
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):574
msgid "Setting up the CUPS service"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):575
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):574
#, no-wrap
msgid ""
"\n"
@@ -750,11 +746,11 @@ msgid ""
"# <i>/etc/init.d/cupsd restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):585
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):584
msgid "Installing a printer for and with CUPS"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):588
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):587
msgid ""
"First, go to <uri link=\"http://linuxprinting.org\">LinuxPrinting.Org</uri> "
"to find and download the correct PPD file for your printer and CUPS. To do "
@@ -768,7 +764,7 @@ msgid ""
"guide</uri> is also very helpful when working with CUPS."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):601
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):600
msgid ""
"Now you have a PPD file for your printer to work with CUPS. Place it in "
"<path>/usr/share/cups/model</path>. The PPD for the HP DeskJet 930C was "
@@ -778,11 +774,11 @@ msgid ""
"is running."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):609
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):608
msgid "Install the printer via command line"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):609
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):608
#, no-wrap
msgid ""
"\n"
@@ -790,7 +786,7 @@ msgid ""
"# <i>/etc/init.d/cupsd restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):614
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):613
msgid ""
"Remember to adjust to what you have. Be sure to have the name (<c>-p</c> "
"argument) right (the name you set above during the Samba configuration!) and "
@@ -798,17 +794,17 @@ msgid ""
"whatever device you are using for your printer."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):621
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):620
msgid ""
"You should now be able to access the printer from the web interface and be "
"able to print a test page."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):629
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):628
msgid "Installing the Windows printer drivers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):632
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):631
msgid ""
"Now that the printer should be working it is time to install the drivers for "
"the Windows clients to work. Samba 2.2 introduced this functionality. "
@@ -818,36 +814,35 @@ msgid ""
"installing printer drivers locally."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):641
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):640
msgid ""
"There are two sets of printer drivers for this. First, the Adobe PS drivers "
"which can be obtained from <uri link=\"http://www.adobe.com/support/"
"downloads/main.html\">Adobe</uri> (PostScript printer drivers). Second, "
"there are the CUPS PS drivers, to be obtained by emerging <c>net-print/cups-"
-"windows</c>. Note that it may still be marked ~arch, so you may need to add "
-"it to <path>/etc/portage/package.keywords</path>. There doesn't seem to be a "
-"difference between the functionality of the two, but the Adobe PS drivers "
-"need to be extracted on a Windows System since it's a Windows binary. Also "
-"the whole procedure of finding and copying the correct files is a bit more "
-"hassle. The CUPS drivers support some options the Adobe drivers don't."
+"windows</c>. There doesn't seem to be a difference between the functionality "
+"of the two, but the Adobe PS drivers need to be extracted on a Windows "
+"System since it's a Windows binary. Also the whole procedure of finding and "
+"copying the correct files is a bit more hassle. The CUPS drivers support "
+"some options the Adobe drivers don't."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):655
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):652
msgid "This HOWTO uses the CUPS drivers for Windows. Install them as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):659
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):656
msgid "Install the drivers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):659
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):656
#, no-wrap
msgid ""
"\n"
"# <i>emerge -av cups-windows</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):663
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):660
msgid ""
"Now we'll use the script <c>cupsaddsmb</c> provided by the CUPS "
"distribution. Be sure to read its manpage (<c>man cupsaddsmb</c>), as it "
@@ -856,11 +851,11 @@ msgid ""
"init.d/cupsd restart</c>. Next, run <c>cupsaddsmb</c> as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):671
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):668
msgid "Run cupsaddsmb"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):671
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):668
#, no-wrap
msgid ""
"\n"
@@ -870,18 +865,18 @@ msgid ""
"# <i>cupsaddsmb -H PrintServer -U root -h PrintServer -a</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(warn):678
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(warn):675
msgid ""
"The execution of this command often causes the most trouble. Read through "
"the <uri link=\"http://forums.gentoo.org/viewtopic.php?t=110931\">posts in "
"this thread</uri> for some troubleshooting tips."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):684
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):681
msgid "Here are common errors that may happen:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):689
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):686
msgid ""
"The hostname given as a parameter for <c>-h</c> and <c>-H</c> "
"(<c>PrintServer</c>) often does not resolve correctly and doesn't identify "
@@ -891,7 +886,7 @@ msgid ""
"<c>localhost</c> and try it again."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):697
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):694
msgid ""
"The command fails with an <b>NT_STATUS_UNSUCCESSFUL</b>. This error message "
"is quite common, but can be triggered by many problems. It's unfortunately "
@@ -901,7 +896,7 @@ msgid ""
"before."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):707
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):704
msgid ""
"This should install the correct driver directory structure under <path>/etc/"
"samba/printer</path>. That would be <path>/etc/samba/printer/W32X86/2/</"
@@ -910,24 +905,24 @@ msgid ""
"printer when installing it (see above)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):715
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):712
msgid ""
"Pending no errors or other complications, your drivers are now installed."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):722
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):719
msgid "Finalizing our setup"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):725
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):722
msgid "Lastly, setup our directories."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):729
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):726
msgid "Final changes needed"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):729
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):726
#, no-wrap
msgid ""
"\n"
@@ -937,22 +932,22 @@ msgid ""
"# <i>chmod 755 /home/samba/public</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):739
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):736
msgid "Testing our Samba configuration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):742
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):739
msgid ""
"We will want to test our configuration file to ensure that it is formatted "
"properly and all of our options have at least the correct syntax. To do this "
"we run <c>testparm</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):748
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):745
msgid "Running the testparm"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):748
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):745
#, no-wrap
msgid ""
"\n"
@@ -970,19 +965,19 @@ msgid ""
" ...\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):766
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):763
msgid "Starting the Samba service"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):769
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):766
msgid "Now configure Samba to start at bootup; then go ahead and start it."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):773
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):770
msgid "Setting up the Samba service"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):773
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):770
#, no-wrap
msgid ""
"\n"
@@ -990,21 +985,21 @@ msgid ""
"# <i>/etc/init.d/samba start</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):781
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):778
msgid "Checking our services"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):784
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):781
msgid ""
"It would probably be prudent to check our logs at this time also. We will "
"also want to take a peak at our Samba shares using <c>smbclient</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):789
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):786
msgid "Checking the shares with smbclient"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):789
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):786
#, no-wrap
msgid ""
"\n"
@@ -1013,25 +1008,25 @@ msgid ""
"<comment>(You should see a BIG list of services here.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):800
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):797
msgid "Configuration of the Clients"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):802
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):799
msgid "Printer configuration of *nix based clients"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):805
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):802
msgid ""
"Despite the variation or distribution, the only thing needed is CUPS. Do the "
"equivalent on any other UNIX/Linux/BSD client."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):810
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):807
msgid "Configuring a Gentoo system"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):810
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):807
#, no-wrap
msgid ""
"\n"
@@ -1040,11 +1035,11 @@ msgid ""
"ServerName <i>PrintServer</i> <comment># your printserver name</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):816
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):813
msgid "That should be it. Nothing else will be needed."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):820
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):817
msgid ""
"If you use only one printer, it will be your default printer. If your print "
"server manages several printers, your administrator will have defined a "
@@ -1052,11 +1047,11 @@ msgid ""
"printer for yourself, use the <c>lpoptions</c> command."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):827
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):824
msgid "Setting your default printer"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):827
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):824
#, no-wrap
msgid ""
"\n"
@@ -1069,11 +1064,11 @@ msgid ""
"# <i>lpoptions -d HPDeskJet930C</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):837
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):834
msgid "Printing in *nix"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):837
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):834
#, no-wrap
msgid ""
"\n"
@@ -1083,7 +1078,7 @@ msgid ""
"# <i>lp foobar.whatever.ps</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):844
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):841
msgid ""
"Just point your web browser to <c>http://printserver:631</c> on the client "
"if you want to manage your printers and their jobs with a nice web "
@@ -1092,17 +1087,17 @@ msgid ""
"server if you used different names."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):855
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):852
msgid "Mounting a Windows or Samba share in GNU/Linux"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(note):858
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(note):855
msgid ""
"Don't forget to install <c>net-fs/mount-cifs</c> or <c>net-fs/samba</c> on "
"the client(s) that will be accessing the shares."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):863
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):860
msgid ""
"Now is time to configure our kernel to support CIFS. Since I'm assuming "
"we've all compiled at least one kernel, we'll need to make sure we have all "
@@ -1111,43 +1106,43 @@ msgid ""
"good thing and should be used whenever possible."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):871
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):868
msgid "Kernel support"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):871
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):868
#, no-wrap
msgid ""
"\n"
"CONFIG_CIFS=m\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):875
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):872
msgid "Then make the module/install it; insert it with:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):879
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):876
msgid "Loading the kernel module"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):879
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):876
#, no-wrap
msgid ""
"\n"
"# <i>modprobe cifs</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):883
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):880
msgid ""
"Once the module is loaded, mounting a Windows or Samba share is possible. "
"Use <c>mount</c> to accomplish this, as detailed below:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):888
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre:caption):885
msgid "Mounting a Windows/Samba share"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):888
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(pre):885
#, no-wrap
msgid ""
"\n"
@@ -1161,16 +1156,16 @@ msgid ""
"# <i>mount -t cifs -o username=USERNAME,password=PASSWORD //PrintServer/public /mnt/public</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):899
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):896
msgid ""
"After you mount the share, you would access it as if it were a local drive."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):906
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):903
msgid "Printer Configuration for Windows NT/2000/XP clients"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):909
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):906
msgid ""
"That's just a bit of point-and-click. Browse to <path>\\\\PrintServer</path> "
"and right click on the printer (HPDeskJet930C) and click connect. This will "
@@ -1179,58 +1174,58 @@ msgid ""
"print to. :-)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):921
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):918
msgid "Final Notes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):923
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):920
msgid "A Fond Farewell"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):926
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):923
msgid ""
"That should be it. You should now have a successful printing enviroment that "
"is friendly to both Windows and *nix as well as a working share!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):936
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):933
msgid "Links and Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):938
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):935
msgid "Links"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):941
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):938
msgid ""
"These are some links that may help you in setting up, configuration and "
"troubleshooting your installation:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):947
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):944
msgid "http://www.cups.org/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):947
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):944
msgid "CUPS Homepage"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):948
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):945
msgid ""
"<uri link=\"http://www.samba.org/\">Samba Homepage</uri>, especially the "
"<uri link=\"http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/CUPS-"
"printing.html\">chapter on Samba/CUPS configuration</uri>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):953
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):950
msgid "http://linuxprinting.org/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):953
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):950
msgid "LinuxPrinting dot Org"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):954
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(li):951
msgid ""
"<uri link=\"http://www.linuxprinting.org/kpfeifle/SambaPrintHOWTO/\">Kurt "
"Pfeifle's Samba Print HOWTO</uri> ( This HOWTO really covers <e>ANYTHING</e> "
@@ -1239,19 +1234,19 @@ msgid ""
"read, with lots and lots of details.)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):961
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri:link):958
msgid "http://www.freebsddiary.org/cups.php"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):961
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(uri):958
msgid "FreeBSD Diary's CUPS Topic"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):967
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(title):964
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):970
+#: ../../gentoo/xml/htdocs/doc/en//quick-samba-howto.xml(p):967
msgid ""
"See <uri link=\"http://www.linuxprinting.org/kpfeifle/SambaPrintHOWTO/Samba-"
"HOWTO-Collection-3.0-PrintingChapter-11th-draft.html#37\">this page</uri> "
diff --git a/doc/gettext/ru/virt-mail-howto.xml.po b/doc/gettext/ru/virt-mail-howto.xml.po
index 5c79411..bd6c35f 100644
--- a/doc/gettext/ru/virt-mail-howto.xml.po
+++ b/doc/gettext/ru/virt-mail-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-03-02 17:28+0500\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"
@@ -81,15 +81,15 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(version):32
-msgid "2"
+msgid "3"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(date):33
-msgid "2010-10-13"
+msgid "2011-03-01"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):36
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1021
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1020
msgid "Introduction"
msgstr "Введение"
@@ -204,7 +204,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):136
#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):327
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):783
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):782
msgid "/etc/postfix/main.cf"
msgstr ""
@@ -454,7 +454,6 @@ msgid ""
"# <i>nano -w /etc/postfix/main.cf</i>\n"
"\n"
"smtpd_sasl_auth_enable = yes\n"
-"smtpd_sasl2_auth_enable = yes\n"
"smtpd_sasl_security_options = noanonymous\n"
"broken_sasl_auth_clients = yes\n"
"smtpd_sasl_local_domain =\n"
@@ -490,7 +489,7 @@ msgid ""
"# <i>postfix reload</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):367
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):366
msgid ""
"Now we're going to verify that the config's we added were picked up by "
"postfix. For this we are going to use <c>telnet</c> (provided by for "
@@ -498,11 +497,11 @@ msgid ""
"(provided by <c>net-analyzer/netcat</c>):"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):374
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):373
msgid "Verifying sasl and tls support"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):374
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):373
#, no-wrap
msgid ""
"\n"
@@ -527,7 +526,7 @@ msgid ""
"telnet&gt; <i>quit</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):396
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):395
msgid ""
"Verify that the above AUTH and STARTTLS lines now appear in your postfix "
"install. As I said before, as it stands now AUTH will not work. that's "
@@ -537,46 +536,46 @@ msgid ""
"domain information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):409
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):408
msgid "The vmail user"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):413
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):412
msgid ""
"Before we set up our virtual mailhosting environment, we create a functional "
"user under which the virtual mailboxes will be hosted. For clarity's sake we "
"will call this <e>vmail</e>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):419
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):418
msgid "Adding the vmail user"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):419
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):418
#, no-wrap
msgid ""
"\n"
"# <i>useradd -d /home/vmail -s /bin/false -m vmail</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):423
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):422
msgid ""
"So now you've set up the vmail account. You can create multiple accounts if "
"you want (to keep some structure in your set of virtual mail accounts). The "
"user id, group id and home dirs are referenced in the MySQL tables."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):429
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):428
msgid ""
"Next to the user account we also need to create the location where the "
"mailboxes will reside:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):434
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):433
msgid "Creating mailboxes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):434
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):433
#, no-wrap
msgid ""
"\n"
@@ -585,22 +584,22 @@ msgid ""
"# <i>maildirmake /home/vmail/virt-domain.com/foo/.maildir</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):445
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):444
msgid "MySQL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):449
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):448
msgid ""
"Next we're going to install and configure MySQL. You'll need the <uri link="
"\"http://www.gentoo.org/doc/en/files/genericmailsql.sql\">genericmailsql."
"sql</uri> dumpfile for this step."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):455
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):454
msgid "Installing and configuring MySQL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):455
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):454
#, no-wrap
msgid ""
"\n"
@@ -630,39 +629,39 @@ msgid ""
"# <i>mysql -u mailsql -p mailsql</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):482
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):481
msgid ""
"Your new database has default values and tables set up for two domains. The "
"following tables are included:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):488
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):487
msgid "alias - local email alias and mailman alias information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):489
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):488
msgid "relocated - relocated user email address maps"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):490
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):489
msgid ""
"transport - default mail transport information for all domains you are "
"hosting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):494
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):493
msgid "users - all user account information"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):495
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):494
msgid "virtual - virtual domain email alias maps"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):498
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):497
msgid "alias table sample"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):498
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):497
#, no-wrap
msgid ""
"\n"
@@ -671,11 +670,11 @@ msgid ""
"2 postmaster foo@bar.com\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):504
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):503
msgid "user table sample"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):504
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):503
#, no-wrap
msgid ""
"\n"
@@ -688,17 +687,17 @@ msgid ""
" /home/foo/.maildir/ y\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):514
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):513
msgid ""
"The values of the <c>virtid</c> uid and gid should be those of the <c>vmail</"
"c> user and group."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):519
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):518
msgid "transport table sample"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):519
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):518
#, no-wrap
msgid ""
"\n"
@@ -707,11 +706,11 @@ msgid ""
"2 virt-domain.com virtual:\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):525
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):524
msgid "virtual table sample"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):525
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):524
#, no-wrap
msgid ""
"\n"
@@ -719,28 +718,28 @@ msgid ""
"3 root@virt-domain.com other@email.address\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):535
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):534
msgid "Apache and phpMyAdmin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):539
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):538
msgid ""
"Next we'll set up apache and add an interface to interact with the database "
"more easily."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):544
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):543
msgid "Setting up apache and phpmyadmin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):544
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):543
#, no-wrap
msgid ""
"\n"
"# <i>emerge apache phpmyadmin</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):548
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):547
msgid ""
"There are plenty of guides out there about how to set up apache with php, "
"including guides provided by the <uri link=\"/proj/en/php/\">Gentoo PHP "
@@ -756,25 +755,25 @@ msgid ""
"micro/htaccess.html.en</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):563
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):562
msgid ""
"Now we're going to install the Apache certificates we made previously. The "
"Apache-SSL directives that you need to use the resulting cert are:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):569
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):568
msgid "SSLCertificateFile /path/to/certs/new.cert.cert"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):570
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):569
msgid "SSLCertificateKeyFile /path/to/certs/new.cert.key"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):573
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):572
msgid "Install Apache SSL certificates"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):573
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):572
#, no-wrap
msgid ""
"\n"
@@ -810,15 +809,15 @@ msgid ""
"# <i>/etc/init.d/apache2 restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):606
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):605
msgid "Next, configure phpMyAdmin."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):610
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):609
msgid "Configuring phpMyAdmin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):610
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):609
#, no-wrap
msgid ""
"\n"
@@ -837,7 +836,7 @@ msgid ""
"$cfg['Servers'][$i]['password'] = '$password'; // MySQL password\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):626
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):625
msgid ""
"Now enter the phpmyadmin page and browse the tables. You'll want to add in "
"your local aliases, edit your user table to add a test user, and change your "
@@ -851,22 +850,22 @@ msgid ""
"setup their account to make sure the .maildir gets created."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):644
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):643
msgid "Configuring MySQL Authentication and vhosts"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):648
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):647
msgid ""
"Next we'll reconfigure our authentication to use the mailsql database in "
"courier-imap and postfix. In all of the following examples, replace <c>"
"$password</c> with the password you set for the mailsql mysql user."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):654
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):653
msgid "Configuring authentication"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):654
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):653
#, no-wrap
msgid ""
"\n"
@@ -893,7 +892,7 @@ msgid ""
"# <i>/etc/init.d/saslauthd restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):678
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):677
msgid ""
"We're almost there, I promise! Next, set up the rest of the necessary "
"configs for postfix to interract with the database for all its other "
@@ -901,11 +900,11 @@ msgid ""
"user, user id, password, alias, email address, and so on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):685
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):684
msgid "/etc/postfix/mysql-aliases.cf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):685
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):684
#, no-wrap
msgid ""
"\n"
@@ -921,11 +920,11 @@ msgid ""
"hosts = unix:/var/run/mysqld/mysqld.sock\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):698
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):697
msgid "/etc/postfix/mysql-relocated.cf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):698
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):697
#, no-wrap
msgid ""
"\n"
@@ -941,11 +940,11 @@ msgid ""
"hosts = unix:/var/run/mysqld/mysqld.sock\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):711
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):710
msgid "/etc/postfix/mysql-transport.cf (optional)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):711
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):710
#, no-wrap
msgid ""
"\n"
@@ -961,11 +960,11 @@ msgid ""
"hosts = unix:/var/run/mysqld/mysqld.sock\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):724
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):723
msgid "/etc/postfix/mysql-virtual-gid.cf (optional)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):724
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):723
#, no-wrap
msgid ""
"\n"
@@ -982,11 +981,11 @@ msgid ""
"hosts = unix:/var/run/mysqld/mysqld.sock\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):738
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):737
msgid "/etc/postfix/mysql-virtual-maps.cf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):738
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):737
#, no-wrap
msgid ""
"\n"
@@ -1003,11 +1002,11 @@ msgid ""
"hosts = unix:/var/run/mysqld/mysqld.sock\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):752
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):751
msgid "/etc/postfix/mysql-virtual-uid.cf (optional)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):752
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):751
#, no-wrap
msgid ""
"\n"
@@ -1024,11 +1023,11 @@ msgid ""
"hosts = unix:/var/run/mysqld/mysqld.sock\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):766
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):765
msgid "/etc/postfix/mysql-virtual.cf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):766
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):765
#, no-wrap
msgid ""
"\n"
@@ -1044,11 +1043,11 @@ msgid ""
"hosts = unix:/var/run/mysqld/mysqld.sock\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):779
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):778
msgid "Lastly, edit <path>/etc/postfix/main.cf</path> one more time."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):783
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):782
#, no-wrap
msgid ""
"\n"
@@ -1076,17 +1075,17 @@ msgid ""
"#virtual_mailbox_limit =\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):808
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):807
msgid ""
"For security reasons you should change the permissions of the various <path>/"
"etc/mail/mysql-*.cf</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):813
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):812
msgid "Changing file permission"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):813
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):812
#, no-wrap
msgid ""
"\n"
@@ -1094,31 +1093,31 @@ msgid ""
"# <i>chgrp postfix /etc/postfix/mysql-*.cf</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):818
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):817
msgid ""
"As of Postfix 2.0.x, there were a number of significant changes over the 1.1."
"x release. Notably the transport, virtual-gid, and virtual-uid tables are no "
"longer necessary. The tables are still included if you wish to use them."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(note):824
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(note):823
msgid ""
"It is recommended that you read VIRTUAL_README included with the postfix "
"docs for more information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):829
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):828
msgid "Make postfix reload its tables"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):829
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):828
#, no-wrap
msgid ""
"\n"
"# <i>postfix reload</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):833
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):832
msgid ""
"Now, if all went well, you should have a functioning mailhost. Users should "
"be able to authenticate against the sql database, using their full email "
@@ -1128,15 +1127,15 @@ msgid ""
"troubleshooting section of this howto."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):847
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):846
msgid "Squirrelmail"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):851
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):850
msgid "Install squirrelmail"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):851
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):850
#, no-wrap
msgid ""
"\n"
@@ -1152,11 +1151,11 @@ msgid ""
"and use your new webmail setup.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):869
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):868
msgid "Mailman"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):873
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):872
msgid ""
"Last step: mailman. The new version of mailman has very nice virtual domain "
"support, which is why I use it, not to mention it's really a great package. "
@@ -1166,22 +1165,22 @@ msgid ""
"being done here."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):882
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):881
msgid "Install mailman"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):882
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):881
#, no-wrap
msgid ""
"\n"
"# <i>emerge mailman</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):886
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):885
msgid "Setting defaults: Mailman/Defaults.py"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):886
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):885
#, no-wrap
msgid ""
"\n"
@@ -1191,11 +1190,11 @@ msgid ""
"DEFAULT_URL_HOST = 'www.domain.com'\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):893
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):892
msgid "mailman config: mm_cfg.py"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):893
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):892
#, no-wrap
msgid ""
"\n"
@@ -1207,11 +1206,11 @@ msgid ""
"<comment>(This is required for your virtual domains for mailman to function.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):902
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):901
msgid "And last but not least"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):902
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):901
#, no-wrap
msgid ""
"\n"
@@ -1256,11 +1255,11 @@ msgid ""
"<comment>(To start mailman at once and on every reboot.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):944
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):943
msgid "Adding mailman alias support to postfix"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):944
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):943
#, no-wrap
msgid ""
"\n"
@@ -1283,7 +1282,7 @@ msgid ""
"to postfix may cause problems, be warned.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):964
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):963
msgid ""
"You should now be able to setup mailing lists for any domain on your box. "
"Last note on this, make sure you run all mailman commands as the user "
@@ -1292,21 +1291,21 @@ msgid ""
"and managing mailman lists."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):977
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):976
msgid "Content Filtering and Anti-Virus"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):981
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):980
msgid ""
"For content filtering and Anti-Virus, please consult our <uri link=\"/doc/en/"
"mailfilter-guide.xml\">mail filtering gateway guide</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):991
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):990
msgid "Wrap Up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):995
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):994
msgid ""
"Ok, you're all set, edit <path>/etc/postfix/master.cf</path> and turn off "
"verbose mode for production use. You'll probably also want to add the "
@@ -1317,11 +1316,11 @@ msgid ""
"provide. I generally have all the services enabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1005
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1004
msgid "Wrap up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1005
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1004
#, no-wrap
msgid ""
"\n"
@@ -1329,15 +1328,15 @@ msgid ""
"# <i>rc-update add $service default</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(e):1011
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(e):1010
msgid "Have fun!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1019
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1018
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1024
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1023
msgid ""
"Troubleshooting: This is a short troubleshooting guide for the set up we've "
"detailed how to install here. It is not exhaustive, but meant as a place to "
@@ -1349,11 +1348,11 @@ msgid ""
"having the problem."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1037
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1036
msgid "Step 1: Check your config files"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1040
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1039
msgid ""
"Typos are killers, especially when dealing with authentication systems. Scan "
"your config's and mailsql database for typo's. You can debug all you want, "
@@ -1363,22 +1362,22 @@ msgid ""
"picked up."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1048
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1047
msgid "How to restart a service"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1048
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1047
#, no-wrap
msgid ""
"\n"
"# <i>/etc/init.d/service restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1055
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1054
msgid "Step 2: Are all the necessary services actually running?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1058
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1057
msgid ""
"If it's not running, start it up. It's awful hard to debug a service that "
"isn't running. Sometimes a service will act like it's started but still not "
@@ -1390,11 +1389,11 @@ msgid ""
"fresh and try it again."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1068
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1067
msgid "Checking the status of a service"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1068
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1067
#, no-wrap
msgid ""
"\n"
@@ -1402,22 +1401,22 @@ msgid ""
"# <i>netstat -a | grep $service (or $port)</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1076
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1075
msgid "Step 3: Are all the service using the current config's?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1079
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1078
msgid ""
"If you've recently made a change to a config file, restart that service to "
"make sure it's using the current version. Some of the components will dump "
"their current config's to you, like postfix."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1085
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1084
msgid "Some services can dump their current config"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1085
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1084
#, no-wrap
msgid ""
"\n"
@@ -1427,11 +1426,11 @@ msgid ""
"# <i>/etc/init.d/$service restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1095
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1094
msgid "Step 4: Check the logs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1098
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1097
msgid ""
"Repeat after me, logs are my friend. My next troubleshooting stop is always "
"the logs. Sometimes it's helpful to try a failed operation again then check "
@@ -1441,11 +1440,11 @@ msgid ""
"very least, figure out which component is having the problem."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1107
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1106
msgid "Checking the logs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1107
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1106
#, no-wrap
msgid ""
"\n"
@@ -1455,17 +1454,17 @@ msgid ""
"# <i>tail /var/log/apache2/error_log</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1114
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1113
msgid ""
"You may also find the debug_peer parameters in main.cf helpful. Setting "
"these will increase log output over just verbose mode."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1119
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1118
msgid "adding debug_peer support"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1119
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1118
#, no-wrap
msgid ""
"\n"
@@ -1476,22 +1475,22 @@ msgid ""
"commands as well.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1130
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1129
msgid "Step 5: Talk to the service itself"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1133
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1132
msgid ""
"SMTP, IMAP, and POP3 all respond to telnet sessions. As we've seen earlier "
"when we verified postfix's config. Sometimes it's helpful to open a telnet "
"session to the service itself and see what's happening."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1139
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1138
msgid "Connect to a service with telnet"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1139
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1138
#, no-wrap
msgid ""
"\n"
@@ -1505,13 +1504,13 @@ msgid ""
"* OK Courier-IMAP ready. Copyright 1998-2002 Double Precision, Inc.\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1153
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1152
msgid ""
"Step 6: Sometimes only the big guns will give you the information you need: "
"strace"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1156
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1155
msgid ""
"You should have this installed anyway. This is an invaluable tool for "
"debugging software. You can start commands from the command line with strace "
@@ -1521,11 +1520,11 @@ msgid ""
"review."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1164
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre:caption):1163
msgid "Using strace"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1164
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(pre):1163
#, no-wrap
msgid ""
"\n"
@@ -1534,11 +1533,11 @@ msgid ""
"# <i>strace -p `ps -C $service -o pid=`</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1173
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(title):1172
msgid "Step 7: Research"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1176
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(p):1175
msgid ""
"Once you have the information, if you can diagnose and fix the problem, "
"great! If not, you'll probably need to go digging on the net for information "
@@ -1547,39 +1546,39 @@ msgid ""
"setting up smtp-auth which contains some great debugging ideas."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1185
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1184
msgid "<uri>http://forums.gentoo.org/</uri> - Great forums for gentoo users"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1186
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1185
msgid ""
"<uri>http://bugs.gentoo.org/</uri> - Bugs database for gentoo - great place "
"to look for specific errors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1190
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1189
msgid "<uri>http://postfix.state-of-mind.de/</uri> - smtp-auth howto"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1191
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1190
msgid ""
"<uri>http://marc.theaimsgroup.com/?l=postfix-users</uri> - Postfix mailing "
"lists - searchable"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1195
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1194
msgid ""
"<uri>http://sourceforge.net/mailarchive/forum.php?forum_id=6705</uri> - "
"Courier-imap mailing list archives - not searchable"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1199
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1198
msgid ""
"<uri>http://www.google.com/</uri> - If all else fails, there's always "
"google, which has never failed me"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1203
+#: ../../gentoo/xml/htdocs/doc/en//virt-mail-howto.xml(li):1202
msgid ""
"I also spend a lot of time on <uri link=\"irc://irc.gentoo.org/gentoo"
"\">#gentoo</uri>. IRC is a great place to go for help."
diff --git a/doc/gettext/ru/xen-guide.xml.po b/doc/gettext/ru/xen-guide.xml.po
index 3071e0a..efcff18 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-01-21 01:40+0500\n"
+"POT-Creation-Date: 2011-03-02 17:28+0500\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,17 +43,16 @@ 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 "3"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(date):24
-#, fuzzy
-msgid "2010-11-14"
-msgstr "2008-08-11"
+msgid "2011-03-02"
+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):392
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):384
msgid "Introduction"
msgstr "Введение"
@@ -140,41 +139,30 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):109
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):117
msgid "Installing Xen"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):112
msgid ""
-"Xen actually contains many components, so you'll need to install a couple of "
-"packages. Because it is still <uri link=\"/doc/en/handbook/handbook-x86.xml?"
-"part=3&amp;chap=3#doc_chap2\">~arch masked</uri> you first need to unmask it "
-"by adding the necessary lines to <path>/etc/portage/package.keywords</path> "
-"and then install them."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):120
-msgid "Unmasking and Installing Xen"
+"Xen actually contains many components, so you'll need to install a few "
+"packages."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):120
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):117
#, no-wrap
msgid ""
"\n"
-"~# <i>nano -w /etc/portage/package.keywords</i>\n"
-"app-emulation/xen\n"
-"app-emulation/xen-tools\n"
-"sys-kernel/xen-sources\n"
-"\n"
"~# <i>emerge xen xen-tools xen-sources</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):132
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):214
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):267
+#: ../../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
msgid "Building the Kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):135
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):127
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 "
@@ -186,7 +174,7 @@ msgid ""
"communicate directly with the hardware."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):146
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):138
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 "
@@ -196,11 +184,11 @@ msgid ""
"NAT, etc.)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):155
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):147
msgid "Enabling Xen Support for i386 Kernels"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):155
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):147
#, no-wrap
msgid ""
"\n"
@@ -208,11 +196,11 @@ msgid ""
" Subarchitecture Type (Xen-compatible)\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):160
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):152
msgid "Enabling Xen Support for x86_64 Kernels"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):160
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):152
#, no-wrap
msgid ""
"\n"
@@ -222,11 +210,11 @@ msgid ""
" [*] Support for hot-pluggable CPUs\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):167
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):159
msgid "Domain-0 Kernel Config"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):167
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):159
#, no-wrap
msgid ""
"\n"
@@ -251,11 +239,11 @@ msgid ""
" Xen version compatibility (3.0.4 and later)\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):189
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):181
msgid "Domain-U Kernel Config"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):189
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):181
#, no-wrap
msgid ""
"\n"
@@ -277,14 +265,14 @@ msgid ""
" Xen version compatibility (3.0.4 and later)\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):208
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):200
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):214
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):206
#, no-wrap
msgid ""
"\n"
@@ -294,7 +282,7 @@ msgid ""
"~# <i>make O=~/build/dom0 &amp;&amp; make O=~/build/dom0 modules_install</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):221
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):213
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) "
@@ -305,11 +293,11 @@ msgid ""
"should boot. For instance, for GRUB:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):231
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):223
msgid "GRUB Configuration for Xen"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):231
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):223
#, no-wrap
msgid ""
"\n"
@@ -319,24 +307,24 @@ msgid ""
"module /boot/kernel-2.6.x.y-xen0 root=/dev/hda3\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):238
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):230
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):243
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):235
msgid "Loading the Xen daemon"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):243
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):235
#, no-wrap
msgid ""
"\n"
"~# <i>/etc/init.d/xend start</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):247
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):239
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 "
@@ -344,7 +332,7 @@ msgid ""
"automatically next time you boot."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(note):254
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(note):246
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/"
@@ -352,11 +340,11 @@ msgid ""
"start."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):265
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):257
msgid "Creating an Unpriviledged Domain"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):270
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):262
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 "
@@ -366,11 +354,11 @@ msgid ""
"this is <path>/mnt/data/xen/kernel</path>):"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):279
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):271
msgid "Building the guest kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):279
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):271
#, no-wrap
msgid ""
"\n"
@@ -378,18 +366,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):284
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):276
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):293
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):285
msgid "Creating the Domain Disks"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):296
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):288
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 "
@@ -397,18 +385,18 @@ msgid ""
"advantages (especially regarding maintenance)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):303
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):295
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):309
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):301
msgid "Creating a file based filesystem"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):309
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):301
#, no-wrap
msgid ""
"\n"
@@ -416,11 +404,11 @@ msgid ""
"~# <i>mke2fs -j /mnt/data/xen/disks/ext3root.img</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):317
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):309
msgid "Configuring a Domain"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):320
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):312
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/"
@@ -428,11 +416,11 @@ msgid ""
"Gentoo environment which uses the disk image we created previously:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):328
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):320
msgid "Creating a domain configuration file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):328
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):320
#, no-wrap
msgid ""
"\n"
@@ -446,17 +434,17 @@ msgid ""
"root = \"/dev/sda1 ro\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):339
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):331
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):344
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):336
msgid "Using a block device"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):344
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):336
#, no-wrap
msgid ""
"\n"
@@ -467,33 +455,33 @@ msgid ""
"disk = [ 'phy:sdb6,sda1,w' ]\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):352
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):344
msgid "You can find example configuration files in <path>/etc/xen</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):359
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):351
msgid "Launching the New Domain"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):362
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):354
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):368
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):360
msgid "Creating and starting a new domain"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):368
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):360
#, 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):372
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):364
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 "
@@ -501,7 +489,7 @@ msgid ""
"install Gentoo as you're used to."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):379
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):371
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>. "
@@ -509,17 +497,17 @@ msgid ""
"access the domain otherwise (for instance, through SSH)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):390
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):382
msgid "Networking on Unpriviledged Domains"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):395
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):387
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):400
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):392
msgid ""
"When selecting the <e>routed</e> approach, the interface inside your "
"unpriviledged domain is connected to the virtual interface on your "
@@ -531,7 +519,7 @@ msgid ""
"specific routing rules."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):411
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):403
msgid ""
"When selecting the <e>bridged</e> approach, your default network interface "
"on the administrative domain becomes a bridge which accepts connections to "
@@ -539,11 +527,11 @@ msgid ""
"has."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):420
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):412
msgid "Regular Routed Interfaces"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):423
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):415
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 "
@@ -553,12 +541,12 @@ msgid ""
"c> instruction to it."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):432
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):488
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):424
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):480
msgid "Configuring a virtual interface"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):432
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):424
#, no-wrap
msgid ""
"\n"
@@ -568,7 +556,7 @@ msgid ""
"vif = [ 'ip=192.168.1.101, vifname=veth1' ]\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):439
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):431
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 "
@@ -576,7 +564,7 @@ msgid ""
"through interface <path>veth1</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):446
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):438
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 "
@@ -584,18 +572,18 @@ msgid ""
"domain and thus cannot be reached."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):453
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):445
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):458
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):500
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):450
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):492
msgid "Editing xend-config.sxp"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):458
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):450
#, no-wrap
msgid ""
"\n"
@@ -610,11 +598,11 @@ msgid ""
"(vif-script vif-route)\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):473
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):465
msgid "Bridged Interfaces"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):476
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):468
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 "
@@ -623,11 +611,11 @@ msgid ""
"(<path>bridge</path> module if build as such)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):484
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):476
msgid "Now edit your virtual domain and add the <c>vif</c> construct:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):488
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):480
#, no-wrap
msgid ""
"\n"
@@ -637,13 +625,13 @@ msgid ""
"vif = [ 'ip=192.168.1.101, vifname=veth0' ]\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):495
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):487
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):500
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):492
#, no-wrap
msgid ""
"\n"
@@ -658,7 +646,7 @@ msgid ""
"<i>#</i> (vif-script vif-route)\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):512
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):504
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 "
@@ -666,11 +654,11 @@ msgid ""
"<path>xend-config.sxp</path> as follows:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):519
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):511
msgid "Editing xend-config.sxp to change bridge configuration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):519
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):511
#, no-wrap
msgid ""
"\n"
@@ -680,60 +668,60 @@ 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):526
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(p):518
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):531
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre:caption):523
msgid "Restarting the xend daemon"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):531
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(pre):523
#, no-wrap
msgid ""
"\n"
"~# <i>/etc/init.d/xend restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):539
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):531
msgid "Further Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):541
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):533
msgid "Xen Documentation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):546
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):538
msgid "http://tx.downloads.xensource.com/downloads/docs/user/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):546
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):538
msgid "Xen Users' Manual"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):550
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):542
msgid "http://xen.xensource.com/documentation.html"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):550
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):542
msgid "Xen Community Documentation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):554
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri:link):546
msgid "http://wiki.xensource.com/xenwiki/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):554
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(uri):546
msgid "Xen Wiki"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):561
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(title):553
msgid "Xen Tools"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(li):565
+#: ../../gentoo/xml/htdocs/doc/en//xen-guide.xml(li):557
msgid ""
"<uri link=\"http://virt-manager.et.redhat.com/\">app-emulation/virt-manager</"
"uri> is a graphical tool for administering virtual machines"
diff --git a/doc/gettext/ru/xfce-config.xml.po b/doc/gettext/ru/xfce-config.xml.po
index c1359d4..97af8ce 100644
--- a/doc/gettext/ru/xfce-config.xml.po
+++ b/doc/gettext/ru/xfce-config.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-02-14 21:36+0500\n"
+"POT-Creation-Date: 2011-03-02 17:28+0500\n"
"PO-Revision-Date: 2010-02-09 00:53+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -36,11 +36,11 @@ msgstr ""
"полноценной графической средой."
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(version):21
-msgid "4"
+msgid "5"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(date):22
-msgid "2011-02-08"
+msgid "2011-02-14"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):25
@@ -587,8 +587,7 @@ msgid ""
"full-featured word processor but don't want the bloat of OpenOffice, try "
"emerging <c>abiword</c>. <uri link=\"http://www.abisource.com\">AbiWord</"
"uri> is lighter, faster, and is completely interoperable with industry-"
-"standard document types. It can also be further extended with <c>abiword-"
-"plugins</c>."
+"standard document types."
msgstr ""
"Хотя <c>mousepad</c> — хороший текстовый редактор, но если вам необходим "
"полноценный текстовый процессор, и вы не хотите связываться с OpenOffice, то "
diff --git a/doc/gettext/ru/xorg-config.xml.po b/doc/gettext/ru/xorg-config.xml.po
index 065dd87..d54cc30 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-01-21 01:40+0500\n"
+"POT-Creation-Date: 2011-03-02 17:28+0500\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,13 +39,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(version):25
-msgid "4"
+msgid "6"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(date):26
-#, fuzzy
-msgid "2010-10-25"
-msgstr "2009-10-02"
+msgid "2011-03-02"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):29
msgid "What is the X Window Server?"
@@ -111,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):315
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):323
msgid "Installing Xorg"
msgstr ""
@@ -265,6 +264,14 @@ 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 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"
" (/lib/firmware/) Firmware blobs root directory\n"
"\n"
"<comment>(Enable Radeon KMS support)</comment>\n"
@@ -275,31 +282,31 @@ msgid ""
" [*] Enable modesetting on radeon by default\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):216
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):224
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):222
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):230
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):230
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):238
msgid "make.conf configuration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):233
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):241
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):238
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):246
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 "
@@ -308,7 +315,7 @@ msgid ""
"open-source drivers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):246
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):254
msgid ""
"You may also try the proprietary drivers from nVidia and ATI, <c>nvidia</c> "
"and <c>fglrx</c> respectively. However, setting up the proprietary drivers "
@@ -318,19 +325,19 @@ msgid ""
"you should choose, refer to these guides for more information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):255
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):263
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):260
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):268
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):265
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):273
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 "
@@ -339,17 +346,17 @@ msgid ""
"<c>INPUT_DEVICES</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):273
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):281
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):278
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):286
msgid "Sample make.conf entries"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):278
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):286
#, no-wrap
msgid ""
"\n"
@@ -361,7 +368,7 @@ msgid ""
"VIDEO_CARDS=\"radeon\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):287
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):295
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 "
@@ -369,11 +376,11 @@ msgid ""
"Synaptics touchpad, and a Radeon video card."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):294
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):302
msgid "Displaying all the driver options available"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):294
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):302
#, no-wrap
msgid ""
"\n"
@@ -393,19 +400,19 @@ msgid ""
"0 kB\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):311
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):319
msgid ""
"After setting all the necessary variables you can install the Xorg package."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):315
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):323
#, no-wrap
msgid ""
"\n"
"# <i>emerge xorg-server</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):319
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):327
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-"
@@ -414,18 +421,18 @@ msgid ""
"many different languages. They're not necessary for a working desktop."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):327
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):335
msgid ""
"When the installation is finished, you will need to re-initialise some "
"environment variables before you continue. Just run <c>env-update</c> "
"followed by <c>source /etc/profile</c> and you're all set."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):333
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):341
msgid "Re-initialising the environment variables"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):333
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):341
#, no-wrap
msgid ""
"\n"
@@ -433,7 +440,7 @@ msgid ""
"# <i>source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):338
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):346
msgid ""
"Now it's time to start the Hardware Abstraction Layer (HAL) daemon and set "
"it to automatically start each time you boot. This is necessary to get a "
@@ -442,11 +449,11 @@ msgid ""
"link=\"#using_hal\">next section</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):346
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):354
msgid "Starting HAL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):346
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):354
#, no-wrap
msgid ""
"\n"
@@ -454,40 +461,40 @@ msgid ""
"# <i>rc-update add hald default</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):356
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):364
msgid "Configuring Xorg"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):358
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):366
msgid "Using HAL"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):361
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):369
msgid ""
"The X server is designed to work out-of-the-box, with no need to manually "
"edit Xorg's configuration files."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):366
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):374
msgid ""
"You should first try <uri link=\"#using_startx\">starting X</uri> without "
"creating <path>/etc/X11/xorg.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):371
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):379
msgid ""
"If Xorg won't start (if there's something wrong with the screen, or with "
"your keyboard/mouse), then you can try fixing problems by using the right "
"configuration files."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):377
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):385
msgid ""
"By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and "
"configure devices such as keyboards and mice."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):382
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):390
msgid ""
"HAL comes with many premade device rules, also called policies. These policy "
"files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a "
@@ -495,24 +502,24 @@ msgid ""
"policy/</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):389
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):397
msgid ""
"Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the "
"ones you need, and edit them once they're placed in the proper <path>/etc</"
"path> location."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):395
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):403
msgid ""
"For example, to get a basic working keyboard/mouse combination, you could "
"copy the following files to <path>/etc/hal/fdi/policy/</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):400
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):408
msgid "Using HAL policy files"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):400
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):408
#, no-wrap
msgid ""
"\n"
@@ -520,7 +527,7 @@ msgid ""
"# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):405
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):413
msgid ""
"There are several other HAL policies in <path>/usr/share/hal/fdi/</path> "
"that may interest you, such as laptop configurations, storage device "
@@ -528,28 +535,28 @@ msgid ""
"<path>/etc/hal/fdi/policy/</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):412
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):420
msgid ""
"Remember, <e>every</e> time you finish making changes to HAL policy files, "
"you need to restart the HAL daemon by running <c>/etc/init.d/hald restart</"
"c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):417
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):425
msgid ""
"You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your "
"liking. You may want to make a few tweaks or to expose additional "
"functionality. Let's go through an example of tweaking a HAL policy."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):423
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):431
msgid ""
"One very convenient trick is to kill the X server entirely by pressing Ctrl-"
"Alt-Backspace. This is useful when your X server is malfunctioning, frozen, "
"etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):429
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):437
msgid ""
"Recent X server versions disabled this key combination by default. However, "
"you can reenable it by copying <path>10-x11-input.fdi</path> to <path>/etc/"
@@ -557,11 +564,11 @@ msgid ""
"the appropriate section, as shown below:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):436
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):444
msgid "Editing 10-x11-input.fdi"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):436
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):444
#, no-wrap
msgid ""
"\n"
@@ -580,13 +587,13 @@ msgid ""
" &lt;/match&gt;\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):452
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):460
msgid ""
"Once you're done, run <c>/etc/init.d/hald restart</c> so that HAL picks up "
"your changes."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):457
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):465
msgid ""
"There, now you have a handy way of killing an unresponsive X server. This is "
"useful when programs have frozen your display entirely, or when configuring "
@@ -595,7 +602,7 @@ msgid ""
"them this way, and you may lose some (or all) of what you were working on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):465
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):473
msgid ""
"Hopefully just working with the HAL policy files results in a working X "
"desktop. If Xorg still won't start, or there's some other problem, then "
@@ -603,11 +610,11 @@ msgid ""
"next section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):474
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):482
msgid "The xorg.conf file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):477
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):485
msgid ""
"Configuring <path>xorg.conf</path> should be seen as a \"last resort\" "
"option. It really desirable to run without one if possible, and to do all "
@@ -615,7 +622,7 @@ msgid ""
"configuration, then read on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):484
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492
msgid ""
"The configuration file of Xorg is called <path>xorg.conf</path> and it "
"resides in <path>/etc/X11</path>. Xorg provides an example configuration as "
@@ -624,22 +631,22 @@ msgid ""
"documentation regarding the syntax, don't hesitate to read the man page:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):492
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):500
msgid "Reading the xorg.conf man page"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):492
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):500
#, no-wrap
msgid ""
"\n"
"$ <i>man 5 xorg.conf</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):499
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):507
msgid "Automatic Generation of xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):502
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):510
msgid ""
"Xorg itself is able to guess most parameters for you. In most cases, you "
"will only have to change some lines to get the resolution you want up and "
@@ -648,18 +655,18 @@ msgid ""
"(hopefully working) Xorg configuration file."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):510
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):518
msgid "Generating an xorg.conf file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):510
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):518
#, no-wrap
msgid ""
"\n"
"# <i>Xorg -configure</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):514
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):522
msgid ""
"Be sure to read the last lines printed on your screen when Xorg has finished "
"probing your hardware. If it tells you it failed at some point, you're "
@@ -668,18 +675,18 @@ msgid ""
"new</path> ready for you to test. So let's test. :)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):522
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):530
msgid "Testing the xorg.conf.new file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):522
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):530
#, no-wrap
msgid ""
"\n"
"# <i>X -retro -config /root/xorg.conf.new</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):526
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):534
msgid ""
"If all goes well, you should see a simple black and white pattern. Verify if "
"your mouse works correctly and if the resolution is good. You might not be "
@@ -687,30 +694,30 @@ msgid ""
"too low. You can exit any time by pressing Ctrl-Alt-Backspace."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):536
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):545
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):544
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):553
msgid "Copying over xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):539
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):547
msgid ""
"Let us copy over the <path>xorg.conf.new</path> to <path>/etc/X11/xorg.conf</"
"path> now, so we won't have to continuously run <c>X -config</c> -- typing "
"just <c>startx</c> is easier. :)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):545
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):553
#, no-wrap
msgid ""
"\n"
"# <i>cp /root/xorg.conf.new /etc/X11/xorg.conf</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):552
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):560
msgid "Using startx"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):555
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):563
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 "
@@ -718,13 +725,13 @@ msgid ""
"using the following logic:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):563
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):571
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):567
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):575
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> "
@@ -732,35 +739,36 @@ msgid ""
"d/90xsession</path> to make it a default for all the users on the system. "
"For example, as root, run <c>echo XSESSION=\"Xfce4\" &gt; /etc/env."
"d/90xsession</c>. This will create the <path>90xsession</path> file and set "
-"the default X session to <uri link=\"/doc/en/xfce-config.xml\">Xfce</uri>."
+"the default X session to <uri link=\"/doc/en/xfce-config.xml\">Xfce</uri>. "
+"Remember to run <c>env-update</c> after changing <path>90xsession</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):579
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):588
msgid "Starting X"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):579
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):588
#, no-wrap
msgid ""
"\n"
"$ <i>startx</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):583
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):592
msgid ""
"You can kill the X session by using the Ctrl-Alt-Backspace key combination. "
"This will, however, make X exit disgracefully -- something that you might "
"not always want."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):589
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):598
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):595
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):604
msgid ""
"Once those two programs are installed, run <c>startx</c> again. A few xterm "
"windows should appear, making it easier to verify that X is working "
@@ -769,15 +777,15 @@ msgid ""
"them once you've setup a proper desktop environment."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):608
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):617
msgid "Tweaking X settings"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):610
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):619
msgid "Setting your Resolution"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):613
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):622
msgid ""
"If you feel that the screen resolution is wrong, you will need to check two "
"sections in your <path>xorg.conf</path> configuration. First of all, you "
@@ -787,7 +795,7 @@ msgid ""
"based on the information in the second section, <e>Monitor</e>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):622
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):631
msgid ""
"What happens is that Xorg checks the settings of <c>HorizSync</c> and "
"<c>VertRefresh</c> in the <e>Monitor</e> section to compute valid "
@@ -797,7 +805,7 @@ msgid ""
"correct values."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(warn):630
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(warn):639
msgid ""
"Do <b>not</b> \"just\" change the values of these two monitor related "
"variables without consulting the technical specifications of your monitor. "
@@ -805,7 +813,7 @@ msgid ""
"screens at worst."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):637
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):646
msgid ""
"Now let us change the resolution. In the next example from <path>/etc/X11/"
"xorg.conf</path> we add the <c>PreferredMode</c> line so that our X server "
@@ -818,11 +826,11 @@ msgid ""
"section) must match the <c>Identifier</c> in the <c>Monitor</c> section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):649
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):658
msgid "Changing the Monitor section in /etc/X11/xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):649
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):658
#, no-wrap
msgid ""
"\n"
@@ -836,15 +844,15 @@ msgid ""
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):660
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):669
msgid "Run X (<c>startx</c>) to discover it uses the resolution you want."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):667
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):676
msgid "Multiple monitors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):670
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):679
msgid ""
"You can configure more than one monitor in <path>/etc/X11/xorg.conf</path>. "
"All you have to do is give each monitor an identifer, then list its physical "
@@ -853,11 +861,11 @@ msgid ""
"as the right-hand screen:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):678
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):687
msgid "Configuring multiple monitors in xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):678
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):687
#, no-wrap
msgid ""
"\n"
@@ -877,46 +885,46 @@ msgid ""
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):698
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):707
msgid "Configuring your keyboard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):701
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):710
msgid ""
"To setup X to use an international keyboard, you can copy the content of "
"<path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to <path>/"
"etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):707
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):716
msgid "Using an existing config file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):707
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):716
#, no-wrap
msgid ""
"\n"
"# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2 &gt; /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):711
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):720
msgid ""
"Now you can just edit <path>10-xinput-configuration.fdi</path> and change "
"the Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain "
"(<b>gb</b>) or Polish (<b>pl</b>)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):717
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):726
msgid ""
"When you're finished, run <c>/etc/init.d/hald restart</c> as root to make "
"sure that HAL picks up your configuration file changes."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):725
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):734
msgid "Finishing up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):728
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):737
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 "
@@ -924,15 +932,15 @@ msgid ""
"but that's not part of this guide."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):740
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):749
msgid "Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):742
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):751
msgid "Creating and Tweaking xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):745
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):754
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 "
@@ -940,31 +948,31 @@ msgid ""
"configuration files!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):752
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):761
msgid ""
"Also, be sure to look at <path>/etc/X11/xorg.conf.example</path>; you may "
"wish to copy this and use it as a foundation for writing your own <path>xorg."
"conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):758
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):767
msgid ""
"You may find the X.org <uri link=\"http://www.x.org/wiki/FAQ\">FAQ</uri> "
"provided on their website, in addition to their other documentation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):763
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):772
msgid ""
"There are also many online resources on editing <path>xorg.conf</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):772
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):781
msgid "Other resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):775
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):784
msgid ""
"More information about installing and configuring various graphical desktop "
"environments and applications can be found in the <uri link=\"/doc/en/?"
@@ -972,7 +980,7 @@ msgid ""
"documentation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):782
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):791
msgid ""
"If you're upgrading to <c>xorg-server</c> 1.8 from an earlier version, then "
"be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.8-"