summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAzamat H. Hackimov <azamat.hackimov@gmail.com>2011-03-23 21:20:29 +0500
committerAzamat H. Hackimov <azamat.hackimov@gmail.com>2011-03-23 21:20:29 +0500
commitd4deff6b81b019104e7f0b44d498cd9ca258ad68 (patch)
treed45f9dc7bf8d8c79509b86304c674e5c788ce3a0 /doc
parentSync with g.org. (diff)
downloadgentoo-doc-translations-d4deff6b81b019104e7f0b44d498cd9ca258ad68.tar.gz
gentoo-doc-translations-d4deff6b81b019104e7f0b44d498cd9ca258ad68.tar.bz2
gentoo-doc-translations-d4deff6b81b019104e7f0b44d498cd9ca258ad68.zip
Sync with g.org
Diffstat (limited to 'doc')
-rw-r--r--doc/gettext/ati-faq.xml.pot2
-rw-r--r--doc/gettext/dri-howto.xml.pot113
-rw-r--r--doc/gettext/el/dri-howto.xml.po133
-rw-r--r--doc/gettext/el/openbox.xml.po6
-rw-r--r--doc/gettext/el/xorg-config.xml.po547
-rw-r--r--doc/gettext/openbox.xml.pot4
-rw-r--r--doc/gettext/ru/dri-howto.xml.po140
-rw-r--r--doc/gettext/ru/openbox.xml.po4
-rw-r--r--doc/gettext/ru/xorg-config.xml.po547
-rw-r--r--doc/gettext/xorg-config.xml.pot323
10 files changed, 617 insertions, 1202 deletions
diff --git a/doc/gettext/ati-faq.xml.pot b/doc/gettext/ati-faq.xml.pot
index f2312dc..e668757 100644
--- a/doc/gettext/ati-faq.xml.pot
+++ b/doc/gettext/ati-faq.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-02 17:28+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+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"
diff --git a/doc/gettext/dri-howto.xml.pot b/doc/gettext/dri-howto.xml.pot
index be8e873..b9a5c30 100644
--- a/doc/gettext/dri-howto.xml.pot
+++ b/doc/gettext/dri-howto.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-02 17:28+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+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"
@@ -38,11 +38,11 @@ msgid "This document is a guide to getting 3D acceleration working using the DRM
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(version):27
-msgid "2"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(date):28
-msgid "2011-03-01"
+msgid "2011-03-23"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):31
@@ -201,159 +201,176 @@ msgstr ""
msgid "Don't forget to set up <path>grub.conf</path> or <path>lilo.conf</path> and run <c>/sbin/lilo</c> if you use LILO."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):201
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):199
+msgid "Add your user to the video group"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):202
+msgid "Next, add your user(s) to the video group, as explained in the <uri link=\"/doc/en/handbook\">handbook</uri>:"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):207
+msgid "Adding a user to the video group"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):207
+#, no-wrap
+msgid "\n# <i>gpasswd -a username video</i>\n"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):216
msgid "Configure direct rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):203
-msgid "Configure Xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):218
+msgid "Configure Xorg"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):206
-msgid "Open <path>/etc/X11/xorg.conf</path> with your favorite text editor and edit it to enable DRI and GLX."
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):221
+msgid "Hopefully just adding your user to the <c>video</c> group is sufficient to enable direct rendering. However, you may also need to create a file in <path>/etc/X11/xorg.conf.d/</path>. You can name it anything you like; just make sure it ends in <path>.conf</path>. Open up your favorite text editor and create a file with this inside it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):211
-msgid "xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):229
+msgid "/etc/X11/xorg.conf.d/10-dri.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):211
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):229
#, no-wrap
-msgid "\n...\nSection \"Module\"\n Load \"dri\"\n Load \"glx\"\n ...\nEndSection\n...\nSection \"Device\"\n Driver \"radeon\"\n <comment>(Replace radeon with the name of your driver.)</comment>\n ...\nEndSection\n...\nSection \"dri\"\n Mode 0666\nEndSection\n"
+msgid "\nSection \"Device\"\n Driver \"radeon\"\n <comment>(Replace radeon with the name of your driver.)</comment>\nEndSection\nSection \"dri\"\n Mode 0666\nEndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):233
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):242
msgid "Changes to modules.autoload.d"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):236
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):245
msgid "You will need to add the module name that your card uses to <path>/etc/modules.autoload.d/kernel-2.6</path> to ensure that the module is loaded automatically when the system starts up."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):242
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):251
msgid "Editing /etc/modules.autoload.d/kernel-2.6"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):242
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):251
#, no-wrap
msgid "\n<comment>(Change module name as required.)</comment>\nintel-agp\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):247
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):256
msgid "If you compiled <c>agpgart</c> as a module, you will also need to add it to <path>/etc/modules.autoload.d/kernel-2.6</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):257
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):266
msgid "Test 3D acceleration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):259
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):268
msgid "Reboot to the new kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):262
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):271
msgid "Reboot your computer to your new kernel and login as a normal user. It's time to see if you have direct rendering and how good it is. <c>glxinfo</c> and <c>glxgears</c> are part of the <c>mesa-progs</c> package, so make sure it is installed before you attempt to run these commands."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):269
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):278
msgid "Testing rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):269
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):278
#, no-wrap
msgid "\n$ <i>startx</i>\n<comment>(No need to load modules for your driver or agpgart, even if you compiled them as a module.)</comment>\n<comment>(They will be loaded automatically.)</comment>\n$ <i>glxinfo | grep rendering</i>\ndirect rendering: Yes\n<comment>(If it says \"No\", you don't have 3D acceleration.)</comment>\n$ <i>glxgears</i>\n<comment>(Test your frames per second (FPS) at the default size. The number should be\nsignificantly higher than before configuring DRM. Do this while the CPU is as idle as\npossible.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):282
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):291
msgid "FPS may be limited by your screen's refresh rate, so keep this in mind if <c>glxgears</c> reports only about 70-100 FPS. <c>games-fps/ut2004-demo</c> or other 3D games are better benchmarking tools, as they give you real-world performance results."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):292
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):301
msgid "Get the most out of direct rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):295
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):304
msgid "If you want to set more features, for performance or other reasons, check out the <uri link=\"http://dri.freedesktop.org/wiki/FeatureMatrix\">feature matrix</uri> on the DRI web site or the <uri link=\"http://dri.sourceforge.net/doc/dri_driver_features.phtml\">features listing</uri> on Sourceforge."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):308
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):317
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):310
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):319
msgid "It doesn't work. I don't have rendering, and I can't tell why."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):313
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):322
msgid "Try <c>modprobe radeon</c> before you start the X server (replace <c>radeon</c> with the name of your driver). Also, try building agpgart into the kernel instead of as a module."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):322
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):331
msgid "When I startx, I get this error: \"[drm] failed to load kernel module agpgart\""
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):325
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):334
msgid "That's because you compiled agpgart into the kernel instead of as a module. Ignore it unless you're having problems."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):333
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):342
msgid "I have a Radeon, and I want TV-Out."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):336
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):345
msgid "The drivers originally developed by the <uri link=\"http://gatos.sf.net\">GATOS</uri> project have been merged into Xorg's codebase. You don't need anything special for TV-Out; <c>x11-drivers/xf86-video-ati</c> will work just fine."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):346
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):355
msgid "It doesn't work. My card is so incredibly new and cool that it isn't supported at all."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):352
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):361
msgid "Try out the binary drivers. For AMD cards, use <c>ati-drivers</c>; a listing is at <uri>http://support.amd.com/us/gpudownload/Pages/index.aspx</uri>. If those don't support it, use fbdev. It's slow, but it works."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):361
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):370
msgid "I have a PCI card and it doesn't work. Help!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):364
-msgid "Edit <path>/etc/X11/xorg.conf</path>. In section \"Device\" enable ForcePCIMode."
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):373
+msgid "Create a config file in <path>/etc/X11/xorg.conf.d/</path>; name it anything you want as long as it ends in <path>.conf</path>. Add the following to it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):368
-msgid "Enabling ForcePCIMode"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):378
+msgid "/etc/X11/xorg.conf.x/10-pcimode.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):368
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):378
#, no-wrap
-msgid "\nOption \"ForcePCIMode\" \"True\"\n"
+msgid "\nSection \"Device\"\n Option \"ForcePCIMode\" \"True\"\nEndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):377
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):389
msgid "References"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):382
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):394
msgid "http://forums.gentoo.org/viewtopic.php?t=46681"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):383
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):395
msgid "http://forums.gentoo.org/viewtopic.php?t=29264"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):384
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):396
msgid "http://dri.freedesktop.org/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):385
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):397
msgid "http://www.retinalburn.net/linux/dri_status.html"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):391
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):403
msgid "Feedback"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):394
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):406
msgid "With suggestions, questions, etc., e-mail <mail link=\"dberkholz\"/>."
msgstr ""
diff --git a/doc/gettext/el/dri-howto.xml.po b/doc/gettext/el/dri-howto.xml.po
index 95fb818..b29efff 100644
--- a/doc/gettext/el/dri-howto.xml.po
+++ b/doc/gettext/el/dri-howto.xml.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-02 17:28+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+0500\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -43,11 +43,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(version):27
-msgid "2"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(date):28
-msgid "2011-03-01"
+msgid "2011-03-23"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):31
@@ -269,62 +269,77 @@ msgid ""
"run <c>/sbin/lilo</c> if you use LILO."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):201
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):199
+msgid "Add your user to the video group"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):202
+msgid ""
+"Next, add your user(s) to the video group, as explained in the <uri link=\"/"
+"doc/en/handbook\">handbook</uri>:"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):207
+msgid "Adding a user to the video group"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):207
+#, no-wrap
+msgid ""
+"\n"
+"# <i>gpasswd -a username video</i>\n"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):216
msgid "Configure direct rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):203
-msgid "Configure Xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):218
+msgid "Configure Xorg"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):206
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):221
msgid ""
-"Open <path>/etc/X11/xorg.conf</path> with your favorite text editor and edit "
-"it to enable DRI and GLX."
+"Hopefully just adding your user to the <c>video</c> group is sufficient to "
+"enable direct rendering. However, you may also need to create a file in "
+"<path>/etc/X11/xorg.conf.d/</path>. You can name it anything you like; just "
+"make sure it ends in <path>.conf</path>. Open up your favorite text editor "
+"and create a file with this inside it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):211
-msgid "xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):229
+msgid "/etc/X11/xorg.conf.d/10-dri.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):211
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):229
#, no-wrap
msgid ""
"\n"
-"...\n"
-"Section \"Module\"\n"
-" Load \"dri\"\n"
-" Load \"glx\"\n"
-" ...\n"
-"EndSection\n"
-"...\n"
"Section \"Device\"\n"
" Driver \"radeon\"\n"
" <comment>(Replace radeon with the name of your driver.)</comment>\n"
-" ...\n"
"EndSection\n"
-"...\n"
"Section \"dri\"\n"
" Mode 0666\n"
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):233
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):242
msgid "Changes to modules.autoload.d"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):236
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):245
msgid ""
"You will need to add the module name that your card uses to <path>/etc/"
"modules.autoload.d/kernel-2.6</path> to ensure that the module is loaded "
"automatically when the system starts up."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):242
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):251
msgid "Editing /etc/modules.autoload.d/kernel-2.6"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):242
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):251
#, no-wrap
msgid ""
"\n"
@@ -332,21 +347,21 @@ msgid ""
"intel-agp\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):247
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):256
msgid ""
"If you compiled <c>agpgart</c> as a module, you will also need to add it to "
"<path>/etc/modules.autoload.d/kernel-2.6</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):257
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):266
msgid "Test 3D acceleration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):259
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):268
msgid "Reboot to the new kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):262
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):271
msgid ""
"Reboot your computer to your new kernel and login as a normal user. It's "
"time to see if you have direct rendering and how good it is. <c>glxinfo</c> "
@@ -354,11 +369,11 @@ msgid ""
"it is installed before you attempt to run these commands."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):269
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):278
msgid "Testing rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):269
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):278
#, no-wrap
msgid ""
"\n"
@@ -374,7 +389,7 @@ msgid ""
"possible.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):282
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):291
msgid ""
"FPS may be limited by your screen's refresh rate, so keep this in mind if "
"<c>glxgears</c> reports only about 70-100 FPS. <c>games-fps/ut2004-demo</c> "
@@ -382,11 +397,11 @@ msgid ""
"performance results."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):292
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):301
msgid "Get the most out of direct rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):295
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):304
msgid ""
"If you want to set more features, for performance or other reasons, check "
"out the <uri link=\"http://dri.freedesktop.org/wiki/FeatureMatrix\">feature "
@@ -394,38 +409,38 @@ msgid ""
"net/doc/dri_driver_features.phtml\">features listing</uri> on Sourceforge."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):308
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):317
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):310
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):319
msgid "It doesn't work. I don't have rendering, and I can't tell why."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):313
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):322
msgid ""
"Try <c>modprobe radeon</c> before you start the X server (replace <c>radeon</"
"c> with the name of your driver). Also, try building agpgart into the kernel "
"instead of as a module."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):322
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):331
msgid ""
"When I startx, I get this error: \"[drm] failed to load kernel module agpgart"
"\""
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):325
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):334
msgid ""
"That's because you compiled agpgart into the kernel instead of as a module. "
"Ignore it unless you're having problems."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):333
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):342
msgid "I have a Radeon, and I want TV-Out."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):336
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):345
msgid ""
"The drivers originally developed by the <uri link=\"http://gatos.sf.net"
"\">GATOS</uri> project have been merged into Xorg's codebase. You don't need "
@@ -433,65 +448,67 @@ msgid ""
"just fine."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):346
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):355
msgid ""
"It doesn't work. My card is so incredibly new and cool that it isn't "
"supported at all."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):352
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):361
msgid ""
"Try out the binary drivers. For AMD cards, use <c>ati-drivers</c>; a listing "
"is at <uri>http://support.amd.com/us/gpudownload/Pages/index.aspx</uri>. If "
"those don't support it, use fbdev. It's slow, but it works."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):361
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):370
msgid "I have a PCI card and it doesn't work. Help!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):364
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):373
msgid ""
-"Edit <path>/etc/X11/xorg.conf</path>. In section \"Device\" enable "
-"ForcePCIMode."
+"Create a config file in <path>/etc/X11/xorg.conf.d/</path>; name it anything "
+"you want as long as it ends in <path>.conf</path>. Add the following to it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):368
-msgid "Enabling ForcePCIMode"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):378
+msgid "/etc/X11/xorg.conf.x/10-pcimode.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):368
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):378
#, no-wrap
msgid ""
"\n"
-"Option \"ForcePCIMode\" \"True\"\n"
+"Section \"Device\"\n"
+" Option \"ForcePCIMode\" \"True\"\n"
+"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):377
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):389
msgid "References"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):382
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):394
msgid "http://forums.gentoo.org/viewtopic.php?t=46681"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):383
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):395
msgid "http://forums.gentoo.org/viewtopic.php?t=29264"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):384
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):396
msgid "http://dri.freedesktop.org/"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):385
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):397
msgid "http://www.retinalburn.net/linux/dri_status.html"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):391
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):403
msgid "Feedback"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):394
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):406
msgid "With suggestions, questions, etc., e-mail <mail link=\"dberkholz\"/>."
msgstr ""
diff --git a/doc/gettext/el/openbox.xml.po b/doc/gettext/el/openbox.xml.po
index 7c95817..ba520be 100644
--- a/doc/gettext/el/openbox.xml.po
+++ b/doc/gettext/el/openbox.xml.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-21 01:40+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+0500\n"
"PO-Revision-Date: 2011-01-21 01:40+0500\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//openbox.xml(title):6
@@ -704,7 +704,7 @@ msgstr ""
msgid ""
"<uri link=\"http://packages.gentoo.org/package/x11-misc/pcmanfm\">PCManFM</"
"uri> is the lightweight filemanager from LXDE. It supports tabbed browsing, "
-"drag and drop, thumnails for images, bookmarks, volume management, "
+"drag and drop, thumbnails for images, bookmarks, volume management, "
"searching, and more. It also provides supports for managing the desktop "
"background and drawing desktop icons (both optionally)."
msgstr ""
diff --git a/doc/gettext/el/xorg-config.xml.po b/doc/gettext/el/xorg-config.xml.po
index 89aab35..14f8bb0 100644
--- a/doc/gettext/el/xorg-config.xml.po
+++ b/doc/gettext/el/xorg-config.xml.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-02 17:28+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+0500\n"
"PO-Revision-Date: 2011-01-21 01:40+0500\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,11 +36,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(version):25
-msgid "6"
+msgid "7"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(date):26
-msgid "2011-03-02"
+msgid "2011-03-23"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):29
@@ -184,7 +184,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):149
msgid ""
"Next, configure your kernel to use the proper KMS driver for your video "
-"card. Intel, nVidia, and ATI are the most common cards, so follow code "
+"card. Intel, nVidia, and AMD/ATI are the most common cards, so follow code "
"listing for your card below."
msgstr ""
@@ -236,13 +236,13 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):187
msgid ""
-"For newer ATI cards (<uri link=\"/doc/en/ati-faq.xml\">RadeonHD 2000 and up</"
-"uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed "
-"<c>radeon-ucode</c>, configure your kernel as shown:"
+"For newer AMD/ATI cards (<uri link=\"/doc/en/ati-faq.xml\">RadeonHD 2000 and "
+"up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have "
+"installed <c>radeon-ucode</c>, configure your kernel as shown:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):193
-msgid "ATI settings"
+msgid "AMD/ATI settings"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):193
@@ -314,11 +314,11 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):254
msgid ""
-"You may also try the proprietary drivers from nVidia and ATI, <c>nvidia</c> "
-"and <c>fglrx</c> respectively. However, setting up the proprietary drivers "
-"is beyond the scope of this guide. Please read the <uri link=\"/doc/en/"
-"nvidia-guide.xml\">Gentoo Linux nVidia Guide</uri> and <uri link=\"/doc/en/"
-"ati-faq.xml\">Gentoo Linux ATI FAQ</uri>. If you don't know which drivers "
+"You may also try the proprietary drivers from nVidia and AMD/ATI, <c>nvidia</"
+"c> and <c>fglrx</c> respectively. However, setting up the proprietary "
+"drivers is beyond the scope of this guide. Please read the <uri link=\"/doc/"
+"en/nvidia-guide.xml\">Gentoo Linux nVidia Guide</uri> and <uri link=\"/doc/"
+"en/ati-faq.xml\">Gentoo Linux ATI FAQ</uri>. If you don't know which drivers "
"you should choose, refer to these guides for more information."
msgstr ""
@@ -361,7 +361,7 @@ msgid ""
"INPUT_DEVICES=\"evdev synaptics\"\n"
"<comment>(For nVidia cards)</comment>\n"
"VIDEO_CARDS=\"nouveau\"\n"
-"<comment>(OR, for ATI Radeon cards)</comment>\n"
+"<comment>(For AMD/ATI cards)</comment>\n"
"VIDEO_CARDS=\"radeon\"\n"
msgstr ""
@@ -406,10 +406,13 @@ msgstr ""
#, no-wrap
msgid ""
"\n"
+"<comment>(Make sure udev is in your USE flags)</comment>\n"
+"# <i>echo \"x11-base/xorg-server udev\" &gt;&gt; /etc/portage/package.use</i>\n"
+"<comment>(Install Xorg)</comment>\n"
"# <i>emerge xorg-server</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):327
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):330
msgid ""
"You could install the <c>xorg-x11</c> metapackage instead of the more "
"lightweight <c>xorg-server</c>. Functionally, <c>xorg-x11</c> and <c>xorg-"
@@ -418,18 +421,17 @@ msgid ""
"many different languages. They're not necessary for a working desktop."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):335
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):338
msgid ""
"When the installation is finished, you will need to re-initialise some "
-"environment variables before you continue. Just run <c>env-update</c> "
-"followed by <c>source /etc/profile</c> and you're all set."
+"environment variables before you continue:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):341
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):343
msgid "Re-initialising the environment variables"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):341
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):343
#, no-wrap
msgid ""
"\n"
@@ -437,298 +439,77 @@ msgid ""
"# <i>source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):346
-msgid ""
-"Now it's time to start the Hardware Abstraction Layer (HAL) daemon and set "
-"it to automatically start each time you boot. This is necessary to get a "
-"working X environment, otherwise your input devices won't be detected and "
-"you'll probably just get a blank screen. We'll cover HAL more in the <uri "
-"link=\"#using_hal\">next section</uri>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):354
-msgid "Starting HAL"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):354
-#, no-wrap
-msgid ""
-"\n"
-"# <i>/etc/init.d/hald start</i>\n"
-"# <i>rc-update add hald default</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):364
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):353
msgid "Configuring Xorg"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):366
-msgid "Using HAL"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):369
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):357
msgid ""
"The X server is designed to work out-of-the-box, with no need to manually "
-"edit Xorg's configuration files."
+"edit Xorg's configuration files. It should detect and configure devices such "
+"as displays, keyboards, and mice."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):374
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):363
msgid ""
"You should first try <uri link=\"#using_startx\">starting X</uri> without "
-"creating <path>/etc/X11/xorg.conf</path>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):379
-msgid ""
-"If Xorg won't start (if there's something wrong with the screen, or with "
-"your keyboard/mouse), then you can try fixing problems by using the right "
-"configuration files."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):385
-msgid ""
-"By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and "
-"configure devices such as keyboards and mice."
+"editing any configuration files. If Xorg won't start, or there's some other "
+"problem, then you'll need to manually configure Xorg as shown in the next "
+"section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):390
-msgid ""
-"HAL comes with many premade device rules, also called policies. These policy "
-"files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a "
-"few that suit your needs most closely and copy them to <path>/etc/hal/fdi/"
-"policy/</path>."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):372
+msgid "The xorg.conf.d directory"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):397
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):375
msgid ""
-"Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the "
-"ones you need, and edit them once they're placed in the proper <path>/etc</"
-"path> location."
+"Configuring files in <path>xorg.conf.d</path> should be seen as a \"last "
+"resort\" option. It really desirable to run without any special "
+"configuration if possible. If you still can't get a working configuration, "
+"then read on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):403
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):381
msgid ""
-"For example, to get a basic working keyboard/mouse combination, you could "
-"copy the following files to <path>/etc/hal/fdi/policy/</path>:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):408
-msgid "Using HAL policy files"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):408
-#, no-wrap
-msgid ""
-"\n"
-"# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi /etc/hal/fdi/policy</i>\n"
-"# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>\n"
+"The configuration files of Xorg are stored in <path>/etc/X11/xorg.conf.d/</"
+"path>. Each file is given a unique name and ends in <path>.conf</path>. If "
+"the filenames start with a number, then Xorg will read the files in numeric "
+"order. <path>10-evdev.conf</path> will be read before <path>20-synaptics."
+"conf</path>, and so on. You don't <e>have</e> to give them numbers, but it "
+"may help you organize them."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):413
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):390
msgid ""
-"There are several other HAL policies in <path>/usr/share/hal/fdi/</path> "
-"that may interest you, such as laptop configurations, storage device "
-"handling, power management, and more. Just copy any of the policies to "
-"<path>/etc/hal/fdi/policy/</path>."
+"Xorg provides example configurations in <path>/usr/share/doc/xorg-server-"
+"${version}/xorg.conf.example.bz2</path>. You can use these to create your "
+"own configuration files in <path>/etc/X11/xorg.conf.d/</path>. The examples "
+"are heavily commented, but if you are in need of more documentation "
+"regarding the syntax, read <c>man xorg.conf</c>. Other examples can be found "
+"in the <uri link=\"#resources\">Resources</uri> chapter at the end of this "
+"guide."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):420
-msgid ""
-"Remember, <e>every</e> time you finish making changes to HAL policy files, "
-"you need to restart the HAL daemon by running <c>/etc/init.d/hald restart</"
-"c>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):425
-msgid ""
-"You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your "
-"liking. You may want to make a few tweaks or to expose additional "
-"functionality. Let's go through an example of tweaking a HAL policy."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):431
-msgid ""
-"One very convenient trick is to kill the X server entirely by pressing Ctrl-"
-"Alt-Backspace. This is useful when your X server is malfunctioning, frozen, "
-"etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):437
-msgid ""
-"Recent X server versions disabled this key combination by default. However, "
-"you can reenable it by copying <path>10-x11-input.fdi</path> to <path>/etc/"
-"hal/fdi/policy</path> and editing it. You'll need to add just one line to "
-"the appropriate section, as shown below:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):444
-msgid "Editing 10-x11-input.fdi"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):444
-#, no-wrap
-msgid ""
-"\n"
-"<comment>(Open the file in your preferred editor)</comment>\n"
-"# <i>nano -w /etc/hal/fdi/policy/10-x11-input.fdi</i>\n"
-"<comment>(Find the \"input.keys\" section)</comment>\n"
-"&lt;match key=\"info.capabilities\" contains=\"input.keys\"&gt;\n"
-"<comment>(Add the \"terminate\" merge string as shown)</comment>\n"
-"&lt;match key=\"info.capabilities\" contains=\"input.keys\"&gt;\n"
-" &lt;merge key=\"input.x11_driver\" type=\"string\"&gt;keyboard&lt;/merge&gt;\n"
-" <i>&lt;merge key=\"input.xkb.options\" type=\"string\"&gt;terminate:ctrl_alt_bksp&lt;/merge&gt;</i>\n"
-" &lt;match key=\"/org/freedesktop/Hal/devices/computer:system.kernel.name\"\n"
-" string=\"Linux\"&gt;\n"
-" &lt;merge key=\"input.x11_driver\" type=\"string\"&gt;evdev&lt;merge&gt;\n"
-" &lt;/match&gt;\n"
-" &lt;/match&gt;\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):460
-msgid ""
-"Once you're done, run <c>/etc/init.d/hald restart</c> so that HAL picks up "
-"your changes."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):465
-msgid ""
-"There, now you have a handy way of killing an unresponsive X server. This is "
-"useful when programs have frozen your display entirely, or when configuring "
-"and tweaking your Xorg environment. Be careful when killing your desktop "
-"with this key combination -- most programs really don't like it when you end "
-"them this way, and you may lose some (or all) of what you were working on."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):473
-msgid ""
-"Hopefully just working with the HAL policy files results in a working X "
-"desktop. If Xorg still won't start, or there's some other problem, then "
-"you'll need to manually configure <path>xorg.conf</path> as shown in the "
-"next section."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):482
-msgid "The xorg.conf file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):485
-msgid ""
-"Configuring <path>xorg.conf</path> should be seen as a \"last resort\" "
-"option. It really desirable to run without one if possible, and to do all "
-"your configuration via HAL policy files. If you still can't get a working "
-"configuration, then read on."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492
-msgid ""
-"The configuration file of Xorg is called <path>xorg.conf</path> and it "
-"resides in <path>/etc/X11</path>. Xorg provides an example configuration as "
-"<path>/etc/X11/xorg.conf.example</path> which you can use to create your own "
-"configuration. It is heavily commented, but if you are in need of more "
-"documentation regarding the syntax, don't hesitate to read the man page:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):500
-msgid "Reading the xorg.conf man page"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):500
-#, no-wrap
-msgid ""
-"\n"
-"$ <i>man 5 xorg.conf</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):507
-msgid "Automatic Generation of xorg.conf"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):510
-msgid ""
-"Xorg itself is able to guess most parameters for you. In most cases, you "
-"will only have to change some lines to get the resolution you want up and "
-"running. If you are interested in more in-depth tweaking, be sure to check "
-"the resources at the end of this chapter. But first, let us generate a "
-"(hopefully working) Xorg configuration file."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):518
-msgid "Generating an xorg.conf file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):518
-#, no-wrap
-msgid ""
-"\n"
-"# <i>Xorg -configure</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):522
-msgid ""
-"Be sure to read the last lines printed on your screen when Xorg has finished "
-"probing your hardware. If it tells you it failed at some point, you're "
-"forced to manually write an <path>xorg.conf</path> file. Assuming that it "
-"didn't fail, it will have told you that it has written <path>/root/xorg.conf."
-"new</path> ready for you to test. So let's test. :)"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):530
-msgid "Testing the xorg.conf.new file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):530
-#, no-wrap
-msgid ""
-"\n"
-"# <i>X -retro -config /root/xorg.conf.new</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):534
-msgid ""
-"If all goes well, you should see a simple black and white pattern. Verify if "
-"your mouse works correctly and if the resolution is good. You might not be "
-"able to deduce the exact resolution, but you should be able to see if it's "
-"too low. You can exit any time by pressing Ctrl-Alt-Backspace."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):544
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):553
-msgid "Copying over xorg.conf"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):547
-msgid ""
-"Let us copy over the <path>xorg.conf.new</path> to <path>/etc/X11/xorg.conf</"
-"path> now, so we won't have to continuously run <c>X -config</c> -- typing "
-"just <c>startx</c> is easier. :)"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):553
-#, no-wrap
-msgid ""
-"\n"
-"# <i>cp /root/xorg.conf.new /etc/X11/xorg.conf</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):560
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):403
msgid "Using startx"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):563
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):406
msgid ""
"Now try <c>startx</c> to start up your X server. <c>startx</c> is a script "
-"that executes an <e>X session</e>, that is, it starts the X server and some "
+"that executes an <e>X session</e>; that is, it starts the X server and some "
"graphical applications on top of it. It decides which applications to run "
"using the following logic:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):571
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):414
msgid ""
"If a file named <path>.xinitrc</path> exists in the home directory, it will "
"execute the commands listed there."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):575
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):418
msgid ""
"Otherwise, it will read the value of the XSESSION variable and will execute "
"one of the sessions available in <path>/etc/X11/Sessions/</path> "
@@ -740,97 +521,73 @@ msgid ""
"Remember to run <c>env-update</c> after changing <path>90xsession</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):588
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):431
msgid "Starting X"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):588
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):431
#, no-wrap
msgid ""
"\n"
"$ <i>startx</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):592
-msgid ""
-"You can kill the X session by using the Ctrl-Alt-Backspace key combination. "
-"This will, however, make X exit disgracefully -- something that you might "
-"not always want."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):598
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):435
msgid ""
"If you haven't yet installed a window manager, all you'll see is a black "
"screen. Since this can also be a sign that something's wrong, you may want "
"to emerge <c>twm</c> and <c>xterm</c><e>only to test X</e>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):604
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):441
msgid ""
-"Once those two programs are installed, run <c>startx</c> again. A few xterm "
-"windows should appear, making it easier to verify that X is working "
-"correctly. Once you're satisfied with the results, run <c>emerge --unmerge "
-"twm xterm</c> as root to get rid of the testing packages. You won't need "
-"them once you've setup a proper desktop environment."
+"Once those two programs are installed, run <c>startx</c> again. A few "
+"<c>xterm</c> windows should appear, making it easier to verify that X is "
+"working correctly. Once you're satisfied with the results, run <c>emerge --"
+"unmerge twm xterm</c> as root to get rid of the testing packages. You won't "
+"need them once you've setup a proper desktop environment."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):617
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):454
msgid "Tweaking X settings"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):619
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):456
msgid "Setting your Resolution"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):622
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):459
msgid ""
"If you feel that the screen resolution is wrong, you will need to check two "
-"sections in your <path>xorg.conf</path> configuration. First of all, you "
-"have the <e>Screen</e> section which lists the resolutions, if any that your "
-"X server will run at. By default, this section might not list any "
-"resolutions at all. If this is the case, Xorg will estimate the resolutions "
-"based on the information in the second section, <e>Monitor</e>."
+"sections in your <path>xorg.conf.d</path> configuration. First of all, you "
+"have the <e>Screen</e> section which lists the resolutions that your X "
+"server will run at. This section might not list any resolutions at all. If "
+"this is the case, Xorg will estimate the resolutions based on the "
+"information in the second section, <e>Monitor</e>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):631
-msgid ""
-"What happens is that Xorg checks the settings of <c>HorizSync</c> and "
-"<c>VertRefresh</c> in the <e>Monitor</e> section to compute valid "
-"resolutions. For now, leave these settings as-is. Only when the changes to "
-"the <e>Screen</e> section (which we will describe in a minute) don't work, "
-"then you will need to look up the specs for your monitor and fill in the "
-"correct values."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(warn):639
-msgid ""
-"Do <b>not</b> \"just\" change the values of these two monitor related "
-"variables without consulting the technical specifications of your monitor. "
-"Setting incorrect values lead to out-of-sync errors at best and smoked up "
-"screens at worst."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):646
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):468
msgid ""
"Now let us change the resolution. In the next example from <path>/etc/X11/"
-"xorg.conf</path> we add the <c>PreferredMode</c> line so that our X server "
-"starts at 1440x900 by default. Don't mind the given strings -- they are "
-"examples and will most likely differ from the settings on your system. "
-"However, the <c>Option</c> in the <c>Device</c> section must match the name "
-"of your monitor (<c>DVI-0</c>), which can be obtained by running <c>xrandr</"
-"c>. You'll need to <c>emerge xrandr</c> just long enough to get this "
-"information. The argument after the monitor name (in the <c>Device</c> "
-"section) must match the <c>Identifier</c> in the <c>Monitor</c> section."
+"xorg.conf.d/40-monitor.conf</path> we add the <c>PreferredMode</c> line so "
+"that our X server starts at 1440x900 by default. The <c>Option</c> in the "
+"<c>Device</c> section must match the name of your monitor (<c>DVI-0</c>), "
+"which can be obtained by running <c>xrandr</c>. You'll need to <c>emerge "
+"xrandr</c> just long enough to get this information. The argument after the "
+"monitor name (in the <c>Device</c> section) must match the <c>Identifier</c> "
+"in the <c>Monitor</c> section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):658
-msgid "Changing the Monitor section in /etc/X11/xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):479
+msgid "Changing the Monitor section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):658
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):479
#, no-wrap
msgid ""
"\n"
+"# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>\n"
+"\n"
"Section \"Device\"\n"
" Identifier \"RadeonHD 4550\"\n"
" Option \"Monitor-DVI-0\" \"DVI screen\"\n"
@@ -841,135 +598,133 @@ msgid ""
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):669
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492
msgid "Run X (<c>startx</c>) to discover it uses the resolution you want."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):676
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):499
msgid "Multiple monitors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):679
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):502
msgid ""
-"You can configure more than one monitor in <path>/etc/X11/xorg.conf</path>. "
-"All you have to do is give each monitor an identifer, then list its physical "
-"position, such as \"RightOf\" or \"Above\" another monitor. The following "
-"example shows how to configure a DVI and a VGA monitor, with the VGA monitor "
-"as the right-hand screen:"
+"You can configure more than one monitor in <path>/etc/X11/xorg.conf.d/</"
+"path>. All you have to do is give each monitor an identifer, then list its "
+"physical position, such as \"RightOf\" or \"Above\" another monitor. The "
+"following example shows how to configure a DVI and a VGA monitor, with the "
+"VGA monitor as the right-hand screen:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):687
-msgid "Configuring multiple monitors in xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):510
+msgid "Configuring multiple monitors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):687
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):510
#, no-wrap
msgid ""
"\n"
+"# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>\n"
+"\n"
"Section \"Device\"\n"
" Identifier \"RadeonHD 4550\"\n"
" Option \"Monitor-DVI-0\" \"DVI screen\"\n"
" Option \"Monitor-VGA-0\" \"VGA screen\"\n"
"EndSection\n"
-"\n"
"Section \"Monitor\"\n"
" Identifier \"DVI screen\"\n"
"EndSection\n"
-"\n"
"Section \"Monitor\"\n"
" Identifier \"VGA screen\"\n"
" Option \"RightOf\" \"DVI screen\"\n"
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):707
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):530
msgid "Configuring your keyboard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):710
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):533
msgid ""
-"To setup X to use an international keyboard, you can copy the content of "
-"<path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to <path>/"
-"etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:"
+"To setup X to use an international keyboard, you just have to create the "
+"appropriate config file in <path>/etc/X11/xorg.conf.d/</path>. This example "
+"features a Czech keyboard layout:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):716
-msgid "Using an existing config file"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):539
+msgid "Using an international keyboard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):716
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):539
#, no-wrap
msgid ""
"\n"
-"# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2 &gt; /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):720
-msgid ""
-"Now you can just edit <path>10-xinput-configuration.fdi</path> and change "
-"the Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain "
-"(<b>gb</b>) or Polish (<b>pl</b>)."
+"# <i>nano -w /etc/X11/xorg.conf.d/30-keyboard.conf</i>\n"
+"\n"
+"Section \"InputClass\"\n"
+" Identifier \"keyboard-all\"\n"
+" Driver \"evdev\"\n"
+" Option \"XkbLayout\" \"us,cz\"\n"
+" Option \"XkbModel\" \"logitech_g15\"\n"
+" Option \"XkbRules\" \"xorg\"\n"
+" Option \"XkbOptions\" \"grp:alt_shift_toggle,grp:switch,grp_led:scroll,compose:rwin,terminate:ctrl_alt_bksp\"\n"
+" Option \"XkbVariant\" \",qwerty\"\n"
+" MatchIsKeyboard \"on\"\n"
+"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):726
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):554
msgid ""
-"When you're finished, run <c>/etc/init.d/hald restart</c> as root to make "
-"sure that HAL picks up your configuration file changes."
+"The \"terminate\" command (<c>terminate:ctrl_alt_bksp</c>) lets you kill the "
+"X session by using the Ctrl-Alt-Backspace key combination. This will, "
+"however, make X exit disgracefully -- something that you might not always "
+"want. It can be useful when programs have frozen your display entirely, or "
+"when you're configuring and tweaking your Xorg environment. Be careful when "
+"killing your desktop with this key combination -- most programs really don't "
+"like it when you end them this way, and you may lose some (or all) of what "
+"you were working on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):734
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):567
msgid "Finishing up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):737
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):570
msgid ""
"Run <c>startx</c> and be happy about the result. Congratulations, you now "
"(hopefully) have a working Xorg on your system. The next step is to install "
"a useful window manager or desktop environment such as KDE, GNOME, or Xfce, "
-"but that's not part of this guide."
+"but that's not part of this guide. Information on installing these desktop "
+"environments can be found in our <uri link=\"/doc/en/?catid=desktop\">Gentoo "
+"Desktop Documentation Resources</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):749
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):584
msgid "Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):751
-msgid "Creating and Tweaking xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):586
+msgid "Creating and editing config files"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):754
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):589
msgid ""
"First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet "
"complete references about the syntax used by these configuration files. Be "
-"sure to have them open on a terminal near you when you edit your "
-"configuration files!"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):761
-msgid ""
-"Also, be sure to look at <path>/etc/X11/xorg.conf.example</path>; you may "
-"wish to copy this and use it as a foundation for writing your own <path>xorg."
-"conf</path>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):767
-msgid ""
-"You may find the X.org <uri link=\"http://www.x.org/wiki/FAQ\">FAQ</uri> "
-"provided on their website, in addition to their other documentation."
+"sure to have them open on a terminal when you edit your configuration files!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):772
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):595
msgid ""
-"There are also many online resources on editing <path>xorg.conf</path>. We "
-"only list few of them here, be sure to <uri link=\"http://www.google.com"
-"\">Google</uri> for more."
+"There are also many online resources on editing config files in <path>/etc/"
+"X11/</path>. We only list few of them here; be sure to <uri link=\"http://"
+"www.google.com\">Google</uri> for more."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):781
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):604
msgid "Other resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):784
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):607
msgid ""
"More information about installing and configuring various graphical desktop "
"environments and applications can be found in the <uri link=\"/doc/en/?"
@@ -977,13 +732,19 @@ msgid ""
"documentation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):791
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):614
msgid ""
-"If you're upgrading to <c>xorg-server</c> 1.8 from an earlier version, then "
-"be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.8-"
+"If you're upgrading to <c>xorg-server</c> 1.9 from an earlier version, then "
+"be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.9-"
"upgrade-guide.xml\">migration guide</uri>."
msgstr ""
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):621
+msgid ""
+"X.org provides many <uri link=\"http://www.x.org/wiki/FAQ\">FAQs</uri> on "
+"their website, in addition to their other documentation."
+msgstr ""
+
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(None):0
msgid "translator-credits"
diff --git a/doc/gettext/openbox.xml.pot b/doc/gettext/openbox.xml.pot
index 9b74cb5..2a98797 100644
--- a/doc/gettext/openbox.xml.pot
+++ b/doc/gettext/openbox.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-21 01:40+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+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"
@@ -419,7 +419,7 @@ msgid "File managers"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//openbox.xml(li):551
-msgid "<uri link=\"http://packages.gentoo.org/package/x11-misc/pcmanfm\">PCManFM</uri> is the lightweight filemanager from LXDE. It supports tabbed browsing, drag and drop, thumnails for images, bookmarks, volume management, searching, and more. It also provides supports for managing the desktop background and drawing desktop icons (both optionally)."
+msgid "<uri link=\"http://packages.gentoo.org/package/x11-misc/pcmanfm\">PCManFM</uri> is the lightweight filemanager from LXDE. It supports tabbed browsing, drag and drop, thumbnails for images, bookmarks, volume management, searching, and more. It also provides supports for managing the desktop background and drawing desktop icons (both optionally)."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//openbox.xml(li):559
diff --git a/doc/gettext/ru/dri-howto.xml.po b/doc/gettext/ru/dri-howto.xml.po
index efa4690..52d7bc3 100644
--- a/doc/gettext/ru/dri-howto.xml.po
+++ b/doc/gettext/ru/dri-howto.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-03-02 17:28+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+0500\n"
"PO-Revision-Date: 2009-10-18 05:09+0600\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -48,11 +48,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(version):27
-msgid "2"
+msgid "4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(date):28
-msgid "2011-03-01"
+msgid "2011-03-23"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):31
@@ -274,62 +274,78 @@ msgid ""
"run <c>/sbin/lilo</c> if you use LILO."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):201
-msgid "Configure direct rendering"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):199
+msgid "Add your user to the video group"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):202
+msgid ""
+"Next, add your user(s) to the video group, as explained in the <uri link=\"/"
+"doc/en/handbook\">handbook</uri>:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):203
-msgid "Configure Xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):207
+msgid "Adding a user to the video group"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):206
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):207
+#, no-wrap
msgid ""
-"Open <path>/etc/X11/xorg.conf</path> with your favorite text editor and edit "
-"it to enable DRI and GLX."
+"\n"
+"# <i>gpasswd -a username video</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):211
-msgid "xorg.conf"
-msgstr "xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):216
+msgid "Configure direct rendering"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):218
+#, fuzzy
+msgid "Configure Xorg"
+msgstr "Конфигурация ядра"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):211
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):221
+msgid ""
+"Hopefully just adding your user to the <c>video</c> group is sufficient to "
+"enable direct rendering. However, you may also need to create a file in "
+"<path>/etc/X11/xorg.conf.d/</path>. You can name it anything you like; just "
+"make sure it ends in <path>.conf</path>. Open up your favorite text editor "
+"and create a file with this inside it:"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):229
+msgid "/etc/X11/xorg.conf.d/10-dri.conf"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):229
#, no-wrap
msgid ""
"\n"
-"...\n"
-"Section \"Module\"\n"
-" Load \"dri\"\n"
-" Load \"glx\"\n"
-" ...\n"
-"EndSection\n"
-"...\n"
"Section \"Device\"\n"
" Driver \"radeon\"\n"
" <comment>(Replace radeon with the name of your driver.)</comment>\n"
-" ...\n"
"EndSection\n"
-"...\n"
"Section \"dri\"\n"
" Mode 0666\n"
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):233
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):242
msgid "Changes to modules.autoload.d"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):236
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):245
msgid ""
"You will need to add the module name that your card uses to <path>/etc/"
"modules.autoload.d/kernel-2.6</path> to ensure that the module is loaded "
"automatically when the system starts up."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):242
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):251
msgid "Editing /etc/modules.autoload.d/kernel-2.6"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):242
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):251
#, no-wrap
msgid ""
"\n"
@@ -337,21 +353,21 @@ msgid ""
"intel-agp\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):247
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):256
msgid ""
"If you compiled <c>agpgart</c> as a module, you will also need to add it to "
"<path>/etc/modules.autoload.d/kernel-2.6</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):257
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):266
msgid "Test 3D acceleration"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):259
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):268
msgid "Reboot to the new kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):262
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):271
msgid ""
"Reboot your computer to your new kernel and login as a normal user. It's "
"time to see if you have direct rendering and how good it is. <c>glxinfo</c> "
@@ -359,11 +375,11 @@ msgid ""
"it is installed before you attempt to run these commands."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):269
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):278
msgid "Testing rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):269
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):278
#, no-wrap
msgid ""
"\n"
@@ -379,7 +395,7 @@ msgid ""
"possible.)</comment>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):282
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(note):291
msgid ""
"FPS may be limited by your screen's refresh rate, so keep this in mind if "
"<c>glxgears</c> reports only about 70-100 FPS. <c>games-fps/ut2004-demo</c> "
@@ -387,11 +403,11 @@ msgid ""
"performance results."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):292
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):301
msgid "Get the most out of direct rendering"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):295
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):304
msgid ""
"If you want to set more features, for performance or other reasons, check "
"out the <uri link=\"http://dri.freedesktop.org/wiki/FeatureMatrix\">feature "
@@ -399,38 +415,38 @@ msgid ""
"net/doc/dri_driver_features.phtml\">features listing</uri> on Sourceforge."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):308
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):317
msgid "Troubleshooting"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):310
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):319
msgid "It doesn't work. I don't have rendering, and I can't tell why."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):313
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):322
msgid ""
"Try <c>modprobe radeon</c> before you start the X server (replace <c>radeon</"
"c> with the name of your driver). Also, try building agpgart into the kernel "
"instead of as a module."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):322
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):331
msgid ""
"When I startx, I get this error: \"[drm] failed to load kernel module agpgart"
"\""
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):325
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):334
msgid ""
"That's because you compiled agpgart into the kernel instead of as a module. "
"Ignore it unless you're having problems."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):333
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):342
msgid "I have a Radeon, and I want TV-Out."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):336
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):345
msgid ""
"The drivers originally developed by the <uri link=\"http://gatos.sf.net"
"\">GATOS</uri> project have been merged into Xorg's codebase. You don't need "
@@ -438,67 +454,69 @@ msgid ""
"just fine."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):346
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):355
msgid ""
"It doesn't work. My card is so incredibly new and cool that it isn't "
"supported at all."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):352
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):361
msgid ""
"Try out the binary drivers. For AMD cards, use <c>ati-drivers</c>; a listing "
"is at <uri>http://support.amd.com/us/gpudownload/Pages/index.aspx</uri>. If "
"those don't support it, use fbdev. It's slow, but it works."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):361
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):370
msgid "I have a PCI card and it doesn't work. Help!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):364
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):373
msgid ""
-"Edit <path>/etc/X11/xorg.conf</path>. In section \"Device\" enable "
-"ForcePCIMode."
+"Create a config file in <path>/etc/X11/xorg.conf.d/</path>; name it anything "
+"you want as long as it ends in <path>.conf</path>. Add the following to it:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):368
-msgid "Enabling ForcePCIMode"
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre:caption):378
+msgid "/etc/X11/xorg.conf.x/10-pcimode.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):368
-#, no-wrap
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(pre):378
+#, fuzzy, no-wrap
msgid ""
"\n"
-"Option \"ForcePCIMode\" \"True\"\n"
+"Section \"Device\"\n"
+" Option \"ForcePCIMode\" \"True\"\n"
+"EndSection\n"
msgstr ""
"\n"
"Option \"ForcePCIMode\" \"True\"\n"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):377
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):389
msgid "References"
msgstr "Ссылки"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):382
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):394
msgid "http://forums.gentoo.org/viewtopic.php?t=46681"
msgstr "http://forums.gentoo.org/viewtopic.php?t=46681"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):383
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):395
msgid "http://forums.gentoo.org/viewtopic.php?t=29264"
msgstr "http://forums.gentoo.org/viewtopic.php?t=29264"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):384
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):396
msgid "http://dri.freedesktop.org/"
msgstr "http://dri.freedesktop.org/"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):385
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(uri):397
msgid "http://www.retinalburn.net/linux/dri_status.html"
msgstr "http://www.retinalburn.net/linux/dri_status.html"
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):391
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(title):403
msgid "Feedback"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):394
+#: ../../gentoo/xml/htdocs/doc/en//dri-howto.xml(p):406
msgid "With suggestions, questions, etc., e-mail <mail link=\"dberkholz\"/>."
msgstr ""
diff --git a/doc/gettext/ru/openbox.xml.po b/doc/gettext/ru/openbox.xml.po
index 5f06862..e5e7498 100644
--- a/doc/gettext/ru/openbox.xml.po
+++ b/doc/gettext/ru/openbox.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-01-21 01:40+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+0500\n"
"PO-Revision-Date: 2010-02-09 01:05+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -708,7 +708,7 @@ msgstr ""
msgid ""
"<uri link=\"http://packages.gentoo.org/package/x11-misc/pcmanfm\">PCManFM</"
"uri> is the lightweight filemanager from LXDE. It supports tabbed browsing, "
-"drag and drop, thumnails for images, bookmarks, volume management, "
+"drag and drop, thumbnails for images, bookmarks, volume management, "
"searching, and more. It also provides supports for managing the desktop "
"background and drawing desktop icons (both optionally)."
msgstr ""
diff --git a/doc/gettext/ru/xorg-config.xml.po b/doc/gettext/ru/xorg-config.xml.po
index d54cc30..3a080d7 100644
--- a/doc/gettext/ru/xorg-config.xml.po
+++ b/doc/gettext/ru/xorg-config.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-03-02 17:28+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+0500\n"
"PO-Revision-Date: 2009-10-18 05:15+0600\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -39,11 +39,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(version):25
-msgid "6"
+msgid "7"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(date):26
-msgid "2011-03-02"
+msgid "2011-03-23"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):29
@@ -187,7 +187,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):149
msgid ""
"Next, configure your kernel to use the proper KMS driver for your video "
-"card. Intel, nVidia, and ATI are the most common cards, so follow code "
+"card. Intel, nVidia, and AMD/ATI are the most common cards, so follow code "
"listing for your card below."
msgstr ""
@@ -239,13 +239,13 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):187
msgid ""
-"For newer ATI cards (<uri link=\"/doc/en/ati-faq.xml\">RadeonHD 2000 and up</"
-"uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed "
-"<c>radeon-ucode</c>, configure your kernel as shown:"
+"For newer AMD/ATI cards (<uri link=\"/doc/en/ati-faq.xml\">RadeonHD 2000 and "
+"up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have "
+"installed <c>radeon-ucode</c>, configure your kernel as shown:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):193
-msgid "ATI settings"
+msgid "AMD/ATI settings"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):193
@@ -317,11 +317,11 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):254
msgid ""
-"You may also try the proprietary drivers from nVidia and ATI, <c>nvidia</c> "
-"and <c>fglrx</c> respectively. However, setting up the proprietary drivers "
-"is beyond the scope of this guide. Please read the <uri link=\"/doc/en/"
-"nvidia-guide.xml\">Gentoo Linux nVidia Guide</uri> and <uri link=\"/doc/en/"
-"ati-faq.xml\">Gentoo Linux ATI FAQ</uri>. If you don't know which drivers "
+"You may also try the proprietary drivers from nVidia and AMD/ATI, <c>nvidia</"
+"c> and <c>fglrx</c> respectively. However, setting up the proprietary "
+"drivers is beyond the scope of this guide. Please read the <uri link=\"/doc/"
+"en/nvidia-guide.xml\">Gentoo Linux nVidia Guide</uri> and <uri link=\"/doc/"
+"en/ati-faq.xml\">Gentoo Linux ATI FAQ</uri>. If you don't know which drivers "
"you should choose, refer to these guides for more information."
msgstr ""
@@ -364,7 +364,7 @@ msgid ""
"INPUT_DEVICES=\"evdev synaptics\"\n"
"<comment>(For nVidia cards)</comment>\n"
"VIDEO_CARDS=\"nouveau\"\n"
-"<comment>(OR, for ATI Radeon cards)</comment>\n"
+"<comment>(For AMD/ATI cards)</comment>\n"
"VIDEO_CARDS=\"radeon\"\n"
msgstr ""
@@ -409,10 +409,13 @@ msgstr ""
#, no-wrap
msgid ""
"\n"
+"<comment>(Make sure udev is in your USE flags)</comment>\n"
+"# <i>echo \"x11-base/xorg-server udev\" &gt;&gt; /etc/portage/package.use</i>\n"
+"<comment>(Install Xorg)</comment>\n"
"# <i>emerge xorg-server</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):327
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):330
msgid ""
"You could install the <c>xorg-x11</c> metapackage instead of the more "
"lightweight <c>xorg-server</c>. Functionally, <c>xorg-x11</c> and <c>xorg-"
@@ -421,18 +424,17 @@ msgid ""
"many different languages. They're not necessary for a working desktop."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):335
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):338
msgid ""
"When the installation is finished, you will need to re-initialise some "
-"environment variables before you continue. Just run <c>env-update</c> "
-"followed by <c>source /etc/profile</c> and you're all set."
+"environment variables before you continue:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):341
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):343
msgid "Re-initialising the environment variables"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):341
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):343
#, no-wrap
msgid ""
"\n"
@@ -440,298 +442,77 @@ msgid ""
"# <i>source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):346
-msgid ""
-"Now it's time to start the Hardware Abstraction Layer (HAL) daemon and set "
-"it to automatically start each time you boot. This is necessary to get a "
-"working X environment, otherwise your input devices won't be detected and "
-"you'll probably just get a blank screen. We'll cover HAL more in the <uri "
-"link=\"#using_hal\">next section</uri>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):354
-msgid "Starting HAL"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):354
-#, no-wrap
-msgid ""
-"\n"
-"# <i>/etc/init.d/hald start</i>\n"
-"# <i>rc-update add hald default</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):364
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):353
msgid "Configuring Xorg"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):366
-msgid "Using HAL"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):369
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):357
msgid ""
"The X server is designed to work out-of-the-box, with no need to manually "
-"edit Xorg's configuration files."
+"edit Xorg's configuration files. It should detect and configure devices such "
+"as displays, keyboards, and mice."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):374
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):363
msgid ""
"You should first try <uri link=\"#using_startx\">starting X</uri> without "
-"creating <path>/etc/X11/xorg.conf</path>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):379
-msgid ""
-"If Xorg won't start (if there's something wrong with the screen, or with "
-"your keyboard/mouse), then you can try fixing problems by using the right "
-"configuration files."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):385
-msgid ""
-"By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and "
-"configure devices such as keyboards and mice."
+"editing any configuration files. If Xorg won't start, or there's some other "
+"problem, then you'll need to manually configure Xorg as shown in the next "
+"section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):390
-msgid ""
-"HAL comes with many premade device rules, also called policies. These policy "
-"files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a "
-"few that suit your needs most closely and copy them to <path>/etc/hal/fdi/"
-"policy/</path>."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):372
+msgid "The xorg.conf.d directory"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):397
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):375
msgid ""
-"Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the "
-"ones you need, and edit them once they're placed in the proper <path>/etc</"
-"path> location."
+"Configuring files in <path>xorg.conf.d</path> should be seen as a \"last "
+"resort\" option. It really desirable to run without any special "
+"configuration if possible. If you still can't get a working configuration, "
+"then read on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):403
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):381
msgid ""
-"For example, to get a basic working keyboard/mouse combination, you could "
-"copy the following files to <path>/etc/hal/fdi/policy/</path>:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):408
-msgid "Using HAL policy files"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):408
-#, no-wrap
-msgid ""
-"\n"
-"# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi /etc/hal/fdi/policy</i>\n"
-"# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>\n"
+"The configuration files of Xorg are stored in <path>/etc/X11/xorg.conf.d/</"
+"path>. Each file is given a unique name and ends in <path>.conf</path>. If "
+"the filenames start with a number, then Xorg will read the files in numeric "
+"order. <path>10-evdev.conf</path> will be read before <path>20-synaptics."
+"conf</path>, and so on. You don't <e>have</e> to give them numbers, but it "
+"may help you organize them."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):413
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):390
msgid ""
-"There are several other HAL policies in <path>/usr/share/hal/fdi/</path> "
-"that may interest you, such as laptop configurations, storage device "
-"handling, power management, and more. Just copy any of the policies to "
-"<path>/etc/hal/fdi/policy/</path>."
+"Xorg provides example configurations in <path>/usr/share/doc/xorg-server-"
+"${version}/xorg.conf.example.bz2</path>. You can use these to create your "
+"own configuration files in <path>/etc/X11/xorg.conf.d/</path>. The examples "
+"are heavily commented, but if you are in need of more documentation "
+"regarding the syntax, read <c>man xorg.conf</c>. Other examples can be found "
+"in the <uri link=\"#resources\">Resources</uri> chapter at the end of this "
+"guide."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):420
-msgid ""
-"Remember, <e>every</e> time you finish making changes to HAL policy files, "
-"you need to restart the HAL daemon by running <c>/etc/init.d/hald restart</"
-"c>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):425
-msgid ""
-"You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your "
-"liking. You may want to make a few tweaks or to expose additional "
-"functionality. Let's go through an example of tweaking a HAL policy."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):431
-msgid ""
-"One very convenient trick is to kill the X server entirely by pressing Ctrl-"
-"Alt-Backspace. This is useful when your X server is malfunctioning, frozen, "
-"etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):437
-msgid ""
-"Recent X server versions disabled this key combination by default. However, "
-"you can reenable it by copying <path>10-x11-input.fdi</path> to <path>/etc/"
-"hal/fdi/policy</path> and editing it. You'll need to add just one line to "
-"the appropriate section, as shown below:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):444
-msgid "Editing 10-x11-input.fdi"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):444
-#, no-wrap
-msgid ""
-"\n"
-"<comment>(Open the file in your preferred editor)</comment>\n"
-"# <i>nano -w /etc/hal/fdi/policy/10-x11-input.fdi</i>\n"
-"<comment>(Find the \"input.keys\" section)</comment>\n"
-"&lt;match key=\"info.capabilities\" contains=\"input.keys\"&gt;\n"
-"<comment>(Add the \"terminate\" merge string as shown)</comment>\n"
-"&lt;match key=\"info.capabilities\" contains=\"input.keys\"&gt;\n"
-" &lt;merge key=\"input.x11_driver\" type=\"string\"&gt;keyboard&lt;/merge&gt;\n"
-" <i>&lt;merge key=\"input.xkb.options\" type=\"string\"&gt;terminate:ctrl_alt_bksp&lt;/merge&gt;</i>\n"
-" &lt;match key=\"/org/freedesktop/Hal/devices/computer:system.kernel.name\"\n"
-" string=\"Linux\"&gt;\n"
-" &lt;merge key=\"input.x11_driver\" type=\"string\"&gt;evdev&lt;merge&gt;\n"
-" &lt;/match&gt;\n"
-" &lt;/match&gt;\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):460
-msgid ""
-"Once you're done, run <c>/etc/init.d/hald restart</c> so that HAL picks up "
-"your changes."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):465
-msgid ""
-"There, now you have a handy way of killing an unresponsive X server. This is "
-"useful when programs have frozen your display entirely, or when configuring "
-"and tweaking your Xorg environment. Be careful when killing your desktop "
-"with this key combination -- most programs really don't like it when you end "
-"them this way, and you may lose some (or all) of what you were working on."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):473
-msgid ""
-"Hopefully just working with the HAL policy files results in a working X "
-"desktop. If Xorg still won't start, or there's some other problem, then "
-"you'll need to manually configure <path>xorg.conf</path> as shown in the "
-"next section."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):482
-msgid "The xorg.conf file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):485
-msgid ""
-"Configuring <path>xorg.conf</path> should be seen as a \"last resort\" "
-"option. It really desirable to run without one if possible, and to do all "
-"your configuration via HAL policy files. If you still can't get a working "
-"configuration, then read on."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492
-msgid ""
-"The configuration file of Xorg is called <path>xorg.conf</path> and it "
-"resides in <path>/etc/X11</path>. Xorg provides an example configuration as "
-"<path>/etc/X11/xorg.conf.example</path> which you can use to create your own "
-"configuration. It is heavily commented, but if you are in need of more "
-"documentation regarding the syntax, don't hesitate to read the man page:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):500
-msgid "Reading the xorg.conf man page"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):500
-#, no-wrap
-msgid ""
-"\n"
-"$ <i>man 5 xorg.conf</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):507
-msgid "Automatic Generation of xorg.conf"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):510
-msgid ""
-"Xorg itself is able to guess most parameters for you. In most cases, you "
-"will only have to change some lines to get the resolution you want up and "
-"running. If you are interested in more in-depth tweaking, be sure to check "
-"the resources at the end of this chapter. But first, let us generate a "
-"(hopefully working) Xorg configuration file."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):518
-msgid "Generating an xorg.conf file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):518
-#, no-wrap
-msgid ""
-"\n"
-"# <i>Xorg -configure</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):522
-msgid ""
-"Be sure to read the last lines printed on your screen when Xorg has finished "
-"probing your hardware. If it tells you it failed at some point, you're "
-"forced to manually write an <path>xorg.conf</path> file. Assuming that it "
-"didn't fail, it will have told you that it has written <path>/root/xorg.conf."
-"new</path> ready for you to test. So let's test. :)"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):530
-msgid "Testing the xorg.conf.new file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):530
-#, no-wrap
-msgid ""
-"\n"
-"# <i>X -retro -config /root/xorg.conf.new</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):534
-msgid ""
-"If all goes well, you should see a simple black and white pattern. Verify if "
-"your mouse works correctly and if the resolution is good. You might not be "
-"able to deduce the exact resolution, but you should be able to see if it's "
-"too low. You can exit any time by pressing Ctrl-Alt-Backspace."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):544
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):553
-msgid "Copying over xorg.conf"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):547
-msgid ""
-"Let us copy over the <path>xorg.conf.new</path> to <path>/etc/X11/xorg.conf</"
-"path> now, so we won't have to continuously run <c>X -config</c> -- typing "
-"just <c>startx</c> is easier. :)"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):553
-#, no-wrap
-msgid ""
-"\n"
-"# <i>cp /root/xorg.conf.new /etc/X11/xorg.conf</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):560
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):403
msgid "Using startx"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):563
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):406
msgid ""
"Now try <c>startx</c> to start up your X server. <c>startx</c> is a script "
-"that executes an <e>X session</e>, that is, it starts the X server and some "
+"that executes an <e>X session</e>; that is, it starts the X server and some "
"graphical applications on top of it. It decides which applications to run "
"using the following logic:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):571
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):414
msgid ""
"If a file named <path>.xinitrc</path> exists in the home directory, it will "
"execute the commands listed there."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):575
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):418
msgid ""
"Otherwise, it will read the value of the XSESSION variable and will execute "
"one of the sessions available in <path>/etc/X11/Sessions/</path> "
@@ -743,97 +524,73 @@ msgid ""
"Remember to run <c>env-update</c> after changing <path>90xsession</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):588
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):431
msgid "Starting X"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):588
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):431
#, no-wrap
msgid ""
"\n"
"$ <i>startx</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):592
-msgid ""
-"You can kill the X session by using the Ctrl-Alt-Backspace key combination. "
-"This will, however, make X exit disgracefully -- something that you might "
-"not always want."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):598
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):435
msgid ""
"If you haven't yet installed a window manager, all you'll see is a black "
"screen. Since this can also be a sign that something's wrong, you may want "
"to emerge <c>twm</c> and <c>xterm</c><e>only to test X</e>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):604
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):441
msgid ""
-"Once those two programs are installed, run <c>startx</c> again. A few xterm "
-"windows should appear, making it easier to verify that X is working "
-"correctly. Once you're satisfied with the results, run <c>emerge --unmerge "
-"twm xterm</c> as root to get rid of the testing packages. You won't need "
-"them once you've setup a proper desktop environment."
+"Once those two programs are installed, run <c>startx</c> again. A few "
+"<c>xterm</c> windows should appear, making it easier to verify that X is "
+"working correctly. Once you're satisfied with the results, run <c>emerge --"
+"unmerge twm xterm</c> as root to get rid of the testing packages. You won't "
+"need them once you've setup a proper desktop environment."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):617
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):454
msgid "Tweaking X settings"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):619
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):456
msgid "Setting your Resolution"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):622
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):459
msgid ""
"If you feel that the screen resolution is wrong, you will need to check two "
-"sections in your <path>xorg.conf</path> configuration. First of all, you "
-"have the <e>Screen</e> section which lists the resolutions, if any that your "
-"X server will run at. By default, this section might not list any "
-"resolutions at all. If this is the case, Xorg will estimate the resolutions "
-"based on the information in the second section, <e>Monitor</e>."
+"sections in your <path>xorg.conf.d</path> configuration. First of all, you "
+"have the <e>Screen</e> section which lists the resolutions that your X "
+"server will run at. This section might not list any resolutions at all. If "
+"this is the case, Xorg will estimate the resolutions based on the "
+"information in the second section, <e>Monitor</e>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):631
-msgid ""
-"What happens is that Xorg checks the settings of <c>HorizSync</c> and "
-"<c>VertRefresh</c> in the <e>Monitor</e> section to compute valid "
-"resolutions. For now, leave these settings as-is. Only when the changes to "
-"the <e>Screen</e> section (which we will describe in a minute) don't work, "
-"then you will need to look up the specs for your monitor and fill in the "
-"correct values."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(warn):639
-msgid ""
-"Do <b>not</b> \"just\" change the values of these two monitor related "
-"variables without consulting the technical specifications of your monitor. "
-"Setting incorrect values lead to out-of-sync errors at best and smoked up "
-"screens at worst."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):646
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):468
msgid ""
"Now let us change the resolution. In the next example from <path>/etc/X11/"
-"xorg.conf</path> we add the <c>PreferredMode</c> line so that our X server "
-"starts at 1440x900 by default. Don't mind the given strings -- they are "
-"examples and will most likely differ from the settings on your system. "
-"However, the <c>Option</c> in the <c>Device</c> section must match the name "
-"of your monitor (<c>DVI-0</c>), which can be obtained by running <c>xrandr</"
-"c>. You'll need to <c>emerge xrandr</c> just long enough to get this "
-"information. The argument after the monitor name (in the <c>Device</c> "
-"section) must match the <c>Identifier</c> in the <c>Monitor</c> section."
+"xorg.conf.d/40-monitor.conf</path> we add the <c>PreferredMode</c> line so "
+"that our X server starts at 1440x900 by default. The <c>Option</c> in the "
+"<c>Device</c> section must match the name of your monitor (<c>DVI-0</c>), "
+"which can be obtained by running <c>xrandr</c>. You'll need to <c>emerge "
+"xrandr</c> just long enough to get this information. The argument after the "
+"monitor name (in the <c>Device</c> section) must match the <c>Identifier</c> "
+"in the <c>Monitor</c> section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):658
-msgid "Changing the Monitor section in /etc/X11/xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):479
+msgid "Changing the Monitor section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):658
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):479
#, no-wrap
msgid ""
"\n"
+"# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>\n"
+"\n"
"Section \"Device\"\n"
" Identifier \"RadeonHD 4550\"\n"
" Option \"Monitor-DVI-0\" \"DVI screen\"\n"
@@ -844,135 +601,133 @@ msgid ""
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):669
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492
msgid "Run X (<c>startx</c>) to discover it uses the resolution you want."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):676
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):499
msgid "Multiple monitors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):679
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):502
msgid ""
-"You can configure more than one monitor in <path>/etc/X11/xorg.conf</path>. "
-"All you have to do is give each monitor an identifer, then list its physical "
-"position, such as \"RightOf\" or \"Above\" another monitor. The following "
-"example shows how to configure a DVI and a VGA monitor, with the VGA monitor "
-"as the right-hand screen:"
+"You can configure more than one monitor in <path>/etc/X11/xorg.conf.d/</"
+"path>. All you have to do is give each monitor an identifer, then list its "
+"physical position, such as \"RightOf\" or \"Above\" another monitor. The "
+"following example shows how to configure a DVI and a VGA monitor, with the "
+"VGA monitor as the right-hand screen:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):687
-msgid "Configuring multiple monitors in xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):510
+msgid "Configuring multiple monitors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):687
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):510
#, no-wrap
msgid ""
"\n"
+"# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>\n"
+"\n"
"Section \"Device\"\n"
" Identifier \"RadeonHD 4550\"\n"
" Option \"Monitor-DVI-0\" \"DVI screen\"\n"
" Option \"Monitor-VGA-0\" \"VGA screen\"\n"
"EndSection\n"
-"\n"
"Section \"Monitor\"\n"
" Identifier \"DVI screen\"\n"
"EndSection\n"
-"\n"
"Section \"Monitor\"\n"
" Identifier \"VGA screen\"\n"
" Option \"RightOf\" \"DVI screen\"\n"
"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):707
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):530
msgid "Configuring your keyboard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):710
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):533
msgid ""
-"To setup X to use an international keyboard, you can copy the content of "
-"<path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to <path>/"
-"etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:"
+"To setup X to use an international keyboard, you just have to create the "
+"appropriate config file in <path>/etc/X11/xorg.conf.d/</path>. This example "
+"features a Czech keyboard layout:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):716
-msgid "Using an existing config file"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):539
+msgid "Using an international keyboard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):716
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):539
#, no-wrap
msgid ""
"\n"
-"# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2 &gt; /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):720
-msgid ""
-"Now you can just edit <path>10-xinput-configuration.fdi</path> and change "
-"the Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain "
-"(<b>gb</b>) or Polish (<b>pl</b>)."
+"# <i>nano -w /etc/X11/xorg.conf.d/30-keyboard.conf</i>\n"
+"\n"
+"Section \"InputClass\"\n"
+" Identifier \"keyboard-all\"\n"
+" Driver \"evdev\"\n"
+" Option \"XkbLayout\" \"us,cz\"\n"
+" Option \"XkbModel\" \"logitech_g15\"\n"
+" Option \"XkbRules\" \"xorg\"\n"
+" Option \"XkbOptions\" \"grp:alt_shift_toggle,grp:switch,grp_led:scroll,compose:rwin,terminate:ctrl_alt_bksp\"\n"
+" Option \"XkbVariant\" \",qwerty\"\n"
+" MatchIsKeyboard \"on\"\n"
+"EndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):726
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):554
msgid ""
-"When you're finished, run <c>/etc/init.d/hald restart</c> as root to make "
-"sure that HAL picks up your configuration file changes."
+"The \"terminate\" command (<c>terminate:ctrl_alt_bksp</c>) lets you kill the "
+"X session by using the Ctrl-Alt-Backspace key combination. This will, "
+"however, make X exit disgracefully -- something that you might not always "
+"want. It can be useful when programs have frozen your display entirely, or "
+"when you're configuring and tweaking your Xorg environment. Be careful when "
+"killing your desktop with this key combination -- most programs really don't "
+"like it when you end them this way, and you may lose some (or all) of what "
+"you were working on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):734
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):567
msgid "Finishing up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):737
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):570
msgid ""
"Run <c>startx</c> and be happy about the result. Congratulations, you now "
"(hopefully) have a working Xorg on your system. The next step is to install "
"a useful window manager or desktop environment such as KDE, GNOME, or Xfce, "
-"but that's not part of this guide."
+"but that's not part of this guide. Information on installing these desktop "
+"environments can be found in our <uri link=\"/doc/en/?catid=desktop\">Gentoo "
+"Desktop Documentation Resources</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):749
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):584
msgid "Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):751
-msgid "Creating and Tweaking xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):586
+msgid "Creating and editing config files"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):754
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):589
msgid ""
"First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet "
"complete references about the syntax used by these configuration files. Be "
-"sure to have them open on a terminal near you when you edit your "
-"configuration files!"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):761
-msgid ""
-"Also, be sure to look at <path>/etc/X11/xorg.conf.example</path>; you may "
-"wish to copy this and use it as a foundation for writing your own <path>xorg."
-"conf</path>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):767
-msgid ""
-"You may find the X.org <uri link=\"http://www.x.org/wiki/FAQ\">FAQ</uri> "
-"provided on their website, in addition to their other documentation."
+"sure to have them open on a terminal when you edit your configuration files!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):772
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):595
msgid ""
-"There are also many online resources on editing <path>xorg.conf</path>. We "
-"only list few of them here, be sure to <uri link=\"http://www.google.com"
-"\">Google</uri> for more."
+"There are also many online resources on editing config files in <path>/etc/"
+"X11/</path>. We only list few of them here; be sure to <uri link=\"http://"
+"www.google.com\">Google</uri> for more."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):781
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):604
msgid "Other resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):784
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):607
msgid ""
"More information about installing and configuring various graphical desktop "
"environments and applications can be found in the <uri link=\"/doc/en/?"
@@ -980,13 +735,19 @@ msgid ""
"documentation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):791
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):614
msgid ""
-"If you're upgrading to <c>xorg-server</c> 1.8 from an earlier version, then "
-"be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.8-"
+"If you're upgrading to <c>xorg-server</c> 1.9 from an earlier version, then "
+"be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.9-"
"upgrade-guide.xml\">migration guide</uri>."
msgstr ""
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):621
+msgid ""
+"X.org provides many <uri link=\"http://www.x.org/wiki/FAQ\">FAQs</uri> on "
+"their website, in addition to their other documentation."
+msgstr ""
+
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(None):0
msgid "translator-credits"
diff --git a/doc/gettext/xorg-config.xml.pot b/doc/gettext/xorg-config.xml.pot
index 0616305..c8d848c 100644
--- a/doc/gettext/xorg-config.xml.pot
+++ b/doc/gettext/xorg-config.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-02 17:28+0500\n"
+"POT-Creation-Date: 2011-03-23 21:19+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"
@@ -30,11 +30,11 @@ msgid "Xorg is the X Window server which allows users to have a graphical enviro
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(version):25
-msgid "6"
+msgid "7"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(date):26
-msgid "2011-03-02"
+msgid "2011-03-23"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):29
@@ -120,7 +120,7 @@ msgid "\nDevice Drivers ---&gt;\n Graphics support ---&gt;\n Support for fra
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):149
-msgid "Next, configure your kernel to use the proper KMS driver for your video card. Intel, nVidia, and ATI are the most common cards, so follow code listing for your card below."
+msgid "Next, configure your kernel to use the proper KMS driver for your video card. Intel, nVidia, and AMD/ATI are the most common cards, so follow code listing for your card below."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):155
@@ -150,11 +150,11 @@ msgid "\n<comment>(Enable DRM)</comment>\nDevice Drivers ---&gt;\n Graphics sup
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):187
-msgid "For newer ATI cards (<uri link=\"/doc/en/ati-faq.xml\">RadeonHD 2000 and up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed <c>radeon-ucode</c>, configure your kernel as shown:"
+msgid "For newer AMD/ATI cards (<uri link=\"/doc/en/ati-faq.xml\">RadeonHD 2000 and up</uri>), you will need to emerge <c>radeon-ucode</c>. Once you have installed <c>radeon-ucode</c>, configure your kernel as shown:"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):193
-msgid "ATI settings"
+msgid "AMD/ATI settings"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):193
@@ -183,7 +183,7 @@ msgid "The first variable is <c>VIDEO_CARDS</c>. This is used to set the video d
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):254
-msgid "You may also try the proprietary drivers from nVidia and ATI, <c>nvidia</c> and <c>fglrx</c> respectively. However, setting up the proprietary drivers is beyond the scope of this guide. Please read the <uri link=\"/doc/en/nvidia-guide.xml\">Gentoo Linux nVidia Guide</uri> and <uri link=\"/doc/en/ati-faq.xml\">Gentoo Linux ATI FAQ</uri>. If you don't know which drivers you should choose, refer to these guides for more information."
+msgid "You may also try the proprietary drivers from nVidia and AMD/ATI, <c>nvidia</c> and <c>fglrx</c> respectively. However, setting up the proprietary drivers is beyond the scope of this guide. Please read the <uri link=\"/doc/en/nvidia-guide.xml\">Gentoo Linux nVidia Guide</uri> and <uri link=\"/doc/en/ati-faq.xml\">Gentoo Linux ATI FAQ</uri>. If you don't know which drivers you should choose, refer to these guides for more information."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):263
@@ -208,7 +208,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):286
#, no-wrap
-msgid "\n<comment>(For mouse, keyboard, and Synaptics touchpad support)</comment>\nINPUT_DEVICES=\"evdev synaptics\"\n<comment>(For nVidia cards)</comment>\nVIDEO_CARDS=\"nouveau\"\n<comment>(OR, for ATI Radeon cards)</comment>\nVIDEO_CARDS=\"radeon\"\n"
+msgid "\n<comment>(For mouse, keyboard, and Synaptics touchpad support)</comment>\nINPUT_DEVICES=\"evdev synaptics\"\n<comment>(For nVidia cards)</comment>\nVIDEO_CARDS=\"nouveau\"\n<comment>(For AMD/ATI cards)</comment>\nVIDEO_CARDS=\"radeon\"\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):295
@@ -230,351 +230,192 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):323
#, no-wrap
-msgid "\n# <i>emerge xorg-server</i>\n"
+msgid "\n<comment>(Make sure udev is in your USE flags)</comment>\n# <i>echo \"x11-base/xorg-server udev\" &gt;&gt; /etc/portage/package.use</i>\n<comment>(Install Xorg)</comment>\n# <i>emerge xorg-server</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):327
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):330
msgid "You could install the <c>xorg-x11</c> metapackage instead of the more lightweight <c>xorg-server</c>. Functionally, <c>xorg-x11</c> and <c>xorg-server</c> are the same. However, <c>xorg-x11</c> brings in many more packages that you probably don't need, such as a huge assortment of fonts in many different languages. They're not necessary for a working desktop."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):335
-msgid "When the installation is finished, you will need to re-initialise some environment variables before you continue. Just run <c>env-update</c> followed by <c>source /etc/profile</c> and you're all set."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):338
+msgid "When the installation is finished, you will need to re-initialise some environment variables before you continue:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):341
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):343
msgid "Re-initialising the environment variables"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):341
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):343
#, no-wrap
msgid "\n# <i>env-update</i>\n# <i>source /etc/profile</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):346
-msgid "Now it's time to start the Hardware Abstraction Layer (HAL) daemon and set it to automatically start each time you boot. This is necessary to get a working X environment, otherwise your input devices won't be detected and you'll probably just get a blank screen. We'll cover HAL more in the <uri link=\"#using_hal\">next section</uri>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):354
-msgid "Starting HAL"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):354
-#, no-wrap
-msgid "\n# <i>/etc/init.d/hald start</i>\n# <i>rc-update add hald default</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):364
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):353
msgid "Configuring Xorg"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):366
-msgid "Using HAL"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):369
-msgid "The X server is designed to work out-of-the-box, with no need to manually edit Xorg's configuration files."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):357
+msgid "The X server is designed to work out-of-the-box, with no need to manually edit Xorg's configuration files. It should detect and configure devices such as displays, keyboards, and mice."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):374
-msgid "You should first try <uri link=\"#using_startx\">starting X</uri> without creating <path>/etc/X11/xorg.conf</path>."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):363
+msgid "You should first try <uri link=\"#using_startx\">starting X</uri> without editing any configuration files. If Xorg won't start, or there's some other problem, then you'll need to manually configure Xorg as shown in the next section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):379
-msgid "If Xorg won't start (if there's something wrong with the screen, or with your keyboard/mouse), then you can try fixing problems by using the right configuration files."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):372
+msgid "The xorg.conf.d directory"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):385
-msgid "By default, Xorg uses HAL (Hardware Abstraction Layer) to detect and configure devices such as keyboards and mice."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):375
+msgid "Configuring files in <path>xorg.conf.d</path> should be seen as a \"last resort\" option. It really desirable to run without any special configuration if possible. If you still can't get a working configuration, then read on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):390
-msgid "HAL comes with many premade device rules, also called policies. These policy files are available in <path>/usr/share/hal/fdi/policy/</path>. Just find a few that suit your needs most closely and copy them to <path>/etc/hal/fdi/policy/</path>."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):381
+msgid "The configuration files of Xorg are stored in <path>/etc/X11/xorg.conf.d/</path>. Each file is given a unique name and ends in <path>.conf</path>. If the filenames start with a number, then Xorg will read the files in numeric order. <path>10-evdev.conf</path> will be read before <path>20-synaptics.conf</path>, and so on. You don't <e>have</e> to give them numbers, but it may help you organize them."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):397
-msgid "Do not edit the files in <path>/usr/share/hal/fdi/</path>! Just copy the ones you need, and edit them once they're placed in the proper <path>/etc</path> location."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):390
+msgid "Xorg provides example configurations in <path>/usr/share/doc/xorg-server-${version}/xorg.conf.example.bz2</path>. You can use these to create your own configuration files in <path>/etc/X11/xorg.conf.d/</path>. The examples are heavily commented, but if you are in need of more documentation regarding the syntax, read <c>man xorg.conf</c>. Other examples can be found in the <uri link=\"#resources\">Resources</uri> chapter at the end of this guide."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):403
-msgid "For example, to get a basic working keyboard/mouse combination, you could copy the following files to <path>/etc/hal/fdi/policy/</path>:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):408
-msgid "Using HAL policy files"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):408
-#, no-wrap
-msgid "\n# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi /etc/hal/fdi/policy</i>\n# <i>cp /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi /etc/hal/fdi/policy</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):413
-msgid "There are several other HAL policies in <path>/usr/share/hal/fdi/</path> that may interest you, such as laptop configurations, storage device handling, power management, and more. Just copy any of the policies to <path>/etc/hal/fdi/policy/</path>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(impo):420
-msgid "Remember, <e>every</e> time you finish making changes to HAL policy files, you need to restart the HAL daemon by running <c>/etc/init.d/hald restart</c>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):425
-msgid "You can edit the policy files in <path>/etc/hal/fdi/policy</path> to your liking. You may want to make a few tweaks or to expose additional functionality. Let's go through an example of tweaking a HAL policy."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):431
-msgid "One very convenient trick is to kill the X server entirely by pressing Ctrl-Alt-Backspace. This is useful when your X server is malfunctioning, frozen, etc. It's not as extreme as rebooting the whole machine with Ctrl-Alt-Del."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):437
-msgid "Recent X server versions disabled this key combination by default. However, you can reenable it by copying <path>10-x11-input.fdi</path> to <path>/etc/hal/fdi/policy</path> and editing it. You'll need to add just one line to the appropriate section, as shown below:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):444
-msgid "Editing 10-x11-input.fdi"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):444
-#, no-wrap
-msgid "\n<comment>(Open the file in your preferred editor)</comment>\n# <i>nano -w /etc/hal/fdi/policy/10-x11-input.fdi</i>\n<comment>(Find the \"input.keys\" section)</comment>\n&lt;match key=\"info.capabilities\" contains=\"input.keys\"&gt;\n<comment>(Add the \"terminate\" merge string as shown)</comment>\n&lt;match key=\"info.capabilities\" contains=\"input.keys\"&gt;\n &lt;merge key=\"input.x11_driver\" type=\"string\"&gt;keyboard&lt;/merge&gt;\n <i>&lt;merge key=\"input.xkb.options\" type=\"string\"&gt;terminate:ctrl_alt_bksp&lt;/merge&gt;</i>\n &lt;match key=\"/org/freedesktop/Hal/devices/computer:system.kernel.name\"\n string=\"Linux\"&gt;\n &lt;merge key=\"input.x11_driver\" type=\"string\"&gt;evdev&lt;merge&gt;\n &lt;/match&gt;\n &lt;/match&gt;\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):460
-msgid "Once you're done, run <c>/etc/init.d/hald restart</c> so that HAL picks up your changes."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):465
-msgid "There, now you have a handy way of killing an unresponsive X server. This is useful when programs have frozen your display entirely, or when configuring and tweaking your Xorg environment. Be careful when killing your desktop with this key combination -- most programs really don't like it when you end them this way, and you may lose some (or all) of what you were working on."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):473
-msgid "Hopefully just working with the HAL policy files results in a working X desktop. If Xorg still won't start, or there's some other problem, then you'll need to manually configure <path>xorg.conf</path> as shown in the next section."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):482
-msgid "The xorg.conf file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(note):485
-msgid "Configuring <path>xorg.conf</path> should be seen as a \"last resort\" option. It really desirable to run without one if possible, and to do all your configuration via HAL policy files. If you still can't get a working configuration, then read on."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492
-msgid "The configuration file of Xorg is called <path>xorg.conf</path> and it resides in <path>/etc/X11</path>. Xorg provides an example configuration as <path>/etc/X11/xorg.conf.example</path> which you can use to create your own configuration. It is heavily commented, but if you are in need of more documentation regarding the syntax, don't hesitate to read the man page:"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):500
-msgid "Reading the xorg.conf man page"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):500
-#, no-wrap
-msgid "\n$ <i>man 5 xorg.conf</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):507
-msgid "Automatic Generation of xorg.conf"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):510
-msgid "Xorg itself is able to guess most parameters for you. In most cases, you will only have to change some lines to get the resolution you want up and running. If you are interested in more in-depth tweaking, be sure to check the resources at the end of this chapter. But first, let us generate a (hopefully working) Xorg configuration file."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):518
-msgid "Generating an xorg.conf file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):518
-#, no-wrap
-msgid "\n# <i>Xorg -configure</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):522
-msgid "Be sure to read the last lines printed on your screen when Xorg has finished probing your hardware. If it tells you it failed at some point, you're forced to manually write an <path>xorg.conf</path> file. Assuming that it didn't fail, it will have told you that it has written <path>/root/xorg.conf.new</path> ready for you to test. So let's test. :)"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):530
-msgid "Testing the xorg.conf.new file"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):530
-#, no-wrap
-msgid "\n# <i>X -retro -config /root/xorg.conf.new</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):534
-msgid "If all goes well, you should see a simple black and white pattern. Verify if your mouse works correctly and if the resolution is good. You might not be able to deduce the exact resolution, but you should be able to see if it's too low. You can exit any time by pressing Ctrl-Alt-Backspace."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):544 ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):553
-msgid "Copying over xorg.conf"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):547
-msgid "Let us copy over the <path>xorg.conf.new</path> to <path>/etc/X11/xorg.conf</path> now, so we won't have to continuously run <c>X -config</c> -- typing just <c>startx</c> is easier. :)"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):553
-#, no-wrap
-msgid "\n# <i>cp /root/xorg.conf.new /etc/X11/xorg.conf</i>\n"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):560
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):403
msgid "Using startx"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):563
-msgid "Now try <c>startx</c> to start up your X server. <c>startx</c> is a script that executes an <e>X session</e>, that is, it starts the X server and some graphical applications on top of it. It decides which applications to run using the following logic:"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):406
+msgid "Now try <c>startx</c> to start up your X server. <c>startx</c> is a script that executes an <e>X session</e>; that is, it starts the X server and some graphical applications on top of it. It decides which applications to run using the following logic:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):571
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):414
msgid "If a file named <path>.xinitrc</path> exists in the home directory, it will execute the commands listed there."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):575
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(li):418
msgid "Otherwise, it will read the value of the XSESSION variable and will execute one of the sessions available in <path>/etc/X11/Sessions/</path> accordingly. You can set the value of XSESSION in <path>/etc/env.d/90xsession</path> to make it a default for all the users on the system. For example, as root, run <c>echo XSESSION=\"Xfce4\" &gt; /etc/env.d/90xsession</c>. This will create the <path>90xsession</path> file and set the default X session to <uri link=\"/doc/en/xfce-config.xml\">Xfce</uri>. Remember to run <c>env-update</c> after changing <path>90xsession</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):588
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):431
msgid "Starting X"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):588
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):431
#, no-wrap
msgid "\n$ <i>startx</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):592
-msgid "You can kill the X session by using the Ctrl-Alt-Backspace key combination. This will, however, make X exit disgracefully -- something that you might not always want."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):598
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):435
msgid "If you haven't yet installed a window manager, all you'll see is a black screen. Since this can also be a sign that something's wrong, you may want to emerge <c>twm</c> and <c>xterm</c><e>only to test X</e>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):604
-msgid "Once those two programs are installed, run <c>startx</c> again. A few xterm windows should appear, making it easier to verify that X is working correctly. Once you're satisfied with the results, run <c>emerge --unmerge twm xterm</c> as root to get rid of the testing packages. You won't need them once you've setup a proper desktop environment."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):441
+msgid "Once those two programs are installed, run <c>startx</c> again. A few <c>xterm</c> windows should appear, making it easier to verify that X is working correctly. Once you're satisfied with the results, run <c>emerge --unmerge twm xterm</c> as root to get rid of the testing packages. You won't need them once you've setup a proper desktop environment."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):617
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):454
msgid "Tweaking X settings"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):619
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):456
msgid "Setting your Resolution"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):622
-msgid "If you feel that the screen resolution is wrong, you will need to check two sections in your <path>xorg.conf</path> configuration. First of all, you have the <e>Screen</e> section which lists the resolutions, if any that your X server will run at. By default, this section might not list any resolutions at all. If this is the case, Xorg will estimate the resolutions based on the information in the second section, <e>Monitor</e>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):631
-msgid "What happens is that Xorg checks the settings of <c>HorizSync</c> and <c>VertRefresh</c> in the <e>Monitor</e> section to compute valid resolutions. For now, leave these settings as-is. Only when the changes to the <e>Screen</e> section (which we will describe in a minute) don't work, then you will need to look up the specs for your monitor and fill in the correct values."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):459
+msgid "If you feel that the screen resolution is wrong, you will need to check two sections in your <path>xorg.conf.d</path> configuration. First of all, you have the <e>Screen</e> section which lists the resolutions that your X server will run at. This section might not list any resolutions at all. If this is the case, Xorg will estimate the resolutions based on the information in the second section, <e>Monitor</e>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(warn):639
-msgid "Do <b>not</b> \"just\" change the values of these two monitor related variables without consulting the technical specifications of your monitor. Setting incorrect values lead to out-of-sync errors at best and smoked up screens at worst."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):468
+msgid "Now let us change the resolution. In the next example from <path>/etc/X11/xorg.conf.d/40-monitor.conf</path> we add the <c>PreferredMode</c> line so that our X server starts at 1440x900 by default. The <c>Option</c> in the <c>Device</c> section must match the name of your monitor (<c>DVI-0</c>), which can be obtained by running <c>xrandr</c>. You'll need to <c>emerge xrandr</c> just long enough to get this information. The argument after the monitor name (in the <c>Device</c> section) must match the <c>Identifier</c> in the <c>Monitor</c> section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):646
-msgid "Now let us change the resolution. In the next example from <path>/etc/X11/xorg.conf</path> we add the <c>PreferredMode</c> line so that our X server starts at 1440x900 by default. Don't mind the given strings -- they are examples and will most likely differ from the settings on your system. However, the <c>Option</c> in the <c>Device</c> section must match the name of your monitor (<c>DVI-0</c>), which can be obtained by running <c>xrandr</c>. You'll need to <c>emerge xrandr</c> just long enough to get this information. The argument after the monitor name (in the <c>Device</c> section) must match the <c>Identifier</c> in the <c>Monitor</c> section."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):479
+msgid "Changing the Monitor section"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):658
-msgid "Changing the Monitor section in /etc/X11/xorg.conf"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):658
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):479
#, no-wrap
-msgid "\nSection \"Device\"\n Identifier \"RadeonHD 4550\"\n Option \"Monitor-DVI-0\" \"DVI screen\"\nEndSection\nSection \"Monitor\"\n Identifier \"DVI screen\"\n Option \"PreferredMode\" \"1440x900\"\nEndSection\n"
+msgid "\n# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>\n\nSection \"Device\"\n Identifier \"RadeonHD 4550\"\n Option \"Monitor-DVI-0\" \"DVI screen\"\nEndSection\nSection \"Monitor\"\n Identifier \"DVI screen\"\n Option \"PreferredMode\" \"1440x900\"\nEndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):669
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):492
msgid "Run X (<c>startx</c>) to discover it uses the resolution you want."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):676
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):499
msgid "Multiple monitors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):679
-msgid "You can configure more than one monitor in <path>/etc/X11/xorg.conf</path>. All you have to do is give each monitor an identifer, then list its physical position, such as \"RightOf\" or \"Above\" another monitor. The following example shows how to configure a DVI and a VGA monitor, with the VGA monitor as the right-hand screen:"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):502
+msgid "You can configure more than one monitor in <path>/etc/X11/xorg.conf.d/</path>. All you have to do is give each monitor an identifer, then list its physical position, such as \"RightOf\" or \"Above\" another monitor. The following example shows how to configure a DVI and a VGA monitor, with the VGA monitor as the right-hand screen:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):687
-msgid "Configuring multiple monitors in xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):510
+msgid "Configuring multiple monitors"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):687
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):510
#, no-wrap
-msgid "\nSection \"Device\"\n Identifier \"RadeonHD 4550\"\n Option \"Monitor-DVI-0\" \"DVI screen\"\n Option \"Monitor-VGA-0\" \"VGA screen\"\nEndSection\n\nSection \"Monitor\"\n Identifier \"DVI screen\"\nEndSection\n\nSection \"Monitor\"\n Identifier \"VGA screen\"\n Option \"RightOf\" \"DVI screen\"\nEndSection\n"
+msgid "\n# <i>nano -w /etc/X11/xorg.conf.d/40-monitor.conf</i>\n\nSection \"Device\"\n Identifier \"RadeonHD 4550\"\n Option \"Monitor-DVI-0\" \"DVI screen\"\n Option \"Monitor-VGA-0\" \"VGA screen\"\nEndSection\nSection \"Monitor\"\n Identifier \"DVI screen\"\nEndSection\nSection \"Monitor\"\n Identifier \"VGA screen\"\n Option \"RightOf\" \"DVI screen\"\nEndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):707
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):530
msgid "Configuring your keyboard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):710
-msgid "To setup X to use an international keyboard, you can copy the content of <path>/usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2</path> to <path>/etc/hal/fdi/policy/10-xinput-configuration.fdi</path>:"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):533
+msgid "To setup X to use an international keyboard, you just have to create the appropriate config file in <path>/etc/X11/xorg.conf.d/</path>. This example features a Czech keyboard layout:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):716
-msgid "Using an existing config file"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre:caption):539
+msgid "Using an international keyboard"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):716
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(pre):539
#, no-wrap
-msgid "\n# <i>bzcat /usr/share/doc/hal-*/*/use-estonian-layout.fdi.bz2 &gt; /etc/hal/fdi/policy/10-xinput-configuration.fdi</i>\n"
+msgid "\n# <i>nano -w /etc/X11/xorg.conf.d/30-keyboard.conf</i>\n\nSection \"InputClass\"\n Identifier \"keyboard-all\"\n Driver \"evdev\"\n Option \"XkbLayout\" \"us,cz\"\n Option \"XkbModel\" \"logitech_g15\"\n Option \"XkbRules\" \"xorg\"\n Option \"XkbOptions\" \"grp:alt_shift_toggle,grp:switch,grp_led:scroll,compose:rwin,terminate:ctrl_alt_bksp\"\n Option \"XkbVariant\" \",qwerty\"\n MatchIsKeyboard \"on\"\nEndSection\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):720
-msgid "Now you can just edit <path>10-xinput-configuration.fdi</path> and change the Estonian keyboard layout (<c>ee</c>) to your own, such as Great Britain (<b>gb</b>) or Polish (<b>pl</b>)."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):554
+msgid "The \"terminate\" command (<c>terminate:ctrl_alt_bksp</c>) lets you kill the X session by using the Ctrl-Alt-Backspace key combination. This will, however, make X exit disgracefully -- something that you might not always want. It can be useful when programs have frozen your display entirely, or when you're configuring and tweaking your Xorg environment. Be careful when killing your desktop with this key combination -- most programs really don't like it when you end them this way, and you may lose some (or all) of what you were working on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):726
-msgid "When you're finished, run <c>/etc/init.d/hald restart</c> as root to make sure that HAL picks up your configuration file changes."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):734
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):567
msgid "Finishing up"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):737
-msgid "Run <c>startx</c> and be happy about the result. Congratulations, you now (hopefully) have a working Xorg on your system. The next step is to install a useful window manager or desktop environment such as KDE, GNOME, or Xfce, but that's not part of this guide."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):570
+msgid "Run <c>startx</c> and be happy about the result. Congratulations, you now (hopefully) have a working Xorg on your system. The next step is to install a useful window manager or desktop environment such as KDE, GNOME, or Xfce, but that's not part of this guide. Information on installing these desktop environments can be found in our <uri link=\"/doc/en/?catid=desktop\">Gentoo Desktop Documentation Resources</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):749
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):584
msgid "Resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):751
-msgid "Creating and Tweaking xorg.conf"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):586
+msgid "Creating and editing config files"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):754
-msgid "First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet complete references about the syntax used by these configuration files. Be sure to have them open on a terminal near you when you edit your configuration files!"
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):589
+msgid "First of all, <c>man xorg.conf</c> and <c>man evdev</c> provide quick yet complete references about the syntax used by these configuration files. Be sure to have them open on a terminal when you edit your configuration files!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):761
-msgid "Also, be sure to look at <path>/etc/X11/xorg.conf.example</path>; you may wish to copy this and use it as a foundation for writing your own <path>xorg.conf</path>."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):595
+msgid "There are also many online resources on editing config files in <path>/etc/X11/</path>. We only list few of them here; be sure to <uri link=\"http://www.google.com\">Google</uri> for more."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):767
-msgid "You may find the X.org <uri link=\"http://www.x.org/wiki/FAQ\">FAQ</uri> provided on their website, in addition to their other documentation."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):772
-msgid "There are also many online resources on editing <path>xorg.conf</path>. We only list few of them here, be sure to <uri link=\"http://www.google.com\">Google</uri> for more."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):781
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(title):604
msgid "Other resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):784
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):607
msgid "More information about installing and configuring various graphical desktop environments and applications can be found in the <uri link=\"/doc/en/?catid=desktop\">Gentoo Desktop Documentation Resources</uri> section of our documentation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):791
-msgid "If you're upgrading to <c>xorg-server</c> 1.8 from an earlier version, then be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.8-upgrade-guide.xml\">migration guide</uri>."
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):614
+msgid "If you're upgrading to <c>xorg-server</c> 1.9 from an earlier version, then be sure to read the <uri link=\"/proj/en/desktop/x/x11/xorg-server-1.9-upgrade-guide.xml\">migration guide</uri>."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//xorg-config.xml(p):621
+msgid "X.org provides many <uri link=\"http://www.x.org/wiki/FAQ\">FAQs</uri> on their website, in addition to their other documentation."
msgstr ""
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL