summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAzamat H. Hackimov <azamat.hackimov@gmail.com>2011-05-18 19:20:00 +0600
committerAzamat H. Hackimov <azamat.hackimov@gmail.com>2011-05-18 19:20:00 +0600
commit0ee9fb8188a088f631037ac22fd1a06905fec3f5 (patch)
treed03fb390d0fb6338a10837bf31d2dd11dfb4fef5 /doc
parentsync with gorg (diff)
downloadgentoo-doc-translations-0ee9fb8188a088f631037ac22fd1a06905fec3f5.tar.gz
gentoo-doc-translations-0ee9fb8188a088f631037ac22fd1a06905fec3f5.tar.bz2
gentoo-doc-translations-0ee9fb8188a088f631037ac22fd1a06905fec3f5.zip
Sync
Diffstat (limited to 'doc')
-rw-r--r--doc/gettext/el/gentoo-x86+raid+lvm2-quickinstall.xml.po17
-rw-r--r--doc/gettext/el/gentoo-x86-quickinstall.xml.po11
-rw-r--r--doc/gettext/el/gentoo-x86-tipsntricks.xml.po154
-rw-r--r--doc/gettext/el/java.xml.po346
-rw-r--r--doc/gettext/el/source_mirrors.xml.po71
-rw-r--r--doc/gettext/gentoo-x86+raid+lvm2-quickinstall.xml.pot10
-rw-r--r--doc/gettext/gentoo-x86-quickinstall.xml.pot8
-rw-r--r--doc/gettext/gentoo-x86-tipsntricks.xml.pot148
-rw-r--r--doc/gettext/java.xml.pot306
-rw-r--r--doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po18
-rw-r--r--doc/gettext/ru/gentoo-x86-quickinstall.xml.po12
-rw-r--r--doc/gettext/ru/gentoo-x86-tipsntricks.xml.po154
-rw-r--r--doc/gettext/ru/java.xml.po347
-rw-r--r--doc/gettext/ru/source_mirrors.xml.po72
-rw-r--r--doc/gettext/source_mirrors.xml.pot66
15 files changed, 859 insertions, 881 deletions
diff --git a/doc/gettext/el/gentoo-x86+raid+lvm2-quickinstall.xml.po b/doc/gettext/el/gentoo-x86+raid+lvm2-quickinstall.xml.po
index e0d7450..31fe313 100644
--- a/doc/gettext/el/gentoo-x86+raid+lvm2-quickinstall.xml.po
+++ b/doc/gettext/el/gentoo-x86+raid+lvm2-quickinstall.xml.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):6
@@ -50,11 +50,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(version):32
-msgid "16"
+msgid "18"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(date):33
-msgid "2010-06-15"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):36
@@ -239,7 +239,7 @@ msgid ""
"\n"
"livecd ~ # <i>mdadm --create /dev/md1 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda1 /dev/sdb1</i>\n"
"mdadm: array /dev/md1 started.\n"
-"livecd ~ # <i>mdadm --create /dev/md3 --level=1 --raid-devices=2 /dev/sda3 /dev/sdb3</i>\n"
+"livecd ~ # <i>mdadm --create /dev/md3 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda3 /dev/sdb3</i>\n"
"mdadm: array /dev/md3 started.\n"
"livecd ~ # <i>mdadm --create /dev/md4 --level=0 --raid-devices=2 /dev/sda4 /dev/sdb4</i>\n"
"mdadm: array /dev/md4 started.\n"
@@ -547,10 +547,9 @@ msgstr ""
msgid ""
"\n"
"livecd conf.d # <i>exit</i>\n"
-"livecd / # <i>umount /mnt/gentoo/usr/portage/distfiles /mnt/gentoo/usr/portage \\\n"
-"/mnt/gentoo/usr /mnt/gentoo/var/tmp /mnt/gentoo/tmp /mnt/gentoo/var \\\n"
-"/mnt/gentoo/opt /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/home \\\n"
-"/mnt/gentoo/boot /mnt/gentoo</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo/usr{/portage/distfiles,/portage,}</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo/dev{/pts,/shm,}</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo{/usr,/var/tmp,/tmp,/var,/opt,/dev,/proc,/home,/boot,}</i>\n"
"livecd / # <i>reboot</i>\n"
"<comment>(Don't forget to remove the CD)</comment>\n"
msgstr ""
diff --git a/doc/gettext/el/gentoo-x86-quickinstall.xml.po b/doc/gettext/el/gentoo-x86-quickinstall.xml.po
index 0528a40..65d863e 100644
--- a/doc/gettext/el/gentoo-x86-quickinstall.xml.po
+++ b/doc/gettext/el/gentoo-x86-quickinstall.xml.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(title):6
@@ -50,11 +50,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(version):32
-msgid "25"
+msgid "26"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(date):33
-msgid "2010-01-26"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(title):36
@@ -245,7 +245,8 @@ msgstr ""
msgid ""
"\n"
"livecd conf.d # <i>exit</i>\n"
-"livecd / # <i>umount /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/boot /mnt/gentoo</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo/dev{/shm,/pts,}</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo{/proc,/boot,}</i>\n"
"livecd / # <i>reboot</i>\n"
"<comment>(Don't forget to remove the CD)</comment>\n"
msgstr ""
diff --git a/doc/gettext/el/gentoo-x86-tipsntricks.xml.po b/doc/gettext/el/gentoo-x86-tipsntricks.xml.po
index d15f100..d3d586f 100644
--- a/doc/gettext/el/gentoo-x86-tipsntricks.xml.po
+++ b/doc/gettext/el/gentoo-x86-tipsntricks.xml.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-18 11:31+0500\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -53,11 +53,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(version):29
-msgid "2"
+msgid "3"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(date):30
-msgid "2011-03-16"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):33
@@ -93,7 +93,7 @@ msgid "#ata-raid-2.4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):56
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):185
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):187
msgid "ATA RAID using 2.4 kernels"
msgstr ""
@@ -102,7 +102,7 @@ msgid "#livecd-kernel"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):57
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):260
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):262
msgid "Using the Installation CD kernel"
msgstr ""
@@ -119,7 +119,7 @@ msgid "#checking-disks"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):73
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):396
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):398
msgid "Extensive Testing of your Disks"
msgstr ""
@@ -128,7 +128,7 @@ msgid "#recover"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):75
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):414
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):416
msgid "Recovering from a malfunctioning installation"
msgstr ""
@@ -211,68 +211,70 @@ msgstr ""
#, no-wrap
msgid ""
"\n"
-"# <i>mdadm --create --verbose /dev/md1 --level=1 --raid-devices=2 /dev/sda1 /dev/sdb1</i>\n"
-"# <i>mdadm --create --verbose /dev/md2 --level=1 --raid-devices=2 /dev/sda2 /dev/sdb2</i>\n"
-"# <i>mdadm --create --verbose /dev/md3 --level=1 --raid-devices=2 /dev/sda3 /dev/sdb3</i>\n"
+"# <i>mdadm --create --verbose /dev/md1 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda1 /dev/sdb1</i>\n"
+"# <i>mdadm --create --verbose /dev/md2 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda2 /dev/sdb2</i>\n"
+"# <i>mdadm --create --verbose /dev/md3 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda3 /dev/sdb3</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(impo):140
msgid ""
"You should not use any form of striping such as RAID-0 or RAID-5 on the "
-"partition you boot from."
+"partition you boot from. Also, the <c>--metadata=0.90</c> is only necessary "
+"for these critical file systems. Other filesystems can use more recent "
+"metadata formats."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):145
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):147
msgid ""
"The Linux Software RAID driver will start creating the metadevices. You can "
"see its progress in <path>/proc/mdstat</path>. Wait until the metadevices "
"are completely finished before proceeding."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):151
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):153
msgid "Saving information about the created devices"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):151
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):153
#, no-wrap
msgid ""
"\n"
"# <i>mdadm --detail --scan &gt; /etc/mdadm.conf</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):155
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):157
msgid ""
"From now onwards, use <path>/dev/md1</path> for the boot partition, <path>/"
"dev/md2</path> for the swap partition and <path>/dev/md3</path> for the root "
"partition."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):161
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):163
msgid ""
"Right before chrooting, don't forget to copy over <path>/etc/mdadm.conf</"
"path> to <path>/mnt/gentoo/etc</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):166
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):168
msgid ""
"When you're configuring your kernel, make sure you have the appropriate RAID "
"support <e>in</e> your kernel and not as module."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):171
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):173
msgid ""
"When installing extra tools, emerge <c>mdadm</c> as well. Note that this "
"isn't available on all Installation CDs so you might not be able to install "
"Gentoo on a Software RAID when using a networkless installation!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):177
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):179
msgid ""
"When configuring your bootloader, make sure it gets installed in the MBR of "
"<e>both</e> disks if you use mirroring."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):188
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):190
msgid ""
"Make sure you boot your Installation CD using the <c>doataraid</c> option. "
"Once booted, check the contents of <path>/dev/ataraid</path>. It should "
@@ -281,31 +283,31 @@ msgid ""
"partitions are <path>part*</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):196
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):198
msgid ""
"Write down the various <path>/dev/ataraid/disc*/*</path> device files that "
"you use to install Gentoo on. You will need to substitute the <path>/dev/"
"hda</path> examples in the installation with this path."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):202
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):204
msgid ""
"Before chrooting, bind-mount the <path>/dev</path> structure in the new "
"environment:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):207
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):209
msgid "Bind-mounting /dev"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):207
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):209
#, no-wrap
msgid ""
"\n"
"# <i>mount --rbind /dev /mnt/gentoo/dev</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):211
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):213
msgid ""
"When configuring your kernel, make sure you enable support for your ATA RAID "
"chipset and options. For instance, a popular ATA RAID system is a <e>Promise "
@@ -313,7 +315,7 @@ msgid ""
"FastTrack Options</c> built in into your kernel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):218
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):220
msgid ""
"When configuring GRUB, you first have to create a GRUB bootdisk. This is not "
"as hard as you think. First install GRUB as you would, but when you come to "
@@ -321,11 +323,11 @@ msgid ""
"instructions:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):225
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):227
msgid "Creating a GRUB bootdisk"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):225
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):227
#, no-wrap
msgid ""
"\n"
@@ -334,25 +336,25 @@ msgid ""
"# <i>dd if=stage2 of=/dev/fd0 bs=512 seek=1</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):231
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):233
msgid ""
"You still need to write your <path>grub.conf</path> file. This is no "
"different from the installation instructions, just make sure that your "
"<c>root=</c> points to the ATA RAID device."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):237
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):239
msgid ""
"After finishing the installation, boot with your GRUB bootdisk. You will be "
"greeted by a GRUB prompt. Now configure GRUB to boot from the ATA RAID "
"device:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):242
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):244
msgid "Installing GRUB on the ATA RAID"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):242
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):244
#, no-wrap
msgid ""
"\n"
@@ -361,17 +363,17 @@ msgid ""
"grub&gt; quit\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):248
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):250
msgid "Now reboot (with the GRUB bootfloppy removed)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):252
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):254
msgid ""
"LILO users can safely use the instructions mentioned in the installation "
"instructions."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):263
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):265
msgid ""
"If you don't want to compile a kernel yourself you can use the kernel from "
"the Installation CD and copy it to your system. When you come to the point "
@@ -380,15 +382,15 @@ msgid ""
"installation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):271
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):273
msgid "Copy over the kernel and modules to your Gentoo system:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):275
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):277
msgid "Copying over the Installation CD kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):275
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):277
#, no-wrap
msgid ""
"\n"
@@ -398,18 +400,18 @@ msgid ""
"cdiamge ~# <i>cp -Rp /lib/modules/`uname -r` /mnt/gentoo/lib/modules</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):284
msgid ""
"To have all modules that are currently running (from the Installation CD) "
"loaded during bootup of your Gentoo system, run the following command from "
"within the chrooted environment:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):288
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):290
msgid "Adding all running modules to the modules.conf file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):288
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):290
#, no-wrap
msgid ""
"\n"
@@ -418,15 +420,15 @@ msgid ""
"# <i>update-modules</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):299
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):301
msgid "Simplifying the Installation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):301
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):303
msgid "Leaving your Terminal"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):304
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):306
msgid ""
"Many people want to leave their system when it's compiling. In certain cases "
"this is rather difficult as the installation is done in a public environment "
@@ -434,31 +436,31 @@ msgid ""
"perform the compilation in the background and log out from all terminals."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):311
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):313
msgid ""
"There are several possible solutions for this. The first one is to use "
"<c>screen</c>. After booting the Installation CD, set your root password and "
"start a screen session:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(note):317
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(note):319
msgid ""
"Not all Installation CDs provide screen. If this is the case, you will have "
"to use one of the other methods described in this section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):322
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):324
msgid "Starting a screen session"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):322
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):324
#, no-wrap
msgid ""
"\n"
"# <i>screen -S gentoo</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):326
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):328
msgid ""
"Once inside the screen session you can perform the entire installation. When "
"you want to leave your terminal, press <c>Ctrl-a, d</c> (that is, control "
@@ -466,24 +468,24 @@ msgid ""
"session. You can now safely log out of your system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):333
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):335
msgid ""
"To regain access to your terminal, log in as root again and <e>attach</e> to "
"the running screen session:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):338
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):340
msgid "Attaching to a screen session"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):338
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):340
#, no-wrap
msgid ""
"\n"
"# <i>screen -x gentoo</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):342
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):344
msgid ""
"If you can't use screen, there is still a way to leave your terminal. Follow "
"the installation instructions, but when you come to the point where a long-"
@@ -494,11 +496,11 @@ msgid ""
"command will show you that) as you will need to know this later on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):352
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):354
msgid "Using nohup"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):352
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):354
#, no-wrap
msgid ""
"\n"
@@ -507,24 +509,24 @@ msgid ""
"# <i>nohup ./scripts/bootstrap.sh &amp;</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):358
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):360
msgid ""
"Now exit the chrooted environment (<c>exit</c>) and the Installation CD "
"session. Your compilation will continue in the background."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):363
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):365
msgid ""
"When you want to check the compilation, log in as root (on the Installation "
"CD) and chroot back into your environment and go to the directory where you "
"left off:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):369
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):371
msgid "Chrooting back"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):369
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):371
#, no-wrap
msgid ""
"\n"
@@ -533,7 +535,7 @@ msgid ""
"# <i>cd /usr/portage</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):375
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):377
msgid ""
"Now use the <c>less</c> command on the <path>nohup.out</path> file that is "
"situated inside that directory. The compilation will append its output to "
@@ -543,18 +545,18 @@ msgid ""
"instructions."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):383
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):385
msgid ""
"If you ever get tired of following the changes, press <c>Ctrl-C</c> followed "
"by a <c>q</c>. This won't stop the compilation process, only the <c>less</c> "
"process."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):394
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):396
msgid "Fixing Errors/Issues"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):399
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):401
msgid ""
"If you think your disk needs to be thoroughly checked for consistency (bad "
"sectors and such), you can use the <c>-c</c> option while placing the ext2 "
@@ -563,18 +565,18 @@ msgid ""
"<c>-c -c</c> to format your disk and perform an extensive read/write test."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):407
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):409
msgid "Checking for disk consistency"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):407
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):409
#, no-wrap
msgid ""
"\n"
"# <i>mke2fs -j -c /dev/hda3</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):417
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):419
msgid ""
"If for some reason your Gentoo installation fails, you don't have to redo "
"the installation all over again. Instead, you can safely \"go\" to the point "
@@ -582,7 +584,7 @@ msgid ""
"flawed) and try a different approach."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):424
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):426
msgid ""
"First of all you need to chroot back into your Gentoo Linux environment. "
"Follow the instructions again, but ignore the partitioning steps as your "
@@ -592,7 +594,7 @@ msgid ""
"path> - you don't want to overwrite your files do you?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):433
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):435
msgid ""
"Once chrooted inside your Gentoo Linux environment, immediately go to the "
"step where you think you should try a different approach. Don't redo all the "
@@ -600,39 +602,39 @@ msgid ""
"things went wrong."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):440
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):442
msgid ""
"For instance, if you believe that you have a wrongly configured <path>grub."
"conf</path>, you can immediately fire up your editor to update <path>/boot/"
"grub/grub.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):446
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):448
msgid ""
"Once you have tried a different approach for your situation, you should "
"consider how much of the subsequent steps you need to perform again. If the "
"subsequent steps are depending on your change, you will need to redo those."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):452
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):454
msgid "For instance,"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):457
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):459
msgid ""
"if you have changed a variable inside <path>make.conf</path> you will need "
"to do all subsequent compiling since those depend on the settings inside "
"<path>make.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):462
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):464
msgid ""
"if you have altered <path>/boot/grub/grub.conf</path> you can immediately "
"exit the chrooted environment and reboot as no subsequent steps are "
"depending on <path>grub.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):467
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):469
msgid ""
"if you have recompiled your kernel you only need to make sure that your "
"bootloader configuration points to the correct kernel image (double-check "
@@ -640,13 +642,13 @@ msgid ""
"environment and reboot"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):473
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):475
msgid ""
"if you have altered <path>/etc/fstab</path> you can exit the chrooted "
"environment and reboot"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):479
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):481
msgid ""
"As you can see, for most recovery operations you can immediately reboot. "
"Only in certain cases will you need to redo the subsequent installation "
diff --git a/doc/gettext/el/java.xml.po b/doc/gettext/el/java.xml.po
index 091ea75..3a02669 100644
--- a/doc/gettext/el/java.xml.po
+++ b/doc/gettext/el/java.xml.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):6
@@ -55,11 +55,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(version):27
-msgid "0.23"
+msgid "2"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(date):28
-msgid "2010-07-06"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):31
@@ -67,7 +67,7 @@ msgid "What is Java?"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):33
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):170
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):158
msgid "Overview"
msgstr ""
@@ -93,167 +93,162 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):60
-msgid "Before You Begin"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):62
-msgid "Existing installs"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):65
-msgid ""
-"For existing installs, regardless of if you have installed anything Java "
-"before, make sure you have followed the <uri link=\"/proj/en/java/java-"
-"upgrade.xml\">Java Upgrade Guide</uri>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):74
-msgid "New installs"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):77
-msgid "New installs should require no further preparation."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):86
msgid "Installing a Virtual Machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):88
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):62
msgid "The choices"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):91
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):65
msgid ""
"Gentoo provides numerous Runtime Environments (JREs) and Development Kits "
"(JDKs). Among the current choices, we have:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):98
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):72
msgid "Vendor"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):99
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):73
msgid "JDK"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):100
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):74
msgid "JRE"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):103
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):77
msgid "Sun's Java Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):104
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):78
msgid "dev-java/sun-jdk"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):105
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):79
msgid "dev-java/sun-jre-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):108
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):82
msgid "The IBM Java Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):109
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):83
msgid "dev-java/ibm-jdk-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):110
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):84
msgid "dev-java/ibm-jre-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):113
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):87
msgid "BEA WebLogic's J2SE Development Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):114
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):88
msgid "dev-java/jrockit-jdk-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):126
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):91
+msgid "The IcedTea Open Java Kit"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):92
+msgid "dev-java/icedtea6-bin"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):104
msgid "Installing a JRE/JDKs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):129
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):107
msgid ""
"To install your profile's default JDK, you can run <c>emerge virtual/jdk</"
"c>. Or to install your profile's default JRE, you can <c>emerge virtual/jre</"
"c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):134
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):112
msgid ""
-"In recent events, Sun has relicensed their JDK and JRE under a more Linux "
-"distro friendly license. As a result, Sun Java 1.5 and onwards are freely "
-"downloadable, without any further hassle."
+"Some JDKs and JREs, including the Sun packages, require accepting an End "
+"User License Agreement, or EULA. If its license (such as dlj-1.1) is not "
+"listed in ACCEPT_LICENSE in <path>/etc/make.conf</path>, then you won't be "
+"able to install the JDK/JRE. For more information on how to add acceptable "
+"licenses to <path>make.conf</path>, please read the <uri link=\"/doc/en/"
+"handbook/handbook-x86.xml?part=2&amp;chap=1#doc_chap4\">Portage Handbook</"
+"uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):140
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):122
+msgid ""
+"To avoid any restrictive license hassle, consider installing <c>icedtea6-"
+"bin</c>, which is an open Java implementation from the OpenJDK project."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):128
msgid ""
"A JDK also includes a JRE, so if you install a JDK you shouldn't have to "
"also have to install a JRE."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):148
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):136
msgid "Installing fetch-restricted virtual machines"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):151
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):139
msgid ""
"Some of the JDKs and JREs require you to jump through a few hoops before "
"installing. Simply emerge the packages as you normally would. The ebuilds "
"will then instruct you where to go and what to download."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):157
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):145
msgid ""
"You should download the indicated file(s) into <path>/usr/portage/distfiles</"
"path>. Once there, you can rerun the emerge command, at which point the JRE/"
"JDK will be begin to install."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):168
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):156
msgid "Configuring your virtual machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):173
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):161
msgid ""
"Gentoo has the ability to have multiple JDKs and JREs installed without "
"causing conflicts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):178
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):166
msgid ""
"Using the <c>java-config</c> tool, you can set the system-wide default "
"(provided you have root access). Users can also use <c>java-config</c> to "
"set up their own personal default."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):184
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):172
msgid ""
"You can also use <e>eselect</e> to change the system and user vm. See "
"<c>eselect java-vm help</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):192
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):180
msgid "Setting a default virtual machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):195
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):183
msgid ""
"Running the command <c>java-config --list-available-vms</c> will give you a "
"list of all JREs and JDKs installed on your system. Here is an example of "
"output:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):201
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):189
msgid "Listing available VMs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):201
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):189
#, no-wrap
msgid ""
"\n"
@@ -264,7 +259,7 @@ msgid ""
"*) Sun JDK 1.6.0.16 [sun-jdk-1.6]\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):209
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):197
msgid ""
"VMs marked as Build Only may contain security vulnerabilities and/or be EOL. "
"Gentoo recommends not setting these VMs as either your system or user VM. "
@@ -272,7 +267,7 @@ msgid ""
"information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):216
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):204
msgid ""
"The <e>*</e> indicates this is the current active vm (system-vm or user-vm "
"when set). The name in the brackets (<e>[]</e>) is the handle or ID for that "
@@ -280,11 +275,11 @@ msgid ""
"system-vm</c>. Here is an example of how to set the system VM."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):223
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):211
msgid "Setting the System VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):223
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):211
#, no-wrap
msgid ""
"\n"
@@ -296,21 +291,21 @@ msgid ""
"Now using sun-jdk-1.6 as your generation-2 system JVM\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):232
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):220
msgid "As a regular user, you can use <c>java-config --set-user-vm</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):236
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):224
msgid ""
"You no longer have to <c>source</c> the profile for updates to the user/"
"system VM take place."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):244
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):232
msgid "Build Only VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):247
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):235
msgid ""
"Some virtual machines are flagged as build-only due to being EOL and/or "
"containing security vulnerabilities. These virtual machines will not "
@@ -323,17 +318,17 @@ msgid ""
"launcher scripts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):262
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):250
msgid "Preferred Build VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):265
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):253
msgid ""
"While merging Java packages, the VM used for building can sometimes be "
"different from the one currently set as the system VM."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):270
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):258
msgid ""
"This merge time VM switching is needed when, for example, your system-vm is "
"set to a 1.6 VM and the package you are merging requires a 1.5 VM. While "
@@ -341,28 +336,27 @@ msgid ""
"intact."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):264
msgid ""
"To define which VM is selected when a switch is needed, we have created a "
"list of <e>default/supported VMs</e> per arch. You can find them in <path>/"
"usr/share/java-config-2/config/jdk-defaults.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):270
msgid ""
-"Of course, Gentoo is all about choice, so you can override these defaults "
-"(and even your selected system VM) in <path>/etc/java-config-2/build/jdk."
-"conf</path> and have complete control over which VM will get used for "
-"merging. Some examples:"
+"You can override these defaults (and even your selected system VM) in <path>/"
+"etc/java-config-2/build/jdk.conf</path> and have complete control over which "
+"VM will get used for merging. Some examples:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):289
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):294
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):299
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):276
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):281
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):286
msgid "Example /etc/java-config-2/build/jdk.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):289
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):276
#, no-wrap
msgid ""
"\n"
@@ -370,7 +364,7 @@ msgid ""
"*=sun-jdk\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):294
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):281
#, no-wrap
msgid ""
"\n"
@@ -378,7 +372,7 @@ msgid ""
"*=sun-jdk-1.5\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):299
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):286
#, no-wrap
msgid ""
"\n"
@@ -388,7 +382,7 @@ msgid ""
"1.5=sun-jdk\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):306
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):293
msgid ""
"You do not <e>have</e> to edit this file. If you change these options to use "
"a unsupported VM, things could possibly break. Because of the wide variety "
@@ -397,24 +391,24 @@ msgid ""
"prioritized as much as bugs present within supported VMs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):319
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):306
msgid "Compilers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):323
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):310
msgid ""
-"The standard Java compiler used for building is javac, which comes with each "
-"JDK. In addition to configuring the VM used at build time, it is also "
-"possible configure which compiler is used. Essentially, you define a list "
-"your preference for which compiler to use in <path>/etc/java-config-2/build/"
-"compilers.conf</path>."
+"The standard Java compiler used for building is <c>javac</c>, which comes "
+"with each JDK. In addition to configuring the VM used at build time, it is "
+"also possible configure which compiler is used. Essentially, you define a "
+"list your preference for which compiler to use in <path>/etc/java-config-2/"
+"build/compilers.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):331
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):318
msgid "/etc/java-config-2/build/compilers.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):331
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):318
#, no-wrap
msgid ""
"\n"
@@ -425,7 +419,7 @@ msgid ""
"COMPILERS=\"ecj-X.Y jikes javac\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):339
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):326
msgid ""
"Some compilers don't support all possible -target and -source arguments. "
"Therefore, each compiler in the list is checked to see if it can support the "
@@ -433,50 +427,50 @@ msgid ""
"suitable compiler is found, it will be used instead."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):346
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):333
msgid "More details about each compiler are provided below:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):352
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):339
msgid "Name"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):353
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):340
msgid "Handle"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):354
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):341
msgid "Package"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):355
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):342
msgid "Description"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):358
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):359
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):345
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):346
msgid "javac"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):360
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):347
msgid "N/A"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):361
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):348
msgid ""
"This is the default compiler that will be used, and comes with each JDK."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):366
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):367
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):353
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):354
msgid "jikes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):368
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):355
msgid "dev-java/jikes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):369
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):356
msgid ""
"Jikes was originally developed by IBM. Anecdotally, it is generally quicker "
"than javac. Note however, that it is more pedantic, and will fail under a "
@@ -484,29 +478,29 @@ msgid ""
"1.5 syntax yet."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):377
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):364
msgid "Eclipse Compiler for Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):378
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):365
msgid "ecj"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):379
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):366
msgid "dev-java/eclipse-ecj"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):380
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):367
msgid ""
"ECJ is the compiler used by the Eclipse software development kit. It is very "
"full featured, and is pretty fast. It does support Java 1.5 syntax."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):392
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):379
msgid "Setting a default CLASSPATH"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):396
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):383
msgid ""
"The options explained in this section should be considered deprecated and "
"will most likely be removed in the future. We strongly recommend against "
@@ -516,24 +510,24 @@ msgid ""
"would be on the classpath."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):405
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):392
msgid ""
"<c>java-config</c> can also be used to set a system-wide default CLASSPATH, "
"as well a user-specific default CLASSPATH."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):410
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):397
msgid ""
"First, you will want to list available Java libraries installed on your "
"system that might want to be put in your CLASSPATH. Here is an example of "
"output:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):415
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):402
msgid "Listing classes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):415
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):402
#, no-wrap
msgid ""
"\n"
@@ -546,98 +540,98 @@ msgid ""
"...\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):425
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):412
msgid ""
"Again, the names in brackets (<e>[]</e>) are the IDs that you have to pass "
"to <c>java-config --set-system-classpath</c>. Here is an example:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):430
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):417
msgid "Setting classpaths"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):430
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):417
#, no-wrap
msgid ""
"\n"
"# <i>java-config --set-system-classpath log4j,xerces-2</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):434
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):421
msgid ""
"The current directory (<path>.</path>) will not be part of the system "
"classpath, as that should be added in your system's login profile."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):439
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):426
msgid ""
"You will have to update your environment by logging out, then in again or "
"sourcing <path>/etc/profile</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):444
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):431
msgid ""
"For users, <c>java-config --set-user-classpath</c> will create <path>~/."
"gentoo/java-env-classpath</path>, which you should then source from your "
"shell's profile."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):450
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):437
msgid "Sourcing user specific classpath"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):456
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):443
msgid ""
"If you really want a system wide or user default classpath you can add "
"something like the following to your shell's profile. But we would advise "
"against it."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):462
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):449
msgid "Setting classpath"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):462
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):449
#, no-wrap
msgid ""
"\n"
"# <i>export CLASSPATH=\"${CLASSPATH}:$(java-config --classpath log4j,xerces-2)\"</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):471
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):458
msgid "Java Browser Plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):473
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):460
msgid "Installing a plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):476
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):463
msgid ""
"You can install a Java plugin for your web browser by emerging a Java VM "
"with the <c>nsplugin</c> USE flag set."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):481
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):468
msgid ""
"<c>nsplugin</c> is not available for all architectures. Check for available "
"plugins on your arch before trying to install a VM by running <c>emerge -pv "
"&lt;java-vm&gt;</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):487
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):474
msgid ""
"Portage will allow you to install multiple versions of Java plugins, though "
"only one will be used by your browser. You can check the list of available "
"plugins by running:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):493
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):562
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):480
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):549
msgid "Viewing available plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):493
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):480
#, no-wrap
msgid ""
"\n"
@@ -646,31 +640,31 @@ msgid ""
" [2] icedtea6-bin\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):499
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):486
msgid "In this example, <c>sun-jre-bin</c> is selected for the browser plugin."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):503
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):490
msgid "Selecting a plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):503
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):490
#, no-wrap
msgid ""
"\n"
"# <i>eselect java-nsplugin set sun-jre-bin-1.6</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):507
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):494
msgid "Verify that the correct plugin was selected:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):511
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):586
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):498
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):573
msgid "Verifying the correct plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):511
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):498
#, no-wrap
msgid ""
"\n"
@@ -679,7 +673,7 @@ msgid ""
" [2] icedtea6-bin\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):517
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):504
msgid ""
"Java.com also provides a link to <uri link=\"http://java.com/en/download/"
"installed.jsp\">verify your installed plugin</uri>. Additionally, if you are "
@@ -687,11 +681,11 @@ msgid ""
"<c>about:plugins</c> into the address bar."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):527
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):514
msgid "Plugins on multilib systems"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):530
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):517
msgid ""
"If you are running a mixed 64-bit and 32-bit multilib system (for example, "
"on AMD64), you can use 64-bit and 32-bit Java plugins. Unless you have a "
@@ -699,18 +693,18 @@ msgid ""
"bit plugins on 64-bit web browsers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):537
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):524
msgid ""
"There are several native 64-bit browser plugins available. The default JDK/"
"JRE pair, <c>sun-jdk</c> and <c>sun-jre-bin</c>, both include browser "
"plugins. Just emerge one of them with the <c>nsplugin</c> USE flag enabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):543
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):530
msgid "Installing a 64-bit plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):543
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):530
#, no-wrap
msgid ""
"\n"
@@ -718,17 +712,17 @@ msgid ""
"# <i>emerge sun-jre-bin</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):548
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):535
msgid ""
"To use a 32-bit plugin on a 32-bit browser, you will need to emerge <c>emul-"
"linux-x86-java</c> with the <c>nsplugin</c> USE flag enabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):553
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):540
msgid "Installing a 32-bit plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):553
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):540
#, no-wrap
msgid ""
"\n"
@@ -736,11 +730,11 @@ msgid ""
"# <i>emerge emul-linux-x86-java</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):558
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):545
msgid "Next, check which plugins are available:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):562
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):549
#, no-wrap
msgid ""
"\n"
@@ -753,15 +747,15 @@ msgid ""
" [2] sun-jre-bin-1.6\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):572
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):559
msgid "Now select the right plugin for your browsers:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):576
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):563
msgid "Selecting plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):576
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):563
#, no-wrap
msgid ""
"\n"
@@ -770,11 +764,11 @@ msgid ""
"# <i>eselect java-nsplugin set 64bit sun-jre-bin-1.6</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):582
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):569
msgid "Verify the correct plugin was selected:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):586
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):573
#, no-wrap
msgid ""
"\n"
@@ -787,75 +781,75 @@ msgid ""
" [2] sun-jre-bin-1.6 current\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):601
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):588
msgid "USE flags for use with Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):603
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):590
msgid "Setting USE flags"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):606
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):593
msgid ""
"For more information regarding USE flags, refer to the <uri link=\"/doc/en/"
"handbook/handbook-x86.xml?part=2&amp;chap=2\">USE flags</uri> chapter from "
"the Gentoo Handbook."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):615
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):602
msgid "The flags"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):619
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):606
msgid "The <b>java</b> flag adds support for Java in a variety of programs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):620
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):607
msgid ""
"The <b>nsplugin</b> flag adds support for Mozilla-like browsers (including "
"Firefox). You will need this for viewing Java applets in your Mozilla-like "
"browser."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):625
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):612
msgid ""
"The <b>source</b> flag installs a zip of the source code of a package. This "
"is traditionally used for IDEs to 'attach' source to the libraries you are "
"using."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):630
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):617
msgid "The <b>jce</b> flag adds support for the Java Cryptography Engine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):631
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):618
msgid ""
"For Java packages, the <b>doc</b> flag will build API documentation using "
"javadoc."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):642
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):629
msgid "Additional resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):644
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):631
msgid "Off-line resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):648
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):635
msgid "java-config man page"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):655
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):642
msgid "Online resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):659
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):646
msgid ""
"The <uri link=\"http://www.gentoo.org/proj/en/java/\">Java Project Page</uri>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):663
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):650
msgid ""
"The <uri link=\"http://news.gmane.org/gmane.linux.gentoo.java\">gentoo-java</"
"uri>, <uri link=\"http://news.gmane.org/gmane.linux.gentoo.user\">gentoo-"
@@ -863,21 +857,21 @@ msgid ""
"\">gentoo-dev</uri> mailing list archives"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):672
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):659
msgid ""
"<uri link=\"irc://irc.gentoo.org/gentoo\">#gentoo</uri> and <uri link="
"\"irc://irc.gentoo.org/gentoo-java\">#gentoo-java</uri> on IRC"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri:link):678
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri:link):665
msgid "http://en.wikipedia.org/wiki/Java_programming_language"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri):678
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri):665
msgid "Wikipedia's entry for Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):681
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):668
msgid ""
"If you have suggestions or questions regarding this document, please email "
"the Gentoo Java team: <mail>java@gentoo.org</mail>"
diff --git a/doc/gettext/el/source_mirrors.xml.po b/doc/gettext/el/source_mirrors.xml.po
index 9642ce2..14e72e7 100644
--- a/doc/gettext/el/source_mirrors.xml.po
+++ b/doc/gettext/el/source_mirrors.xml.po
@@ -1,14 +1,14 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-10-21 23:56+0600\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(guide:link):5
@@ -84,11 +84,11 @@ msgid "This document explains the requirements for source mirrors."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(version):35
-msgid "1.13"
+msgid "1.14"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(date):36
-msgid "2010-04-28"
+msgid "2011-05-13"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):39
@@ -114,8 +114,8 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):56
msgid ""
"The space requirements depend on whether you choose to run a \"Full\" mirror "
-"or a \"Distfiles only\" mirror. Full mirrors require 210 GB of disk space. "
-"Distfiles only mirrors require 120 GB of space."
+"or a \"Distfiles only\" mirror. Full mirrors require 240 GB of disk space. "
+"Distfiles only mirrors require 150 GB of space."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):65
@@ -187,31 +187,30 @@ msgid "/experimental (20-30G)"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):131
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):141
-msgid "/distfiles (110G)"
+msgid "/distfiles (140G)"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):132
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):142
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):141
msgid "/snapshots (600M)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):133
-msgid "/grp (0M, obsolete)"
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):135
+msgid "Distfiles only mirrors need to carry the following directories:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):136
-msgid "Distfiles only mirrors need to carry the following directories:"
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):140
+msgid "/distfiles (110G)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):145
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):144
msgid ""
"We will then verify that the mirror exists and we can connect to it "
"properly. Then, in the next 2 weeks, we will determine if your mirror is "
"syncing correctly and in accordance with this policy."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):151
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):150
msgid ""
"If all steps went smoothly, we will then add you to our list of <uri link=\"/"
"main/en/mirrors2.xml\">download mirrors</uri> on the main web site. We will "
@@ -219,53 +218,53 @@ msgid ""
"which is only available to official Gentoo Linux source mirrors."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):158
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):157
msgid ""
"Additionally, you, the mirror admin, will be requested to subscribe to the "
"gentoo-mirrors mailing list (low traffic) so that you can follow all issues "
"associated with source mirrors."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(note):164
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(note):163
msgid ""
"Thanks for helping out Gentoo Linux users and developers! :) For any mirror "
"administration issues or problems, please contact <mail link=\"mirror-"
"admin@gentoo.org\">mirror-admin@gentoo.org</mail>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(warn):170
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(warn):169
msgid ""
"Do NOT email mirror-admin@gentoo.org for mirror requests, please file a bug. "
"It makes mirror tracking easier on us."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):180
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):179
msgid "Short FAQ"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):182
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):181
msgid ""
"Q: Who should I contact regarding new mirrors or to get my mirror added to "
"the Gentoo web site?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):188
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):198
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):187
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):197
msgid ""
"A: Please file a bug on bugs.gentoo.org under the <c>Mirrors</c> category."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):195
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):194
msgid "Q: Who should I contact regarding mirror issues and maintenance?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):205
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):204
msgid ""
"Q: I run a private source mirror for my company. Can I still access the "
"private master source mirror?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):211
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):210
msgid ""
"A: Because our resources are limited, we need to ensure we allocate them in "
"such a way to provide the maximum amount of benefit to our users. As such, "
@@ -274,11 +273,11 @@ msgid ""
"establish a private source mirror."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):222
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):221
msgid "Q: How do I find the mirror nearest to me?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):225
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):224
msgid ""
"A: mirrorselect was designed to do this for you. If you haven't already run "
"<c>emerge mirrorselect</c>, then please do so. Then run: <c>mirrorselect</"
@@ -286,48 +285,48 @@ msgid ""
"to you."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):235
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):234
msgid "Q: I don't have that much disk space. Can I mirror part of the sources?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):240
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):239
msgid ""
"A: Yes, if you are unable to mirror our full sources, you can elect to "
"mirror the following two directories only:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):246
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):245
msgid "/distfiles"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):247
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):246
msgid "/snapshots"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):250
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):249
msgid ""
"These two directories will require approximately 50GB of space and you will "
"be listed on our site as a distfiles-only mirror."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):258
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):257
msgid ""
"Q: Do I have to turn on Directory Indexing for directories served up via "
"HTTP?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):263
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):262
msgid ""
"A: Directory Indexing is required for the /releases and /experimental "
"directories, but can be turned off for all other directories (including /"
"distfiles) if you wish."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):273
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):272
msgid "Q: Do I have to mirror historical? I mean, it is old releases."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):275
msgid ""
"A: Of course not, it is quite a bit of data. In your rsync command, add "
"<path>--exclude=/releases/historical</path> to your rsync options. This will "
diff --git a/doc/gettext/gentoo-x86+raid+lvm2-quickinstall.xml.pot b/doc/gettext/gentoo-x86+raid+lvm2-quickinstall.xml.pot
index d5a9a1d..0563b5a 100644
--- a/doc/gettext/gentoo-x86+raid+lvm2-quickinstall.xml.pot
+++ b/doc/gettext/gentoo-x86+raid+lvm2-quickinstall.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\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"
@@ -42,11 +42,11 @@ msgid "The Quick Install guide covers the Gentoo install process in a non-verbos
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(version):32
-msgid "16"
+msgid "18"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(date):33
-msgid "2010-06-15"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):36
@@ -150,7 +150,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):186
#, no-wrap
-msgid "\nlivecd ~ # <i>mknod /dev/md1 b 9 1</i>\nlivecd ~ # <i>mknod /dev/md3 b 9 3</i>\nlivecd ~ # <i>mknod /dev/md4 b 9 4</i>\n\nlivecd ~ # <i>mdadm --create /dev/md1 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda1 /dev/sdb1</i>\nmdadm: array /dev/md1 started.\nlivecd ~ # <i>mdadm --create /dev/md3 --level=1 --raid-devices=2 /dev/sda3 /dev/sdb3</i>\nmdadm: array /dev/md3 started.\nlivecd ~ # <i>mdadm --create /dev/md4 --level=0 --raid-devices=2 /dev/sda4 /dev/sdb4</i>\nmdadm: array /dev/md4 started.\n\n<comment>(Wait until all units are ready)</comment>\nlivecd ~ # <i>cat /proc/mdstat</i>\nPersonalities : [raid0] [raid1]\nmd4 : active raid0 sdb4[1] sda4[0]\n581006592 blocks 64k chunks\n\nmd3 : active raid1 sdb3[1] sda3[0]\n1959808 blocks [2/2] [UU]\n\nmd1 : active raid1 sdb1[1] sda1[0]\n88256 blocks [2/2] [UU]\n"
+msgid "\nlivecd ~ # <i>mknod /dev/md1 b 9 1</i>\nlivecd ~ # <i>mknod /dev/md3 b 9 3</i>\nlivecd ~ # <i>mknod /dev/md4 b 9 4</i>\n\nlivecd ~ # <i>mdadm --create /dev/md1 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda1 /dev/sdb1</i>\nmdadm: array /dev/md1 started.\nlivecd ~ # <i>mdadm --create /dev/md3 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda3 /dev/sdb3</i>\nmdadm: array /dev/md3 started.\nlivecd ~ # <i>mdadm --create /dev/md4 --level=0 --raid-devices=2 /dev/sda4 /dev/sdb4</i>\nmdadm: array /dev/md4 started.\n\n<comment>(Wait until all units are ready)</comment>\nlivecd ~ # <i>cat /proc/mdstat</i>\nPersonalities : [raid0] [raid1]\nmd4 : active raid0 sdb4[1] sda4[0]\n581006592 blocks 64k chunks\n\nmd3 : active raid1 sdb3[1] sda3[0]\n1959808 blocks [2/2] [UU]\n\nmd1 : active raid1 sdb1[1] sda1[0]\n88256 blocks [2/2] [UU]\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(p):211
@@ -299,7 +299,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(pre):437
#, no-wrap
-msgid "\nlivecd conf.d # <i>exit</i>\nlivecd / # <i>umount /mnt/gentoo/usr/portage/distfiles /mnt/gentoo/usr/portage \\\n/mnt/gentoo/usr /mnt/gentoo/var/tmp /mnt/gentoo/tmp /mnt/gentoo/var \\\n/mnt/gentoo/opt /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/home \\\n/mnt/gentoo/boot /mnt/gentoo</i>\nlivecd / # <i>reboot</i>\n<comment>(Don't forget to remove the CD)</comment>\n"
+msgid "\nlivecd conf.d # <i>exit</i>\nlivecd / # <i>umount -l /mnt/gentoo/usr{/portage/distfiles,/portage,}</i>\nlivecd / # <i>umount -l /mnt/gentoo/dev{/pts,/shm,}</i>\nlivecd / # <i>umount -l /mnt/gentoo{/usr,/var/tmp,/tmp,/var,/opt,/dev,/proc,/home,/boot,}</i>\nlivecd / # <i>reboot</i>\n<comment>(Don't forget to remove the CD)</comment>\n"
msgstr ""
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
diff --git a/doc/gettext/gentoo-x86-quickinstall.xml.pot b/doc/gettext/gentoo-x86-quickinstall.xml.pot
index dddeba1..afc0383 100644
--- a/doc/gettext/gentoo-x86-quickinstall.xml.pot
+++ b/doc/gettext/gentoo-x86-quickinstall.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\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"
@@ -42,11 +42,11 @@ msgid "The Quick Install guide covers the Gentoo install process in a non-verbos
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(version):32
-msgid "25"
+msgid "26"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(date):33
-msgid "2010-01-26"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(title):36
@@ -148,7 +148,7 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(pre):195
#, no-wrap
-msgid "\nlivecd conf.d # <i>exit</i>\nlivecd / # <i>umount /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/boot /mnt/gentoo</i>\nlivecd / # <i>reboot</i>\n<comment>(Don't forget to remove the CD)</comment>\n"
+msgid "\nlivecd conf.d # <i>exit</i>\nlivecd / # <i>umount -l /mnt/gentoo/dev{/shm,/pts,}</i>\nlivecd / # <i>umount -l /mnt/gentoo{/proc,/boot,}</i>\nlivecd / # <i>reboot</i>\n<comment>(Don't forget to remove the CD)</comment>\n"
msgstr ""
#. Place here names of translator, one per line. Format should be NAME; ROLE; E-MAIL
diff --git a/doc/gettext/gentoo-x86-tipsntricks.xml.pot b/doc/gettext/gentoo-x86-tipsntricks.xml.pot
index 5b5f701..024a3d0 100644
--- a/doc/gettext/gentoo-x86-tipsntricks.xml.pot
+++ b/doc/gettext/gentoo-x86-tipsntricks.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-03-18 11:31+0500\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\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"
@@ -46,11 +46,11 @@ msgid "The Gentoo installation allows for very flexible approaches to the variou
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(version):29
-msgid "2"
+msgid "3"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(date):30
-msgid "2011-03-16"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):33
@@ -81,7 +81,7 @@ msgstr ""
msgid "#ata-raid-2.4"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):56 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):185
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):56 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):187
msgid "ATA RAID using 2.4 kernels"
msgstr ""
@@ -89,7 +89,7 @@ msgstr ""
msgid "#livecd-kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):57 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):260
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):57 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):262
msgid "Using the Installation CD kernel"
msgstr ""
@@ -105,7 +105,7 @@ msgstr ""
msgid "#checking-disks"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):73 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):396
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):73 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):398
msgid "Extensive Testing of your Disks"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "#recover"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):75 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):414
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):75 ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):416
msgid "Recovering from a malfunctioning installation"
msgstr ""
@@ -169,281 +169,281 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):134
#, no-wrap
-msgid "\n# <i>mdadm --create --verbose /dev/md1 --level=1 --raid-devices=2 /dev/sda1 /dev/sdb1</i>\n# <i>mdadm --create --verbose /dev/md2 --level=1 --raid-devices=2 /dev/sda2 /dev/sdb2</i>\n# <i>mdadm --create --verbose /dev/md3 --level=1 --raid-devices=2 /dev/sda3 /dev/sdb3</i>\n"
+msgid "\n# <i>mdadm --create --verbose /dev/md1 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda1 /dev/sdb1</i>\n# <i>mdadm --create --verbose /dev/md2 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda2 /dev/sdb2</i>\n# <i>mdadm --create --verbose /dev/md3 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda3 /dev/sdb3</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(impo):140
-msgid "You should not use any form of striping such as RAID-0 or RAID-5 on the partition you boot from."
+msgid "You should not use any form of striping such as RAID-0 or RAID-5 on the partition you boot from. Also, the <c>--metadata=0.90</c> is only necessary for these critical file systems. Other filesystems can use more recent metadata formats."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):145
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):147
msgid "The Linux Software RAID driver will start creating the metadevices. You can see its progress in <path>/proc/mdstat</path>. Wait until the metadevices are completely finished before proceeding."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):151
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):153
msgid "Saving information about the created devices"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):151
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):153
#, no-wrap
msgid "\n# <i>mdadm --detail --scan &gt; /etc/mdadm.conf</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):155
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):157
msgid "From now onwards, use <path>/dev/md1</path> for the boot partition, <path>/dev/md2</path> for the swap partition and <path>/dev/md3</path> for the root partition."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):161
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):163
msgid "Right before chrooting, don't forget to copy over <path>/etc/mdadm.conf</path> to <path>/mnt/gentoo/etc</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):166
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):168
msgid "When you're configuring your kernel, make sure you have the appropriate RAID support <e>in</e> your kernel and not as module."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):171
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):173
msgid "When installing extra tools, emerge <c>mdadm</c> as well. Note that this isn't available on all Installation CDs so you might not be able to install Gentoo on a Software RAID when using a networkless installation!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):177
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):179
msgid "When configuring your bootloader, make sure it gets installed in the MBR of <e>both</e> disks if you use mirroring."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):188
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):190
msgid "Make sure you boot your Installation CD using the <c>doataraid</c> option. Once booted, check the contents of <path>/dev/ataraid</path>. It should contain various <path>disc*</path> directories for each harddisk available in the ATA RAID. An entire disk is displayed as <path>disc</path> while partitions are <path>part*</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):196
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):198
msgid "Write down the various <path>/dev/ataraid/disc*/*</path> device files that you use to install Gentoo on. You will need to substitute the <path>/dev/hda</path> examples in the installation with this path."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):202
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):204
msgid "Before chrooting, bind-mount the <path>/dev</path> structure in the new environment:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):207
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):209
msgid "Bind-mounting /dev"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):207
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):209
#, no-wrap
msgid "\n# <i>mount --rbind /dev /mnt/gentoo/dev</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):211
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):213
msgid "When configuring your kernel, make sure you enable support for your ATA RAID chipset and options. For instance, a popular ATA RAID system is a <e>Promise FastTrack built-in RAID</e> in which case you definitely need <c>Promise FastTrack Options</c> built in into your kernel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):218
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):220
msgid "When configuring GRUB, you first have to create a GRUB bootdisk. This is not as hard as you think. First install GRUB as you would, but when you come to the part where GRUB is getting installed in the MBR, follow the following instructions:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):225
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):227
msgid "Creating a GRUB bootdisk"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):225
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):227
#, no-wrap
msgid "\n# <i>cd /boot/grub</i>\n# <i>dd if=stage1 of=/dev/fd0 bs=512 count=1</i>\n# <i>dd if=stage2 of=/dev/fd0 bs=512 seek=1</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):231
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):233
msgid "You still need to write your <path>grub.conf</path> file. This is no different from the installation instructions, just make sure that your <c>root=</c> points to the ATA RAID device."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):237
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):239
msgid "After finishing the installation, boot with your GRUB bootdisk. You will be greeted by a GRUB prompt. Now configure GRUB to boot from the ATA RAID device:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):242
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):244
msgid "Installing GRUB on the ATA RAID"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):242
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):244
#, no-wrap
msgid "\ngrub&gt; root (hd0,x)\ngrub&gt; setup (hd0)\ngrub&gt; quit\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):248
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):250
msgid "Now reboot (with the GRUB bootfloppy removed)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):252
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):254
msgid "LILO users can safely use the instructions mentioned in the installation instructions."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):263
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):265
msgid "If you don't want to compile a kernel yourself you can use the kernel from the Installation CD and copy it to your system. When you come to the point that you're asked to compile a kernel, go to another terminal (press Alt-F2) and log in with the root password you've supplied at the beginning of the installation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):271
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):273
msgid "Copy over the kernel and modules to your Gentoo system:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):275
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):277
msgid "Copying over the Installation CD kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):275
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):277
#, no-wrap
msgid "\n<comment>(${KN} is the kernel name, usually something like 'gentoo' or 'smp')</comment>\ncdimage ~# <i>cp /mnt/cdrom/isolinux/${KN} /mnt/cdrom/isolinux/${KN}.igz /mnt/gentoo/boot</i>\ncdimage ~# <i>mkdir -p /mnt/gentoo/lib/modules</i>\ncdiamge ~# <i>cp -Rp /lib/modules/`uname -r` /mnt/gentoo/lib/modules</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):284
msgid "To have all modules that are currently running (from the Installation CD) loaded during bootup of your Gentoo system, run the following command from within the chrooted environment:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):288
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):290
msgid "Adding all running modules to the modules.conf file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):288
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):290
#, no-wrap
msgid "\n# <i>cat /proc/modules | cut -d ' ' -f 1 &gt;&gt; \\</i>\n <i>/etc/modules.autoload.d/kernel-`uname -r | cut -d . -f -2`</i>\n# <i>update-modules</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):299
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):301
msgid "Simplifying the Installation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):301
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):303
msgid "Leaving your Terminal"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):304
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):306
msgid "Many people want to leave their system when it's compiling. In certain cases this is rather difficult as the installation is done in a public environment where you cannot trust everyone. If this is the case, you want to be able to perform the compilation in the background and log out from all terminals."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):311
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):313
msgid "There are several possible solutions for this. The first one is to use <c>screen</c>. After booting the Installation CD, set your root password and start a screen session:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(note):317
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(note):319
msgid "Not all Installation CDs provide screen. If this is the case, you will have to use one of the other methods described in this section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):322
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):324
msgid "Starting a screen session"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):322
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):324
#, no-wrap
msgid "\n# <i>screen -S gentoo</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):326
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):328
msgid "Once inside the screen session you can perform the entire installation. When you want to leave your terminal, press <c>Ctrl-a, d</c> (that is, control and a at the same time, then followed by a d) to <e>detach</e> your screen session. You can now safely log out of your system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):333
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):335
msgid "To regain access to your terminal, log in as root again and <e>attach</e> to the running screen session:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):338
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):340
msgid "Attaching to a screen session"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):338
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):340
#, no-wrap
msgid "\n# <i>screen -x gentoo</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):342
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):344
msgid "If you can't use screen, there is still a way to leave your terminal. Follow the installation instructions, but when you come to the point where a long-term compilation would be started (for instance the <c>./scripts/bootstrap.sh</c> step), use <c>nohup</c> which allows for a process to continue even when you log out. Don't forget the trailing \"&amp;\", otherwise the process won't be placed in the background! Remember where you are (the <c>pwd</c> command will show you that) as you will need to know this later on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):352
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):354
msgid "Using nohup"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):352
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):354
#, no-wrap
msgid "\n# <i>pwd</i>\n/usr/portage\n# <i>nohup ./scripts/bootstrap.sh &amp;</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):358
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):360
msgid "Now exit the chrooted environment (<c>exit</c>) and the Installation CD session. Your compilation will continue in the background."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):363
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):365
msgid "When you want to check the compilation, log in as root (on the Installation CD) and chroot back into your environment and go to the directory where you left off:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):369
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):371
msgid "Chrooting back"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):369
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):371
#, no-wrap
msgid "\n# <i>chroot /mnt/gentoo /bin/bash</i>\n# <i>env-update &amp;&amp; source /etc/profile</i>\n# <i>cd /usr/portage</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):375
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):377
msgid "Now use the <c>less</c> command on the <path>nohup.out</path> file that is situated inside that directory. The compilation will append its output to that file, so if you want to follow the compilation progress, run <c>less nohup.out</c> and press <c>F</c> to follow the changes. When the compilation is finished, you can continue with the next step of the installation instructions."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):383
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):385
msgid "If you ever get tired of following the changes, press <c>Ctrl-C</c> followed by a <c>q</c>. This won't stop the compilation process, only the <c>less</c> process."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):394
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):396
msgid "Fixing Errors/Issues"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):399
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):401
msgid "If you think your disk needs to be thoroughly checked for consistency (bad sectors and such), you can use the <c>-c</c> option while placing the ext2 or ext3 filesystem on it (using <c>mke2fs</c>). This will format, perform a read-test and mark all bad blocks as such. If you are really paranoid, use <c>-c -c</c> to format your disk and perform an extensive read/write test."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):407
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):409
msgid "Checking for disk consistency"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):407
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):409
#, no-wrap
msgid "\n# <i>mke2fs -j -c /dev/hda3</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):417
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):419
msgid "If for some reason your Gentoo installation fails, you don't have to redo the installation all over again. Instead, you can safely \"go\" to the point where you think you made a mistake (or where you think the instructions are flawed) and try a different approach."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):424
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):426
msgid "First of all you need to chroot back into your Gentoo Linux environment. Follow the instructions again, but ignore the partitioning steps as your partitions are already created and even populated. You can therefore immediately mount those partitions at <path>/mnt/gentoo</path>. You should also ignore the steps about stage extraction and modifying <path>make.conf</path> - you don't want to overwrite your files do you?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):433
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):435
msgid "Once chrooted inside your Gentoo Linux environment, immediately go to the step where you think you should try a different approach. Don't redo all the steps like bootstrapping and such unless that is the place where you think things went wrong."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):440
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):442
msgid "For instance, if you believe that you have a wrongly configured <path>grub.conf</path>, you can immediately fire up your editor to update <path>/boot/grub/grub.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):446
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):448
msgid "Once you have tried a different approach for your situation, you should consider how much of the subsequent steps you need to perform again. If the subsequent steps are depending on your change, you will need to redo those."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):452
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):454
msgid "For instance,"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):457
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):459
msgid "if you have changed a variable inside <path>make.conf</path> you will need to do all subsequent compiling since those depend on the settings inside <path>make.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):462
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):464
msgid "if you have altered <path>/boot/grub/grub.conf</path> you can immediately exit the chrooted environment and reboot as no subsequent steps are depending on <path>grub.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):467
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):469
msgid "if you have recompiled your kernel you only need to make sure that your bootloader configuration points to the correct kernel image (double-check that you mounted your <path>/boot</path>!), then you can exit the chrooted environment and reboot"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):473
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):475
msgid "if you have altered <path>/etc/fstab</path> you can exit the chrooted environment and reboot"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):479
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):481
msgid "As you can see, for most recovery operations you can immediately reboot. Only in certain cases will you need to redo the subsequent installation steps."
msgstr ""
diff --git a/doc/gettext/java.xml.pot b/doc/gettext/java.xml.pot
index f0f8576..50245e8 100644
--- a/doc/gettext/java.xml.pot
+++ b/doc/gettext/java.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\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"
@@ -50,18 +50,18 @@ msgid "This guide will introduce you to Java and explain how to use Java with Ge
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(version):27
-msgid "0.23"
+msgid "2"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(date):28
-msgid "2010-07-06"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):31
msgid "What is Java?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):33 ../../gentoo/xml/htdocs/doc/en//java.xml(title):170
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):33 ../../gentoo/xml/htdocs/doc/en//java.xml(title):158
msgid "Overview"
msgstr ""
@@ -74,563 +74,555 @@ msgid "In order to run Java bytecode, one needs to have a JRE (Java Runtime Envi
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):60
-msgid "Before You Begin"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):62
-msgid "Existing installs"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):65
-msgid "For existing installs, regardless of if you have installed anything Java before, make sure you have followed the <uri link=\"/proj/en/java/java-upgrade.xml\">Java Upgrade Guide</uri>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):74
-msgid "New installs"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):77
-msgid "New installs should require no further preparation."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):86
msgid "Installing a Virtual Machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):88
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):62
msgid "The choices"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):91
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):65
msgid "Gentoo provides numerous Runtime Environments (JREs) and Development Kits (JDKs). Among the current choices, we have:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):98
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):72
msgid "Vendor"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):99
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):73
msgid "JDK"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):100
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):74
msgid "JRE"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):103
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):77
msgid "Sun's Java Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):104
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):78
msgid "dev-java/sun-jdk"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):105
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):79
msgid "dev-java/sun-jre-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):108
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):82
msgid "The IBM Java Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):109
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):83
msgid "dev-java/ibm-jdk-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):110
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):84
msgid "dev-java/ibm-jre-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):113
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):87
msgid "BEA WebLogic's J2SE Development Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):114
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):88
msgid "dev-java/jrockit-jdk-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):126
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):91
+msgid "The IcedTea Open Java Kit"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):92
+msgid "dev-java/icedtea6-bin"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):104
msgid "Installing a JRE/JDKs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):129
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):107
msgid "To install your profile's default JDK, you can run <c>emerge virtual/jdk</c>. Or to install your profile's default JRE, you can <c>emerge virtual/jre</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):134
-msgid "In recent events, Sun has relicensed their JDK and JRE under a more Linux distro friendly license. As a result, Sun Java 1.5 and onwards are freely downloadable, without any further hassle."
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):112
+msgid "Some JDKs and JREs, including the Sun packages, require accepting an End User License Agreement, or EULA. If its license (such as dlj-1.1) is not listed in ACCEPT_LICENSE in <path>/etc/make.conf</path>, then you won't be able to install the JDK/JRE. For more information on how to add acceptable licenses to <path>make.conf</path>, please read the <uri link=\"/doc/en/handbook/handbook-x86.xml?part=2&amp;chap=1#doc_chap4\">Portage Handbook</uri>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):140
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):122
+msgid "To avoid any restrictive license hassle, consider installing <c>icedtea6-bin</c>, which is an open Java implementation from the OpenJDK project."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):128
msgid "A JDK also includes a JRE, so if you install a JDK you shouldn't have to also have to install a JRE."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):148
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):136
msgid "Installing fetch-restricted virtual machines"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):151
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):139
msgid "Some of the JDKs and JREs require you to jump through a few hoops before installing. Simply emerge the packages as you normally would. The ebuilds will then instruct you where to go and what to download."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):157
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):145
msgid "You should download the indicated file(s) into <path>/usr/portage/distfiles</path>. Once there, you can rerun the emerge command, at which point the JRE/JDK will be begin to install."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):168
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):156
msgid "Configuring your virtual machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):173
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):161
msgid "Gentoo has the ability to have multiple JDKs and JREs installed without causing conflicts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):178
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):166
msgid "Using the <c>java-config</c> tool, you can set the system-wide default (provided you have root access). Users can also use <c>java-config</c> to set up their own personal default."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):184
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):172
msgid "You can also use <e>eselect</e> to change the system and user vm. See <c>eselect java-vm help</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):192
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):180
msgid "Setting a default virtual machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):195
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):183
msgid "Running the command <c>java-config --list-available-vms</c> will give you a list of all JREs and JDKs installed on your system. Here is an example of output:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):201
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):189
msgid "Listing available VMs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):201
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):189
#, no-wrap
msgid "\n# <i>java-config --list-available-vms</i>\nThe following VMs are available for generation-2:\n1) IcedTea6-bin 1.4.1 [icedtea6-bin]\n2) Sun JDK 1.5.0.20 [sun-jdk-1.5] <comment>(Build Only)</comment>\n*) Sun JDK 1.6.0.16 [sun-jdk-1.6]\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):209
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):197
msgid "VMs marked as Build Only may contain security vulnerabilities and/or be EOL. Gentoo recommends not setting these VMs as either your system or user VM. Please see <uri link=\"java.xml#build-only\">Build Only VM</uri> for more information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):216
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):204
msgid "The <e>*</e> indicates this is the current active vm (system-vm or user-vm when set). The name in the brackets (<e>[]</e>) is the handle or ID for that particular VM. You use the handle or the number to <c>java-config --set-system-vm</c>. Here is an example of how to set the system VM."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):223
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):211
msgid "Setting the System VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):223
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):211
#, no-wrap
msgid "\n<comment>(By handle (preferred))</comment>\n# <i>java-config --set-system-vm sun-jdk-1.6</i>\nNow using sun-jdk-1.6 as your generation-2 system JVM\n<comment>(By number)</comment>\n# <i>java-config --set-system-vm 3</i>\nNow using sun-jdk-1.6 as your generation-2 system JVM\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):232
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):220
msgid "As a regular user, you can use <c>java-config --set-user-vm</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):236
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):224
msgid "You no longer have to <c>source</c> the profile for updates to the user/system VM take place."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):244
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):232
msgid "Build Only VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):247
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):235
msgid "Some virtual machines are flagged as build-only due to being EOL and/or containing security vulnerabilities. These virtual machines will not automatically be used by Gentoo for the running of applications using Gentoo launchers but will still be available for use by Gentoo's build environment as some packages may require them for building. The setting of these virtual machines as either your system or user VM is strongly discouraged as these VMs will then be used when running the <path>/usr/bin/{java,javac,..}</path> executables and will also be used by any packages not using Gentoo's launcher scripts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):262
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):250
msgid "Preferred Build VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):265
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):253
msgid "While merging Java packages, the VM used for building can sometimes be different from the one currently set as the system VM."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):270
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):258
msgid "This merge time VM switching is needed when, for example, your system-vm is set to a 1.6 VM and the package you are merging requires a 1.5 VM. While merging it will select and use a 1.5 VM, leaving your system-vm choice intact."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):264
msgid "To define which VM is selected when a switch is needed, we have created a list of <e>default/supported VMs</e> per arch. You can find them in <path>/usr/share/java-config-2/config/jdk-defaults.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):282
-msgid "Of course, Gentoo is all about choice, so you can override these defaults (and even your selected system VM) in <path>/etc/java-config-2/build/jdk.conf</path> and have complete control over which VM will get used for merging. Some examples:"
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):270
+msgid "You can override these defaults (and even your selected system VM) in <path>/etc/java-config-2/build/jdk.conf</path> and have complete control over which VM will get used for merging. Some examples:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):289 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):294 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):299
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):276 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):281 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):286
msgid "Example /etc/java-config-2/build/jdk.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):289
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):276
#, no-wrap
msgid "\n<comment>(I always want it to use a sun-jdk, ie sun-jdk-1.4 for 1.4, sun-jdk-1.5 for 1.5, etc)</comment>\n*=sun-jdk\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):294
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):281
#, no-wrap
msgid "\n<comment>(Always use sun-jdk-1.5 wherever possible, except for when a 1.4 or 1.3 VM is explicitly required)</comment>\n*=sun-jdk-1.5\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):299
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):286
#, no-wrap
msgid "\n<comment># For 1.3 I prefer sun-jdk 1.4 but when it is not available, use ibm-jdk-bin,\n# For 1.5, use sun-jdk </comment>\n1.3=sun-jdk-1.4 ibm-jdk-bin\n1.5=sun-jdk\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):306
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):293
msgid "You do not <e>have</e> to edit this file. If you change these options to use a unsupported VM, things could possibly break. Because of the wide variety of available VMs, we do not have the resources to test and verify every package works on all of them. Bugs reported with a unsupported VM won't be prioritized as much as bugs present within supported VMs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):319
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):306
msgid "Compilers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):323
-msgid "The standard Java compiler used for building is javac, which comes with each JDK. In addition to configuring the VM used at build time, it is also possible configure which compiler is used. Essentially, you define a list your preference for which compiler to use in <path>/etc/java-config-2/build/compilers.conf</path>."
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):310
+msgid "The standard Java compiler used for building is <c>javac</c>, which comes with each JDK. In addition to configuring the VM used at build time, it is also possible configure which compiler is used. Essentially, you define a list your preference for which compiler to use in <path>/etc/java-config-2/build/compilers.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):331
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):318
msgid "/etc/java-config-2/build/compilers.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):331
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):318
#, no-wrap
msgid "\n# If the ebuild supports it\n# it will check the COMPILERS var front to back and\n# use the first compiler that is installed\n\nCOMPILERS=\"ecj-X.Y jikes javac\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):339
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):326
msgid "Some compilers don't support all possible -target and -source arguments. Therefore, each compiler in the list is checked to see if it can support the desired -source/-target. javac will work in all cases, so if no other suitable compiler is found, it will be used instead."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):346
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):333
msgid "More details about each compiler are provided below:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):352
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):339
msgid "Name"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):353
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):340
msgid "Handle"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):354
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):341
msgid "Package"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):355
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):342
msgid "Description"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):358 ../../gentoo/xml/htdocs/doc/en//java.xml(ti):359
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):345 ../../gentoo/xml/htdocs/doc/en//java.xml(ti):346
msgid "javac"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):360
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):347
msgid "N/A"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):361
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):348
msgid "This is the default compiler that will be used, and comes with each JDK."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):366 ../../gentoo/xml/htdocs/doc/en//java.xml(ti):367
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):353 ../../gentoo/xml/htdocs/doc/en//java.xml(ti):354
msgid "jikes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):368
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):355
msgid "dev-java/jikes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):369
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):356
msgid "Jikes was originally developed by IBM. Anecdotally, it is generally quicker than javac. Note however, that it is more pedantic, and will fail under a few circumstances where javac has no issue. It also does not support Java 1.5 syntax yet."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):377
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):364
msgid "Eclipse Compiler for Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):378
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):365
msgid "ecj"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):379
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):366
msgid "dev-java/eclipse-ecj"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):380
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):367
msgid "ECJ is the compiler used by the Eclipse software development kit. It is very full featured, and is pretty fast. It does support Java 1.5 syntax."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):392
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):379
msgid "Setting a default CLASSPATH"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):396
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):383
msgid "The options explained in this section should be considered deprecated and will most likely be removed in the future. We strongly recommend against using these, because your Java projects or application should ideally manage their own classpaths. If you choose to specify a default CLASSPATH, some applications may behave unexpectedly, because classes they weren't expecting would be on the classpath."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):405
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):392
msgid "<c>java-config</c> can also be used to set a system-wide default CLASSPATH, as well a user-specific default CLASSPATH."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):410
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):397
msgid "First, you will want to list available Java libraries installed on your system that might want to be put in your CLASSPATH. Here is an example of output:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):415
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):402
msgid "Listing classes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):415
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):402
#, no-wrap
msgid "\n# <i>java-config --list-available-packages</i>\n[xerces-2] The next generation of high performance, fully compliant XML parsers in the Apache Xerces family (/usr/share/xerces-2/package.env)\n[junit] Simple framework to write repeatable tests (/usr/share/junit/package.env)\n[bsh] BeanShell: A small embeddable Java source interpreter (/usr/share/bsh/package.env)\n[bcel] The Byte Code Engineering Library: analyze, create, manipulate Java class files (/usr/share/bcel/package.env)\n[log4j] A low-overhead robust logging package for Java (/usr/share/log4j/package.env)\n...\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):425
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):412
msgid "Again, the names in brackets (<e>[]</e>) are the IDs that you have to pass to <c>java-config --set-system-classpath</c>. Here is an example:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):430
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):417
msgid "Setting classpaths"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):430
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):417
#, no-wrap
msgid "\n# <i>java-config --set-system-classpath log4j,xerces-2</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):434
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):421
msgid "The current directory (<path>.</path>) will not be part of the system classpath, as that should be added in your system's login profile."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):439
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):426
msgid "You will have to update your environment by logging out, then in again or sourcing <path>/etc/profile</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):444
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):431
msgid "For users, <c>java-config --set-user-classpath</c> will create <path>~/.gentoo/java-env-classpath</path>, which you should then source from your shell's profile."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):450
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):437
msgid "Sourcing user specific classpath"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):456
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):443
msgid "If you really want a system wide or user default classpath you can add something like the following to your shell's profile. But we would advise against it."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):462
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):449
msgid "Setting classpath"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):462
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):449
#, no-wrap
msgid "\n# <i>export CLASSPATH=\"${CLASSPATH}:$(java-config --classpath log4j,xerces-2)\"</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):471
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):458
msgid "Java Browser Plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):473
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):460
msgid "Installing a plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):476
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):463
msgid "You can install a Java plugin for your web browser by emerging a Java VM with the <c>nsplugin</c> USE flag set."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):481
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):468
msgid "<c>nsplugin</c> is not available for all architectures. Check for available plugins on your arch before trying to install a VM by running <c>emerge -pv &lt;java-vm&gt;</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):487
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):474
msgid "Portage will allow you to install multiple versions of Java plugins, though only one will be used by your browser. You can check the list of available plugins by running:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):493 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):562
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):480 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):549
msgid "Viewing available plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):493
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):480
#, no-wrap
msgid "\n# <i>eselect java-nsplugin list</i>\n [1] sun-jre-bin-1.6\n [2] icedtea6-bin\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):499
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):486
msgid "In this example, <c>sun-jre-bin</c> is selected for the browser plugin."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):503
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):490
msgid "Selecting a plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):503
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):490
#, no-wrap
msgid "\n# <i>eselect java-nsplugin set sun-jre-bin-1.6</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):507
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):494
msgid "Verify that the correct plugin was selected:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):511 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):586
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):498 ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):573
msgid "Verifying the correct plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):511
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):498
#, no-wrap
msgid "\n# <i>eselect java-nsplugin list</i>\n [1] sun-jre-bin-1.6 current\n [2] icedtea6-bin\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):517
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):504
msgid "Java.com also provides a link to <uri link=\"http://java.com/en/download/installed.jsp\">verify your installed plugin</uri>. Additionally, if you are using a Mozilla-based browser, you can verify your Java plugin by typing <c>about:plugins</c> into the address bar."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):527
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):514
msgid "Plugins on multilib systems"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):530
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):517
msgid "If you are running a mixed 64-bit and 32-bit multilib system (for example, on AMD64), you can use 64-bit and 32-bit Java plugins. Unless you have a pressing need to run 32-bit Java applications, we recommend using native 64-bit plugins on 64-bit web browsers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):537
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):524
msgid "There are several native 64-bit browser plugins available. The default JDK/JRE pair, <c>sun-jdk</c> and <c>sun-jre-bin</c>, both include browser plugins. Just emerge one of them with the <c>nsplugin</c> USE flag enabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):543
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):530
msgid "Installing a 64-bit plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):543
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):530
#, no-wrap
msgid "\n# <i>echo \"dev-java/sun-jre-bin nsplugin\" &gt;&gt; /etc/portage/package.use</i>\n# <i>emerge sun-jre-bin</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):548
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):535
msgid "To use a 32-bit plugin on a 32-bit browser, you will need to emerge <c>emul-linux-x86-java</c> with the <c>nsplugin</c> USE flag enabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):553
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):540
msgid "Installing a 32-bit plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):553
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):540
#, no-wrap
msgid "\n# <i>echo \"app-emulation/emul-linux-x86-java nsplugin\" &gt;&gt; /etc/portage/package.use</i>\n# <i>emerge emul-linux-x86-java</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):558
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):545
msgid "Next, check which plugins are available:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):562
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):549
#, no-wrap
msgid "\n# <i>eselect java-nsplugin list</i>\nAvailable 32-bit Java browser plugins\n [1] emul-linux-x86-java-1.5\n [2] emul-linux-x86-java-1.6\nAvailable 64-bit Java browser plugins\n [1] icedtea6-bin\n [2] sun-jre-bin-1.6\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):572
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):559
msgid "Now select the right plugin for your browsers:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):576
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):563
msgid "Selecting plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):576
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):563
#, no-wrap
msgid "\n<comment>(Choose the plugins for 32-bit and 64-bit browsers)</comment>\n# <i>eselect java-nsplugin set 32bit emul-linux-x86-java-1.6</i>\n# <i>eselect java-nsplugin set 64bit sun-jre-bin-1.6</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):582
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):569
msgid "Verify the correct plugin was selected:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):586
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):573
#, no-wrap
msgid "\n# <i>eselect java-nsplugin list</i>\nAvailable 32-bit Java browser plugins\n [1] emul-linux-x86-java-1.5\n [2] emul-linux-x86-java-1.6 current\nAvailable 64-bit Java browser plugins\n [1] icedtea6-bin\n [2] sun-jre-bin-1.6 current\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):601
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):588
msgid "USE flags for use with Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):603
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):590
msgid "Setting USE flags"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):606
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):593
msgid "For more information regarding USE flags, refer to the <uri link=\"/doc/en/handbook/handbook-x86.xml?part=2&amp;chap=2\">USE flags</uri> chapter from the Gentoo Handbook."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):615
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):602
msgid "The flags"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):619
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):606
msgid "The <b>java</b> flag adds support for Java in a variety of programs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):620
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):607
msgid "The <b>nsplugin</b> flag adds support for Mozilla-like browsers (including Firefox). You will need this for viewing Java applets in your Mozilla-like browser."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):625
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):612
msgid "The <b>source</b> flag installs a zip of the source code of a package. This is traditionally used for IDEs to 'attach' source to the libraries you are using."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):630
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):617
msgid "The <b>jce</b> flag adds support for the Java Cryptography Engine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):631
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):618
msgid "For Java packages, the <b>doc</b> flag will build API documentation using javadoc."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):642
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):629
msgid "Additional resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):644
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):631
msgid "Off-line resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):648
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):635
msgid "java-config man page"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):655
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):642
msgid "Online resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):659
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):646
msgid "The <uri link=\"http://www.gentoo.org/proj/en/java/\">Java Project Page</uri>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):663
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):650
msgid "The <uri link=\"http://news.gmane.org/gmane.linux.gentoo.java\">gentoo-java</uri>, <uri link=\"http://news.gmane.org/gmane.linux.gentoo.user\">gentoo-user</uri>, and <uri link=\"http://news.gmane.org/gmane.linux.gentoo.devel\">gentoo-dev</uri> mailing list archives"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):672
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):659
msgid "<uri link=\"irc://irc.gentoo.org/gentoo\">#gentoo</uri> and <uri link=\"irc://irc.gentoo.org/gentoo-java\">#gentoo-java</uri> on IRC"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri:link):678
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri:link):665
msgid "http://en.wikipedia.org/wiki/Java_programming_language"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri):678
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri):665
msgid "Wikipedia's entry for Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):681
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):668
msgid "If you have suggestions or questions regarding this document, please email the Gentoo Java team: <mail>java@gentoo.org</mail>"
msgstr ""
diff --git a/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po b/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po
index fc8d53e..411bec2 100644
--- a/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po
+++ b/doc/gettext/ru/gentoo-x86+raid+lvm2-quickinstall.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-02-09 00:58+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -53,13 +53,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(version):32
-msgid "16"
+msgid "18"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(date):33
-#, fuzzy
-msgid "2010-06-15"
-msgstr "2009-03-13"
+msgid "2011-05-09"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86+raid+lvm2-quickinstall.xml(title):36
#, fuzzy
@@ -244,7 +243,7 @@ msgid ""
"\n"
"livecd ~ # <i>mdadm --create /dev/md1 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda1 /dev/sdb1</i>\n"
"mdadm: array /dev/md1 started.\n"
-"livecd ~ # <i>mdadm --create /dev/md3 --level=1 --raid-devices=2 /dev/sda3 /dev/sdb3</i>\n"
+"livecd ~ # <i>mdadm --create /dev/md3 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda3 /dev/sdb3</i>\n"
"mdadm: array /dev/md3 started.\n"
"livecd ~ # <i>mdadm --create /dev/md4 --level=0 --raid-devices=2 /dev/sda4 /dev/sdb4</i>\n"
"mdadm: array /dev/md4 started.\n"
@@ -552,10 +551,9 @@ msgstr ""
msgid ""
"\n"
"livecd conf.d # <i>exit</i>\n"
-"livecd / # <i>umount /mnt/gentoo/usr/portage/distfiles /mnt/gentoo/usr/portage \\\n"
-"/mnt/gentoo/usr /mnt/gentoo/var/tmp /mnt/gentoo/tmp /mnt/gentoo/var \\\n"
-"/mnt/gentoo/opt /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/home \\\n"
-"/mnt/gentoo/boot /mnt/gentoo</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo/usr{/portage/distfiles,/portage,}</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo/dev{/pts,/shm,}</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo{/usr,/var/tmp,/tmp,/var,/opt,/dev,/proc,/home,/boot,}</i>\n"
"livecd / # <i>reboot</i>\n"
"<comment>(Don't forget to remove the CD)</comment>\n"
msgstr ""
diff --git a/doc/gettext/ru/gentoo-x86-quickinstall.xml.po b/doc/gettext/ru/gentoo-x86-quickinstall.xml.po
index 514d49f..e7eca40 100644
--- a/doc/gettext/ru/gentoo-x86-quickinstall.xml.po
+++ b/doc/gettext/ru/gentoo-x86-quickinstall.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-02-09 00:58+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -53,13 +53,12 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(version):32
-msgid "25"
+msgid "26"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(date):33
-#, fuzzy
-msgid "2010-01-26"
-msgstr "2009-03-13"
+msgid "2011-05-09"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-quickinstall.xml(title):36
msgid "Introduction"
@@ -249,7 +248,8 @@ msgstr ""
msgid ""
"\n"
"livecd conf.d # <i>exit</i>\n"
-"livecd / # <i>umount /mnt/gentoo/dev /mnt/gentoo/proc /mnt/gentoo/boot /mnt/gentoo</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo/dev{/shm,/pts,}</i>\n"
+"livecd / # <i>umount -l /mnt/gentoo{/proc,/boot,}</i>\n"
"livecd / # <i>reboot</i>\n"
"<comment>(Don't forget to remove the CD)</comment>\n"
msgstr ""
diff --git a/doc/gettext/ru/gentoo-x86-tipsntricks.xml.po b/doc/gettext/ru/gentoo-x86-tipsntricks.xml.po
index 6bb9abc..1281838 100644
--- a/doc/gettext/ru/gentoo-x86-tipsntricks.xml.po
+++ b/doc/gettext/ru/gentoo-x86-tipsntricks.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2011-03-18 11:31+0500\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-02-09 00:58+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -56,11 +56,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(version):29
-msgid "2"
+msgid "3"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(date):30
-msgid "2011-03-16"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):33
@@ -96,7 +96,7 @@ msgid "#ata-raid-2.4"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):56
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):185
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):187
msgid "ATA RAID using 2.4 kernels"
msgstr ""
@@ -105,7 +105,7 @@ msgid "#livecd-kernel"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):57
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):260
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):262
msgid "Using the Installation CD kernel"
msgstr ""
@@ -122,7 +122,7 @@ msgid "#checking-disks"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):73
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):396
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):398
msgid "Extensive Testing of your Disks"
msgstr ""
@@ -131,7 +131,7 @@ msgid "#recover"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(uri):75
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):414
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):416
msgid "Recovering from a malfunctioning installation"
msgstr ""
@@ -214,68 +214,70 @@ msgstr ""
#, no-wrap
msgid ""
"\n"
-"# <i>mdadm --create --verbose /dev/md1 --level=1 --raid-devices=2 /dev/sda1 /dev/sdb1</i>\n"
-"# <i>mdadm --create --verbose /dev/md2 --level=1 --raid-devices=2 /dev/sda2 /dev/sdb2</i>\n"
-"# <i>mdadm --create --verbose /dev/md3 --level=1 --raid-devices=2 /dev/sda3 /dev/sdb3</i>\n"
+"# <i>mdadm --create --verbose /dev/md1 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda1 /dev/sdb1</i>\n"
+"# <i>mdadm --create --verbose /dev/md2 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda2 /dev/sdb2</i>\n"
+"# <i>mdadm --create --verbose /dev/md3 --level=1 --raid-devices=2 --metadata=0.90 /dev/sda3 /dev/sdb3</i>\n"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(impo):140
msgid ""
"You should not use any form of striping such as RAID-0 or RAID-5 on the "
-"partition you boot from."
+"partition you boot from. Also, the <c>--metadata=0.90</c> is only necessary "
+"for these critical file systems. Other filesystems can use more recent "
+"metadata formats."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):145
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):147
msgid ""
"The Linux Software RAID driver will start creating the metadevices. You can "
"see its progress in <path>/proc/mdstat</path>. Wait until the metadevices "
"are completely finished before proceeding."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):151
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):153
msgid "Saving information about the created devices"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):151
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):153
#, no-wrap
msgid ""
"\n"
"# <i>mdadm --detail --scan &gt; /etc/mdadm.conf</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):155
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):157
msgid ""
"From now onwards, use <path>/dev/md1</path> for the boot partition, <path>/"
"dev/md2</path> for the swap partition and <path>/dev/md3</path> for the root "
"partition."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):161
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):163
msgid ""
"Right before chrooting, don't forget to copy over <path>/etc/mdadm.conf</"
"path> to <path>/mnt/gentoo/etc</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):166
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):168
msgid ""
"When you're configuring your kernel, make sure you have the appropriate RAID "
"support <e>in</e> your kernel and not as module."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):171
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):173
msgid ""
"When installing extra tools, emerge <c>mdadm</c> as well. Note that this "
"isn't available on all Installation CDs so you might not be able to install "
"Gentoo on a Software RAID when using a networkless installation!"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):177
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):179
msgid ""
"When configuring your bootloader, make sure it gets installed in the MBR of "
"<e>both</e> disks if you use mirroring."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):188
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):190
msgid ""
"Make sure you boot your Installation CD using the <c>doataraid</c> option. "
"Once booted, check the contents of <path>/dev/ataraid</path>. It should "
@@ -284,31 +286,31 @@ msgid ""
"partitions are <path>part*</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):196
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):198
msgid ""
"Write down the various <path>/dev/ataraid/disc*/*</path> device files that "
"you use to install Gentoo on. You will need to substitute the <path>/dev/"
"hda</path> examples in the installation with this path."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):202
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):204
msgid ""
"Before chrooting, bind-mount the <path>/dev</path> structure in the new "
"environment:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):207
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):209
msgid "Bind-mounting /dev"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):207
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):209
#, no-wrap
msgid ""
"\n"
"# <i>mount --rbind /dev /mnt/gentoo/dev</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):211
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):213
msgid ""
"When configuring your kernel, make sure you enable support for your ATA RAID "
"chipset and options. For instance, a popular ATA RAID system is a <e>Promise "
@@ -316,7 +318,7 @@ msgid ""
"FastTrack Options</c> built in into your kernel."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):218
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):220
msgid ""
"When configuring GRUB, you first have to create a GRUB bootdisk. This is not "
"as hard as you think. First install GRUB as you would, but when you come to "
@@ -324,11 +326,11 @@ msgid ""
"instructions:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):225
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):227
msgid "Creating a GRUB bootdisk"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):225
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):227
#, no-wrap
msgid ""
"\n"
@@ -337,25 +339,25 @@ msgid ""
"# <i>dd if=stage2 of=/dev/fd0 bs=512 seek=1</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):231
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):233
msgid ""
"You still need to write your <path>grub.conf</path> file. This is no "
"different from the installation instructions, just make sure that your "
"<c>root=</c> points to the ATA RAID device."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):237
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):239
msgid ""
"After finishing the installation, boot with your GRUB bootdisk. You will be "
"greeted by a GRUB prompt. Now configure GRUB to boot from the ATA RAID "
"device:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):242
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):244
msgid "Installing GRUB on the ATA RAID"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):242
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):244
#, no-wrap
msgid ""
"\n"
@@ -364,17 +366,17 @@ msgid ""
"grub&gt; quit\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):248
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):250
msgid "Now reboot (with the GRUB bootfloppy removed)."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):252
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):254
msgid ""
"LILO users can safely use the instructions mentioned in the installation "
"instructions."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):263
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):265
msgid ""
"If you don't want to compile a kernel yourself you can use the kernel from "
"the Installation CD and copy it to your system. When you come to the point "
@@ -383,15 +385,15 @@ msgid ""
"installation."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):271
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):273
msgid "Copy over the kernel and modules to your Gentoo system:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):275
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):277
msgid "Copying over the Installation CD kernel"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):275
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):277
#, no-wrap
msgid ""
"\n"
@@ -401,18 +403,18 @@ msgid ""
"cdiamge ~# <i>cp -Rp /lib/modules/`uname -r` /mnt/gentoo/lib/modules</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):284
msgid ""
"To have all modules that are currently running (from the Installation CD) "
"loaded during bootup of your Gentoo system, run the following command from "
"within the chrooted environment:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):288
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):290
msgid "Adding all running modules to the modules.conf file"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):288
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):290
#, no-wrap
msgid ""
"\n"
@@ -421,15 +423,15 @@ msgid ""
"# <i>update-modules</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):299
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):301
msgid "Simplifying the Installation"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):301
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):303
msgid "Leaving your Terminal"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):304
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):306
msgid ""
"Many people want to leave their system when it's compiling. In certain cases "
"this is rather difficult as the installation is done in a public environment "
@@ -437,31 +439,31 @@ msgid ""
"perform the compilation in the background and log out from all terminals."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):311
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):313
msgid ""
"There are several possible solutions for this. The first one is to use "
"<c>screen</c>. After booting the Installation CD, set your root password and "
"start a screen session:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(note):317
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(note):319
msgid ""
"Not all Installation CDs provide screen. If this is the case, you will have "
"to use one of the other methods described in this section."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):322
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):324
msgid "Starting a screen session"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):322
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):324
#, no-wrap
msgid ""
"\n"
"# <i>screen -S gentoo</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):326
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):328
msgid ""
"Once inside the screen session you can perform the entire installation. When "
"you want to leave your terminal, press <c>Ctrl-a, d</c> (that is, control "
@@ -469,24 +471,24 @@ msgid ""
"session. You can now safely log out of your system."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):333
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):335
msgid ""
"To regain access to your terminal, log in as root again and <e>attach</e> to "
"the running screen session:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):338
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):340
msgid "Attaching to a screen session"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):338
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):340
#, no-wrap
msgid ""
"\n"
"# <i>screen -x gentoo</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):342
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):344
msgid ""
"If you can't use screen, there is still a way to leave your terminal. Follow "
"the installation instructions, but when you come to the point where a long-"
@@ -497,11 +499,11 @@ msgid ""
"command will show you that) as you will need to know this later on."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):352
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):354
msgid "Using nohup"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):352
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):354
#, no-wrap
msgid ""
"\n"
@@ -510,24 +512,24 @@ msgid ""
"# <i>nohup ./scripts/bootstrap.sh &amp;</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):358
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):360
msgid ""
"Now exit the chrooted environment (<c>exit</c>) and the Installation CD "
"session. Your compilation will continue in the background."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):363
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):365
msgid ""
"When you want to check the compilation, log in as root (on the Installation "
"CD) and chroot back into your environment and go to the directory where you "
"left off:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):369
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):371
msgid "Chrooting back"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):369
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):371
#, no-wrap
msgid ""
"\n"
@@ -536,7 +538,7 @@ msgid ""
"# <i>cd /usr/portage</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):375
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):377
msgid ""
"Now use the <c>less</c> command on the <path>nohup.out</path> file that is "
"situated inside that directory. The compilation will append its output to "
@@ -546,18 +548,18 @@ msgid ""
"instructions."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):383
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):385
msgid ""
"If you ever get tired of following the changes, press <c>Ctrl-C</c> followed "
"by a <c>q</c>. This won't stop the compilation process, only the <c>less</c> "
"process."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):394
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(title):396
msgid "Fixing Errors/Issues"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):399
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):401
msgid ""
"If you think your disk needs to be thoroughly checked for consistency (bad "
"sectors and such), you can use the <c>-c</c> option while placing the ext2 "
@@ -566,18 +568,18 @@ msgid ""
"<c>-c -c</c> to format your disk and perform an extensive read/write test."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):407
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre:caption):409
msgid "Checking for disk consistency"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):407
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(pre):409
#, no-wrap
msgid ""
"\n"
"# <i>mke2fs -j -c /dev/hda3</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):417
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):419
msgid ""
"If for some reason your Gentoo installation fails, you don't have to redo "
"the installation all over again. Instead, you can safely \"go\" to the point "
@@ -585,7 +587,7 @@ msgid ""
"flawed) and try a different approach."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):424
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):426
msgid ""
"First of all you need to chroot back into your Gentoo Linux environment. "
"Follow the instructions again, but ignore the partitioning steps as your "
@@ -595,7 +597,7 @@ msgid ""
"path> - you don't want to overwrite your files do you?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):433
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):435
msgid ""
"Once chrooted inside your Gentoo Linux environment, immediately go to the "
"step where you think you should try a different approach. Don't redo all the "
@@ -603,39 +605,39 @@ msgid ""
"things went wrong."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):440
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):442
msgid ""
"For instance, if you believe that you have a wrongly configured <path>grub."
"conf</path>, you can immediately fire up your editor to update <path>/boot/"
"grub/grub.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):446
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):448
msgid ""
"Once you have tried a different approach for your situation, you should "
"consider how much of the subsequent steps you need to perform again. If the "
"subsequent steps are depending on your change, you will need to redo those."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):452
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):454
msgid "For instance,"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):457
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):459
msgid ""
"if you have changed a variable inside <path>make.conf</path> you will need "
"to do all subsequent compiling since those depend on the settings inside "
"<path>make.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):462
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):464
msgid ""
"if you have altered <path>/boot/grub/grub.conf</path> you can immediately "
"exit the chrooted environment and reboot as no subsequent steps are "
"depending on <path>grub.conf</path>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):467
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):469
msgid ""
"if you have recompiled your kernel you only need to make sure that your "
"bootloader configuration points to the correct kernel image (double-check "
@@ -643,13 +645,13 @@ msgid ""
"environment and reboot"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):473
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(li):475
msgid ""
"if you have altered <path>/etc/fstab</path> you can exit the chrooted "
"environment and reboot"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):479
+#: ../../gentoo/xml/htdocs/doc/en//gentoo-x86-tipsntricks.xml(p):481
msgid ""
"As you can see, for most recovery operations you can immediately reboot. "
"Only in certain cases will you need to redo the subsequent installation "
diff --git a/doc/gettext/ru/java.xml.po b/doc/gettext/ru/java.xml.po
index dba1a73..3583bb6 100644
--- a/doc/gettext/ru/java.xml.po
+++ b/doc/gettext/ru/java.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-02-09 01:01+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -58,12 +58,11 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(version):27
-#, fuzzy
-msgid "0.23"
-msgstr "0.20"
+msgid "2"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(date):28
-msgid "2010-07-06"
+msgid "2011-05-09"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):31
@@ -71,7 +70,7 @@ msgid "What is Java?"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):33
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):170
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):158
msgid "Overview"
msgstr ""
@@ -97,167 +96,162 @@ msgid ""
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):60
-msgid "Before You Begin"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):62
-msgid "Existing installs"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):65
-msgid ""
-"For existing installs, regardless of if you have installed anything Java "
-"before, make sure you have followed the <uri link=\"/proj/en/java/java-"
-"upgrade.xml\">Java Upgrade Guide</uri>."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):74
-msgid "New installs"
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):77
-msgid "New installs should require no further preparation."
-msgstr ""
-
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):86
msgid "Installing a Virtual Machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):88
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):62
msgid "The choices"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):91
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):65
msgid ""
"Gentoo provides numerous Runtime Environments (JREs) and Development Kits "
"(JDKs). Among the current choices, we have:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):98
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):72
msgid "Vendor"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):99
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):73
msgid "JDK"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):100
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):74
msgid "JRE"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):103
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):77
msgid "Sun's Java Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):104
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):78
msgid "dev-java/sun-jdk"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):105
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):79
msgid "dev-java/sun-jre-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):108
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):82
msgid "The IBM Java Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):109
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):83
msgid "dev-java/ibm-jdk-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):110
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):84
msgid "dev-java/ibm-jre-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):113
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):87
msgid "BEA WebLogic's J2SE Development Kit"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):114
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):88
msgid "dev-java/jrockit-jdk-bin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):126
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):91
+msgid "The IcedTea Open Java Kit"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):92
+msgid "dev-java/icedtea6-bin"
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):104
msgid "Installing a JRE/JDKs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):129
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):107
msgid ""
"To install your profile's default JDK, you can run <c>emerge virtual/jdk</"
"c>. Or to install your profile's default JRE, you can <c>emerge virtual/jre</"
"c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):134
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):112
+msgid ""
+"Some JDKs and JREs, including the Sun packages, require accepting an End "
+"User License Agreement, or EULA. If its license (such as dlj-1.1) is not "
+"listed in ACCEPT_LICENSE in <path>/etc/make.conf</path>, then you won't be "
+"able to install the JDK/JRE. For more information on how to add acceptable "
+"licenses to <path>make.conf</path>, please read the <uri link=\"/doc/en/"
+"handbook/handbook-x86.xml?part=2&amp;chap=1#doc_chap4\">Portage Handbook</"
+"uri>."
+msgstr ""
+
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):122
msgid ""
-"In recent events, Sun has relicensed their JDK and JRE under a more Linux "
-"distro friendly license. As a result, Sun Java 1.5 and onwards are freely "
-"downloadable, without any further hassle."
+"To avoid any restrictive license hassle, consider installing <c>icedtea6-"
+"bin</c>, which is an open Java implementation from the OpenJDK project."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):140
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):128
msgid ""
"A JDK also includes a JRE, so if you install a JDK you shouldn't have to "
"also have to install a JRE."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):148
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):136
msgid "Installing fetch-restricted virtual machines"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):151
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):139
msgid ""
"Some of the JDKs and JREs require you to jump through a few hoops before "
"installing. Simply emerge the packages as you normally would. The ebuilds "
"will then instruct you where to go and what to download."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):157
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):145
msgid ""
"You should download the indicated file(s) into <path>/usr/portage/distfiles</"
"path>. Once there, you can rerun the emerge command, at which point the JRE/"
"JDK will be begin to install."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):168
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):156
msgid "Configuring your virtual machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):173
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):161
msgid ""
"Gentoo has the ability to have multiple JDKs and JREs installed without "
"causing conflicts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):178
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):166
msgid ""
"Using the <c>java-config</c> tool, you can set the system-wide default "
"(provided you have root access). Users can also use <c>java-config</c> to "
"set up their own personal default."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):184
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):172
msgid ""
"You can also use <e>eselect</e> to change the system and user vm. See "
"<c>eselect java-vm help</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):192
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):180
msgid "Setting a default virtual machine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):195
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):183
msgid ""
"Running the command <c>java-config --list-available-vms</c> will give you a "
"list of all JREs and JDKs installed on your system. Here is an example of "
"output:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):201
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):189
msgid "Listing available VMs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):201
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):189
#, no-wrap
msgid ""
"\n"
@@ -268,7 +262,7 @@ msgid ""
"*) Sun JDK 1.6.0.16 [sun-jdk-1.6]\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):209
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):197
msgid ""
"VMs marked as Build Only may contain security vulnerabilities and/or be EOL. "
"Gentoo recommends not setting these VMs as either your system or user VM. "
@@ -276,7 +270,7 @@ msgid ""
"information."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):216
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):204
msgid ""
"The <e>*</e> indicates this is the current active vm (system-vm or user-vm "
"when set). The name in the brackets (<e>[]</e>) is the handle or ID for that "
@@ -284,11 +278,11 @@ msgid ""
"system-vm</c>. Here is an example of how to set the system VM."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):223
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):211
msgid "Setting the System VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):223
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):211
#, no-wrap
msgid ""
"\n"
@@ -300,21 +294,21 @@ msgid ""
"Now using sun-jdk-1.6 as your generation-2 system JVM\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):232
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):220
msgid "As a regular user, you can use <c>java-config --set-user-vm</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):236
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):224
msgid ""
"You no longer have to <c>source</c> the profile for updates to the user/"
"system VM take place."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):244
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):232
msgid "Build Only VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):247
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):235
msgid ""
"Some virtual machines are flagged as build-only due to being EOL and/or "
"containing security vulnerabilities. These virtual machines will not "
@@ -327,17 +321,17 @@ msgid ""
"launcher scripts."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):262
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):250
msgid "Preferred Build VM"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):265
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):253
msgid ""
"While merging Java packages, the VM used for building can sometimes be "
"different from the one currently set as the system VM."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):270
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):258
msgid ""
"This merge time VM switching is needed when, for example, your system-vm is "
"set to a 1.6 VM and the package you are merging requires a 1.5 VM. While "
@@ -345,28 +339,27 @@ msgid ""
"intact."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):264
msgid ""
"To define which VM is selected when a switch is needed, we have created a "
"list of <e>default/supported VMs</e> per arch. You can find them in <path>/"
"usr/share/java-config-2/config/jdk-defaults.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):282
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):270
msgid ""
-"Of course, Gentoo is all about choice, so you can override these defaults "
-"(and even your selected system VM) in <path>/etc/java-config-2/build/jdk."
-"conf</path> and have complete control over which VM will get used for "
-"merging. Some examples:"
+"You can override these defaults (and even your selected system VM) in <path>/"
+"etc/java-config-2/build/jdk.conf</path> and have complete control over which "
+"VM will get used for merging. Some examples:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):289
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):294
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):299
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):276
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):281
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):286
msgid "Example /etc/java-config-2/build/jdk.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):289
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):276
#, no-wrap
msgid ""
"\n"
@@ -374,7 +367,7 @@ msgid ""
"*=sun-jdk\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):294
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):281
#, no-wrap
msgid ""
"\n"
@@ -382,7 +375,7 @@ msgid ""
"*=sun-jdk-1.5\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):299
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):286
#, no-wrap
msgid ""
"\n"
@@ -392,7 +385,7 @@ msgid ""
"1.5=sun-jdk\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):306
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):293
msgid ""
"You do not <e>have</e> to edit this file. If you change these options to use "
"a unsupported VM, things could possibly break. Because of the wide variety "
@@ -401,24 +394,24 @@ msgid ""
"prioritized as much as bugs present within supported VMs."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):319
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):306
msgid "Compilers"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):323
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):310
msgid ""
-"The standard Java compiler used for building is javac, which comes with each "
-"JDK. In addition to configuring the VM used at build time, it is also "
-"possible configure which compiler is used. Essentially, you define a list "
-"your preference for which compiler to use in <path>/etc/java-config-2/build/"
-"compilers.conf</path>."
+"The standard Java compiler used for building is <c>javac</c>, which comes "
+"with each JDK. In addition to configuring the VM used at build time, it is "
+"also possible configure which compiler is used. Essentially, you define a "
+"list your preference for which compiler to use in <path>/etc/java-config-2/"
+"build/compilers.conf</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):331
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):318
msgid "/etc/java-config-2/build/compilers.conf"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):331
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):318
#, no-wrap
msgid ""
"\n"
@@ -429,7 +422,7 @@ msgid ""
"COMPILERS=\"ecj-X.Y jikes javac\"\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):339
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):326
msgid ""
"Some compilers don't support all possible -target and -source arguments. "
"Therefore, each compiler in the list is checked to see if it can support the "
@@ -437,50 +430,50 @@ msgid ""
"suitable compiler is found, it will be used instead."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):346
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):333
msgid "More details about each compiler are provided below:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):352
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):339
msgid "Name"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):353
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):340
msgid "Handle"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):354
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):341
msgid "Package"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):355
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(th):342
msgid "Description"
msgstr "Описание"
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):358
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):359
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):345
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):346
msgid "javac"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):360
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):347
msgid "N/A"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):361
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):348
msgid ""
"This is the default compiler that will be used, and comes with each JDK."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):366
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):367
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):353
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):354
msgid "jikes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):368
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):355
msgid "dev-java/jikes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):369
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):356
msgid ""
"Jikes was originally developed by IBM. Anecdotally, it is generally quicker "
"than javac. Note however, that it is more pedantic, and will fail under a "
@@ -488,29 +481,29 @@ msgid ""
"1.5 syntax yet."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):377
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):364
msgid "Eclipse Compiler for Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):378
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):365
msgid "ecj"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):379
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):366
msgid "dev-java/eclipse-ecj"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):380
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(ti):367
msgid ""
"ECJ is the compiler used by the Eclipse software development kit. It is very "
"full featured, and is pretty fast. It does support Java 1.5 syntax."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):392
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):379
msgid "Setting a default CLASSPATH"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):396
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(warn):383
msgid ""
"The options explained in this section should be considered deprecated and "
"will most likely be removed in the future. We strongly recommend against "
@@ -520,24 +513,24 @@ msgid ""
"would be on the classpath."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):405
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):392
msgid ""
"<c>java-config</c> can also be used to set a system-wide default CLASSPATH, "
"as well a user-specific default CLASSPATH."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):410
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):397
msgid ""
"First, you will want to list available Java libraries installed on your "
"system that might want to be put in your CLASSPATH. Here is an example of "
"output:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):415
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):402
msgid "Listing classes"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):415
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):402
#, no-wrap
msgid ""
"\n"
@@ -550,98 +543,98 @@ msgid ""
"...\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):425
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):412
msgid ""
"Again, the names in brackets (<e>[]</e>) are the IDs that you have to pass "
"to <c>java-config --set-system-classpath</c>. Here is an example:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):430
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):417
msgid "Setting classpaths"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):430
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):417
#, no-wrap
msgid ""
"\n"
"# <i>java-config --set-system-classpath log4j,xerces-2</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):434
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):421
msgid ""
"The current directory (<path>.</path>) will not be part of the system "
"classpath, as that should be added in your system's login profile."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):439
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):426
msgid ""
"You will have to update your environment by logging out, then in again or "
"sourcing <path>/etc/profile</path>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):444
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):431
msgid ""
"For users, <c>java-config --set-user-classpath</c> will create <path>~/."
"gentoo/java-env-classpath</path>, which you should then source from your "
"shell's profile."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):450
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):437
msgid "Sourcing user specific classpath"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):456
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):443
msgid ""
"If you really want a system wide or user default classpath you can add "
"something like the following to your shell's profile. But we would advise "
"against it."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):462
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):449
msgid "Setting classpath"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):462
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):449
#, no-wrap
msgid ""
"\n"
"# <i>export CLASSPATH=\"${CLASSPATH}:$(java-config --classpath log4j,xerces-2)\"</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):471
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):458
msgid "Java Browser Plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):473
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):460
msgid "Installing a plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):476
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):463
msgid ""
"You can install a Java plugin for your web browser by emerging a Java VM "
"with the <c>nsplugin</c> USE flag set."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):481
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(note):468
msgid ""
"<c>nsplugin</c> is not available for all architectures. Check for available "
"plugins on your arch before trying to install a VM by running <c>emerge -pv "
"&lt;java-vm&gt;</c>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):487
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):474
msgid ""
"Portage will allow you to install multiple versions of Java plugins, though "
"only one will be used by your browser. You can check the list of available "
"plugins by running:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):493
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):562
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):480
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):549
msgid "Viewing available plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):493
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):480
#, no-wrap
msgid ""
"\n"
@@ -650,31 +643,31 @@ msgid ""
" [2] icedtea6-bin\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):499
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):486
msgid "In this example, <c>sun-jre-bin</c> is selected for the browser plugin."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):503
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):490
msgid "Selecting a plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):503
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):490
#, no-wrap
msgid ""
"\n"
"# <i>eselect java-nsplugin set sun-jre-bin-1.6</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):507
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):494
msgid "Verify that the correct plugin was selected:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):511
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):586
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):498
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):573
msgid "Verifying the correct plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):511
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):498
#, no-wrap
msgid ""
"\n"
@@ -683,7 +676,7 @@ msgid ""
" [2] icedtea6-bin\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):517
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):504
msgid ""
"Java.com also provides a link to <uri link=\"http://java.com/en/download/"
"installed.jsp\">verify your installed plugin</uri>. Additionally, if you are "
@@ -691,11 +684,11 @@ msgid ""
"<c>about:plugins</c> into the address bar."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):527
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):514
msgid "Plugins on multilib systems"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):530
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):517
msgid ""
"If you are running a mixed 64-bit and 32-bit multilib system (for example, "
"on AMD64), you can use 64-bit and 32-bit Java plugins. Unless you have a "
@@ -703,18 +696,18 @@ msgid ""
"bit plugins on 64-bit web browsers."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):537
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):524
msgid ""
"There are several native 64-bit browser plugins available. The default JDK/"
"JRE pair, <c>sun-jdk</c> and <c>sun-jre-bin</c>, both include browser "
"plugins. Just emerge one of them with the <c>nsplugin</c> USE flag enabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):543
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):530
msgid "Installing a 64-bit plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):543
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):530
#, no-wrap
msgid ""
"\n"
@@ -722,17 +715,17 @@ msgid ""
"# <i>emerge sun-jre-bin</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):548
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):535
msgid ""
"To use a 32-bit plugin on a 32-bit browser, you will need to emerge <c>emul-"
"linux-x86-java</c> with the <c>nsplugin</c> USE flag enabled."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):553
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):540
msgid "Installing a 32-bit plugin"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):553
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):540
#, no-wrap
msgid ""
"\n"
@@ -740,11 +733,11 @@ msgid ""
"# <i>emerge emul-linux-x86-java</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):558
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):545
msgid "Next, check which plugins are available:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):562
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):549
#, no-wrap
msgid ""
"\n"
@@ -757,15 +750,15 @@ msgid ""
" [2] sun-jre-bin-1.6\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):572
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):559
msgid "Now select the right plugin for your browsers:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):576
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre:caption):563
msgid "Selecting plugins"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):576
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):563
#, no-wrap
msgid ""
"\n"
@@ -774,11 +767,11 @@ msgid ""
"# <i>eselect java-nsplugin set 64bit sun-jre-bin-1.6</i>\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):582
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):569
msgid "Verify the correct plugin was selected:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):586
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(pre):573
#, no-wrap
msgid ""
"\n"
@@ -791,75 +784,75 @@ msgid ""
" [2] sun-jre-bin-1.6 current\n"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):601
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):588
msgid "USE flags for use with Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):603
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):590
msgid "Setting USE flags"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):606
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(p):593
msgid ""
"For more information regarding USE flags, refer to the <uri link=\"/doc/en/"
"handbook/handbook-x86.xml?part=2&amp;chap=2\">USE flags</uri> chapter from "
"the Gentoo Handbook."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):615
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):602
msgid "The flags"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):619
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):606
msgid "The <b>java</b> flag adds support for Java in a variety of programs"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):620
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):607
msgid ""
"The <b>nsplugin</b> flag adds support for Mozilla-like browsers (including "
"Firefox). You will need this for viewing Java applets in your Mozilla-like "
"browser."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):625
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):612
msgid ""
"The <b>source</b> flag installs a zip of the source code of a package. This "
"is traditionally used for IDEs to 'attach' source to the libraries you are "
"using."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):630
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):617
msgid "The <b>jce</b> flag adds support for the Java Cryptography Engine"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):631
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):618
msgid ""
"For Java packages, the <b>doc</b> flag will build API documentation using "
"javadoc."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):642
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):629
msgid "Additional resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):644
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):631
msgid "Off-line resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):648
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):635
msgid "java-config man page"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):655
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(title):642
msgid "Online resources"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):659
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):646
msgid ""
"The <uri link=\"http://www.gentoo.org/proj/en/java/\">Java Project Page</uri>"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):663
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):650
msgid ""
"The <uri link=\"http://news.gmane.org/gmane.linux.gentoo.java\">gentoo-java</"
"uri>, <uri link=\"http://news.gmane.org/gmane.linux.gentoo.user\">gentoo-"
@@ -867,21 +860,21 @@ msgid ""
"\">gentoo-dev</uri> mailing list archives"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):672
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):659
msgid ""
"<uri link=\"irc://irc.gentoo.org/gentoo\">#gentoo</uri> and <uri link="
"\"irc://irc.gentoo.org/gentoo-java\">#gentoo-java</uri> on IRC"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri:link):678
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri:link):665
msgid "http://en.wikipedia.org/wiki/Java_programming_language"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri):678
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(uri):665
msgid "Wikipedia's entry for Java"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):681
+#: ../../gentoo/xml/htdocs/doc/en//java.xml(li):668
msgid ""
"If you have suggestions or questions regarding this document, please email "
"the Gentoo Java team: <mail>java@gentoo.org</mail>"
diff --git a/doc/gettext/ru/source_mirrors.xml.po b/doc/gettext/ru/source_mirrors.xml.po
index 004e535..4402378 100644
--- a/doc/gettext/ru/source_mirrors.xml.po
+++ b/doc/gettext/ru/source_mirrors.xml.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\n"
"PO-Revision-Date: 2010-02-09 01:09+0500\n"
"Last-Translator: Azamat H. Hackimov <azamat.hackimov@gmail.com>\n"
"Language-Team: Russian <gentoo-doc-ru@gentoo.org>\n"
@@ -87,12 +87,11 @@ msgid "This document explains the requirements for source mirrors."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(version):35
-#, fuzzy
-msgid "1.13"
-msgstr "1.10"
+msgid "1.14"
+msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(date):36
-msgid "2010-04-28"
+msgid "2011-05-13"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):39
@@ -118,8 +117,8 @@ msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):56
msgid ""
"The space requirements depend on whether you choose to run a \"Full\" mirror "
-"or a \"Distfiles only\" mirror. Full mirrors require 210 GB of disk space. "
-"Distfiles only mirrors require 120 GB of space."
+"or a \"Distfiles only\" mirror. Full mirrors require 240 GB of disk space. "
+"Distfiles only mirrors require 150 GB of space."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):65
@@ -191,31 +190,30 @@ msgid "/experimental (20-30G)"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):131
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):141
-msgid "/distfiles (110G)"
+msgid "/distfiles (140G)"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):132
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):142
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):141
msgid "/snapshots (600M)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):133
-msgid "/grp (0M, obsolete)"
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):135
+msgid "Distfiles only mirrors need to carry the following directories:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):136
-msgid "Distfiles only mirrors need to carry the following directories:"
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):140
+msgid "/distfiles (110G)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):145
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):144
msgid ""
"We will then verify that the mirror exists and we can connect to it "
"properly. Then, in the next 2 weeks, we will determine if your mirror is "
"syncing correctly and in accordance with this policy."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):151
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):150
msgid ""
"If all steps went smoothly, we will then add you to our list of <uri link=\"/"
"main/en/mirrors2.xml\">download mirrors</uri> on the main web site. We will "
@@ -223,53 +221,53 @@ msgid ""
"which is only available to official Gentoo Linux source mirrors."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):158
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):157
msgid ""
"Additionally, you, the mirror admin, will be requested to subscribe to the "
"gentoo-mirrors mailing list (low traffic) so that you can follow all issues "
"associated with source mirrors."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(note):164
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(note):163
msgid ""
"Thanks for helping out Gentoo Linux users and developers! :) For any mirror "
"administration issues or problems, please contact <mail link=\"mirror-"
"admin@gentoo.org\">mirror-admin@gentoo.org</mail>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(warn):170
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(warn):169
msgid ""
"Do NOT email mirror-admin@gentoo.org for mirror requests, please file a bug. "
"It makes mirror tracking easier on us."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):180
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):179
msgid "Short FAQ"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):182
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):181
msgid ""
"Q: Who should I contact regarding new mirrors or to get my mirror added to "
"the Gentoo web site?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):188
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):198
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):187
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):197
msgid ""
"A: Please file a bug on bugs.gentoo.org under the <c>Mirrors</c> category."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):195
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):194
msgid "Q: Who should I contact regarding mirror issues and maintenance?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):205
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):204
msgid ""
"Q: I run a private source mirror for my company. Can I still access the "
"private master source mirror?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):211
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):210
msgid ""
"A: Because our resources are limited, we need to ensure we allocate them in "
"such a way to provide the maximum amount of benefit to our users. As such, "
@@ -278,11 +276,11 @@ msgid ""
"establish a private source mirror."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):222
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):221
msgid "Q: How do I find the mirror nearest to me?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):225
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):224
msgid ""
"A: mirrorselect was designed to do this for you. If you haven't already run "
"<c>emerge mirrorselect</c>, then please do so. Then run: <c>mirrorselect</"
@@ -290,48 +288,48 @@ msgid ""
"to you."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):235
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):234
msgid "Q: I don't have that much disk space. Can I mirror part of the sources?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):240
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):239
msgid ""
"A: Yes, if you are unable to mirror our full sources, you can elect to "
"mirror the following two directories only:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):246
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):245
msgid "/distfiles"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):247
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):246
msgid "/snapshots"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):250
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):249
msgid ""
"These two directories will require approximately 50GB of space and you will "
"be listed on our site as a distfiles-only mirror."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):258
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):257
msgid ""
"Q: Do I have to turn on Directory Indexing for directories served up via "
"HTTP?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):263
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):262
msgid ""
"A: Directory Indexing is required for the /releases and /experimental "
"directories, but can be turned off for all other directories (including /"
"distfiles) if you wish."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):273
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):272
msgid "Q: Do I have to mirror historical? I mean, it is old releases."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):275
msgid ""
"A: Of course not, it is quite a bit of data. In your rsync command, add "
"<path>--exclude=/releases/historical</path> to your rsync options. This will "
diff --git a/doc/gettext/source_mirrors.xml.pot b/doc/gettext/source_mirrors.xml.pot
index 15ddcdd..eae3f69 100644
--- a/doc/gettext/source_mirrors.xml.pot
+++ b/doc/gettext/source_mirrors.xml.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-21 23:56+0600\n"
+"POT-Creation-Date: 2011-05-18 19:18+0600\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"
@@ -78,11 +78,11 @@ msgid "This document explains the requirements for source mirrors."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(version):35
-msgid "1.13"
+msgid "1.14"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(date):36
-msgid "2010-04-28"
+msgid "2011-05-13"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):39
@@ -102,7 +102,7 @@ msgid "Minimum Disk Space"
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):56
-msgid "The space requirements depend on whether you choose to run a \"Full\" mirror or a \"Distfiles only\" mirror. Full mirrors require 210 GB of disk space. Distfiles only mirrors require 120 GB of space."
+msgid "The space requirements depend on whether you choose to run a \"Full\" mirror or a \"Distfiles only\" mirror. Full mirrors require 240 GB of disk space. Distfiles only mirrors require 150 GB of space."
msgstr ""
#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):65
@@ -153,107 +153,107 @@ msgstr ""
msgid "/experimental (20-30G)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):131 ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):141
-msgid "/distfiles (110G)"
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):131
+msgid "/distfiles (140G)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):132 ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):142
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):132 ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):141
msgid "/snapshots (600M)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):133
-msgid "/grp (0M, obsolete)"
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):135
+msgid "Distfiles only mirrors need to carry the following directories:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):136
-msgid "Distfiles only mirrors need to carry the following directories:"
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):140
+msgid "/distfiles (110G)"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):145
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):144
msgid "We will then verify that the mirror exists and we can connect to it properly. Then, in the next 2 weeks, we will determine if your mirror is syncing correctly and in accordance with this policy."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):151
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):150
msgid "If all steps went smoothly, we will then add you to our list of <uri link=\"/main/en/mirrors2.xml\">download mirrors</uri> on the main web site. We will also send you the login information for our private master distfile mirror which is only available to official Gentoo Linux source mirrors."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):158
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):157
msgid "Additionally, you, the mirror admin, will be requested to subscribe to the gentoo-mirrors mailing list (low traffic) so that you can follow all issues associated with source mirrors."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(note):164
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(note):163
msgid "Thanks for helping out Gentoo Linux users and developers! :) For any mirror administration issues or problems, please contact <mail link=\"mirror-admin@gentoo.org\">mirror-admin@gentoo.org</mail>."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(warn):170
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(warn):169
msgid "Do NOT email mirror-admin@gentoo.org for mirror requests, please file a bug. It makes mirror tracking easier on us."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):180
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):179
msgid "Short FAQ"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):182
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):181
msgid "Q: Who should I contact regarding new mirrors or to get my mirror added to the Gentoo web site?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):188 ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):198
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):187 ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):197
msgid "A: Please file a bug on bugs.gentoo.org under the <c>Mirrors</c> category."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):195
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):194
msgid "Q: Who should I contact regarding mirror issues and maintenance?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):205
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):204
msgid "Q: I run a private source mirror for my company. Can I still access the private master source mirror?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):211
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):210
msgid "A: Because our resources are limited, we need to ensure we allocate them in such a way to provide the maximum amount of benefit to our users. As such, we limit connections to our master rsync and distfile mirrors to public mirrors only. Users are welcome to use our regular mirror system to establish a private source mirror."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):222
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):221
msgid "Q: How do I find the mirror nearest to me?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):225
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):224
msgid "A: mirrorselect was designed to do this for you. If you haven't already run <c>emerge mirrorselect</c>, then please do so. Then run: <c>mirrorselect</c>. An ncurses-based menu will display allowing you to select a mirror close to you."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):235
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):234
msgid "Q: I don't have that much disk space. Can I mirror part of the sources?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):240
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):239
msgid "A: Yes, if you are unable to mirror our full sources, you can elect to mirror the following two directories only:"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):246
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):245
msgid "/distfiles"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):247
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(li):246
msgid "/snapshots"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):250
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):249
msgid "These two directories will require approximately 50GB of space and you will be listed on our site as a distfiles-only mirror."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):258
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):257
msgid "Q: Do I have to turn on Directory Indexing for directories served up via HTTP?"
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):263
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):262
msgid "A: Directory Indexing is required for the /releases and /experimental directories, but can be turned off for all other directories (including /distfiles) if you wish."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):273
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(title):272
msgid "Q: Do I have to mirror historical? I mean, it is old releases."
msgstr ""
-#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):276
+#: ../../gentoo/xml/htdocs/doc/en//source_mirrors.xml(p):275
msgid "A: Of course not, it is quite a bit of data. In your rsync command, add <path>--exclude=/releases/historical</path> to your rsync options. This will exclude historical and save you quite a bit of space."
msgstr ""