Update translations

1 files changed, 270 insertions, 278 deletions

diff --git a/docs/docs/stable/installer/ja.po b/docs/docs/stable/installer/ja.po
index 9c2c6536..0d5e1fd1 100644
--- a/docs/docs/stable/installer/ja.po
+++ b/docs/docs/stable/installer/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-06 18:47+0200\n"
+"POT-Creation-Date: 2019-01-08 22:42+0200\n"
 "PO-Revision-Date: 2019-01-08 12:58+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -97,12 +97,6 @@ msgstr ""
 "この特定の Mageia リリースについての重要な情報は<emphasis>リリース ノート</"
 "emphasis> ボタンをクリックすることで参照できます。"
 
-#. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:2
-#: en/DrakX-cover.xml:3 en/DrakX.xml:3 en/media_selection.xml:2
-msgid "en"
-msgstr "ja"
-
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:3
 msgid "Supplemental Installation Media"
@@ -531,17 +525,17 @@ msgstr ""
 "行えます。"
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:6
+#: en/bootLive.xml:21
 msgid "Boot Mageia as Live system"
 msgstr "Mageia をライブ システムとしてブートする"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:10
+#: en/bootLive.xml:26
 msgid "Booting the medium"
 msgstr "メディアをブートする"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:29
 msgid ""
 "You can boot directly from a Live DVD or USB. Usually, you just need to plug "
 "the USB device in or place the DVD in the drive and restart the computer."
@@ -550,7 +544,7 @@ msgstr ""
 "し込むか DVD をドライブに挿入してコンピュータを再起動するだけです。"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:15
+#: en/bootLive.xml:33
 msgid ""
 "If the computer does not automatically boot from the USB or DVD you may need "
 "to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
@@ -562,7 +556,7 @@ msgstr ""
 "バイスから起動するかを選択するメニューを試してみるとよいでしょう。"
 
 #. type: Content of: <section><section><tip><para>
-#: en/bootLive.xml:20
+#: en/bootLive.xml:39
 msgid ""
 "To access the BIOS or boot menu when the computer is starting, you can try "
 "pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
@@ -576,7 +570,7 @@ msgstr ""
 "<keycap>F10</keycap>, <keycap>F11</keycap> のいずれかを押してみてください。"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:48
 msgid ""
 "The actual screen that you will first see when booting from the Live media "
 "will depend on whether your computer motherboard is of the Legacy (BIOS) or "
@@ -586,22 +580,38 @@ msgstr ""
 "マザーボードがレガシー (BIOS) か UEFI かの種類によって変わります。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:35
+#: en/bootLive.xml:56
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/レガシー モード"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/bootLive.xml:38
-msgid "Main Menu"
-msgstr "メイン メニュー"
+#. type: Content of: <section><section><mediaobject>
+#: en/bootLive.xml:60
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><mediaobject><caption><para>
+#: en/bootLive.xml:65
+msgid "First screen while booting in BIOS mode"
+msgstr "BIOS モードにおけるブート時の最初の画面"
+
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/bootLive.xml:70 en/bootLive.xml:142 en/installer.xml:106
+#: en/installer.xml:154
+msgid "Menu"
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:40 en/bootLive.xml:152
+#: en/bootLive.xml:73 en/bootLive.xml:145
 msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia を起動</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:41
+#: en/bootLive.xml:75
 msgid ""
 "This option will boot the Mageia Live system from the connected DVD/USB "
 "media (expect a very slow system compared to an installed OS)."
@@ -611,12 +621,12 @@ msgstr ""
 "てください)。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:42
+#: en/bootLive.xml:79
 msgid "Once the boot is done, you can proceed to the installation."
 msgstr "ブートが完了すれば、インストールを行うことができます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:45 en/bootLive.xml:57
+#: en/bootLive.xml:84 en/bootLive.xml:100
 msgid ""
 "<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
 "emphasis>"
@@ -625,66 +635,46 @@ msgstr ""
 "す)</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:47
+#: en/bootLive.xml:87
 msgid "Boot the Mageia Live system using non-free video drivers"
 msgstr ""
 "非フリーなビデオ ドライバを用いて Mageia ライブ システムをブートします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:53 en/bootLive.xml:156 en/installer.xml:65
+#: en/bootLive.xml:94 en/bootLive.xml:153 en/installer.xml:109
 msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
 msgstr "<emphasis role=\"bold\">Mageia をインストール</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:54 en/bootLive.xml:157
+#: en/bootLive.xml:96 en/bootLive.xml:155
 msgid "This option will install Mageia to a hard disk."
 msgstr "この選択肢は Mageia をハード ディスクにインストールします。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:59
+#: en/bootLive.xml:103
 msgid "Install Mageia using non-free video drivers"
 msgstr "非フリーなビデオ ドライバを用いて Mageia をインストールします。"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:65
-msgid ""
-"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:109 en/installer.xml:125
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:69
-msgid "First screen while booting in BIOS mode"
-msgstr "BIOS モードにおけるブート時の最初の画面"
 
-#. type: Content of: <section><section><itemizedlist><title>
-#: en/bootLive.xml:73
-msgid "Function Keys"
-msgstr "ファンクション キー"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:75
-msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
-msgstr "<keycap>F1</keycap> <emphasis role=\"bold\">ヘルプ</emphasis>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:76
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:111 en/installer.xml:127
 msgid ""
-"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
-"can view relevant help by pressing <keycap>F1</keycap>."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
-"<keycap>F2</keycap> から <keycap>F6</keycap> は、<keycap>F1</keycap> を押すこ"
-"とで関連するヘルプを参照できます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:81
-msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
-msgstr "<keycap>F2</keycap> <emphasis role=\"bold\">言語</emphasis>"
+#: en/bootLive.xml:116 en/bootLive.xml:159
+#, fuzzy
+msgid "<emphasis role=\"bold\"> F2 Language</emphasis>"
+msgstr "<emphasis role=\"bold\">ログイン名</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:82
+#: en/bootLive.xml:118 en/bootLive.xml:161
 msgid ""
 "Press <keycap>F2</keycap> to have the installer use a specific language "
 "during the installation. Use the arrow keys to select the language then "
@@ -693,162 +683,41 @@ msgstr ""
 "<keycap>F2</keycap> を押すとインストール時の使用言語を指定します。矢印キーで"
 "言語を選択して <keycap>Enter</keycap> を押します。"
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:87
-msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
-msgstr "<keycap>F3</keycap> <emphasis role=\"bold\">ビデオ モード</emphasis>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:89
-msgid ""
-"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
-"Options are: 640x480, 800x600, 1024x768."
-msgstr ""
-"必要があれば、<keycap>F3</keycap> を押して画面解像度を変更します。選択肢: "
-"640x480, 800x600, 1024x768"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
-msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
-msgstr "<keycap>F4</keycap> <emphasis role=\"bold\">ソース</emphasis>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:94
-msgid ""
-"Normally, the installation is performed from the inserted installation "
-"medium. Here, you may select other sources, like FTP or NFS servers."
-msgstr ""
-"通常、インストールは挿入されたインストール メディアから実行されます。ここで"
-"は、FTP や NFS サーバのような他のソースが選択できます。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:95
-msgid ""
-"If the installation is carried out in a network with an SLP server, then "
-"select one of the installation sources available on the server with this "
-"option."
-msgstr ""
-"インストールが SLP サーバを用いてネットワーク内で行われる場合、サーバ上で利用"
-"可能なソースのいずれかをこれで選択します。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
-msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
-msgstr "<keycap>F5</keycap> <emphasis role=\"bold\">ドライバ</emphasis>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:99
-msgid ""
-"If you have a driver update that you wish to use, select this option and "
-"then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
-"update disc at the appropriate time."
-msgstr ""
-"更新されたドライバをお持ちでそれを使用したいのであれば、これを選択して "
-"<emphasis>はい</emphasis> を選択します。必要なときにその更新ディスクの挿入が"
-"促されます。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:104
-msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
-msgstr ""
-"<keycap>F6</keycap> <emphasis role=\"bold\">カーネルのオプション</emphasis>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
-msgid ""
-"If you experience problems with the installation, you could try modifying "
-"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
-msgstr ""
-"インストール時に問題が起きた経験がある場合、<emphasis>カーネルのオプション</"
-"emphasis> メニューを用いて既定の設定の変更を試してみるとよいかもしれません。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:111
-msgid ""
-"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
-"audit=0"
-msgstr ""
-"<emphasis role=\"bold\">デフォルト:</emphasis> splash quiet noiswmd resume "
-"audit=0"
-
-#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:114
-msgid ""
-"<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off acpi=off "
-"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
-"irqpoll pci=nommconf</literal>"
-msgstr ""
-"<emphasis role=\"bold\">安全設定:</emphasis> <literal>apm=off acpi=off "
-"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
-"irqpoll pci=nommconf</literal>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:120
-msgid ""
-"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
-"Power Interface): Power management features are not used."
-msgstr ""
-"<emphasis role=\"bold\">ACPI なし:</emphasis> (Advanced Configuration and "
-"Power Interface): 電源管理の機能が使用されません。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/bootLive.xml:125
-msgid ""
-"<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
-"Programmable Interrupt Controller): CPU interrupt. Select this option if you "
-"experience system misbehaviour like a kernel panic in relation to APIC."
-msgstr ""
-"<emphasis role=\"bold\">ローカル APIC なし:</emphasis> (Local Advanced "
-"Programmable Interrupt Controller): CPU の割り込みです。APIC に関連したカーネ"
-"ル パニックなどのシステム誤動作を経験している場合に選択します。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:131
-msgid ""
-"If you open any of the above <keycap>F6</keycap> menu items, and then click "
-"on <keycap>F1</keycap>, an info window will open to show more details for "
-"that particular item:"
-msgstr ""
-"上の <keycap>F6</keycap> のメニュー項目のいずれかを開いた場合、<keycap>F1</"
-"keycap> を押すとその特定の項目の詳細を表示するウィンドウが開きます:"
-
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:127
 msgid "In UEFI mode"
 msgstr "UEFI モード"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:142
+#: en/bootLive.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" align="
-"\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" align="
-"\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:146
+#: en/bootLive.xml:137
 msgid "First screen while booting in UEFI mode"
 msgstr "UEFI モードにおけるブート時の最初の画面"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:149
-msgid "In UEFI mode, you have just the two menu options to choose from:"
-msgstr "UEFI モードでは、メニュー項目が二つだけあります:"
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:153
+#: en/bootLive.xml:147
+#, fuzzy
 msgid ""
 "This option will boot the Mageia Live system from the connected Dvd/USB "
-"media (expect a very slow system compared to an installed OS). Once the boot "
-"is done, you can proceed to the installation"
+"media (expect a very slow system compared to an installed OS).  Once the "
+"boot is done, you can proceed to the installation"
 msgstr ""
 "これを選択すると、接続された DVD/USB メディアから Mageia ライブ システムを"
 "ブートします (OS をインストールした場合と比べて非常にシステムが遅くなると思っ"
 "てください)。ブートが完了すれば、インストールを行うことができます。"
 
 #. type: Content of: <section><section><note><para>
-#: en/bootLive.xml:161
+#: en/bootLive.xml:168
 msgid ""
 "If you booted from a USB stick, you will see the above menu options "
 "duplicated, and in this case, you should choose from the menu pair that will "
@@ -2101,12 +1970,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:14
+#: en/installer.xml:32
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia インストーラ"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:16
+#: en/installer.xml:35
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2117,33 +1986,33 @@ msgstr ""
 "に設計されています。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:20
+#: en/installer.xml:40
 msgid "The installation steps"
 msgstr "インストールのステップ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:23
+#: en/installer.xml:44
 msgid ""
 "The install process is divided into a number of steps - the status of which "
 "is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:28
+#: en/installer.xml:50
 msgid ""
 "Each step has one or more screens, which may also have <emphasis>Advanced</"
 "emphasis> sections with extra, less commonly required options."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/installer.xml:33
+#: en/installer.xml:56
 msgid ""
 "Most screens have <emphasis>Help</emphasis> buttons for further details "
 "about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:38
+#: en/installer.xml:62
 msgid ""
 "If at some point during the install you decide to abort the installation, it "
 "is possible to reboot, but please think twice before you do this. Once a "
@@ -2153,22 +2022,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><caution><para>
-#: en/installer.xml:43
+#: en/installer.xml:68
 msgid ""
 "If, in spite of this, you are very sure rebooting is what you want, go to a "
-"text terminal by pressing the keys <keycombo><keycap>Ctrl</"
-"keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo> together. After "
-"that, press <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
-"keycap><keycap>Delete</keycap></keycombo> together to reboot."
+"text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap> "
+"<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that, "
+"press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> <keycap>Delete</"
+"keycap> </keycombo> together to reboot."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:48
+#: en/installer.xml:86
 msgid "Installation Welcome Screen"
 msgstr "インストールのようこそ画面"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:49
+#: en/installer.xml:88
 msgid ""
 "The particular screen that you will first see when booting from the "
 "Installation media will depend on whether your computer motherboard is of "
@@ -2176,77 +2045,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:52
+#: en/installer.xml:92
 msgid ""
 "The welcome menu screen has various options, however the default option will "
 "start the installer, and is normally all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:56
+#: en/installer.xml:97
 msgid "Legacy (BIOS) Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:58
+#: en/installer.xml:100
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
 "imageobject>"
 msgstr ""
-
-#. type: Content of: <section><section><section><itemizedlist><title>
-#: en/installer.xml:63
-msgid "Menu"
-msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:66
+#: en/installer.xml:111
 msgid ""
 "Install Mageia to a hard disk. This is the default option, and will "
 "automatically start after a short while unless another option is selected."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:69
+#: en/installer.xml:117
 msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:70
+#: en/installer.xml:119
 msgid ""
 "This option allows you to either re-install the bootloader for an existing "
 "Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:75
-msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:76
-msgid ""
-"Test the installed RAM by performing multiple read and write operations. "
-"Reboot to end the test."
-msgstr ""
-
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:80
+#: en/installer.xml:132
 msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:81
+#: en/installer.xml:134
 msgid "Press F2 for alternative languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:86
+#: en/installer.xml:140
 msgid "UEFI Systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:87
+#: en/installer.xml:142
 msgid ""
 "From this screen, you can access options by pressing <keycap>e</keycap> to "
 "enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
@@ -2254,51 +2109,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:92
+#: en/installer.xml:148
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:96
-msgid "In UEFI mode you have only two menu options to choose from:"
-msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#: en/installer.xml:157
 msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:162
 msgid ""
 "<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
 "re-install the bootloader for an existing Mageia installation or you can use "
 "it to restore a Windows bootloader."
 msgstr ""
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:169
+msgid ""
+"<emphasis role=\"bold\">F2: Language:</emphasis> Press <keycap>F2</keycap> "
+"for alternative languages."
+msgstr ""
+
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:109
+#: en/installer.xml:174
 msgid ""
 "If you booted from a USB stick, you will see the above options duplicated, "
 "and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:115
+#: en/installer.xml:181
 msgid "Installation Problems and Possible Solutions"
 msgstr "インストールの問題と解決法"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:117
+#: en/installer.xml:184
 msgid "No Graphical Interface"
 msgstr "グラフィカル インターフェースが表示されない"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:120
+#: en/installer.xml:188
 msgid ""
 "After the initial screen you did not progress to the <emphasis>Language "
 "Selection</emphasis> screen. This can happen with some graphic cards and "
@@ -2307,7 +2165,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:126
+#: en/installer.xml:195
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text-mode installation. To use this press "
@@ -2318,12 +2176,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:138
+#: en/installer.xml:208
 msgid "The Install Freezes"
 msgstr "インストール時にフリーズする"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:139
+#: en/installer.xml:210
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic hardware "
@@ -2333,12 +2191,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:146
+#: en/installer.xml:218
 msgid "RAM problem"
 msgstr "RAM の問題"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:147
+#: en/installer.xml:220
 msgid ""
 "This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2348,12 +2206,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:154
+#: en/installer.xml:228
 msgid "Dynamic partitions"
 msgstr "ダイナミック パーティション"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:155
+#: en/installer.xml:230
 msgid ""
 "If you converted your hard disk from <literal>Basic</literal> format to "
 "<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
@@ -4487,35 +4345,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:3
+#: en/testing.xml:11
 msgid "Testing Mageia as Live system"
 msgstr "Mageia をライブ システムとしてテストする"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:8
+#: en/testing.xml:16
 msgid "Live mode"
 msgstr "ライブ モード"
 
 #. type: Content of: <section><section><para>
-#: en/testing.xml:11
+#: en/testing.xml:19
 msgid ""
 "This is the screen you will see if you selected the <emphasis role=\"bold"
 "\">Boot Mageia </emphasis>option from the Live media menu."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:14
+#: en/testing.xml:23
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:21
+#: en/testing.xml:30
 msgid "Testing hardware"
 msgstr "ハードウェアをテストする"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:24
+#: en/testing.xml:33
 msgid ""
 "One of the aims of using the Live mode is to test that your hardware is "
 "correctly managed by Mageia. You can check if all devices have a driver in "
@@ -4523,56 +4381,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:31
+#: en/testing.xml:40
 msgid "network interface: configure it with net_applet"
 msgstr "ネットワーク インターフェース: net_applet で設定します。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:35
+#: en/testing.xml:44
 msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:40
-msgid "webcam:"
-msgstr "ウェブ カメラ:"
-
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:44
+#: en/testing.xml:49
 msgid "sound: a jingle has already been played"
 msgstr "サウンド: ジングルが既に再生されています。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:48
+#: en/testing.xml:53
 msgid "printer: configure your printer/s and print a test page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:52
+#: en/testing.xml:57
 msgid "scanner: scan a document from ..."
 msgstr "スキャナ: ドキュメントをスキャンします。"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:56
+#: en/testing.xml:61
 msgid ""
 "If everything is satisfactory, you can proceed with the installation. If "
 "not, you can use the <emphasis>Quit</emphasis> button to exit."
 msgstr ""
 
 #. type: Content of: <section><section><section><note><para>
-#: en/testing.xml:61
+#: en/testing.xml:66
 msgid ""
 "The configuration settings you apply here are carried over if you decide to "
 "proceed with the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:68
+#: en/testing.xml:73
 msgid "Launch installation"
 msgstr "インストールを実行する"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:71
+#: en/testing.xml:76
 msgid ""
 "To launch the installation of the Live DVD to a hard disk or SSD drive, "
 "simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live "
@@ -4581,7 +4434,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:77
+#: en/testing.xml:82
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4703,3 +4556,142 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
+
+#~ msgid "en"
+#~ msgstr "ja"
+
+#~ msgid "Main Menu"
+#~ msgstr "メイン メニュー"
+
+#~ msgid "Function Keys"
+#~ msgstr "ファンクション キー"
+
+#~ msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+#~ msgstr "<keycap>F1</keycap> <emphasis role=\"bold\">ヘルプ</emphasis>"
+
+#~ msgid ""
+#~ "Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+#~ "can view relevant help by pressing <keycap>F1</keycap>."
+#~ msgstr ""
+#~ "<keycap>F2</keycap> から <keycap>F6</keycap> は、<keycap>F1</keycap> を押"
+#~ "すことで関連するヘルプを参照できます。"
+
+#~ msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+#~ msgstr "<keycap>F2</keycap> <emphasis role=\"bold\">言語</emphasis>"
+
+#~ msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+#~ msgstr ""
+#~ "<keycap>F3</keycap> <emphasis role=\"bold\">ビデオ モード</emphasis>"
+
+#~ msgid ""
+#~ "If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+#~ "Options are: 640x480, 800x600, 1024x768."
+#~ msgstr ""
+#~ "必要があれば、<keycap>F3</keycap> を押して画面解像度を変更します。選択肢: "
+#~ "640x480, 800x600, 1024x768"
+
+#~ msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+#~ msgstr "<keycap>F4</keycap> <emphasis role=\"bold\">ソース</emphasis>"
+
+#~ msgid ""
+#~ "Normally, the installation is performed from the inserted installation "
+#~ "medium. Here, you may select other sources, like FTP or NFS servers."
+#~ msgstr ""
+#~ "通常、インストールは挿入されたインストール メディアから実行されます。ここ"
+#~ "では、FTP や NFS サーバのような他のソースが選択できます。"
+
+#~ msgid ""
+#~ "If the installation is carried out in a network with an SLP server, then "
+#~ "select one of the installation sources available on the server with this "
+#~ "option."
+#~ msgstr ""
+#~ "インストールが SLP サーバを用いてネットワーク内で行われる場合、サーバ上で"
+#~ "利用可能なソースのいずれかをこれで選択します。"
+
+#~ msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+#~ msgstr "<keycap>F5</keycap> <emphasis role=\"bold\">ドライバ</emphasis>"
+
+#~ msgid ""
+#~ "If you have a driver update that you wish to use, select this option and "
+#~ "then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
+#~ "update disc at the appropriate time."
+#~ msgstr ""
+#~ "更新されたドライバをお持ちでそれを使用したいのであれば、これを選択して "
+#~ "<emphasis>はい</emphasis> を選択します。必要なときにその更新ディスクの挿入"
+#~ "が促されます。"
+
+#~ msgid ""
+#~ "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+#~ msgstr ""
+#~ "<keycap>F6</keycap> <emphasis role=\"bold\">カーネルのオプション</"
+#~ "emphasis>"
+
+#~ msgid ""
+#~ "If you experience problems with the installation, you could try modifying "
+#~ "the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+#~ msgstr ""
+#~ "インストール時に問題が起きた経験がある場合、<emphasis>カーネルのオプション"
+#~ "</emphasis> メニューを用いて既定の設定の変更を試してみるとよいかもしれませ"
+#~ "ん。"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+#~ "audit=0"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">デフォルト:</emphasis> splash quiet noiswmd "
+#~ "resume audit=0"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off "
+#~ "acpi=off mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse."
+#~ "proto=bare irqpoll pci=nommconf</literal>"
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">安全設定:</emphasis> <literal>apm=off acpi=off "
+#~ "mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
+#~ "irqpoll pci=nommconf</literal>"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+#~ "Power Interface): Power management features are not used."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">ACPI なし:</emphasis> (Advanced Configuration and "
+#~ "Power Interface): 電源管理の機能が使用されません。"
+
+#~ msgid ""
+#~ "<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
+#~ "Programmable Interrupt Controller): CPU interrupt. Select this option if "
+#~ "you experience system misbehaviour like a kernel panic in relation to "
+#~ "APIC."
+#~ msgstr ""
+#~ "<emphasis role=\"bold\">ローカル APIC なし:</emphasis> (Local Advanced "
+#~ "Programmable Interrupt Controller): CPU の割り込みです。APIC に関連した"
+#~ "カーネル パニックなどのシステム誤動作を経験している場合に選択します。"
+
+#~ msgid ""
+#~ "If you open any of the above <keycap>F6</keycap> menu items, and then "
+#~ "click on <keycap>F1</keycap>, an info window will open to show more "
+#~ "details for that particular item:"
+#~ msgstr ""
+#~ "上の <keycap>F6</keycap> のメニュー項目のいずれかを開いた場合、"
+#~ "<keycap>F1</keycap> を押すとその特定の項目の詳細を表示するウィンドウが開き"
+#~ "ます:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" "
+#~ "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" "
+#~ "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
+
+#~ msgid "In UEFI mode, you have just the two menu options to choose from:"
+#~ msgstr "UEFI モードでは、メニュー項目が二つだけあります:"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "webcam:"
+#~ msgstr "ウェブ カメラ:"