From: "Azamat H. Hackimov" <winterheart@gentoo.ru>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoo-doc-translations:master commit in: doc/gettext/, doc/gettext/el/, doc/gettext/ru/, handbook/gettext/ru/
Date: Mon, 14 Feb 2011 19:41:46 +0000 (UTC) [thread overview]
Message-ID: <9c9866fbafd761dfb67aecbf62168f783b5dd073.winterheart@gentoo> (raw)
commit: 9c9866fbafd761dfb67aecbf62168f783b5dd073
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Feb 14 19:41:15 2011 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Feb 14 19:41:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-doc-translations.git;a=commit;h=9c9866fb
Sync with gorg.
---
doc/gettext/el/multipath.xml.po | 14 +-
doc/gettext/el/printing-howto.xml.po | 159 ++++++++++--------
doc/gettext/el/xfce-config.xml.po | 229 +++++++++++++++-----------
doc/gettext/multipath.xml.pot | 12 +-
doc/gettext/printing-howto.xml.pot | 124 ++++++++-------
doc/gettext/ru/multipath.xml.po | 16 +-
doc/gettext/ru/printing-howto.xml.po | 163 +++++++++++--------
doc/gettext/ru/xfce-config.xml.po | 230 +++++++++++++++-----------
doc/gettext/xfce-config.xml.pot | 215 +++++++++++++-----------
handbook/gettext/ru/gentoo-handbook.lokalize | 6 +
handbook/gettext/ru/terms.tbx | 155 +++++++++++++++++
11 files changed, 812 insertions(+), 511 deletions(-)
diff --git a/doc/gettext/el/multipath.xml.po b/doc/gettext/el/multipath.xml.po
index 9b97a39..a80305b 100644
--- a/doc/gettext/el/multipath.xml.po
+++ b/doc/gettext/el/multipath.xml.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-02-14 21:36+0500\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(title):6
@@ -65,11 +65,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(version):32
-msgid "1"
+msgid "3"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(date):33
-msgid "2008-09-10"
+msgid "2011-02-07"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(title):36
@@ -152,7 +152,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(p):107
msgid ""
"You need to emerge <c>multipath-tools</c> and <c>sg3_utils</c>. On the disk, "
-"you want to find the <c>wwid</c>. You can use <c>sq_vpd</c> (provided by "
+"you want to find the <c>wwid</c>. You can use <c>sg_vpd</c> (provided by "
"<c>sg3_utils</c>) to do this."
msgstr ""
@@ -166,7 +166,7 @@ msgid ""
"\n"
"# <i>emerge multipath-tools sg3_utils</i>\n"
"<comment>(Replace /dev/DEVICE with your disk to find its wwid)</comment>\n"
-"# <i>/usr/bin/sq_vpd ?page=di /dev/DEVICE</i>\n"
+"# <i>/usr/bin/sg_vpd --page=di /dev/DEVICE</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(p):119
@@ -371,7 +371,7 @@ msgid ""
"multipaths {\n"
"multipath {\n"
"wwid\n"
-"<comment>(To find your wwid, please use /usr/bin/sq_vpd ?page=di /dev/DEVICE.\n"
+"<comment>(To find your wwid, please use /usr/bin/sg_vpd --page=di /dev/DEVICE.\n"
"The address will be a 0x6. Remove the 0x and replace it with 3.)</comment>\n"
"alias DB_SAN\n"
"}\n"
diff --git a/doc/gettext/el/printing-howto.xml.po b/doc/gettext/el/printing-howto.xml.po
index 3655549..c408b48 100644
--- a/doc/gettext/el/printing-howto.xml.po
+++ b/doc/gettext/el/printing-howto.xml.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-02-14 21:36+0500\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):6
@@ -40,11 +40,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(version):25
-msgid "3.6"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(date):26
-msgid "2010-03-17"
+msgid "2011-02-14"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):29
@@ -78,7 +78,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):55
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):544
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):768
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1000
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1021
msgid "Introduction"
msgstr ""
@@ -977,8 +977,13 @@ msgstr ""
msgid "Gutenprint Driver"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(li):784
-msgid "<uri link=\"#hplip\">HPLIP Driver</uri> (deprecates HPOJ and HPIJS)"
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri:link):784
+msgid "#hplip"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri):784
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):820
+msgid "HPLIP Driver"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri:link):785
@@ -986,7 +991,7 @@ msgid "#pnm2ppa"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri):785
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):865
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):886
msgid "PNM2PPA Driver"
msgstr ""
@@ -1023,67 +1028,87 @@ msgid ""
"available through the CUPS web interface."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):820
-msgid "HPLIP Driver"
-msgstr ""
-
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):823
msgid ""
"The <uri link=\"http://hplipopensource.com/hplip-web/index.html\">HPLIP "
"Project</uri> uses the hpcups printer driver. It also includes scanner and "
"fax support and service tools for various multi-purpose peripherals. For "
-"printing support, it is recomended to use the new hpcups driver, which you "
+"printing support, it is recommended to use the new hpcups driver, which you "
"can enable with the <c>hpcups</c> USE flag. The old hpijs driver is still "
-"included when you build <c>hplip</c> with the <c>hpijs</c> USE flag."
+"included when you build <c>net-print/hplip</c> with the <c>hpijs</c> USE "
+"flag."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):832
msgid ""
"The default install enables dynamically generated ppd files at runtime. Some "
-"old printers may still require static ppd files. If you encounter problems "
-"when using <c>hp-setup</c> try enabling the <c>static-ppds</c> USE flag and "
-"rebuilding <c>hplip</c>."
+"printers may still require static ppd files. If you encounter problems when "
+"using <c>hp-setup</c> try enabling the <c>static-ppds</c> USE flag and "
+"rebuild <c>net-print/hplip</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):839
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):839
+msgid ""
+"For USB printers <c>net-print/cups</c> has to be built with the <c>usb</c> "
+"USE flag. This way it makes use of the <c>dev-libs/libusb</c> user space "
+"tool which replaces kernel usb printer support (CONFIG_USB_PRINTER). In case "
+"of problems you can disable the <c>usb</c> USE flag for <c>net-print/cups</"
+"c> and activate the kernel functionality again. All users who need to access "
+"the printer have to be a member of the <c>lp</c> group."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):848
+msgid ""
+"To be able to set up a network printer <c>net-print/cups</c> has to be built "
+"with USE <c>slp</c>. With recent versions of <c>net-print/hplip</c> the "
+"default lookup method for networked printers is mDNS which requires <c>net-"
+"print/cups</c> to be built with USE <c>zeroconf</c>. (Note: this method does "
+"not work with the upcoming <c>net-print/cups-1.4</c> series). To be able to "
+"print on a network printer <c>net-print/hplip</c> needs to be built with USE "
+"<c>snmp</c>."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):858
msgid "Installing the hplip drivers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):839
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):858
#, no-wrap
msgid ""
"\n"
"# <i>emerge -vp hplip</i>\n"
"These are the packages that would be merged, in order:\n"
"\n"
-"Calculating dependencies... done!\n"
-"[ebuild N ] net-print/hplip-3.9.12 USE=\"gtk hpcups qt4 -doc -fax -hpijs \n"
-"-libnotify -minimal -new-hpcups -parport -policykit -scanner -snmp -static-ppds\n"
-"-udev-acl\" 20,871 kB \n"
+"Calculating dependencies ... done!\n"
+"[ebuild N ] net-print/hplip-3.10.9 USE=\"X hpcups hpijs libnotify qt4 udev-acl\n"
+"-doc -fax -kde -minimal -parport -policykit -scanner -snmp -static-ppds\" 21,307 kB\n"
"\n"
-"Total: 1 package (1 new), Size of downloads: 20,871 kB\n"
+"Total: 1 package (1 new), Size of downloads: 21,307 kB\n"
"\n"
"# <i>emerge hplip</i>\n"
-"<comment>(Make sure your USB printer is plugged into your computer)</comment>\n"
+"<comment>(Make sure your USB printer is plugged into your computer or your network\n"
+"printer into the network socket.)</comment>\n"
"# <i>hp-setup</i>\n"
"# <i>/etc/init.d/cupsd restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):856
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):875
msgid ""
"When the emerge process has finished, the <c>hp-setup</c> tool will attempt "
"to detect and install the printer drivers for your printer on the system. "
-"Once finished, your printer will be available in the CUPS configuration."
+"Once finished, your printer will be available in the CUPS configuration. "
+"When upgrading <c>net-print/hplip</c> you should run <c>hp-setup -r</c> to "
+"remove all printers and configure them again."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):868
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):889
msgid ""
"PPA is an HP technology that focuses on sending low-level processing to the "
"system instead of to the printer which makes the printer cheaper but more "
"resource consuming."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):874
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):895
msgid ""
"If the <uri link=\"http://www.linuxprinting.org/printer_list.cgi"
"\">LinuxPrinting</uri> site informs you that the <uri link=\"http://pnm2ppa."
@@ -1091,18 +1116,18 @@ msgid ""
"install the <c>pnm2ppa</c> filter on your system:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):882
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):903
msgid "Installing the pnm2ppa filter"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):882
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):903
#, no-wrap
msgid ""
"\n"
"# <i>emerge pnm2ppa</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):886
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):907
msgid ""
"Once installed, download the PPD file for your printer from the <uri link="
"\"http://www.linuxprinting.org/printer_list.cgi\">LinuxPrinting</uri> site "
@@ -1110,21 +1135,21 @@ msgid ""
"printer using the steps explained above."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):898
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):919
msgid "Printing From and To Microsoft Windows"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(note):902
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(note):923
msgid ""
"You should read our <uri link=\"/doc/en/quick-samba-howto.xml\">Samba/CUPS "
"Guide</uri> for more detailed information on setting up CUPS with Samba."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):910
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):931
msgid "Configuring a Windows Client for IPP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):913
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):934
msgid ""
"Microsoft Windows supports IPP (Windows 9x and ME users need to <uri link="
"\"http://support.microsoft.com/default.aspx?scid=kb;en-us;294439\">install</"
@@ -1134,17 +1159,17 @@ msgid ""
"printers/queue</c> syntax."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):922
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):943
msgid ""
"Make sure that your systems <uri link=\"#remote_usage\">can reach</uri> your "
"printer!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):930
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):951
msgid "Configuring a Windows Client for a Samba Shared Printer"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):933
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):954
msgid ""
"To share the printer on the SMB-CIFS network, you must have SAMBA installed "
"and configured correctly. How to do this is beyond the scope of this "
@@ -1152,17 +1177,17 @@ msgid ""
"shared printers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):939
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):960
msgid ""
"Open <path>/etc/samba/smb.conf</path> with your favorite editor and add a <c>"
"[printers]</c> section to it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):944
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):965
msgid "Adding a [printers] section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):944
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):965
#, no-wrap
msgid ""
"\n"
@@ -1177,18 +1202,18 @@ msgid ""
" printer name = hpljet5p\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):956
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):977
msgid ""
"Now navigate to the top of the <path>smb.conf</path> file until you are "
"inside the <c>[global]</c> section. Then locate the <c>printcap name</c> and "
"<c>printing</c> settings and set each of them to <c>cups</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):962
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):983
msgid "Changing the [global] section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):962
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):983
#, no-wrap
msgid ""
"\n"
@@ -1198,23 +1223,23 @@ msgid ""
" printing = <i>cups</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):969
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):990
msgid ""
"Make sure you enabled the <uri link=\"#windows_pcl\">Windows PCL drivers</"
"uri> support in CUPS. Then, restart the <c>smb</c> service to have the "
"changes take effect."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):978
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):999
msgid "Configuring a Linux Client for a Windows Print Server"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):981
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1002
msgid ""
"First of all, make sure that the printer is shared on your Windows system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):985
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1006
msgid ""
"Next, in the CUPS web interface, configure your printer as described "
"previously. You will notice that CUPS has added another driver called "
@@ -1223,11 +1248,11 @@ msgid ""
"syntax for the URI."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):998
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1019
msgid "Printing-related Applications"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1003
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1024
msgid ""
"Many tools exist that help you configure a printer, use additional printing "
"filters, add features to your printing capabilities, etc. This chapter lists "
@@ -1235,11 +1260,11 @@ msgid ""
"in great detail."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1013
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1034
msgid "Gtk-LP - A Gtk-powered Printer Configuration Tool"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1016
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1037
msgid ""
"With <uri link=\"http://gtklp.sourceforge.net/index.shtml\">Gtk-LP</uri> you "
"can install, modify and configure your printer from a stand-alone Gtk "
@@ -1248,75 +1273,75 @@ msgid ""
"want a stand-alone application for your day-to-day printing routines."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1024
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1045
msgid "To install it, emerge <c>gtklp</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1028
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1049
msgid "Installing Gtk-LP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1028
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1049
#, no-wrap
msgid ""
"\n"
"# <i>emerge gtklp</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1037
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1058
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1039
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1060
msgid "Error: Unable to convert file 0 to printable format"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1042
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1063
msgid ""
"If you are having printing troubles and <path>/var/log/cups/error_log</path> "
"shows this message:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1047
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1068
msgid "Error log"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1047
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1068
#, no-wrap
msgid ""
"\n"
"Unable to convert file 0 to printable format\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1051
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1072
msgid ""
"You need to re-emerge <c>ghostscript-gpl</c> with the <c>cups</c> USE flag. "
"You can either add <c>cups</c> to your USE flags in <path>/etc/make.conf</"
"path>, or you can enable it only for <c>ghostscript-gpl</c> as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1057
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1078
msgid "Adding cups to ghostscript-gpl"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1057
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1078
#, no-wrap
msgid ""
"\n"
"# <i>echo \"app-text/ghostscript-gpl cups\" >> /etc/portage/package.use</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1061
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1082
msgid ""
"Then emerge <c>ghostscript-gpl</c>. When it has finished compiling, be sure "
"to restart <c>cupsd</c> afterward:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1066
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1087
msgid "Restarting cupsd"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1066
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1087
#, no-wrap
msgid ""
"\n"
diff --git a/doc/gettext/el/xfce-config.xml.po b/doc/gettext/el/xfce-config.xml.po
index 6db7dde..f42732b 100644
--- a/doc/gettext/el/xfce-config.xml.po
+++ b/doc/gettext/el/xfce-config.xml.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-04 03:33+0500\n"
+"POT-Creation-Date: 2011-02-14 21:36+0500\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -30,11 +30,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(version):21
-msgid "3"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(date):22
-msgid "2011-01-23"
+msgid "2011-02-08"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):25
@@ -69,53 +69,60 @@ msgid ""
"desktop in keeping with the Xfce philosophy: light, fast, and modular."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):56
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):77
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):51
+msgid ""
+"The last part of this guide lists a few commands to run after upgrading to "
+"Xfce 4.8, so be sure to follow them if you are upgrading from an older "
+"version."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):61
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):82
msgid "Installing Xfce"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):58
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):63
msgid "The basics"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):61
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):66
msgid ""
"First, make sure you've configured Xorg as shown in the <uri link=\"/doc/en/"
"xorg-config.xml\">X Server Configuration Howto</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):66
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):71
msgid ""
"Next, double-check your USE flags in <path>/etc/make.conf</path>; you'll "
"probably at least want <c>USE=\"-gnome -kde -minimal -qt4 dbus jpeg lock "
"session startup-notification thunar udev X\"</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):72
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):77
msgid ""
"Now that you've set your <c>USE</c> variables in <path>/etc/make.conf</"
"path>, it's time to install Xfce."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):77
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):82
#, no-wrap
msgid ""
"\n"
"# <i>emerge -avt xfce4-meta</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):81
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):86
msgid ""
"Next, add your regular user(s) to the <c>plugdev</c>, <c>cdrom</c>, <c>cdrw</"
"c>, and <c>usb</c> groups, so that they can mount and use devices such as "
"cameras, optical drives, and USB sticks."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):87
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):92
msgid "Adding users to the hardware groups"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):87
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):92
#, no-wrap
msgid ""
"\n"
@@ -123,67 +130,67 @@ msgid ""
"# <i>for x in plugdev cdrom cdrw usb ; do gpasswd -a username $x ; done</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):92
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):97
msgid "Next, update your environment variables:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):96
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):101
msgid "Updating environment variables"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):96
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):101
#, no-wrap
msgid ""
"\n"
"# <i>env-update && source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):100
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):105
msgid ""
"You'll also need a graphical terminal so that you can continue working with "
"your new desktop environment. <c>x11-terms/terminal</c> is a good choice, as "
"it's made specifically for Xfce. Install Terminal as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):106
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):111
msgid "Installing Terminal"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):106
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):111
#, no-wrap
msgid ""
"\n"
"# <i>emerge x11-terms/terminal</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):115
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):120
msgid "Configuring Xfce"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):117
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):142
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):122
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):147
msgid "Starting Xfce"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):120
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):125
msgid ""
"Now that Xfce is now installed, we'll configure it to be the default desktop "
"environment when we issue the <c>startx</c> command. Exit your root shell "
"and log on as a regular user."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):126
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):131
msgid "Setting Xfce as the default desktop environment"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):126
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):131
#, no-wrap
msgid ""
"\n"
"$ <i>echo \"exec startxfce4\" > ~/.xinitrc</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):130
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):135
msgid ""
"If you have ConsoleKit installed, your <path>~/.xinitrc</path> should "
"instead contain <c>exec ck-launch-session startxfce4</c>. Otherwise, some of "
@@ -192,29 +199,29 @@ msgid ""
"add consolekit default</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):138
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):143
msgid "Now start your graphical environment by typing <c>startx</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):142
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):147
#, no-wrap
msgid ""
"\n"
"$ <i>startx</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):146
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):151
msgid ""
"Congratulations, and welcome to your new Xfce desktop environment. Go ahead, "
"explore it a bit. Then continue reading to learn how you can configure Xfce "
"to suit your needs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):155
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):160
msgid "Program access"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):158
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):163
msgid ""
"You might notice right-clicking on the desktop shows you the menu of all "
"your applications. It's useful, but your desktop can easily be completely "
@@ -227,11 +234,11 @@ msgid ""
"your installed programs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):172
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):177
msgid "Sessions & startup"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):175
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):180
msgid ""
"If you've installed (or plan to install) popular Gnome or KDE applications "
"such as <c>k3b</c>, <c>nautilus</c>, <c>kmail</c>, <c>evolution</c>, etc. "
@@ -242,7 +249,7 @@ msgid ""
"KDE and Gnome applications."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):184
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):189
msgid ""
"Xfce has the ability to save your session settings and running programs from "
"the \"General\" tab in the Sessions & Startup menu. They can be "
@@ -255,27 +262,27 @@ msgid ""
"out."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):195
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):200
msgid ""
"You've now got a basic working environment installed and configured. But if "
"you're interested in doing more, then continue reading!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):205
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):210
msgid "Additional Applications"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):207
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):212
msgid "Panel plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):210
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):215
msgid ""
"In this chapter, we'll discuss some useful plugins and applications for "
"everyday use within Xfce."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):215
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):220
msgid ""
"There are many plugins for the panel available in Portage; see for yourself "
"with <c>emerge --search xfce</c>. Though for the most part their names are "
@@ -285,7 +292,7 @@ msgid ""
"the panel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):224
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):229
msgid ""
"<c>xfce4-battery-plugin</c> is perfect for laptop users. It displays battery "
"percentage, time remaining, power source (AC or battery), fan status, "
@@ -294,25 +301,25 @@ msgid ""
"the battery is almost exhausted."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):231
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):236
msgid ""
"<c>xfce4-verve-plugin</c> is a small command line embedded into the panel. "
"It's quicker than opening up another terminal when you want to run a command."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):236
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):241
msgid ""
"<c>xfce4-mount-plugin</c> gives you a handy method of mounting devices "
"listed in <path>/etc/fstab</path> just by clicking your mouse"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):240
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):245
msgid ""
"<c>xfce4-sensors-plugin</c> lets you monitor your hardware sensors, such as "
"CPU temperature, fan RPM, hard drive temp, motherboard voltage, and more"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):246
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):251
msgid ""
"If you can't find what you're looking for in the plugins specifically made "
"for Xfce, try searching through the list of Gnome panel applets! That's "
@@ -320,11 +327,11 @@ msgid ""
"run any applet made for Gnome."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):256
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):261
msgid "Useful programs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):259
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):264
msgid ""
"We should now <c>emerge</c> some useful applications and utilities: <c>xfce4-"
"mixer</c>, <c>xfce4-taskmanager</c>, <c>xfwm4-themes</c>, <c>orage</c>, "
@@ -332,7 +339,7 @@ msgid ""
"<c>thunar</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):266
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):271
msgid ""
"<c>xfce4-mixer</c> is a volume control for your sound card. It can also be "
"run as a panel applet, giving you fast access to playback volume. <c>xfce4-"
@@ -343,20 +350,20 @@ msgid ""
"your system's resources."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):281
msgid ""
"<c>xfwm4-themes</c> adds several window manager themes. You may want to add "
"a more full-coverage icon theme such as <c>tango-icon-theme</c> just to "
"round out your desktop."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):287
msgid ""
"<c>orage</c> is a simple, handy calendar. <c>leafpad</c> is a barebones text "
"editor that starts up extremely quickly."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):287
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):292
msgid ""
"<c>xfce4-power-manager</c> is an application to monitor and manage power "
"usage. This is especially important for laptops! The power manager allows "
@@ -369,7 +376,7 @@ msgid ""
"to display battery/charging status, and a brightness control."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):299
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):304
msgid ""
"<c>x11-terms/terminal</c> is an X11 terminal emulator, far more configurable "
"and useful than the barebones <c>xterm</c>. <c>terminal</c> supports Unicode "
@@ -380,14 +387,14 @@ msgid ""
"the launcher and choose \"Properties\" to change the command."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):309
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):314
msgid ""
"<c>thunar</c> is Xfce's default graphical file manager. It's fast yet quite "
"powerful, can support several plugins for even more functionality; just "
"install them with <c>emerge</c>. Let's take a look:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):316
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):321
msgid ""
"<c>thunar-archive-plugin</c> lets you create and extract archive files using "
"the right-click menu. It provides a handy <uri link=\"http://www.foo-"
@@ -396,25 +403,25 @@ msgid ""
"and <c>file-roller</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):323
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):328
msgid ""
"<c>tumbler</c> lets you preview certain types of files from within Thunar, "
"such as images and fonts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):327
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):332
msgid ""
"<c>thunar-volman</c> automatically <uri link=\"http://foo-projects.org/"
"~benny/projects/thunar-volman/\">manages</uri> removable media and drives."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):334
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):339
msgid ""
"Next, let's see about adding some useful but lightweight desktop "
"applications, in keeping with Xfce's philosophy."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):339
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):344
msgid ""
"Though <c>leafpad</c> is nice enough as a basic text editor, if you need a "
"full-featured word processor but don't want the bloat of OpenOffice, try "
@@ -424,13 +431,13 @@ msgid ""
"plugins</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):347
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):352
msgid ""
"Need a nice email client/newsreader that isn't as demanding as "
"<c>thunderbird</c> or <c>evolution</c>? Try emerging <c>claws-mail</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):352
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):357
msgid ""
"For your internet chat needs, <c>irssi</c> is an excellent, tiny, incredibly "
"configurable IRC client that runs in your terminal. If you prefer a compact "
@@ -438,14 +445,14 @@ msgid ""
"<c>emerge pidgin</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):359
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):364
msgid ""
"If you need movie and music players, look no further than <c>mplayer</c> and "
"<uri link=\"/proj/en/desktop/sound/decibel.xml\">decibel-audio-player</uri>. "
"They can play most every media format available quite nicely."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):365
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):370
msgid ""
"Finally, you'll need a webbrowser. Nearly all graphical webbrowsers require "
"more resources than most of your other desktop applications. Still, "
@@ -455,11 +462,11 @@ msgid ""
"more dependencies unless you override them with a few USE flags."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):374
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):379
msgid "Adding a webbrowser"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):374
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):379
#, no-wrap
msgid ""
"\n"
@@ -472,17 +479,17 @@ msgid ""
"# <i>emerge opera</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):384
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):389
msgid ""
"Now that we've explored some good suggestions for rounding out your desktop "
"applications, let's see what else we can do to enhance your Xfce experience."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):392
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):397
msgid "Graphical login"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):395
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):400
msgid ""
"Remember when we added <c>startxfce4</c> to our <path>~/.xinitrc</path>? All "
"you have to do to get into your desktop is type <c>startx</c> after logging "
@@ -491,22 +498,22 @@ msgid ""
"(so that you can login graphically)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):403
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):408
msgid "First, let's make sure Xfce loads at boot:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):407
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):412
msgid "Adding xdm to the default runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):407
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):412
#, no-wrap
msgid ""
"\n"
"# <i>rc-update add xdm default</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):411
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):416
msgid ""
"We aren't quite finished yet. We have to pick a display manager and set the "
"appropriate variable. Though there are a few choices available in Portage, "
@@ -514,56 +521,56 @@ msgid ""
"uri>, the Simple Login Manager."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):418
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):423
msgid ""
"<c>slim</c> is speedy and lightweight, with minimal dependencies. Perfect "
"for Xfce!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):423
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):428
msgid "Installing SLiM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):423
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):428
#, no-wrap
msgid ""
"\n"
"# <i>emerge -avt slim</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):427
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):432
msgid ""
"The <c>branding</c> USE flag will pull in the <c>slim-themes</c> package, "
"which will give you an assortment of login themes, including a Gentoo Linux "
"theme."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):432
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):437
msgid "Then edit the DISPLAYMANAGER variable in <path>/etc/conf.d/xdm</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):436
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):441
msgid "Editing /etc/conf.d/xdm"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):436
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):441
#, no-wrap
msgid ""
"\n"
"DISPLAYMANAGER=\"slim\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):440
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):445
msgid ""
"SLiM can automatically start your Xfce session if you add <c>XSESSION="
"\"Xfce4\"</c> to <path>/etc/env.d/90xsession</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):445
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):450
msgid "Setting XSESSION"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):445
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):450
#, no-wrap
msgid ""
"\n"
@@ -571,11 +578,11 @@ msgid ""
"# <i>env-update && source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):453
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):458
msgid "Beautifying your desktop"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):456
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):461
msgid ""
"A little customization of your desktop's appearance can go a long way. Xfce "
"has all the options you'd expect from a modern desktop environment, font "
@@ -584,7 +591,7 @@ msgid ""
"icon sets, mouse cursor themes, and wallpapers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):464
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):469
msgid ""
"A selection of nice Gentoo wallpapers in a variety of resolutions are hosted "
"on the <uri link=\"/main/en/graphics.xml\">Gentoo website</uri>. If you're "
@@ -598,7 +605,7 @@ msgid ""
"sets to <path>~/.themes/</path> and <path>~/.icons/</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):477
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):482
msgid ""
"If you installed SLiM as your display manager, there are lots of themes in "
"the <c>slim-themes</c> package available in Portage. Also, be sure to check "
@@ -608,7 +615,7 @@ msgid ""
"Gentoo also ships a <c>slim-themes</c> package that you can <c>emerge</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):486
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):491
msgid ""
"Finally, Xfce has its own built-in compositor to manage window transparency. "
"This option can be found in Menu --> Settings --> Window Manager. For "
@@ -619,11 +626,11 @@ msgid ""
"section:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):495
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):500
msgid "Enabling composite in xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):495
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):500
#, no-wrap
msgid ""
"\n"
@@ -632,7 +639,7 @@ msgid ""
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):501
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):506
msgid ""
"This is the bare minimum configuration required for Xfce and Xorg-X11. "
"However, setting up hardware-accelerated rendering depends on your "
@@ -642,47 +649,71 @@ msgid ""
"hardware-accelerated rendering for your graphics card."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):510
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):515
msgid ""
"Once you've finished setting up a beautiful Xfce desktop, the next thing to "
"do is take a picture of it to share with other folks! Just install <c>xfce4-"
"screenshooter</c> and post your pictures somewhere for all to admire."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):521
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):526
msgid "Summary"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):525
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):530
msgid ""
"Congratulations on making it this far! You've installed and configured a "
"speedy desktop environment with a solid suite of applications for your "
"computing needs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):534
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):539
+msgid "Upgrading Xfce"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):542
+msgid ""
+"If you're upgrading Xfce from an old version to 4.8 or newer, then you will "
+"need to remove your old cached sessions. For each of your users, run the "
+"following commands to remove your old incompatible cached sessions:"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):548
+msgid "Deleting old sessions from the cache"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):548
+#, no-wrap
+msgid ""
+"\n"
+"$ <i>rm -r ~/.cache/sessions</i>\n"
+"$ <i>rm -r ~/.config/xfce*</i>\n"
+"$ <i>rm -r ~/.config/Thunar</i>\n"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):557
msgid "Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):537
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):560
msgid ""
"Need additional help on configuring and using Xfce? Need more lightweight "
"application suggestions? Try checking out:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):543
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):566
msgid "http://forums.gentoo.org"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):543
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):566
msgid "The Gentoo forums"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):544
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):567
msgid "#xfce on irc.freenode.net"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):545
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):568
msgid ""
"The installed help files and other documentation provided by Xfce: <path>/"
"usr/share/xfce4/doc/C/index.html</path>. Just point your browser at it and "
@@ -690,11 +721,11 @@ msgid ""
"detailed in the help files."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):551
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):574
msgid "http://www.xfce.org"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):551
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):574
msgid "Xfce's home page"
msgstr ""
diff --git a/doc/gettext/multipath.xml.pot b/doc/gettext/multipath.xml.pot
index 679e8c0..e544df0 100644
--- a/doc/gettext/multipath.xml.pot
+++ b/doc/gettext/multipath.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-02-14 21:36+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,11 +58,11 @@ msgid "This document teaches you how to set up multipathing services for data st
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(version):32
-msgid "1"
+msgid "3"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(date):33
-msgid "2008-09-10"
+msgid "2011-02-07"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(title):36
@@ -98,7 +98,7 @@ msgid "Installation and Tools"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(p):107
-msgid "You need to emerge <c>multipath-tools</c> and <c>sg3_utils</c>. On the disk, you want to find the <c>wwid</c>. You can use <c>sq_vpd</c> (provided by <c>sg3_utils</c>) to do this."
+msgid "You need to emerge <c>multipath-tools</c> and <c>sg3_utils</c>. On the disk, you want to find the <c>wwid</c>. You can use <c>sg_vpd</c> (provided by <c>sg3_utils</c>) to do this."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(pre:caption):113
@@ -107,7 +107,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(pre):113
#, no-wrap
-msgid "\n# <i>emerge multipath-tools sg3_utils</i>\n<comment>(Replace /dev/DEVICE with your disk to find its wwid)</comment>\n# <i>/usr/bin/sq_vpd ?page=di /dev/DEVICE</i>\n"
+msgid "\n# <i>emerge multipath-tools sg3_utils</i>\n<comment>(Replace /dev/DEVICE with your disk to find its wwid)</comment>\n# <i>/usr/bin/sg_vpd --page=di /dev/DEVICE</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(p):119
@@ -198,7 +198,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(pre):264
#, no-wrap
-msgid "\ndefaults {\nudev_dir /dev\npolling_interval 15\nselector \"round-robin 0\"\npath_grouping_policy group_by_prio\nfailback 5\npath_checker tur\nprio_callout \"/sbin/mpath_prio_tpc /dev/%n\"\nrr_min_io 100\nrr_weight uniform\nno_path_retry queue\nuser_friendly_names yes\n}\nblacklist {\ndevnode cciss\ndevnode fd\ndevnode hd\ndevnode md\ndevnode sr\ndevnode scd\ndevnode st\ndevnode ram\ndevnode raw\ndevnode loop\ndevnode sda\n}\n\nmultipaths {\nmultipath {\nwwid\n<comment>(To find your wwid, please use /usr/bin/sq_vpd ?page=di /dev/DEVICE.\nThe address will be a 0x6. Remove the 0x and replace it with 3.)</comment>\nalias DB_SAN\n}\ndevices {\ndevice {\n<comment>(White spacing is important on these two items to match the vendor specifications.)</comment>\n\"IBM \"\n\"1815 FAStT \"\n}\n}\n}\n"
+msgid "\ndefaults {\nudev_dir /dev\npolling_interval 15\nselector \"round-robin 0\"\npath_grouping_policy group_by_prio\nfailback 5\npath_checker tur\nprio_callout \"/sbin/mpath_prio_tpc /dev/%n\"\nrr_min_io 100\nrr_weight uniform\nno_path_retry queue\nuser_friendly_names yes\n}\nblacklist {\ndevnode cciss\ndevnode fd\ndevnode hd\ndevnode md\ndevnode sr\ndevnode scd\ndevnode st\ndevnode ram\ndevnode raw\ndevnode loop\ndevnode sda\n}\n\nmultipaths {\nmultipath {\nwwid\n<comment>(To find your wwid, please use /usr/bin/sg_vpd --page=di /dev/DEVICE.\nThe address will be a 0x6. Remove the 0x and replace it with 3.)</comment>\nalias DB_SAN\n}\ndevices {\ndevice {\n<comment>(White spacing is important on these two items to match the vendor specifications.)</comment>\n\"IBM \"\n\"1815 FAStT \"\n}\n}\n}\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(impo):309
diff --git a/doc/gettext/printing-howto.xml.pot b/doc/gettext/printing-howto.xml.pot
index 2ecc350..ec7a821 100644
--- a/doc/gettext/printing-howto.xml.pot
+++ b/doc/gettext/printing-howto.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-02-14 21:36+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,11 +34,11 @@ msgid "This document covers the installation and maintenance of printers using C
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(version):25
-msgid "3.6"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(date):26
-msgid "2010-03-17"
+msgid "2011-02-14"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):29
@@ -61,7 +61,7 @@ msgstr ""
msgid "Configure your Kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):55 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):544 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):768 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1000
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):55 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):544 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):768 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1021
msgid "Introduction"
msgstr ""
@@ -668,15 +668,19 @@ msgstr ""
msgid "Gutenprint Driver"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(li):784
-msgid "<uri link=\"#hplip\">HPLIP Driver</uri> (deprecates HPOJ and HPIJS)"
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri:link):784
+msgid "#hplip"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri):784 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):820
+msgid "HPLIP Driver"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri:link):785
msgid "#pnm2ppa"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri):785 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):865
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri):785 ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):886
msgid "PNM2PPA Driver"
msgstr ""
@@ -701,194 +705,198 @@ msgstr ""
msgid "When the emerge process has finished, the gutenprint drivers will be available through the CUPS web interface."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):820
-msgid "HPLIP Driver"
-msgstr ""
-
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):823
-msgid "The <uri link=\"http://hplipopensource.com/hplip-web/index.html\">HPLIP Project</uri> uses the hpcups printer driver. It also includes scanner and fax support and service tools for various multi-purpose peripherals. For printing support, it is recomended to use the new hpcups driver, which you can enable with the <c>hpcups</c> USE flag. The old hpijs driver is still included when you build <c>hplip</c> with the <c>hpijs</c> USE flag."
+msgid "The <uri link=\"http://hplipopensource.com/hplip-web/index.html\">HPLIP Project</uri> uses the hpcups printer driver. It also includes scanner and fax support and service tools for various multi-purpose peripherals. For printing support, it is recommended to use the new hpcups driver, which you can enable with the <c>hpcups</c> USE flag. The old hpijs driver is still included when you build <c>net-print/hplip</c> with the <c>hpijs</c> USE flag."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):832
-msgid "The default install enables dynamically generated ppd files at runtime. Some old printers may still require static ppd files. If you encounter problems when using <c>hp-setup</c> try enabling the <c>static-ppds</c> USE flag and rebuilding <c>hplip</c>."
+msgid "The default install enables dynamically generated ppd files at runtime. Some printers may still require static ppd files. If you encounter problems when using <c>hp-setup</c> try enabling the <c>static-ppds</c> USE flag and rebuild <c>net-print/hplip</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):839
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):839
+msgid "For USB printers <c>net-print/cups</c> has to be built with the <c>usb</c> USE flag. This way it makes use of the <c>dev-libs/libusb</c> user space tool which replaces kernel usb printer support (CONFIG_USB_PRINTER). In case of problems you can disable the <c>usb</c> USE flag for <c>net-print/cups</c> and activate the kernel functionality again. All users who need to access the printer have to be a member of the <c>lp</c> group."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):848
+msgid "To be able to set up a network printer <c>net-print/cups</c> has to be built with USE <c>slp</c>. With recent versions of <c>net-print/hplip</c> the default lookup method for networked printers is mDNS which requires <c>net-print/cups</c> to be built with USE <c>zeroconf</c>. (Note: this method does not work with the upcoming <c>net-print/cups-1.4</c> series). To be able to print on a network printer <c>net-print/hplip</c> needs to be built with USE <c>snmp</c>."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):858
msgid "Installing the hplip drivers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):839
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):858
#, no-wrap
-msgid "\n# <i>emerge -vp hplip</i>\nThese are the packages that would be merged, in order:\n\nCalculating dependencies... done!\n[ebuild N ] net-print/hplip-3.9.12 USE=\"gtk hpcups qt4 -doc -fax -hpijs \n-libnotify -minimal -new-hpcups -parport -policykit -scanner -snmp -static-ppds\n-udev-acl\" 20,871 kB \n\nTotal: 1 package (1 new), Size of downloads: 20,871 kB\n\n# <i>emerge hplip</i>\n<comment>(Make sure your USB printer is plugged into your computer)</comment>\n# <i>hp-setup</i>\n# <i>/etc/init.d/cupsd restart</i>\n"
+msgid "\n# <i>emerge -vp hplip</i>\nThese are the packages that would be merged, in order:\n\nCalculating dependencies ... done!\n[ebuild N ] net-print/hplip-3.10.9 USE=\"X hpcups hpijs libnotify qt4 udev-acl\n-doc -fax -kde -minimal -parport -policykit -scanner -snmp -static-ppds\" 21,307 kB\n\nTotal: 1 package (1 new), Size of downloads: 21,307 kB\n\n# <i>emerge hplip</i>\n<comment>(Make sure your USB printer is plugged into your computer or your network\nprinter into the network socket.)</comment>\n# <i>hp-setup</i>\n# <i>/etc/init.d/cupsd restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):856
-msgid "When the emerge process has finished, the <c>hp-setup</c> tool will attempt to detect and install the printer drivers for your printer on the system. Once finished, your printer will be available in the CUPS configuration."
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):875
+msgid "When the emerge process has finished, the <c>hp-setup</c> tool will attempt to detect and install the printer drivers for your printer on the system. Once finished, your printer will be available in the CUPS configuration. When upgrading <c>net-print/hplip</c> you should run <c>hp-setup -r</c> to remove all printers and configure them again."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):868
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):889
msgid "PPA is an HP technology that focuses on sending low-level processing to the system instead of to the printer which makes the printer cheaper but more resource consuming."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):874
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):895
msgid "If the <uri link=\"http://www.linuxprinting.org/printer_list.cgi\">LinuxPrinting</uri> site informs you that the <uri link=\"http://pnm2ppa.sourceforge.net/\">pnm2ppa</uri> driver is your best option, you need to install the <c>pnm2ppa</c> filter on your system:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):882
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):903
msgid "Installing the pnm2ppa filter"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):882
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):903
#, no-wrap
msgid "\n# <i>emerge pnm2ppa</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):886
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):907
msgid "Once installed, download the PPD file for your printer from the <uri link=\"http://www.linuxprinting.org/printer_list.cgi\">LinuxPrinting</uri> site and put it in <path>/usr/share/cups/model</path>. Next, configure your printer using the steps explained above."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):898
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):919
msgid "Printing From and To Microsoft Windows"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(note):902
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(note):923
msgid "You should read our <uri link=\"/doc/en/quick-samba-howto.xml\">Samba/CUPS Guide</uri> for more detailed information on setting up CUPS with Samba."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):910
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):931
msgid "Configuring a Windows Client for IPP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):913
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):934
msgid "Microsoft Windows supports IPP (Windows 9x and ME users need to <uri link=\"http://support.microsoft.com/default.aspx?scid=kb;en-us;294439\">install</uri> it separately). To install a printer that is attached to your Linux box on Windows, fire up the <c>Add Printer</c> wizard and select <c>Network Printer</c>. When you are asked for the URI, use the <c>http://hostname:631/printers/queue</c> syntax."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):922
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):943
msgid "Make sure that your systems <uri link=\"#remote_usage\">can reach</uri> your printer!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):930
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):951
msgid "Configuring a Windows Client for a Samba Shared Printer"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):933
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):954
msgid "To share the printer on the SMB-CIFS network, you must have SAMBA installed and configured correctly. How to do this is beyond the scope of this document, but we will quickly deal with the configuration of SAMBA for shared printers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):939
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):960
msgid "Open <path>/etc/samba/smb.conf</path> with your favorite editor and add a <c>[printers]</c> section to it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):944
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):965
msgid "Adding a [printers] section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):944
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):965
#, no-wrap
msgid "\n[printers]\n comment = All printers\n path = /var/spool/samba\n browseable = no\n guest ok = no\n writable = no\n printable = yes\n public = yes\n printer name = hpljet5p\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):956
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):977
msgid "Now navigate to the top of the <path>smb.conf</path> file until you are inside the <c>[global]</c> section. Then locate the <c>printcap name</c> and <c>printing</c> settings and set each of them to <c>cups</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):962
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):983
msgid "Changing the [global] section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):962
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):983
#, no-wrap
msgid "\n[global]\n <comment>(...)</comment>\n printcap name = <i>cups</i>\n printing = <i>cups</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):969
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):990
msgid "Make sure you enabled the <uri link=\"#windows_pcl\">Windows PCL drivers</uri> support in CUPS. Then, restart the <c>smb</c> service to have the changes take effect."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):978
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):999
msgid "Configuring a Linux Client for a Windows Print Server"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):981
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1002
msgid "First of all, make sure that the printer is shared on your Windows system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):985
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1006
msgid "Next, in the CUPS web interface, configure your printer as described previously. You will notice that CUPS has added another driver called <c>Windows Printer via SAMBA</c>. Select it and use the <c>smb://username:password@workgroup/server/printername</c> or <c>smb://server/printername</c> syntax for the URI."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):998
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1019
msgid "Printing-related Applications"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1003
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1024
msgid "Many tools exist that help you configure a printer, use additional printing filters, add features to your printing capabilities, etc. This chapter lists a few of them. The list is not exhaustive and not meant to discuss each tool in great detail."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1013
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1034
msgid "Gtk-LP - A Gtk-powered Printer Configuration Tool"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1016
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1037
msgid "With <uri link=\"http://gtklp.sourceforge.net/index.shtml\">Gtk-LP</uri> you can install, modify and configure your printer from a stand-alone Gtk application. It uses CUPS and provides all standard CUPS capabilities as well. Definitely worth checking out if you dislike the CUPS Web interface or want a stand-alone application for your day-to-day printing routines."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1024
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1045
msgid "To install it, emerge <c>gtklp</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1028
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1049
msgid "Installing Gtk-LP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1028
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1049
#, no-wrap
msgid "\n# <i>emerge gtklp</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1037
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1058
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1039
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1060
msgid "Error: Unable to convert file 0 to printable format"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1042
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1063
msgid "If you are having printing troubles and <path>/var/log/cups/error_log</path> shows this message:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1047
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1068
msgid "Error log"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1047
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1068
#, no-wrap
msgid "\nUnable to convert file 0 to printable format\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1051
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1072
msgid "You need to re-emerge <c>ghostscript-gpl</c> with the <c>cups</c> USE flag. You can either add <c>cups</c> to your USE flags in <path>/etc/make.conf</path>, or you can enable it only for <c>ghostscript-gpl</c> as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1057
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1078
msgid "Adding cups to ghostscript-gpl"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1057
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1078
#, no-wrap
msgid "\n# <i>echo \"app-text/ghostscript-gpl cups\" >> /etc/portage/package.use</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1061
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1082
msgid "Then emerge <c>ghostscript-gpl</c>. When it has finished compiling, be sure to restart <c>cupsd</c> afterward:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1066
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1087
msgid "Restarting cupsd"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1066
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1087
#, no-wrap
msgid "\n# <i>/etc/init.d/cupsd restart</i>\n"
msgstr ""
diff --git a/doc/gettext/ru/multipath.xml.po b/doc/gettext/ru/multipath.xml.po
index b11d641..3418b6d 100644
--- a/doc/gettext/ru/multipath.xml.po
+++ b/doc/gettext/ru/multipath.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-02-14 21:36+0500\n"
"PO-Revision-Date: 2010-02-09 01:04+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -68,12 +68,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(version):32
-msgid "1"
-msgstr "1"
+msgid "3"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(date):33
-msgid "2008-09-10"
-msgstr "2008-09-10"
+msgid "2011-02-07"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(title):36
msgid "Introduction"
@@ -155,7 +155,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(p):107
msgid ""
"You need to emerge <c>multipath-tools</c> and <c>sg3_utils</c>. On the disk, "
-"you want to find the <c>wwid</c>. You can use <c>sq_vpd</c> (provided by "
+"you want to find the <c>wwid</c>. You can use <c>sg_vpd</c> (provided by "
"<c>sg3_utils</c>) to do this."
msgstr ""
@@ -169,7 +169,7 @@ msgid ""
"\n"
"# <i>emerge multipath-tools sg3_utils</i>\n"
"<comment>(Replace /dev/DEVICE with your disk to find its wwid)</comment>\n"
-"# <i>/usr/bin/sq_vpd ?page=di /dev/DEVICE</i>\n"
+"# <i>/usr/bin/sg_vpd --page=di /dev/DEVICE</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//multipath.xml(p):119
@@ -374,7 +374,7 @@ msgid ""
"multipaths {\n"
"multipath {\n"
"wwid\n"
-"<comment>(To find your wwid, please use /usr/bin/sq_vpd ?page=di /dev/DEVICE.\n"
+"<comment>(To find your wwid, please use /usr/bin/sg_vpd --page=di /dev/DEVICE.\n"
"The address will be a 0x6. Remove the 0x and replace it with 3.)</comment>\n"
"alias DB_SAN\n"
"}\n"
diff --git a/doc/gettext/ru/printing-howto.xml.po b/doc/gettext/ru/printing-howto.xml.po
index defb9cb..4efc329 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: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-02-14 21:36+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,14 +44,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(version):25
-#, fuzzy
-msgid "3.6"
-msgstr "3.3"
+msgid "4"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(date):26
-#, fuzzy
-msgid "2010-03-17"
-msgstr "2009-06-14"
+msgid "2011-02-14"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):29
msgid "Printing and Gentoo Linux"
@@ -84,7 +82,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):55
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):544
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):768
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1000
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1021
msgid "Introduction"
msgstr "Введение"
@@ -983,8 +981,13 @@ msgstr ""
msgid "Gutenprint Driver"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(li):784
-msgid "<uri link=\"#hplip\">HPLIP Driver</uri> (deprecates HPOJ and HPIJS)"
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri:link):784
+msgid "#hplip"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri):784
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):820
+msgid "HPLIP Driver"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri:link):785
@@ -992,7 +995,7 @@ msgid "#pnm2ppa"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(uri):785
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):865
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):886
msgid "PNM2PPA Driver"
msgstr ""
@@ -1029,67 +1032,87 @@ msgid ""
"available through the CUPS web interface."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):820
-msgid "HPLIP Driver"
-msgstr ""
-
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):823
msgid ""
"The <uri link=\"http://hplipopensource.com/hplip-web/index.html\">HPLIP "
"Project</uri> uses the hpcups printer driver. It also includes scanner and "
"fax support and service tools for various multi-purpose peripherals. For "
-"printing support, it is recomended to use the new hpcups driver, which you "
+"printing support, it is recommended to use the new hpcups driver, which you "
"can enable with the <c>hpcups</c> USE flag. The old hpijs driver is still "
-"included when you build <c>hplip</c> with the <c>hpijs</c> USE flag."
+"included when you build <c>net-print/hplip</c> with the <c>hpijs</c> USE "
+"flag."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):832
msgid ""
"The default install enables dynamically generated ppd files at runtime. Some "
-"old printers may still require static ppd files. If you encounter problems "
-"when using <c>hp-setup</c> try enabling the <c>static-ppds</c> USE flag and "
-"rebuilding <c>hplip</c>."
+"printers may still require static ppd files. If you encounter problems when "
+"using <c>hp-setup</c> try enabling the <c>static-ppds</c> USE flag and "
+"rebuild <c>net-print/hplip</c>."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):839
+msgid ""
+"For USB printers <c>net-print/cups</c> has to be built with the <c>usb</c> "
+"USE flag. This way it makes use of the <c>dev-libs/libusb</c> user space "
+"tool which replaces kernel usb printer support (CONFIG_USB_PRINTER). In case "
+"of problems you can disable the <c>usb</c> USE flag for <c>net-print/cups</"
+"c> and activate the kernel functionality again. All users who need to access "
+"the printer have to be a member of the <c>lp</c> group."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):839
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):848
+msgid ""
+"To be able to set up a network printer <c>net-print/cups</c> has to be built "
+"with USE <c>slp</c>. With recent versions of <c>net-print/hplip</c> the "
+"default lookup method for networked printers is mDNS which requires <c>net-"
+"print/cups</c> to be built with USE <c>zeroconf</c>. (Note: this method does "
+"not work with the upcoming <c>net-print/cups-1.4</c> series). To be able to "
+"print on a network printer <c>net-print/hplip</c> needs to be built with USE "
+"<c>snmp</c>."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):858
msgid "Installing the hplip drivers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):839
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):858
#, no-wrap
msgid ""
"\n"
"# <i>emerge -vp hplip</i>\n"
"These are the packages that would be merged, in order:\n"
"\n"
-"Calculating dependencies... done!\n"
-"[ebuild N ] net-print/hplip-3.9.12 USE=\"gtk hpcups qt4 -doc -fax -hpijs \n"
-"-libnotify -minimal -new-hpcups -parport -policykit -scanner -snmp -static-ppds\n"
-"-udev-acl\" 20,871 kB \n"
+"Calculating dependencies ... done!\n"
+"[ebuild N ] net-print/hplip-3.10.9 USE=\"X hpcups hpijs libnotify qt4 udev-acl\n"
+"-doc -fax -kde -minimal -parport -policykit -scanner -snmp -static-ppds\" 21,307 kB\n"
"\n"
-"Total: 1 package (1 new), Size of downloads: 20,871 kB\n"
+"Total: 1 package (1 new), Size of downloads: 21,307 kB\n"
"\n"
"# <i>emerge hplip</i>\n"
-"<comment>(Make sure your USB printer is plugged into your computer)</comment>\n"
+"<comment>(Make sure your USB printer is plugged into your computer or your network\n"
+"printer into the network socket.)</comment>\n"
"# <i>hp-setup</i>\n"
"# <i>/etc/init.d/cupsd restart</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):856
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):875
msgid ""
"When the emerge process has finished, the <c>hp-setup</c> tool will attempt "
"to detect and install the printer drivers for your printer on the system. "
-"Once finished, your printer will be available in the CUPS configuration."
+"Once finished, your printer will be available in the CUPS configuration. "
+"When upgrading <c>net-print/hplip</c> you should run <c>hp-setup -r</c> to "
+"remove all printers and configure them again."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):868
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):889
msgid ""
"PPA is an HP technology that focuses on sending low-level processing to the "
"system instead of to the printer which makes the printer cheaper but more "
"resource consuming."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):874
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):895
msgid ""
"If the <uri link=\"http://www.linuxprinting.org/printer_list.cgi"
"\">LinuxPrinting</uri> site informs you that the <uri link=\"http://pnm2ppa."
@@ -1097,18 +1120,18 @@ msgid ""
"install the <c>pnm2ppa</c> filter on your system:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):882
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):903
msgid "Installing the pnm2ppa filter"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):882
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):903
#, no-wrap
msgid ""
"\n"
"# <i>emerge pnm2ppa</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):886
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):907
msgid ""
"Once installed, download the PPD file for your printer from the <uri link="
"\"http://www.linuxprinting.org/printer_list.cgi\">LinuxPrinting</uri> site "
@@ -1116,21 +1139,21 @@ msgid ""
"printer using the steps explained above."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):898
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):919
msgid "Printing From and To Microsoft Windows"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(note):902
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(note):923
msgid ""
"You should read our <uri link=\"/doc/en/quick-samba-howto.xml\">Samba/CUPS "
"Guide</uri> for more detailed information on setting up CUPS with Samba."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):910
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):931
msgid "Configuring a Windows Client for IPP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):913
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):934
msgid ""
"Microsoft Windows supports IPP (Windows 9x and ME users need to <uri link="
"\"http://support.microsoft.com/default.aspx?scid=kb;en-us;294439\">install</"
@@ -1140,17 +1163,17 @@ msgid ""
"printers/queue</c> syntax."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):922
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):943
msgid ""
"Make sure that your systems <uri link=\"#remote_usage\">can reach</uri> your "
"printer!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):930
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):951
msgid "Configuring a Windows Client for a Samba Shared Printer"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):933
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):954
msgid ""
"To share the printer on the SMB-CIFS network, you must have SAMBA installed "
"and configured correctly. How to do this is beyond the scope of this "
@@ -1158,17 +1181,17 @@ msgid ""
"shared printers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):939
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):960
msgid ""
"Open <path>/etc/samba/smb.conf</path> with your favorite editor and add a <c>"
"[printers]</c> section to it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):944
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):965
msgid "Adding a [printers] section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):944
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):965
#, no-wrap
msgid ""
"\n"
@@ -1183,18 +1206,18 @@ msgid ""
" printer name = hpljet5p\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):956
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):977
msgid ""
"Now navigate to the top of the <path>smb.conf</path> file until you are "
"inside the <c>[global]</c> section. Then locate the <c>printcap name</c> and "
"<c>printing</c> settings and set each of them to <c>cups</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):962
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):983
msgid "Changing the [global] section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):962
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):983
#, no-wrap
msgid ""
"\n"
@@ -1204,23 +1227,23 @@ msgid ""
" printing = <i>cups</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):969
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):990
msgid ""
"Make sure you enabled the <uri link=\"#windows_pcl\">Windows PCL drivers</"
"uri> support in CUPS. Then, restart the <c>smb</c> service to have the "
"changes take effect."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):978
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):999
msgid "Configuring a Linux Client for a Windows Print Server"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):981
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1002
msgid ""
"First of all, make sure that the printer is shared on your Windows system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):985
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1006
msgid ""
"Next, in the CUPS web interface, configure your printer as described "
"previously. You will notice that CUPS has added another driver called "
@@ -1229,11 +1252,11 @@ msgid ""
"syntax for the URI."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):998
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1019
msgid "Printing-related Applications"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1003
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1024
msgid ""
"Many tools exist that help you configure a printer, use additional printing "
"filters, add features to your printing capabilities, etc. This chapter lists "
@@ -1241,11 +1264,11 @@ msgid ""
"in great detail."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1013
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1034
msgid "Gtk-LP - A Gtk-powered Printer Configuration Tool"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1016
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1037
msgid ""
"With <uri link=\"http://gtklp.sourceforge.net/index.shtml\">Gtk-LP</uri> you "
"can install, modify and configure your printer from a stand-alone Gtk "
@@ -1254,75 +1277,75 @@ msgid ""
"want a stand-alone application for your day-to-day printing routines."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1024
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1045
msgid "To install it, emerge <c>gtklp</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1028
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1049
msgid "Installing Gtk-LP"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1028
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1049
#, no-wrap
msgid ""
"\n"
"# <i>emerge gtklp</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1037
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1058
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1039
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(title):1060
msgid "Error: Unable to convert file 0 to printable format"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1042
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1063
msgid ""
"If you are having printing troubles and <path>/var/log/cups/error_log</path> "
"shows this message:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1047
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1068
msgid "Error log"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1047
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1068
#, no-wrap
msgid ""
"\n"
"Unable to convert file 0 to printable format\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1051
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1072
msgid ""
"You need to re-emerge <c>ghostscript-gpl</c> with the <c>cups</c> USE flag. "
"You can either add <c>cups</c> to your USE flags in <path>/etc/make.conf</"
"path>, or you can enable it only for <c>ghostscript-gpl</c> as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1057
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1078
msgid "Adding cups to ghostscript-gpl"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1057
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1078
#, no-wrap
msgid ""
"\n"
"# <i>echo \"app-text/ghostscript-gpl cups\" >> /etc/portage/package.use</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1061
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(p):1082
msgid ""
"Then emerge <c>ghostscript-gpl</c>. When it has finished compiling, be sure "
"to restart <c>cupsd</c> afterward:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1066
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre:caption):1087
msgid "Restarting cupsd"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1066
+#: ../../gentoo/xml/htdocs/doc/en//printing-howto.xml(pre):1087
#, no-wrap
msgid ""
"\n"
diff --git a/doc/gettext/ru/xfce-config.xml.po b/doc/gettext/ru/xfce-config.xml.po
index 271b2df..c1359d4 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-04 03:33+0500\n"
+"POT-Creation-Date: 2011-02-14 21:36+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 "3"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(date):22
-msgid "2011-01-23"
+msgid "2011-02-08"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):25
@@ -88,16 +88,23 @@ msgstr ""
"полноценной графической среды с учётом философии Xfce: лёгкость, быстрота и "
"модульность."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):56
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):77
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):51
+msgid ""
+"The last part of this guide lists a few commands to run after upgrading to "
+"Xfce 4.8, so be sure to follow them if you are upgrading from an older "
+"version."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):61
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):82
msgid "Installing Xfce"
msgstr "Установка Xfce"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):58
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):63
msgid "The basics"
msgstr "Основы"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):61
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):66
msgid ""
"First, make sure you've configured Xorg as shown in the <uri link=\"/doc/en/"
"xorg-config.xml\">X Server Configuration Howto</uri>."
@@ -106,7 +113,7 @@ msgstr ""
"рассказано в руководстве <uri link=\"/doc/ru/xorg-config.xml\">Настройка X "
"Server</uri>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):66
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):71
#, fuzzy
msgid ""
"Next, double-check your USE flags in <path>/etc/make.conf</path>; you'll "
@@ -117,13 +124,13 @@ msgstr ""
"вам понадобятся хотя бы следующие флаги: <c>USE=\"-gnome -kde -minimal -qt3 -"
"qt4 X branding dbus hal jpeg lock session startup-notification thunar\"</c>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):72
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):77
msgid ""
"Now that you've set your <c>USE</c> variables in <path>/etc/make.conf</"
"path>, it's time to install Xfce."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):77
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):82
#, no-wrap
msgid ""
"\n"
@@ -132,7 +139,7 @@ msgstr ""
"\n"
"# <i>emerge -avt xfce4-meta</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):81
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):86
#, fuzzy
msgid ""
"Next, add your regular user(s) to the <c>plugdev</c>, <c>cdrom</c>, <c>cdrw</"
@@ -144,11 +151,11 @@ msgstr ""
"возможностям <c>hal</c>, могли монтировать и использовать различные "
"устройства: камеры, приводы оптических дисков и USB-накопители."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):87
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):92
msgid "Adding users to the hardware groups"
msgstr "Добавление пользователей в группы аппаратуры"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):87
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):92
#, no-wrap
msgid ""
"\n"
@@ -159,15 +166,15 @@ msgstr ""
"<comment>(Замените \"username\" существующим пользователем)</comment>\n"
"# <i>for x in plugdev cdrom cdrw usb ; do gpasswd -a username $x ; done</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):92
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):97
msgid "Next, update your environment variables:"
msgstr "Следующий шаг — обновление переменных среды:"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):96
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):101
msgid "Updating environment variables"
msgstr "Обновление переменных среды"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):96
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):101
#, no-wrap
msgid ""
"\n"
@@ -176,19 +183,19 @@ msgstr ""
"\n"
"# <i>env-update && source /etc/profile</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):100
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):105
msgid ""
"You'll also need a graphical terminal so that you can continue working with "
"your new desktop environment. <c>x11-terms/terminal</c> is a good choice, as "
"it's made specifically for Xfce. Install Terminal as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):106
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):111
#, fuzzy
msgid "Installing Terminal"
msgstr "Установка Xfce"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):106
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):111
#, fuzzy, no-wrap
msgid ""
"\n"
@@ -197,16 +204,16 @@ msgstr ""
"\n"
"# <i>emerge -avt slim</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):115
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):120
msgid "Configuring Xfce"
msgstr "Настройка Xfce"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):117
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):142
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):122
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):147
msgid "Starting Xfce"
msgstr "Запуск Xfce"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):120
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):125
msgid ""
"Now that Xfce is now installed, we'll configure it to be the default desktop "
"environment when we issue the <c>startx</c> command. Exit your root shell "
@@ -216,11 +223,11 @@ msgstr ""
"включающейся при выполнении команды <c>startx</c>. Для этого выйдите из "
"оболочки root и войдите как обычный пользователь."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):126
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):131
msgid "Setting Xfce as the default desktop environment"
msgstr "Установка Xfce графической средой по умолчанию"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):126
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):131
#, no-wrap
msgid ""
"\n"
@@ -229,7 +236,7 @@ msgstr ""
"\n"
"$ <i>echo \"exec startxfce4\" > ~/.xinitrc</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):130
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):135
msgid ""
"If you have ConsoleKit installed, your <path>~/.xinitrc</path> should "
"instead contain <c>exec ck-launch-session startxfce4</c>. Otherwise, some of "
@@ -238,11 +245,11 @@ msgid ""
"add consolekit default</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):138
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):143
msgid "Now start your graphical environment by typing <c>startx</c>:"
msgstr "Теперь загрузим саму среду командой <c>startx</c>:"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):142
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):147
#, no-wrap
msgid ""
"\n"
@@ -252,7 +259,7 @@ msgstr ""
"$ <i>startx</i>\n"
# немного корявое предложение (wh)
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):146
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):151
msgid ""
"Congratulations, and welcome to your new Xfce desktop environment. Go ahead, "
"explore it a bit. Then continue reading to learn how you can configure Xfce "
@@ -262,11 +269,11 @@ msgstr ""
"После этого возвращайтесь к чтению, чтобы узнать, как настроить Xfce под "
"ваши нужды."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):155
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):160
msgid "Program access"
msgstr "Доступ к программам"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):158
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):163
msgid ""
"You might notice right-clicking on the desktop shows you the menu of all "
"your applications. It's useful, but your desktop can easily be completely "
@@ -289,11 +296,11 @@ msgstr ""
"приложений/настроек, в котором присутствуют программы, отсортированные по "
"категориям."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):172
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):177
msgid "Sessions & startup"
msgstr "Сеансы и загрузка"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):175
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):180
msgid ""
"If you've installed (or plan to install) popular Gnome or KDE applications "
"such as <c>k3b</c>, <c>nautilus</c>, <c>kmail</c>, <c>evolution</c>, etc. "
@@ -312,7 +319,7 @@ msgstr ""
"немного увеличить время запуска Xfce, но уменьшит время запуска приложений "
"KDE и Gnome."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):184
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):189
msgid ""
"Xfce has the ability to save your session settings and running programs from "
"the \"General\" tab in the Sessions & Startup menu. They can be "
@@ -334,7 +341,7 @@ msgstr ""
"терминал и почтовый клиент при следующем запуске? Просто сохраните сессию "
"перед выходом."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):195
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):200
msgid ""
"You've now got a basic working environment installed and configured. But if "
"you're interested in doing more, then continue reading!"
@@ -342,15 +349,15 @@ msgstr ""
"Теперь у вас есть установленная и настроенная базовая рабочая среда. Но если "
"вы заинтересованы в большем, то продолжайте чтение!"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):205
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):210
msgid "Additional Applications"
msgstr "Дополнительные приложения"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):207
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):212
msgid "Panel plugins"
msgstr "Плагины для панели"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):210
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):215
msgid ""
"In this chapter, we'll discuss some useful plugins and applications for "
"everyday use within Xfce."
@@ -358,7 +365,7 @@ msgstr ""
"В этой главе мы обсудим полезные плагины и приложения для повседневного "
"использования в Xfce."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):215
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):220
#, fuzzy
msgid ""
"There are many plugins for the panel available in Portage; see for yourself "
@@ -377,7 +384,7 @@ msgstr ""
"новый элемент» («Add New Item»), появляющемся при нажатию правой кнопкой "
"мыши на панели."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):224
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):229
msgid ""
"<c>xfce4-battery-plugin</c> is perfect for laptop users. It displays battery "
"percentage, time remaining, power source (AC or battery), fan status, "
@@ -393,7 +400,7 @@ msgstr ""
"Эта возможность может быть использована для перевода ноутбука в спящий "
"режим, когда аккумулятор почти израсходован."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):231
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):236
msgid ""
"<c>xfce4-verve-plugin</c> is a small command line embedded into the panel. "
"It's quicker than opening up another terminal when you want to run a command."
@@ -402,7 +409,7 @@ msgstr ""
"панель. Добраться до нее гораздо быстрее, чем открывать другой терминал при "
"запуске команды."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):236
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):241
msgid ""
"<c>xfce4-mount-plugin</c> gives you a handy method of mounting devices "
"listed in <path>/etc/fstab</path> just by clicking your mouse"
@@ -410,7 +417,7 @@ msgstr ""
"<c>xfce4-mount-plugin</c> даёт вам возможность вручную подключать одним "
"щелчком мыши устройства, перечисленные в <path>/etc/fstab</path>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):240
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):245
msgid ""
"<c>xfce4-sensors-plugin</c> lets you monitor your hardware sensors, such as "
"CPU temperature, fan RPM, hard drive temp, motherboard voltage, and more"
@@ -420,7 +427,7 @@ msgstr ""
"вентиляторов, температура жестких дисков, напряжение на материнской плате и "
"прочими."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):246
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):251
msgid ""
"If you can't find what you're looking for in the plugins specifically made "
"for Xfce, try searching through the list of Gnome panel applets! That's "
@@ -432,11 +439,11 @@ msgstr ""
"xfapplet-plugin</c>, вы сможете установить и запустить любой апплет для "
"Gnome."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):256
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):261
msgid "Useful programs"
msgstr "Полезные программы"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):259
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):264
#, fuzzy
msgid ""
"We should now <c>emerge</c> some useful applications and utilities: <c>xfce4-"
@@ -448,7 +455,7 @@ msgstr ""
"<c>xfprint</c>, <c>xfce4-taskmanager</c>, <c>xfwm4-themes</c>, <c>orage</c>, "
"<c>mousepad</c>, <c>x11-terms/terminal</c> и <c>thunar</c>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):266
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):271
#, fuzzy
msgid ""
"<c>xfce4-mixer</c> is a volume control for your sound card. It can also be "
@@ -471,7 +478,7 @@ msgstr ""
"приоритет исполнения, что позволит настроить потребление системных ресурсов."
# надо перефразировать (wh)
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):281
msgid ""
"<c>xfwm4-themes</c> adds several window manager themes. You may want to add "
"a more full-coverage icon theme such as <c>tango-icon-theme</c> just to "
@@ -481,13 +488,13 @@ msgstr ""
"могут пригодиться темы с большим количеством иконок, такие как <c>tango-icon-"
"theme</c> для того, чтобы довести до совершенства рабочее окружение."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):287
msgid ""
"<c>orage</c> is a simple, handy calendar. <c>leafpad</c> is a barebones text "
"editor that starts up extremely quickly."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):287
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):292
msgid ""
"<c>xfce4-power-manager</c> is an application to monitor and manage power "
"usage. This is especially important for laptops! The power manager allows "
@@ -500,7 +507,7 @@ msgid ""
"to display battery/charging status, and a brightness control."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):299
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):304
#, fuzzy
msgid ""
"<c>x11-terms/terminal</c> is an X11 terminal emulator, far more configurable "
@@ -521,7 +528,7 @@ msgstr ""
"<c>xterm</c>. Щелкните правой кнопкой мыши на launcher и выберите "
"«Свойства» («Properties») для смены команды."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):309
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):314
msgid ""
"<c>thunar</c> is Xfce's default graphical file manager. It's fast yet quite "
"powerful, can support several plugins for even more functionality; just "
@@ -532,7 +539,7 @@ msgstr ""
"сделать его ещё более функциональным; их можно установить командой "
"<c>emerge</c>. Рассмотрим их:"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):316
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):321
msgid ""
"<c>thunar-archive-plugin</c> lets you create and extract archive files using "
"the right-click menu. It provides a handy <uri link=\"http://www.foo-"
@@ -546,7 +553,7 @@ msgstr ""
"\">интерфейс</uri> к графическим архиваторам, таким как <c>xarchiver</c>, "
"<c>squeeze</c> и <c>file-roller</c>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):323
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):328
#, fuzzy
msgid ""
"<c>tumbler</c> lets you preview certain types of files from within Thunar, "
@@ -556,7 +563,7 @@ msgstr ""
"org/projects/thunar-plugins/thunar-thumbnailers\">предпросмотр</uri> файлов "
"в Thunar, например картинок и шрифтов."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):327
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):332
msgid ""
"<c>thunar-volman</c> automatically <uri link=\"http://foo-projects.org/"
"~benny/projects/thunar-volman/\">manages</uri> removable media and drives."
@@ -565,7 +572,7 @@ msgstr ""
"org/~benny/projects/thunar-volman/\">управляет</uri> подключаемыми "
"устройствами и дисками."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):334
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):339
msgid ""
"Next, let's see about adding some useful but lightweight desktop "
"applications, in keeping with Xfce's philosophy."
@@ -573,7 +580,7 @@ msgstr ""
"Теперь рассмотрим добавление некоторых полезных, но легковесных графических "
"приложений, отвечающих философии Xfce."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):339
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):344
#, fuzzy
msgid ""
"Though <c>leafpad</c> is nice enough as a basic text editor, if you need a "
@@ -590,7 +597,7 @@ msgstr ""
"типами документов. К тому же он может быть расширен с помощью <c>abiword-"
"plugins</c>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):347
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):352
#, fuzzy
msgid ""
"Need a nice email client/newsreader that isn't as demanding as "
@@ -600,7 +607,7 @@ msgstr ""
"<c>mozilla-thunderbird</c> или <c>evolution</c>? Попробуйте установить "
"<c>claws-mail</c>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):352
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):357
msgid ""
"For your internet chat needs, <c>irssi</c> is an excellent, tiny, incredibly "
"configurable IRC client that runs in your terminal. If you prefer a compact "
@@ -612,7 +619,7 @@ msgstr ""
"вам нужен небольшой мультипротокольный клиент, то попробуйте установить "
"<c>pidgin</c>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):359
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):364
msgid ""
"If you need movie and music players, look no further than <c>mplayer</c> and "
"<uri link=\"/proj/en/desktop/sound/decibel.xml\">decibel-audio-player</uri>. "
@@ -623,7 +630,7 @@ msgstr ""
"превосходно работают практически со всеми доступными мультимедийными "
"форматами."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):365
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):370
#, fuzzy
msgid ""
"Finally, you'll need a webbrowser. Nearly all graphical webbrowsers require "
@@ -641,11 +648,11 @@ msgstr ""
"отличии от <c>mozilla-firefox</c>) и у неё больше зависимостей, если не "
"отключить это соответствующим USE-флагом."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):374
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):379
msgid "Adding a webbrowser"
msgstr "Добавление браузера"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):374
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):379
#, fuzzy, no-wrap
msgid ""
"\n"
@@ -664,7 +671,7 @@ msgstr ""
"# <i>echo \"www-client/opera qt-static\" >> /etc/portage/package.use</i>\n"
"# <i>emerge opera</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):384
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):389
msgid ""
"Now that we've explored some good suggestions for rounding out your desktop "
"applications, let's see what else we can do to enhance your Xfce experience."
@@ -672,11 +679,11 @@ msgstr ""
"Мы рассмотрели хорошие решения для графических приложения, теперь "
"рассмотрим, что ещё мы можем сделать для углубления знаний по Xfce."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):392
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):397
msgid "Graphical login"
msgstr "Графический вход в систему"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):395
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):400
msgid ""
"Remember when we added <c>startxfce4</c> to our <path>~/.xinitrc</path>? All "
"you have to do to get into your desktop is type <c>startx</c> after logging "
@@ -691,15 +698,15 @@ msgstr ""
"автоматической загрузки Xfce после включения (таким образом вы можете "
"использовать графический вход в систему)."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):403
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):408
msgid "First, let's make sure Xfce loads at boot:"
msgstr "Во-первых, проверим, что Xfce стартует при загрузке:"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):407
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):412
msgid "Adding xdm to the default runlevel"
msgstr "Добавление xdm в уровень исполнения по умолчанию"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):407
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):412
#, no-wrap
msgid ""
"\n"
@@ -708,7 +715,7 @@ msgstr ""
"\n"
"# <i>rc-update add xdm default</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):411
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):416
msgid ""
"We aren't quite finished yet. We have to pick a display manager and set the "
"appropriate variable. Though there are a few choices available in Portage, "
@@ -720,7 +727,7 @@ msgstr ""
"остановимся на <uri link=\"http://slim.berlios.de\">SLiM</uri> — Simple "
"Login Manager."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):418
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):423
msgid ""
"<c>slim</c> is speedy and lightweight, with minimal dependencies. Perfect "
"for Xfce!"
@@ -728,11 +735,11 @@ msgstr ""
"<c>slim</c> быстр и легковесен, с минимальным количеством зависимостей. Он "
"превосходно подходит для Xfce!"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):423
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):428
msgid "Installing SLiM"
msgstr "Установка SLiM"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):423
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):428
#, no-wrap
msgid ""
"\n"
@@ -741,7 +748,7 @@ msgstr ""
"\n"
"# <i>emerge -avt slim</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):427
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):432
msgid ""
"The <c>branding</c> USE flag will pull in the <c>slim-themes</c> package, "
"which will give you an assortment of login themes, including a Gentoo Linux "
@@ -750,17 +757,17 @@ msgstr ""
"USE-флаг <c>branding</c> вытянет пакет <c>slim-themes</c>, в котором "
"содержится набор тем входа, включающих в себя тему Gentoo Linux."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):432
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):437
msgid "Then edit the DISPLAYMANAGER variable in <path>/etc/conf.d/xdm</path>:"
msgstr ""
"Теперь отредактируем переменную DISPLAYMANAGER в <path>/etc/conf.d/xdm</"
"path>:"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):436
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):441
msgid "Editing /etc/conf.d/xdm"
msgstr "Изменение /etc/conf.d/xdm"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):436
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):441
#, no-wrap
msgid ""
"\n"
@@ -769,7 +776,7 @@ msgstr ""
"\n"
"DISPLAYMANAGER=\"slim\"\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):440
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):445
#, fuzzy
msgid ""
"SLiM can automatically start your Xfce session if you add <c>XSESSION="
@@ -778,11 +785,11 @@ msgstr ""
"SLiM может автоматически загружать сеанс Xfce, если вы добавите <c>XSESSION="
"\"Xfce4\"</c> в <path>/etc/rc.conf</path>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):445
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):450
msgid "Setting XSESSION"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):445
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):450
#, fuzzy, no-wrap
msgid ""
"\n"
@@ -792,11 +799,11 @@ msgstr ""
"\n"
"# <i>env-update && source /etc/profile</i>\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):453
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):458
msgid "Beautifying your desktop"
msgstr "Украшение графической среды"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):456
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):461
msgid ""
"A little customization of your desktop's appearance can go a long way. Xfce "
"has all the options you'd expect from a modern desktop environment, font "
@@ -810,7 +817,7 @@ msgstr ""
"тем и прочее. Если этого не достаточно, то легко можно установить темы, "
"иконки, курсоры и обои от сторонних разработчиков."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):464
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):469
msgid ""
"A selection of nice Gentoo wallpapers in a variety of resolutions are hosted "
"on the <uri link=\"/main/en/graphics.xml\">Gentoo website</uri>. If you're "
@@ -835,7 +842,7 @@ msgstr ""
"сохраняйте их в <path>~/.themes/</path> и <path>~/.icons</path> "
"соответственно."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):477
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):482
msgid ""
"If you installed SLiM as your display manager, there are lots of themes in "
"the <c>slim-themes</c> package available in Portage. Also, be sure to check "
@@ -852,7 +859,7 @@ msgstr ""
"\">Themes HowTo</uri>. Gentoo также предоставляет пакет <c>slim-themes</c>, "
"который вы можете установить с помощью <c>emerge</c>."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):486
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):491
msgid ""
"Finally, Xfce has its own built-in compositor to manage window transparency. "
"This option can be found in Menu --> Settings --> Window Manager. For "
@@ -870,11 +877,11 @@ msgstr ""
"<c>xcomposite</c>. Далее вам понадобится включить compositing в <path>/etc/"
"X11/xorg.conf</path>, добавив следующий раздел:"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):495
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):500
msgid "Enabling composite in xorg.conf"
msgstr "Добавление composite в xorg.conf"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):495
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):500
#, no-wrap
msgid ""
"\n"
@@ -887,7 +894,7 @@ msgstr ""
" Option \"Composite\" \"Enable\"\n"
"EndSection\n"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):501
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):506
msgid ""
"This is the bare minimum configuration required for Xfce and Xorg-X11. "
"However, setting up hardware-accelerated rendering depends on your "
@@ -902,7 +909,7 @@ msgstr ""
"\"/doc/ru/index.xml?catid=desktop\">Документация по графической среде</uri> "
"по поводу настройки вашей карты."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):510
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):515
msgid ""
"Once you've finished setting up a beautiful Xfce desktop, the next thing to "
"do is take a picture of it to share with other folks! Just install <c>xfce4-"
@@ -912,11 +919,11 @@ msgstr ""
"другими! Просто установите <c>xfce4-screenshooter</c> и загрузите снимки "
"экрана, чтобы все могли ими любоваться."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):521
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):526
msgid "Summary"
msgstr "В итоге"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):525
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):530
msgid ""
"Congratulations on making it this far! You've installed and configured a "
"speedy desktop environment with a solid suite of applications for your "
@@ -925,11 +932,36 @@ msgstr ""
"Поздравляем с тем, что дошли так далеко! Вы установили и настроили быструю "
"графическую среду c полным комплектом необходимых приложений."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):534
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):539
+#, fuzzy
+msgid "Upgrading Xfce"
+msgstr "Настройка Xfce"
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):542
+msgid ""
+"If you're upgrading Xfce from an old version to 4.8 or newer, then you will "
+"need to remove your old cached sessions. For each of your users, run the "
+"following commands to remove your old incompatible cached sessions:"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):548
+msgid "Deleting old sessions from the cache"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):548
+#, no-wrap
+msgid ""
+"\n"
+"$ <i>rm -r ~/.cache/sessions</i>\n"
+"$ <i>rm -r ~/.config/xfce*</i>\n"
+"$ <i>rm -r ~/.config/Thunar</i>\n"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):557
msgid "Resources"
msgstr "Ссылки"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):537
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):560
msgid ""
"Need additional help on configuring and using Xfce? Need more lightweight "
"application suggestions? Try checking out:"
@@ -938,19 +970,19 @@ msgstr ""
"дополнительные предложения по легковесных приложениям? Попробуйте поискать "
"информацию в следующих источниках:"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):543
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):566
msgid "http://forums.gentoo.org"
msgstr "http://forums.gentoo.org"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):543
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):566
msgid "The Gentoo forums"
msgstr "Форумы Gentoo"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):544
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):567
msgid "#xfce on irc.freenode.net"
msgstr "#xfce на irc.freenode.net"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):545
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):568
msgid ""
"The installed help files and other documentation provided by Xfce: <path>/"
"usr/share/xfce4/doc/C/index.html</path>. Just point your browser at it and "
@@ -961,11 +993,11 @@ msgstr ""
"usr/share/xfce4/doc/C/index.html</path>. Просто откройте ваш браузер и "
"начинайте читать. В этих файлах детально описано много «скрытых» настроек."
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):551
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):574
msgid "http://www.xfce.org"
msgstr "http://www.xfce.org"
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):551
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):574
msgid "Xfce's home page"
msgstr "Домашняя страница Xfce"
diff --git a/doc/gettext/xfce-config.xml.pot b/doc/gettext/xfce-config.xml.pot
index 8cf3157..fdb3c22 100644
--- a/doc/gettext/xfce-config.xml.pot
+++ b/doc/gettext/xfce-config.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-02-04 03:33+0500\n"
+"POT-Creation-Date: 2011-02-14 21:36+0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,11 +26,11 @@ msgid "This guide provides an extensive introduction to Xfce, a fast, lightweigh
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(version):21
-msgid "3"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(date):22
-msgid "2011-01-23"
+msgid "2011-02-08"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):25
@@ -53,391 +53,412 @@ msgstr ""
msgid "This guide will not only show you how to install and configure a minimal Xfce environment, but will also explore options to create a full-featured desktop in keeping with the Xfce philosophy: light, fast, and modular."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):56 ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):77
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):51
+msgid "The last part of this guide lists a few commands to run after upgrading to Xfce 4.8, so be sure to follow them if you are upgrading from an older version."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):61 ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):82
msgid "Installing Xfce"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):58
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):63
msgid "The basics"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):61
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):66
msgid "First, make sure you've configured Xorg as shown in the <uri link=\"/doc/en/xorg-config.xml\">X Server Configuration Howto</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):66
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):71
msgid "Next, double-check your USE flags in <path>/etc/make.conf</path>; you'll probably at least want <c>USE=\"-gnome -kde -minimal -qt4 dbus jpeg lock session startup-notification thunar udev X\"</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):72
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):77
msgid "Now that you've set your <c>USE</c> variables in <path>/etc/make.conf</path>, it's time to install Xfce."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):77
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):82
#, no-wrap
msgid "\n# <i>emerge -avt xfce4-meta</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):81
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):86
msgid "Next, add your regular user(s) to the <c>plugdev</c>, <c>cdrom</c>, <c>cdrw</c>, and <c>usb</c> groups, so that they can mount and use devices such as cameras, optical drives, and USB sticks."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):87
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):92
msgid "Adding users to the hardware groups"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):87
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):92
#, no-wrap
msgid "\n<comment>(Replace username with your actual user)</comment>\n# <i>for x in plugdev cdrom cdrw usb ; do gpasswd -a username $x ; done</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):92
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):97
msgid "Next, update your environment variables:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):96
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):101
msgid "Updating environment variables"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):96
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):101
#, no-wrap
msgid "\n# <i>env-update && source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):100
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):105
msgid "You'll also need a graphical terminal so that you can continue working with your new desktop environment. <c>x11-terms/terminal</c> is a good choice, as it's made specifically for Xfce. Install Terminal as shown:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):106
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):111
msgid "Installing Terminal"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):106
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):111
#, no-wrap
msgid "\n# <i>emerge x11-terms/terminal</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):115
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):120
msgid "Configuring Xfce"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):117 ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):142
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):122 ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):147
msgid "Starting Xfce"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):120
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):125
msgid "Now that Xfce is now installed, we'll configure it to be the default desktop environment when we issue the <c>startx</c> command. Exit your root shell and log on as a regular user."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):126
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):131
msgid "Setting Xfce as the default desktop environment"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):126
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):131
#, no-wrap
msgid "\n$ <i>echo \"exec startxfce4\" > ~/.xinitrc</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):130
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):135
msgid "If you have ConsoleKit installed, your <path>~/.xinitrc</path> should instead contain <c>exec ck-launch-session startxfce4</c>. Otherwise, some of your applications may stop working. You'll also need to add consolekit to the default runlevel by running the following command as root: <c>rc-update add consolekit default</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):138
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):143
msgid "Now start your graphical environment by typing <c>startx</c>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):142
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):147
#, no-wrap
msgid "\n$ <i>startx</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):146
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):151
msgid "Congratulations, and welcome to your new Xfce desktop environment. Go ahead, explore it a bit. Then continue reading to learn how you can configure Xfce to suit your needs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):155
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):160
msgid "Program access"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):158
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):163
msgid "You might notice right-clicking on the desktop shows you the menu of all your applications. It's useful, but your desktop can easily be completely obscured by open windows, making it hard to to launch a new program. So, one of the first things you may wish to do is give yourself a handy application menu on your panel. Right click on this panel, and choose \"Add New Item\". Scroll through the list of choices and select \"Xfce Menu\". You can choose where you want it to be displayed on your panel. When clicked, it displays the application/preferences menu, providing a nicely categorized list of your installed programs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):172
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):177
msgid "Sessions & startup"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):175
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):180
msgid "If you've installed (or plan to install) popular Gnome or KDE applications such as <c>k3b</c>, <c>nautilus</c>, <c>kmail</c>, <c>evolution</c>, etc. then you should make sure that Xfce launches the appropriate services for these at startup. Navigate to Menu --> Settings --> Sessions & Startup. On the \"Advanced\" tab, select the appropriate checkbox. This might slightly increase Xfce startup times, but it decreases load times for KDE and Gnome applications."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):184
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):189
msgid "Xfce has the ability to save your session settings and running programs from the \"General\" tab in the Sessions & Startup menu. They can be automatically saved when you logout, or Xfce can ask you each time. This feature is particularly useful for undoing configuration mistakes. Accidentally killed a panel? Just select \"No\" when prompted to save your current session, and the next time you start Xfce, your old desktop is restored. Want to automatically launch your open webbrowser, terminal, and email client the next time you login? Just save your session before logging out."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):195
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):200
msgid "You've now got a basic working environment installed and configured. But if you're interested in doing more, then continue reading!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):205
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):210
msgid "Additional Applications"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):207
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):212
msgid "Panel plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):210
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):215
msgid "In this chapter, we'll discuss some useful plugins and applications for everyday use within Xfce."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):215
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):220
msgid "There are many plugins for the panel available in Portage; see for yourself with <c>emerge --search xfce</c>. Though for the most part their names are self-explanatory, a few deserve extra attention, as they are quite helpful. To use them, simply <c>emerge</c> them. They'll be added to the list of available items in the \"Add New Items\" menu shown when you right-click on the panel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):224
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):229
msgid "<c>xfce4-battery-plugin</c> is perfect for laptop users. It displays battery percentage, time remaining, power source (AC or battery), fan status, warnings, and can even be configured to execute commands at certain power levels. This feature can be used to put the laptop into hibernate mode when the battery is almost exhausted."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):231
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):236
msgid "<c>xfce4-verve-plugin</c> is a small command line embedded into the panel. It's quicker than opening up another terminal when you want to run a command."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):236
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):241
msgid "<c>xfce4-mount-plugin</c> gives you a handy method of mounting devices listed in <path>/etc/fstab</path> just by clicking your mouse"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):240
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):245
msgid "<c>xfce4-sensors-plugin</c> lets you monitor your hardware sensors, such as CPU temperature, fan RPM, hard drive temp, motherboard voltage, and more"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):246
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):251
msgid "If you can't find what you're looking for in the plugins specifically made for Xfce, try searching through the list of Gnome panel applets! That's right, by first emerging <c>xfce4-xfapplet-plugin</c>, you can install and run any applet made for Gnome."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):256
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):261
msgid "Useful programs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):259
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):264
msgid "We should now <c>emerge</c> some useful applications and utilities: <c>xfce4-mixer</c>, <c>xfce4-taskmanager</c>, <c>xfwm4-themes</c>, <c>orage</c>, <c>leafpad</c>, <c>xfce4-power-manager</c>, <c>x11-terms/terminal</c>, and <c>thunar</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):266
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):271
msgid "<c>xfce4-mixer</c> is a volume control for your sound card. It can also be run as a panel applet, giving you fast access to playback volume. <c>xfce4-taskmanager</c> displays a list of all running programs, and the CPU and memory consumption each one takes up. By right-clicking an item, you can kill a misbehaving application, pause and restart it, or even alter its runtime priority, which lets you fine-tune how much of a demand it puts on your system's resources."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):281
msgid "<c>xfwm4-themes</c> adds several window manager themes. You may want to add a more full-coverage icon theme such as <c>tango-icon-theme</c> just to round out your desktop."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):287
msgid "<c>orage</c> is a simple, handy calendar. <c>leafpad</c> is a barebones text editor that starts up extremely quickly."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):287
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):292
msgid "<c>xfce4-power-manager</c> is an application to monitor and manage power usage. This is especially important for laptops! The power manager allows you to adjust screen brightness, choose maximum performance or battery-saving modes, and setup hibernate, suspend, and shutdown actions when the lid is shut or buttons are pressed. You can set <uri link=\"http://goodies.xfce.org/projects/applications/xfce4-power-manager\">xfce4-power-manager</uri> to warn you when your battery reaches certain levels, or even turn off your machine. The application comes with a couple of helpful panel plugins to display battery/charging status, and a brightness control."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):299
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):304
msgid "<c>x11-terms/terminal</c> is an X11 terminal emulator, far more configurable and useful than the barebones <c>xterm</c>. <c>terminal</c> supports Unicode text, color schemes, pseudo-transparency and hardware-accelerated transparency via Xfce's built-in compositor, all out-of-the-box. Just make sure that the default action on the terminal launcher of your panel runs <path>/usr/bin/Terminal</path> instead of <path>xterm</path>. Right-click the launcher and choose \"Properties\" to change the command."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):309
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):314
msgid "<c>thunar</c> is Xfce's default graphical file manager. It's fast yet quite powerful, can support several plugins for even more functionality; just install them with <c>emerge</c>. Let's take a look:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):316
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):321
msgid "<c>thunar-archive-plugin</c> lets you create and extract archive files using the right-click menu. It provides a handy <uri link=\"http://www.foo-projects.org/~benny/projects/thunar-archive-plugin\">front-end</uri> for graphical archiving applications such as <c>xarchiver</c>, <c>squeeze</c>, and <c>file-roller</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):323
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):328
msgid "<c>tumbler</c> lets you preview certain types of files from within Thunar, such as images and fonts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):327
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):332
msgid "<c>thunar-volman</c> automatically <uri link=\"http://foo-projects.org/~benny/projects/thunar-volman/\">manages</uri> removable media and drives."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):334
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):339
msgid "Next, let's see about adding some useful but lightweight desktop applications, in keeping with Xfce's philosophy."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):339
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):344
msgid "Though <c>leafpad</c> is nice enough as a basic text editor, if you need a 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>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):347
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):352
msgid "Need a nice email client/newsreader that isn't as demanding as <c>thunderbird</c> or <c>evolution</c>? Try emerging <c>claws-mail</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):352
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):357
msgid "For your internet chat needs, <c>irssi</c> is an excellent, tiny, incredibly configurable IRC client that runs in your terminal. If you prefer a compact all-in-one client that handles nearly all chat protocols, you may want to <c>emerge pidgin</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):359
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):364
msgid "If you need movie and music players, look no further than <c>mplayer</c> and <uri link=\"/proj/en/desktop/sound/decibel.xml\">decibel-audio-player</uri>. They can play most every media format available quite nicely."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):365
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):370
msgid "Finally, you'll need a webbrowser. Nearly all graphical webbrowsers require more resources than most of your other desktop applications. Still, <c>firefox</c> and <c>midori</c> are always good choices. Alternatively, you may find <c>opera</c> to be quite fast. However, <c>opera</c> is not available on as many processor architectures as <c>firefox</c>, and it has more dependencies unless you override them with a few USE flags."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):374
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):379
msgid "Adding a webbrowser"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):374
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):379
#, no-wrap
msgid "\n<comment>(Installing Mozilla Firefox)</comment>\n# <i>emerge firefox</i>\n<comment>(Installing Midori)</comment>\n# <i>emerge midori</i>\n<comment>(Installing Opera)</comment>\n# <i>echo \"www-client/opera gtk -kde\" >> /etc/portage/package.use</i>\n# <i>emerge opera</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):384
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):389
msgid "Now that we've explored some good suggestions for rounding out your desktop applications, let's see what else we can do to enhance your Xfce experience."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):392
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):397
msgid "Graphical login"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):395
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):400
msgid "Remember when we added <c>startxfce4</c> to our <path>~/.xinitrc</path>? All you have to do to get into your desktop is type <c>startx</c> after logging in. This is fine if you prefer a completely text-based boot and login, but let's use a display manager that will automatically start Xfce after booting (so that you can login graphically)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):403
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):408
msgid "First, let's make sure Xfce loads at boot:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):407
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):412
msgid "Adding xdm to the default runlevel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):407
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):412
#, no-wrap
msgid "\n# <i>rc-update add xdm default</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):411
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):416
msgid "We aren't quite finished yet. We have to pick a display manager and set the appropriate variable. Though there are a few choices available in Portage, for this guide, we'll stick with <uri link=\"http://slim.berlios.de\">SLiM</uri>, the Simple Login Manager."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):418
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):423
msgid "<c>slim</c> is speedy and lightweight, with minimal dependencies. Perfect for Xfce!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):423
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):428
msgid "Installing SLiM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):423
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):428
#, no-wrap
msgid "\n# <i>emerge -avt slim</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):427
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(note):432
msgid "The <c>branding</c> USE flag will pull in the <c>slim-themes</c> package, which will give you an assortment of login themes, including a Gentoo Linux theme."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):432
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):437
msgid "Then edit the DISPLAYMANAGER variable in <path>/etc/conf.d/xdm</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):436
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):441
msgid "Editing /etc/conf.d/xdm"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):436
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):441
#, no-wrap
msgid "\nDISPLAYMANAGER=\"slim\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):440
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):445
msgid "SLiM can automatically start your Xfce session if you add <c>XSESSION=\"Xfce4\"</c> to <path>/etc/env.d/90xsession</path>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):445
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):450
msgid "Setting XSESSION"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):445
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):450
#, no-wrap
msgid "\n# <i>echo XSESSION=\\\"Xfce4\\\" > /etc/env.d/90xsession</i>\n# <i>env-update && source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):453
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):458
msgid "Beautifying your desktop"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):456
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):461
msgid "A little customization of your desktop's appearance can go a long way. Xfce has all the options you'd expect from a modern desktop environment, font antialiasing settings, color schemes, dozens of window decorations, themes, and more. If these aren't enough, it's easy to install third-party themes, icon sets, mouse cursor themes, and wallpapers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):464
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):469
msgid "A selection of nice Gentoo wallpapers in a variety of resolutions are hosted on the <uri link=\"/main/en/graphics.xml\">Gentoo website</uri>. If you're looking for icon sets and complete Xfce themes, <uri link=\"http://www.xfce-look.org/\">Xfce-Look</uri> has a huge collection. The important thing to remember about any third-party eyecandy you download is that it will usually first need to be unpacked and then installed to the proper directory. Icon sets go in <path>/usr/share/icons/</path>, and themes go to <path>/usr/share/themes/</path>; use these directories when you want all users to be able to access themes and icon sets. Individual users can install themes and icon sets to <path>~/.themes/</path> and <path>~/.icons/</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):477
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):482
msgid "If you installed SLiM as your display manager, there are lots of themes in the <c>slim-themes</c> package available in Portage. Also, be sure to check the SLiM <uri link=\"http://slim.berlios.de/themes01.php\">themes page</uri> for more themes. Creating your own SLiM theme is fairly easy; just read the <uri link=\"http://slim.berlios.de/themes_howto.php\">Themes HowTo</uri>. Gentoo also ships a <c>slim-themes</c> package that you can <c>emerge</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):486
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):491
msgid "Finally, Xfce has its own built-in compositor to manage window transparency. This option can be found in Menu --> Settings --> Window Manager. For best performance, you will need to be running a graphics card with drivers that support hardware-accelerated rendering. Make sure you emerged <c>xfwm4</c> with the <c>xcomposite</c> USE flag. Next, you will need to enable compositing in <path>/etc/X11/xorg.conf</path> by adding the following section:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):495
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):500
msgid "Enabling composite in xorg.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):495
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):500
#, no-wrap
msgid "\nSection \"Extensions\"\n Option \"Composite\" \"Enable\"\nEndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):501
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):506
msgid "This is the bare minimum configuration required for Xfce and Xorg-X11. However, setting up hardware-accelerated rendering depends on your individual graphics card, and is beyond the scope of this guide. Please see the other guides in the <uri link=\"/doc/en/index.xml?catid=desktop\">Desktop Documentation Resources</uri> list to learn about configuring hardware-accelerated rendering for your graphics card."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):510
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):515
msgid "Once you've finished setting up a beautiful Xfce desktop, the next thing to do is take a picture of it to share with other folks! Just install <c>xfce4-screenshooter</c> and post your pictures somewhere for all to admire."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):521
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):526
msgid "Summary"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):525
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):530
msgid "Congratulations on making it this far! You've installed and configured a speedy desktop environment with a solid suite of applications for your computing needs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):534
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):539
+msgid "Upgrading Xfce"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):542
+msgid "If you're upgrading Xfce from an old version to 4.8 or newer, then you will need to remove your old cached sessions. For each of your users, run the following commands to remove your old incompatible cached sessions:"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre:caption):548
+msgid "Deleting old sessions from the cache"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(pre):548
+#, no-wrap
+msgid "\n$ <i>rm -r ~/.cache/sessions</i>\n$ <i>rm -r ~/.config/xfce*</i>\n$ <i>rm -r ~/.config/Thunar</i>\n"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(title):557
msgid "Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):537
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(p):560
msgid "Need additional help on configuring and using Xfce? Need more lightweight application suggestions? Try checking out:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):543
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):566
msgid "http://forums.gentoo.org"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):543
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):566
msgid "The Gentoo forums"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):544
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):567
msgid "#xfce on irc.freenode.net"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):545
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(li):568
msgid "The installed help files and other documentation provided by Xfce: <path>/usr/share/xfce4/doc/C/index.html</path>. Just point your browser at it and start reading. There are even a lot of \"hidden\" configuration options detailed in the help files."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):551
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri:link):574
msgid "http://www.xfce.org"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):551
+#: ../../gentoo/xml/htdocs/doc/en//xfce-config.xml(uri):574
msgid "Xfce's home page"
msgstr ""
diff --git a/handbook/gettext/ru/gentoo-handbook.lokalize b/handbook/gettext/ru/gentoo-handbook.lokalize
new file mode 100644
index 0000000..06e1aa8
--- /dev/null
+++ b/handbook/gettext/ru/gentoo-handbook.lokalize
@@ -0,0 +1,6 @@
+[General]
+LangCode=ru
+MailingList=gentoo-doc-ru@gentoo.org
+PotBaseDir=../
+ProjectID=gentoo-doc
+TargetLangCode=ru
diff --git a/handbook/gettext/ru/terms.tbx b/handbook/gettext/ru/terms.tbx
new file mode 100644
index 0000000..d93ef63
--- /dev/null
+++ b/handbook/gettext/ru/terms.tbx
@@ -0,0 +1,155 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE martif PUBLIC 'ISO 12200:1999A//DTD MARTIF core (DXFcdV04)//EN' 'TBXcdv04.dtd'>
+<martif type="TBX" xml:lang="en_US">
+ <text>
+ <body>
+ <termEntry id="azamat_h._hackimov-0">
+ <descrip type="subjectField">portage</descrip>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>license groups</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>группы лицензий</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>license group</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>группа лицензий</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ </termEntry>
+ <termEntry id="azamat_h._hackimov-1">
+ <descrip type="subjectField">portage</descrip>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>stable branch</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>стабильная ветвь</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ </termEntry>
+ <termEntry id="azamat_h._hackimov-2">
+ <descrip type="subjectField">portage</descrip>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>testing branch</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>тестовая ветвь</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ </termEntry>
+ <termEntry id="azamat_h._hackimov-3">
+ <descrip type="subjectField">portage</descrip>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>architecture</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>архитектура</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ </termEntry>
+ <termEntry id="azamat_h._hackimov-4">
+ <descrip type="subjectField">portage</descrip>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>profile</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>профиль</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ </termEntry>
+ <termEntry id="azamat_h._hackimov-5">
+ <descrip type="subjectField">portage</descrip>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>dependencies</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>зависимости</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>dependency</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>зависимость</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ </termEntry>
+ <termEntry id="azamat_h._hackimov-6">
+ <descrip type="subjectField">portage</descrip>
+ <langSet xml:lang="en_US">
+ <ntig>
+ <termGrp>
+ <term>circular dependencies</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ <langSet xml:lang="ru">
+ <ntig>
+ <termGrp>
+ <term>циклические зависимости</term>
+ </termGrp>
+ </ntig>
+ </langSet>
+ </termEntry>
+ </body>
+ </text>
+</martif>
reply other threads:[~2011-02-14 19:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9c9866fbafd761dfb67aecbf62168f783b5dd073.winterheart@gentoo \
--to=winterheart@gentoo.ru \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox