aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2017-08-28 00:25:39 +0300
committerYuri Chornoivan <yurchor@ukr.net>2017-08-28 00:25:39 +0300
commit26e661b404c1c2a0d878f0b0947302bce744f6f0 (patch)
tree527ae6afc91104509e57df02a6a9df2bdf81b13c /docs/installer
parent429f9897f7cb2acb20cf6559e8a31b6a9eac8cd9 (diff)
downloadtools-26e661b404c1c2a0d878f0b0947302bce744f6f0.tar
tools-26e661b404c1c2a0d878f0b0947302bce744f6f0.tar.gz
tools-26e661b404c1c2a0d878f0b0947302bce744f6f0.tar.bz2
tools-26e661b404c1c2a0d878f0b0947302bce744f6f0.tar.xz
tools-26e661b404c1c2a0d878f0b0947302bce744f6f0.zip
Update Japanese translation
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/ja.po493
-rw-r--r--docs/installer/ja/DrakLive-cover.xml25
-rw-r--r--docs/installer/ja/DrakLive.xml21
-rw-r--r--docs/installer/ja/DrakX-cover.xml21
-rw-r--r--docs/installer/ja/DrakX.xml60
-rw-r--r--docs/installer/ja/acceptLicense.xml13
-rw-r--r--docs/installer/ja/add_supplemental_media.xml20
-rw-r--r--docs/installer/ja/diskdrake.xml39
-rw-r--r--docs/installer/ja/doPartitionDisks.xml133
-rw-r--r--docs/installer/ja/exitInstall.xml9
-rw-r--r--docs/installer/ja/firewall.xml49
-rw-r--r--docs/installer/ja/installer.xml230
-rw-r--r--docs/installer/ja/selectLanguage.xml27
-rw-r--r--docs/installer/ja/setupBootloader.xml2
-rw-r--r--docs/installer/ja/setupBootloaderAddEntry.xml5
15 files changed, 385 insertions, 762 deletions
diff --git a/docs/installer/ja.po b/docs/installer/ja.po
index fbbfe16c..cb3f135f 100644
--- a/docs/installer/ja.po
+++ b/docs/installer/ja.po
@@ -1,29 +1,31 @@
+# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Mageia
# This file is distributed under the same license as the Mageia Installer Help package.
#
# Translators:
-# ook rio <riokoko5@gmail.com>, 2016.
-# Yuri Chornoivan <yurchor@ukr.net>, 2016.
+# Masanori Kakura <kakurasan@gmail.com>, 2017
+# ook rio <riokoko5@gmail.com>, 2016
+# ook rio <riokoko5@gmail.com>, 2016
+# Yuri Chornoivan <yurchor@ukr.net>, 2016
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 19:47+0300\n"
-"PO-Revision-Date: 2016-07-17 11:51+0300\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
+"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"PO-Revision-Date: 2017-08-27 04:28+0000\n"
+"Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
+"language/ja/)\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"language/ja/)\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.5\n"
#. type: Content of: <section><info><title>
#: en/acceptLicense.xml:25
msgid "License and Release Notes"
-msgstr "ライセンスとリリース ノート"
+msgstr "使用許諾契約とリリース ノート"
#. type: Content of: <section><mediaobject>
#: en/acceptLicense.xml:29
@@ -43,7 +45,7 @@ msgstr ""
#. type: Content of: <section><section><info><title>
#: en/acceptLicense.xml:40
msgid "License Agreement"
-msgstr "使用許諾に同意する"
+msgstr "使用許諾契約の同意"
#. type: Content of: <section><section><para>
#: en/acceptLicense.xml:43
@@ -51,8 +53,8 @@ msgid ""
"Before installing <application>Mageia</application>, please read the license "
"terms and conditions carefully."
msgstr ""
-"<application>Mageia</application> をインストールする前に使用許諾をお読みくだ"
-"さい。"
+"<application>Mageia</application> をインストールする前に使用許諾契約の内容を"
+"よくお読みください。"
#. type: Content of: <section><section><para>
#: en/acceptLicense.xml:46
@@ -60,6 +62,9 @@ msgid ""
"These terms and conditions apply to the entire <application>Mageia</"
"application> distribution and must be accepted before you can continue."
msgstr ""
+"これらの使用許諾契約の内容は、 <application>Mageia</application> ディストリ"
+"ビューション全体に適用され、あなたは続行する前にこれらに同意しなくてはなりま"
+"せん。"
#. type: Content of: <section><section><para>
#: en/acceptLicense.xml:50
@@ -78,7 +83,7 @@ msgstr ""
#. type: Content of: <section><section><info><title>
#: en/acceptLicense.xml:63
msgid "Release Notes"
-msgstr "リリースノート"
+msgstr "リリース ノート"
#. type: Content of: <section><section><para>
#: en/acceptLicense.xml:70
@@ -97,7 +102,7 @@ msgstr "ja"
#. type: Content of: <section><info><title>
#: en/add_supplemental_media.xml:10
msgid "Media Selection (Configure Supplemental Installation Media)"
-msgstr ""
+msgstr "メディアの選択 (追加のインストール メディアを設定する)"
#. papoteur 2013-04-13 - created
#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
@@ -121,16 +126,19 @@ msgid ""
"source selection determines which packages will be available for selection "
"during the next steps."
msgstr ""
+"この画面は認識済みのリポジトリの一覧を示しています。あなたは光学ディスクやリ"
+"モート ソースのように他のパッケージ入手先を追加できます。この入手先の選択は、"
+"以降の段階における利用可能パッケージに影響します。"
#. type: Content of: <section><para>
#: en/add_supplemental_media.xml:29
msgid "For a network source, there are two steps to follow:"
-msgstr ""
+msgstr "ネットワーク ソースでは、以下の2つの手順が続きます:"
#. type: Content of: <section><orderedlist><listitem><para>
#: en/add_supplemental_media.xml:33
msgid "Choosing and activation of the network, if not already up."
-msgstr ""
+msgstr "ネットワークが有効化されていなければ、選択および有効化を行います。"
#. type: Content of: <section><orderedlist><listitem><para>
#: en/add_supplemental_media.xml:37
@@ -141,6 +149,11 @@ msgid ""
"the URL, you can designate a specific repository or your own NFS "
"installation."
msgstr ""
+"ミラーを選択するか、 URL (一覧の一番上の項目) を指定します。ミラーを選択する"
+"ことで Mageia に管理されているすべてのリポジトリを自由に選択できるようにな"
+"り、 Nonfree, Tainted といったリポジトリと、それぞれに更新を提供する Updates "
+"があります。 URL を指定することで、特定のリポジトリやあなたの NFS インストー"
+"ルを指し示すことができます。"
#. type: Content of: <section><note><para>
#: en/add_supplemental_media.xml:46
@@ -161,17 +174,16 @@ msgstr ""
#. Lebarhon: 20170210 updated for Mageia 6 (umask)
#. type: Content of: <section><mediaobject>
#: en/addUser.xml:7
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" "
-"fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
+"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/addUser.xml:16
@@ -650,13 +662,12 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/chooseDesktop.xml:16
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
"align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/chooseDesktop.xml:21
@@ -678,13 +689,12 @@ msgstr "パッケージグループを選択"
#. Lebarhon 20170209 Updated SC
#. type: Content of: <section><mediaobject>
#: en/choosePackageGroups.xml:9
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
"\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/choosePackageGroups.xml:14
@@ -1120,15 +1130,14 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/diskdrake.xml:10
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
#. type: Content of: <section><warning><para>
#: en/diskdrake.xml:18
@@ -1190,16 +1199,16 @@ msgstr ""
#. type: Content of: <section><note><para><mediaobject>
#: en/diskdrake.xml:46
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
"\" align=\"center\"/></imageobject><imageobject condition=\"live"
"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
"imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
#. type: Content of: <section><note><para>
#: en/diskdrake.xml:46
@@ -1215,16 +1224,16 @@ msgstr ""
#. type: Content of: <section><note><mediaobject>
#: en/diskdrake.xml:51
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
#. type: Content of: <section><info><title>
#: en/doPartitionDisks.xml:7
@@ -1248,16 +1257,16 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/doPartitionDisks.xml:17
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
#: en/doPartitionDisks.xml:24
@@ -1325,16 +1334,16 @@ msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
#: en/doPartitionDisks.xml:45
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
"\"center\"/></imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
#. type: Content of: <section><para><itemizedlist><listitem><para>
#: en/doPartitionDisks.xml:45
@@ -1361,9 +1370,8 @@ msgstr ""
#. type: Content of: <section><para><itemizedlist><listitem><para>
#: en/doPartitionDisks.xml:51
-#, fuzzy
msgid "Custom disk partitioning"
-msgstr "パーティションの設定"
+msgstr "パーティションを手動で設定"
#. type: Content of: <section><para><itemizedlist><listitem><para>
#: en/doPartitionDisks.xml:52
@@ -1441,24 +1449,22 @@ msgstr ""
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:79
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
#. type: Content of: <section><note><mediaobject>
#: en/doPartitionDisks.xml:87
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
"imageobject>"
#. type: Content of: <section><warning><para>
@@ -1492,7 +1498,7 @@ msgstr ""
#. type: Content of: <article><info><title>
#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
msgid "Installation from LIVE medium"
-msgstr ""
+msgstr "ライブ メディアからのインストール"
#. type: Content of: <book><info>
#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
@@ -1517,8 +1523,7 @@ msgstr ""
#. type: Content of: <book><info><cover><mediaobject>
#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
#. type: Content of: <article><info><cover><para>
#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1528,6 +1533,10 @@ msgid ""
"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
msgstr ""
+"本マニュアル内の文章とスクリーンショットは クリエイティブ・コモンズ 表示-継"
+"承 3.0 ライセンス <link ns6:href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">https://creativecommons.org/licenses/by-sa/3.0/</link> のもとで利用"
+"可能です。"
#. type: Content of: <article><info><cover><para>
#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
@@ -1537,6 +1546,9 @@ msgid ""
"calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
"neodoc.biz\">NeoDoc</link>."
msgstr ""
+"本マニュアルは <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link> によっ"
+"て開発された <link ns6:href=\"http://www.calenco.com\">Calenco CMS</link> の"
+"助けを借りて作られました。"
#. type: Content of: <article><info><cover><para>
#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
@@ -1546,6 +1558,9 @@ msgid ""
"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
"link>, if you would like to help improve this manual."
msgstr ""
+"これはボランティアによってその自由な時間の中で書かれたものです。もし本マニュ"
+"アルの改善を手助けしたいのであれば <link ns6:href=\"https://wiki.mageia.org/"
+"en/Documentation_team\">Documentation Team</link> までご連絡をお願いします。"
#. type: Content of: <article><info><cover><para><note>
#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
@@ -1561,6 +1576,9 @@ msgid ""
"screens you will see, depends on your hardware and the choices you make "
"while installing."
msgstr ""
+"あなたが本マニュアル内で目にしたすべてのインストーラの画面を目にする人はいな"
+"いでしょう。どの画面を見ることになるのかは、あなたのハードウェアとインストー"
+"ル時の選択内容によって変わります。"
#. type: Content of: <article><info><cover><para>
#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
@@ -1591,14 +1609,12 @@ msgstr "おめでとうございます"
#. Lebarhon 20170209 updated SC
#. type: Content of: <section><mediaobject>
#: en/exitInstall.xml:7
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/exitInstall.xml:11
@@ -1637,7 +1653,7 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/firewall.xml:3
msgid "Firewall"
-msgstr ""
+msgstr "ファイアウォール"
#. type: Content of: <section><para>
#: en/firewall.xml:6
@@ -1818,9 +1834,8 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/installer.xml:26
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
#: en/installer.xml:31
@@ -1833,9 +1848,8 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/installer.xml:37
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
#: en/installer.xml:42
@@ -1851,12 +1865,10 @@ msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
#: en/installer.xml:50
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
#: en/installer.xml:55
@@ -1874,11 +1886,9 @@ msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
#: en/installer.xml:65
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
#: en/installer.xml:72
@@ -1887,12 +1897,10 @@ msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
#: en/installer.xml:76
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
#: en/installer.xml:83
@@ -1946,12 +1954,10 @@ msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
#: en/installer.xml:115
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
#: en/installer.xml:122
@@ -1968,12 +1974,10 @@ msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
#: en/installer.xml:131
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
#: en/installer.xml:136
@@ -1986,12 +1990,10 @@ msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
#: en/installer.xml:142
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
#: en/installer.xml:148
@@ -2034,9 +2036,8 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/installer.xml:175
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
#. type: Content of: <section><section><title>
#: en/installer.xml:183
@@ -2357,10 +2358,10 @@ msgstr ""
#. Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
#. type: Content of: <section><mediaobject>
#: en/misc-params.xml:10
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/misc-params.xml:15
@@ -2545,14 +2546,12 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/misc-params.xml:147
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/misc-params.xml:155
@@ -2663,10 +2662,8 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/reboot.xml:11
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/reboot.xml:15
@@ -2678,13 +2675,12 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/reboot.xml:17
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><info><title>
#: en/resizeFATChoose.xml:16
@@ -3289,14 +3285,12 @@ msgstr ""
#. Lebarhon 2016 12 16 updated for Mageia 6
#. type: Content of: <section><mediaobject>
#: en/selectCountry.xml:9
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/selectCountry.xml:14
@@ -3528,15 +3522,14 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/selectLanguage.xml:25
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
@@ -3641,9 +3634,8 @@ msgstr "ブートローダのメインオプション"
#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:13
-#, fuzzy
msgid "Bootloader interface"
-msgstr "ブートローダのメインオプション"
+msgstr ""
#. type: Content of: <section><section><para>
#: en/setupBootloader.xml:15
@@ -3673,18 +3665,16 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:36
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
"setupBootloader.png\"/> </imageobject>"
msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
@@ -3706,16 +3696,16 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:56
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:65
@@ -3762,16 +3752,16 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:100
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
"imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:111
@@ -3803,16 +3793,16 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:129
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
"\"center\"/> </imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
#. type: Content of: <section><section><para>
#: en/setupBootloader.xml:138
@@ -3823,17 +3813,17 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:142
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:149
msgid "Options"
-msgstr ""
+msgstr "オプション"
#. type: Content of: <section><section><section><title>
#: en/setupBootloader.xml:152
@@ -3873,9 +3863,8 @@ msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
-#, fuzzy
msgid "<guilabel>Advanced</guilabel>"
-msgstr "<guilabel>プロキシ</guilabel>:"
+msgstr ""
#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
#: en/setupBootloader.xml:185
@@ -4000,13 +3989,12 @@ msgstr "サウンドの設定"
#. Lebarhon 20170209 updated SC
#. type: Content of: <section><mediaobject>
#: en/soundConfig.xml:9
-#, fuzzy
msgid ""
"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/soundConfig.xml:14
@@ -4288,240 +4276,3 @@ msgid ""
"The next step is the copying of files on hard disk. This takes some minutes. "
"At the end, you get a blank screen for some time, it's normal."
msgstr ""
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
-#~ "align=\"center\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
-#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
-#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid "Custom"
-#~ msgstr "カスタム"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
-#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
-#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
-#~ "imageobject>"
-#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#~ msgid "DVD"
-#~ msgstr "DVD"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type="
-#~ "\"mediaobject\" id=\"1\"/>"
-#~ msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-#~ "imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png"
-#~ "\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
-#~ "\"center\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
-#~ "imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
-#~ "imageobject>"
-#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-#~ "setupBootloader.png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-#~ "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" "
-#~ "revision=\"1\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
-#~ "imageobject>"
-#~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
-#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
-#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
-#~ "png\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
-#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
-#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
-#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
-#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-#~ "</imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-#~ "</imageobject>"
-
-#~ msgid ""
-#~ "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
-#~ "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png"
-#~ "\" align=\"center\" revision=\"1\"/> </imageobject> <imageobject "
-#~ "condition=\"live\"> <imagedata format=\"PNG\" xml:id="
-#~ "\"bootloaderConfiguration-im1\" fileref=\"live-bootloaderConfiguration.png"
-#~ "\" align=\"center\" revision=\"1\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
-#~ "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png"
-#~ "\" align=\"center\" revision=\"1\"/> </imageobject> <imageobject "
-#~ "condition=\"live\"> <imagedata format=\"PNG\" xml:id="
-#~ "\"bootloaderConfiguration-im1\" fileref=\"live-bootloaderConfiguration.png"
-#~ "\" align=\"center\" revision=\"1\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/ja/DrakLive-cover.xml b/docs/installer/ja/DrakLive-cover.xml
index afab33b2..5ebb2c7d 100644
--- a/docs/installer/ja/DrakLive-cover.xml
+++ b/docs/installer/ja/DrakLive-cover.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ja" xml:id="Quick-Startup">
<info>
- <title>Installation from LIVE medium</title>
+ <title>ライブ メディアからのインストール</title>
<publisher> <publishername>Mageia.org</publishername> </publisher>
<revhistory>
<revision>
@@ -12,26 +12,23 @@
<cover>
<para role="tagline">The Official Documentation for Mageia</para>
<mediaobject>
-<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
- <para>The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>本マニュアル内の文章とスクリーンショットは クリエイティブ・コモンズ 表示-継承 3.0 ライセンス <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">https://creativecommons.org/licenses/by-sa/3.0/</link>
+のもとで利用可能です。
</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ <para>本マニュアルは <link ns6:href="http://www.neodoc.biz">NeoDoc</link> によって開発された <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> の助けを借りて作られました。
</para>
- <para>It was written by volunteers in their free time. Please contact <link
+ <para>これはボランティアによってその自由な時間の中で書かれたものです。もし本マニュアルの改善を手助けしたいのであれば <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+Team</link> までご連絡をお願いします。</para>
</cover>
</info>
<article>
- <title>Installation from LIVE medium</title>
+ <title>ライブ メディアからのインストール</title>
<para><note>
- <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+ <para>あなたが本マニュアル内で目にしたすべてのインストーラの画面を目にする人はいないでしょう。どの画面を見ることになるのかは、あなたのハードウェアとインストール時の選択内容によって変わります。</para>
</note></para>
<xi:include href="SelectAndUseISOs2.xml"/>
diff --git a/docs/installer/ja/DrakLive.xml b/docs/installer/ja/DrakLive.xml
index 923d85a7..7c9889bd 100644
--- a/docs/installer/ja/DrakLive.xml
+++ b/docs/installer/ja/DrakLive.xml
@@ -1,25 +1,22 @@
<?xml version='1.0' encoding='utf-8'?><article xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ja" xml:id="Quick-Startup">
<info>
- <title>Installation from LIVE medium</title>
+ <title>ライブ メディアからのインストール</title>
<cover>
<para><note>
- <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+ <para>あなたが本マニュアル内で目にしたすべてのインストーラの画面を目にする人はいないでしょう。どの画面を見ることになるのかは、あなたのハードウェアとインストール時の選択内容によって変わります。</para>
</note></para>
- <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+ <para xml:id="CC_BY-SA">本マニュアル内の文章とスクリーンショットは クリエイティブ・コモンズ 表示-継承 3.0 ライセンス <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">https://creativecommons.org/licenses/by-sa/3.0/</link>
+のもとで利用可能です。</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>本マニュアルは <link ns6:href="http://www.neodoc.biz">NeoDoc</link> によって開発された <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> の助けを借りて作られました。</para>
- <para>It was written by volunteers in their free time. Please contact <link
+ <para>これはボランティアによってその自由な時間の中で書かれたものです。もし本マニュアルの改善を手助けしたいのであれば <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+Team</link> までご連絡をお願いします。</para>
</cover>
</info>
diff --git a/docs/installer/ja/DrakX-cover.xml b/docs/installer/ja/DrakX-cover.xml
index 4551f065..c36e7730 100644
--- a/docs/installer/ja/DrakX-cover.xml
+++ b/docs/installer/ja/DrakX-cover.xml
@@ -13,18 +13,17 @@
<cover>
<para role="tagline">The Official Documentation for Mageia</para>
<mediaobject>
-<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
- <para>The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>本マニュアル内の文章とスクリーンショットは クリエイティブ・コモンズ 表示-継承 3.0 ライセンス <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">https://creativecommons.org/licenses/by-sa/3.0/</link>
+のもとで利用可能です。
</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ <para>本マニュアルは <link ns6:href="http://www.neodoc.biz">NeoDoc</link> によって開発された <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> の助けを借りて作られました。
</para>
- <para>It was written by volunteers in their free time. Please contact <link
+ <para>これはボランティアによってその自由な時間の中で書かれたものです。もし本マニュアルの改善を手助けしたいのであれば <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+Team</link> までご連絡をお願いします。</para>
</cover>
</info>
<article>
@@ -41,9 +40,7 @@ Team</link>, if you would like to help improve this manual.</para>
<!--2013-12-08 add soundConfig.xml -->
<title>Installation with DrakX</title>
<para><note>
- <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+ <para>あなたが本マニュアル内で目にしたすべてのインストーラの画面を目にする人はいないでしょう。どの画面を見ることになるのかは、あなたのハードウェアとインストール時の選択内容によって変わります。</para>
</note></para>
diff --git a/docs/installer/ja/DrakX.xml b/docs/installer/ja/DrakX.xml
index 72b6a8f3..e424ffc2 100644
--- a/docs/installer/ja/DrakX.xml
+++ b/docs/installer/ja/DrakX.xml
@@ -13,33 +13,34 @@
<cover>
<para><note>
- <para>No one will see all the installer screens that you see in this manual. Which
-screens you will see, depends on your hardware and the choices you make
-while installing.</para>
+ <para>あなたが本マニュアル内で目にしたすべてのインストーラの画面を目にする人はいないでしょう。どの画面を見ることになるのかは、あなたのハードウェアとインストール時の選択内容によって変わります。</para>
</note></para>
- <para xml:id="CC_BY-SA">The texts and screenshots in this manual are available under the CC BY-SA
-3.0 license <link
-ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+ <para xml:id="CC_BY-SA">本マニュアル内の文章とスクリーンショットは クリエイティブ・コモンズ 表示-継承 3.0 ライセンス <link
+ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">https://creativecommons.org/licenses/by-sa/3.0/</link>
+のもとで利用可能です。</para>
- <para>This manual was produced with the help of the <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+ <para>本マニュアルは <link ns6:href="http://www.neodoc.biz">NeoDoc</link> によって開発された <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> の助けを借りて作られました。</para>
- <para>It was written by volunteers in their free time. Please contact <link
+ <para>これはボランティアによってその自由な時間の中で書かれたものです。もし本マニュアルの改善を手助けしたいのであれば <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
-Team</link>, if you would like to help improve this manual.</para>
+Team</link> までご連絡をお願いします。</para>
</cover>
</info>
+
+
+
-
+
+
<xi:include href="SelectAndUseISOs2.xml"/>
@@ -58,7 +59,7 @@ Team</link>, if you would like to help improve this manual.</para>
<xi:include href="doPartitionDisks.xml"/>
-
+
<!-- <xi:include href="resizeFATChoose.xml"/>
@@ -66,23 +67,23 @@ Team</link>, if you would like to help improve this manual.</para>
<xi:include href="takeOverHdChoose.xml"/> -->
<xi:include href="ask_mntpoint_s.xml"/>
-<xi:include href="takeOverHdConfirm.xml"/>
+ <xi:include href="takeOverHdConfirm.xml"/>
<xi:include href="diskdrake.xml"/>
<xi:include href="formatPartitions.xml"/>
-<xi:include href="add_supplemental_media.xml"/>
+ <xi:include href="add_supplemental_media.xml"/>
-<xi:include href="media_selection.xml"/>
+ <xi:include href="media_selection.xml"/>
-<xi:include href="chooseDesktop.xml"></xi:include>
+ <xi:include href="chooseDesktop.xml"/>
-<xi:include href="choosePackageGroups.xml"></xi:include>
+ <xi:include href="choosePackageGroups.xml"/>
-<xi:include href="minimal-install.xml"></xi:include>
+ <xi:include href="minimal-install.xml"/>
-<xi:include href="choosePackagesTree.xml"></xi:include>
+ <xi:include href="choosePackagesTree.xml"/>
@@ -110,18 +111,19 @@ Team</link>, if you would like to help improve this manual.</para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
-<xi:include href="configureTimezoneUTC.xml"></xi:include>
-
-<xi:include href="selectCountry.xml"></xi:include>
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="selectCountry.xml"/>
-<xi:include href="configureServices.xml"></xi:include>
+ <xi:include href="configureServices.xml"/>
-<xi:include href="selectMouse.xml"/>
+ <xi:include href="selectMouse.xml"/>
-<xi:include href="soundConfig.xml"/>
+ <xi:include href="soundConfig.xml"/>
- <xi:include href="securityLevel.xml"></xi:include>
+ <xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
@@ -131,5 +133,5 @@ Team</link>, if you would like to help improve this manual.</para>
<xi:include href="exitInstall.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uninstall-Mageia.xml"/>
-</article>
+ <xi:include href="uninstall-Mageia.xml"/>
+</article> \ No newline at end of file
diff --git a/docs/installer/ja/acceptLicense.xml b/docs/installer/ja/acceptLicense.xml
index ff881d01..fd3a1768 100644
--- a/docs/installer/ja/acceptLicense.xml
+++ b/docs/installer/ja/acceptLicense.xml
@@ -31,7 +31,7 @@
<!-- barjac:2012-04-10 - edited header to correct formatting after my saves - not
sure what is causing the corruption -->
<!-- JohnR 2012-04-19 language proofreading -->
-<title xml:id="acceptLicense-ti1">ライセンスとリリース ノート</title>
+<title xml:id="acceptLicense-ti1">使用許諾契約とリリース ノート</title>
</info>
<mediaobject>
@@ -43,14 +43,13 @@ fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
- <title xml:id="license-ti1">使用許諾に同意する</title>
+ <title xml:id="license-ti1">使用許諾契約の同意</title>
</info>
- <para><application>Mageia</application> をインストールする前に使用許諾をお読みください。</para>
+ <para><application>Mageia</application> をインストールする前に使用許諾契約の内容をよくお読みください。</para>
- <para>These terms and conditions apply to the entire
-<application>Mageia</application> distribution and must be accepted before
-you can continue.</para>
+ <para>これらの使用許諾契約の内容は、 <application>Mageia</application>
+ディストリビューション全体に適用され、あなたは続行する前にこれらに同意しなくてはなりません。</para>
<para>To accept, simply select <guilabel>Accept</guilabel> and then click on
<guibutton>Next</guibutton>.</para>
@@ -69,7 +68,7 @@ looking. Clicking <guibutton>Quit</guibutton> will reboot your computer.</para>
Release Notes</para>
-->
<info>
- <title xml:id="releaseNotes-ti1">リリースノート</title>
+ <title xml:id="releaseNotes-ti1">リリース ノート</title>
</info>
diff --git a/docs/installer/ja/add_supplemental_media.xml b/docs/installer/ja/add_supplemental_media.xml
index 71a68ea5..4480c8c2 100644
--- a/docs/installer/ja/add_supplemental_media.xml
+++ b/docs/installer/ja/add_supplemental_media.xml
@@ -7,7 +7,7 @@
xmlns:ns3="http://www.w3.org/2000/svg"
xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title xml:id="add_supplemental_media-ti1">Media Selection (Configure Supplemental Installation Media)</title>
+ <title xml:id="add_supplemental_media-ti1">メディアの選択 (追加のインストール メディアを設定する)</title>
</info>
@@ -22,24 +22,20 @@
fileref="dx2-add_supplemental_media.png" format="PNG" revision="1"
xml:id="dx2-add_supplemental_media-im1"/> </imageobject></mediaobject>
- <para>This screen gives you the list of already recognized repositories. You can
-add other sources for packages, like an optical disc or a remote source. The
-source selection determines which packages will be available for selection
-during the next steps.</para>
+ <para>この画面は認識済みのリポジトリの一覧を示しています。あなたは光学ディスクやリモート
+ソースのように他のパッケージ入手先を追加できます。この入手先の選択は、以降の段階における利用可能パッケージに影響します。</para>
- <para>For a network source, there are two steps to follow:</para>
+ <para>ネットワーク ソースでは、以下の2つの手順が続きます:</para>
<orderedlist>
<listitem>
- <para>Choosing and activation of the network, if not already up. </para>
+ <para>ネットワークが有効化されていなければ、選択および有効化を行います。 </para>
</listitem>
<listitem>
- <para>Selecting a mirror or specifying a URL (very first entry). By selecting a
-mirror, you have access to the selection of all repositories managed by
-Mageia, like the Nonfree , the Tainted repositories and the Updates. With
-the URL, you can designate a specific repository or your own NFS
-installation.</para>
+ <para>ミラーを選択するか、 URL (一覧の一番上の項目) を指定します。ミラーを選択することで Mageia
+に管理されているすべてのリポジトリを自由に選択できるようになり、 Nonfree, Tainted といったリポジトリと、それぞれに更新を提供する
+Updates があります。 URL を指定することで、特定のリポジトリやあなたの NFS インストールを指し示すことができます。</para>
</listitem>
</orderedlist>
diff --git a/docs/installer/ja/diskdrake.xml b/docs/installer/ja/diskdrake.xml
index dcb84523..8a6cc96f 100644
--- a/docs/installer/ja/diskdrake.xml
+++ b/docs/installer/ja/diskdrake.xml
@@ -1,60 +1,49 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ja" xml:id="diskdrake">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:lang="ja" xml:id="diskdrake">
-
<info>
<!-- Lebarhon 2016 12 16 updated for Mageia 6
Lebarhon 20170902 added SC-->
<title xml:id="diskdrake-ti1">Custom disk partitioning with DiskDrake</title>
</info>
-
<mediaobject>
<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake.png"
align="center"/> </imageobject> <imageobject condition="live"> <imagedata
fileref="live-diskdrake.png" align="center"/> </imageobject></mediaobject>
-
<warning>
<para revision="3" xml:id="diskdrake-pa1">If you wish to use encryption on your <literal>/</literal> partition you
must ensure that you have a separate <literal>/boot</literal> partition. The
encryption option for the <literal>/boot</literal> partition must NOT be
set, otherwise your system will be unbootable.</para>
</warning>
-
<para xml:id="diskdrake-pa3" revision="2">Adjust the layout of your disk(s) here. You can remove or create
partitions, change the filesystem of a partition or change its size and even
view what is in them before you start.</para>
-
<para xml:id="diskdrake-pa4" revision="1">There is a tab for every detected hard disk or other storage device, like an
-USB key. For example sda, sdb and sdc if there are three of them.</para>
-
+USB key. For example sda, sdb and sdc if there are three of them. </para>
<para xml:id="diskdrake-pa5" revision="1">Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected
storage device</para>
-
<para xml:id="diskdrake-pa6" revision="1">For all other actions: click on the desired partition first. Then view it,
-or choose a filesystem and a mount point, resize it or wipe it.</para>
-
+or choose a filesystem and a mount point, resize it or wipe
+it. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert
+mode</guibutton>) gives some more tools like to add a label or to choose a
+partition type. </para>
<para xml:id="diskdrake-pa6a" revision="1">Continue until you adjusted everything to your wishes.</para>
-
<para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton> when you're ready.</para>
-
<note>
<para>If you are installing Mageia on an UEFI system, check that an ESP (EFI
System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
-
- <para><mediaobject>
-<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
-align="center"/> </imageobject> <imageobject condition="live"> <imagedata
-fileref="live-diskdrake2.png" align="center"/> </imageobject></mediaobject></para>
+ <para><mediaobject><imageobject condition="classical"><imagedata fileref="dx2-diskdrake2.png"
+align="center"/></imageobject><imageobject condition="live"><imagedata
+align="center" fileref="live-diskdrake2.png"/></imageobject></mediaobject></para>
</note>
-
<note>
<para>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
-partition is present with a correct type</para>
-
+partition is present and of the correct type</para>
<mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks3.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
</note>
</section> \ No newline at end of file
diff --git a/docs/installer/ja/doPartitionDisks.xml b/docs/installer/ja/doPartitionDisks.xml
index 22b72ea1..6953eae9 100644
--- a/docs/installer/ja/doPartitionDisks.xml
+++ b/docs/installer/ja/doPartitionDisks.xml
@@ -1,8 +1,6 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ja" xml:id="doPartitionDisks">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ja" xml:id="doPartitionDisks">
-
-
<info>
<!---->
<!-- lebarhon 20161216 updated for Mageia 6
@@ -10,143 +8,65 @@
lebarhon 20170209 added SC-->
<title xml:id="doPartitionDisks-ti1">パーティションの設定</title>
</info>
-
<para xml:id="doPartitionDisks-pa1" revision="1">In this screen you can see the content of your hard drive(s) and see the
solutions the DrakX partitioning wizard found for where to install
<application>Mageia</application>.</para>
-
<para xml:id="doPartitionDisks-pa2" revision="1">The options available from the list below will vary depending on your
particular hard drive(s) layout and content.</para>
-
<mediaobject>
<imageobject condition="classical"> <imagedata
fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
<imageobject condition="live"> <imagedata
fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
-
- <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
- <listitem>
- <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing Partitions</para>
-
- <para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
-been found and may be used for the installation.</para>
- </listitem>
-
- <listitem>
- <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
-
- <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
-your new Mageia installation.</para>
- </listitem>
-
- <listitem>
- <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a Windows Partition</para>
-
- <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
-offer to use it.</para>
-
- <para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
+ <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist><listitem><para revision="1" xml:id="doPartitionDisks-pa4">Use Existing Partitions</para><para xml:id="doPartitionDisks-pa5" revision="1">If this option is available, then existing Linux compatible partitions have
+been found and may be used for the installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para><para xml:id="doPartitionDisks-pa7" revision="1">If you have unused space on your hard drive then this option will use it for
+your new Mageia installation.</para></listitem><listitem><para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a Windows Partition</para><para xml:id="doPartitionDisks-pa9" revision="1">If you have unused space on an existing Windows partition, the installer may
+offer to use it.</para><para xml:id="doPartitionDisks-pa10" revision="2">This can be a useful way of making room for your new Mageia installation,
but is a risky operation so you should make sure you have backed up all
-important files!</para>
-
- <para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
+important files!</para><para revision="3" xml:id="doPartitionDisks-pa11">Note that this involves shrinking the size of the Windows partition. The
partition must be "clean", meaning that Windows must have closed down
correctly the last time it was used. It must also have been defragmented,
although this is not a guarantee that all files in the partition have been
moved out of the area that is about to be used. It is highly recommended to
-back up your personal files.</para>
-
- <para>With this option, the installer displays the remaining Windows partition in
+back up your personal files.</para><para>With this option, the installer displays the remaining Windows partition in
light blue and the future Mageia partition in dark blue with their intended
sizes just under. You have the possibility to adapt these sizes by clicking
-and dragging the gap between both partitions. See the screen-shot below.</para>
-
- <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
- </listitem>
- </itemizedlist> <itemizedlist>
- <listitem>
- <para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire Disk.</para>
-
- <para xml:id="doPartitionDisks-pa13" revision="1">This option will use the complete drive for Mageia.</para>
-
- <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will erase ALL data on the selected hard drive. Take care!</para>
-
- <para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
+and dragging the gap between both partitions. See the screen-shot below.</para><mediaobject><imageobject condition="classical"><imagedata
+fileref="dx2-doPartitionDisks2.png"
+align="center"/></imageobject><imageobject condition="live"><imagedata
+fileref="live-doPartitionDisks2.png" align="center"/></imageobject></mediaobject></listitem></itemizedlist> <itemizedlist><listitem><para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire Disk.</para><para xml:id="doPartitionDisks-pa13" revision="1">This option will use the complete drive for Mageia.</para><para xml:id="doPartitionDisks-pa14" revision="1">Note! This will erase ALL data on the selected hard drive. Take care!</para><para xml:id="doPartitionDisks-pa15" revision="1">If you intend to use part of the disk for something else, or you already
have data on the drive that you are not prepared to lose, then do not use
-this option.</para>
- </listitem>
- </itemizedlist><itemizedlist>
- <listitem>
- <para xml:id="doPartitionDisks-pa16" revision="1">カスタム</para>
-
- <para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
-hard drive(s).</para>
- </listitem>
- </itemizedlist></para>
-
- <para><emphasis role="bold">Partitions sizing:</emphasis></para>
-
+this option.</para></listitem></itemizedlist><itemizedlist><listitem><para xml:id="doPartitionDisks-pa16" revision="1">パーティションを手動で設定</para><para xml:id="doPartitionDisks-pa17" revision="1">This gives you complete control over the placing of the installation on your
+hard drive(s).</para></listitem></itemizedlist></para>
+ <para><emphasis role="bold">Partition sizing:</emphasis></para>
<para>The installer will share the available place out according to the following
rules:</para>
-
- <para><itemizedlist>
- <listitem>
- <para>If the total available place is lower than 50 GB, only one partition is
-created for /, there is no separate partition for /home.</para>
- </listitem>
-
- <listitem>
- <para>If the total available place is over 50 GB, then three partitions are
-created</para>
-
- <itemizedlist>
- <listitem>
- <para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para>
- </listitem>
-
- <listitem>
- <para>1/19 is allocated to swap with a maximum of 4 GB</para>
- </listitem>
-
- <listitem>
- <para>the rest (at least 12/19) is allocated to /home</para>
- </listitem>
- </itemizedlist>
- </listitem>
- </itemizedlist></para>
-
+ <para><itemizedlist><listitem><para>If the total available place is lower than 50 GB, only one partition is
+created for /, there is no separate partition for /home.</para></listitem><listitem><para>If the total available place is over 50 GB, then three partitions are
+created</para><itemizedlist><listitem><para>6/19 of the total available place is allocated to / with a maximum of 50 GB</para></listitem><listitem><para>1/19 is allocated to swap with a maximum of 4 GB</para></listitem><listitem><para>the rest (at least 12/19) is allocated to /home</para></listitem></itemizedlist></listitem></itemizedlist></para>
<para>That means that from 160 GB and over of available place, the installer will
create three partitions: 50 GB for /, 4 GB for swap and the rest for /home.</para>
-
<note>
<para>If you are using an UEFI system, the ESP (EFI System Partition) will be
automatically detected, or created if it does not exist yet, and mounted on
-/boot/EFI. The "Custom" option is the only one that allows to check it has
-been correctly done</para>
+/boot/EFI. The "Custom disk partitioning" option is the only one that allows
+to check it has been correctly done</para>
</note>
-
<note>
<para>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
you need to create a Bios boot partition if not already existing. It is an
-about 1 MiB partition with no mount point. Choose the "Custom disk
-partitioning" option to be able to create it with the Installer like any
+about 1 MiB partition with no mount point. Choose <xref
+linkend="diskdrake"/> to be able to create it with the Installer like any
other partition, just select BIOS boot partition as filesystem type.</para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-doPartitionDisks3.png"/>
+</imageobject></mediaobject>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
</imageobject></mediaobject>
</note>
-
<warning>
<para>Some newer drives are now using 4096 byte logical sectors, instead of the
previous standard of 512 byte logical sectors. Due to lack of available
@@ -155,11 +75,8 @@ with such a drive. Also some ssd drives now use an erase block size over 1
MB. We suggest to pre-partition the drive, using an alternative partitioning
tool like gparted, if you own such a device, and to use the following
settings:</para>
-
<para>"Align to" "MiB"</para>
-
<para>"Free space preceding (MiB)" "2"</para>
-
<para>Also make sure all partitions are created with an even number of megabytes.</para>
</warning>
</section> \ No newline at end of file
diff --git a/docs/installer/ja/exitInstall.xml b/docs/installer/ja/exitInstall.xml
index 8c15199c..e8136e34 100644
--- a/docs/installer/ja/exitInstall.xml
+++ b/docs/installer/ja/exitInstall.xml
@@ -1,27 +1,20 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0" xml:lang="ja">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" xml:id="exitInstall" version="5.0" xml:lang="ja">
<info>
<title xml:id="exitInstall-ti1">おめでとうございます</title>
</info>
-
-
<mediaobject>
<!-- Lebarhon 20170209 updated SC-->
<imageobject> <imagedata format="PNG" fileref="dx2-exitInstall.png"
align="center" revision="1" xml:id="exitInstall-im1"/> </imageobject></mediaobject>
-
<para xml:id="exitInstall-pa1" revision="2">You have finished installing and configuring
<application>Mageia</application> and it is now safe to remove the
installation medium and reboot your computer.</para>
-
<para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader screen, you can choose between the operating
systems on your computer (if you have more than one).</para>
-
<para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the settings for the bootloader, your Mageia install
will be automatically selected and started.</para>
-
<para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
-
<para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have any questions or want to contribute to
Mageia</para>
</section> \ No newline at end of file
diff --git a/docs/installer/ja/firewall.xml b/docs/installer/ja/firewall.xml
new file mode 100644
index 00000000..a3000f8a
--- /dev/null
+++ b/docs/installer/ja/firewall.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="ja">
+ <info>
+ <title xml:id="firewall-ti1">ファイアウォール</title>
+ </info>
+
+ <para xml:id="firewall-pa1" revision="1">This section allows to configure some simple firewall rules: they determine
+which type of message from the Internet will be accepted by the target
+system. This, in turn, allows the corresponding services on the system to be
+accessible from the Internet.</para>
+
+ <para>In the default setting, no button is checked - no service of the system is
+accessibly from the network. The "<emphasis>Everything (no
+firewall)</emphasis>" button has a particular role: it enables access to all
+services of the machine - an option that does not make much sense in the
+context of the installer since it would create a totally unprotected
+system. Its veritable use is in the context of the Mageia Control Center
+(which uses the same GUI layout) for temporarily disabling the entire set of
+firewall rules for testing and debugging purposes.</para>
+
+ <para>All other checkbuttons are more or less self-explanatory. As an example, you
+will check the "CUPS server" button if you want printers on your machine to
+be accessible from the network.</para>
+
+ <para><emphasis role="bold">Advanced</emphasis></para>
+
+ <para>The set of checkbuttons only comprises the most common services. The
+"Advanced" button allows to enable messages that correspond to a service for
+which no checkbutton exists. The "<emphasis>Advanced</emphasis>" button
+opens a window where you can enable a series of services by typing a list of
+couples (blank separated)</para>
+
+ <para><emphasis>&lt;port-number>/&lt;protocol></emphasis></para>
+
+ <simplelist>
+ <member>- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to
+the service you want to enable (e.g. 873 for the RSYNC service) as defined
+in <emphasis>RFC-433</emphasis>;</member>
+
+ <member>- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or
+<emphasis>UDP</emphasis> - the internet protocol that is used by the
+service.</member>
+ </simplelist>
+
+ <para>For instance, the entry for enabling access to the RSYNC service therefore
+is <emphasis>873/tcp</emphasis>.</para>
+
+ <para>In case a service is implemented to use both protocols, you specify 2
+couples for the same port.</para>
+</section> \ No newline at end of file
diff --git a/docs/installer/ja/installer.xml b/docs/installer/ja/installer.xml
index f66281bc..ecda395d 100644
--- a/docs/installer/ja/installer.xml
+++ b/docs/installer/ja/installer.xml
@@ -1,186 +1,145 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installer" version="5.0" xml:lang="ja">
-
-
-
-
-
-
-
-
-
-
-
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ja" xml:id="installer">
<info>
- <!-- Made by marja on 2012 03 30, using barjac's text -->
-<!-- NEEDS TO BE REVIEWED! -->
-<!--removed para id's, corrected duplicate id's for segments, marja, 20120409 -->
-<!--barjac 2012-04-11 - corrected link to Welcome screen and unmangled header -
- seems to be corrupted by xxe addon when saving -->
-<!-- JohnR - apparent corruption is caused by the positioning of this comment block
- - corrected Lebarhon : I put [] where it seems having mistakes -->
-<!-- barjac 18/04/2012 Commented out para relating to peripherals, as it's apparently wrong -->
-<title xml:id="installer-ti1">DrakX, the Mageia Installer</title>
+ <title xml:id="Select-and-use-ISOs-ti1">DrakX, the Mageia Installer</title>
</info>
<para>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
possible.</para>
-
-
- <!-- <para>
-If you have peripherals like printers or scanners, it is [best] to
- connect them and make sure they are powered up during installation. These
- will be automatically detected and configured.</para> -->
-<para>The initial menu screen has various options, however the default one will
+ <para>The initial menu screen has various options, however the default one will
start the installer, which will normally be all that you will need.</para>
- <figure xml:id="dx-welcome">
- <info>
- <title xml:id="installer-ti2">Installation Welcome Screen</title>
- </info>
+ <section>
+ <title>Installation Welcome Screen</title>
- <para>Here are the default welcome screens when using a Mageia DVD, The first one
-with a legacy system and the second one with an UEFI system:
- </para>
+ <section>
+ <title>Using a Mageia DVD</title>
-<mediaobject>
-<imageobject> <imagedata xml:id="BId-drakx-intro-im1" revision="1"
-align="center" format="PNG" fileref="../dx-welcome.png"/> </imageobject></mediaobject></figure>
+ <para>Here are the default welcome screens when using a Mageia DVD, The first one
+with an UEFI system and the second one with a Legacy system:</para>
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png" align="center"/>
-</imageobject></mediaobject>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome2.png"/> </imageobject></mediaobject>
+
+ <para>From this screen, you can access to options by pressing the "e" letter to
+enter the "edit mode". To come back to this screen, press either the key
+"esc" to quit without saving or press the key "Ctrl" or "F10" to quit with
+saving.</para>
- <para>From this first screen, it is possible to set some personal preferences:</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome.png"/> </imageobject></mediaobject>
- <itemizedlist>
- <listitem>
- <para>The language (for the installation only, may be different that the chosen
+ <para>From this screen, it is possible to set some personal preferences:<itemizedlist>
+ <listitem>
+ <para>The language (for the installation only, may be different that the chosen
language for the system) by pressing the key F2 (Legacy mode only)</para>
- <para/>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome-lang.png" align="center"/>
-</imageobject></mediaobject>
+ <para>Use the arrow keys to select the language and press the key Enter.</para>
- <para>Use the arrow keys to select the language and press the key Enter.</para>
-
- <para>Here is for example, the French welcome screen when using a Live
+ <para>Here is for example, the French welcome screen when using a Live
DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue
System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
Detection Tool</guilabel>.</para>
- <para/>
-
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome4fr.png" align="center"/>
-</imageobject></mediaobject>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
+ </listitem>
- <para/>
- </listitem>
+ <listitem>
+ <para>Change the screen resolution by pressing the F3 key (Legacy mode only).</para>
- <listitem>
- <para>Change the screen resolution by pressing the F3 key (Legacy mode only).</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
+ </listitem>
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome5def.png" align="center"/>
-</imageobject></mediaobject>
- </listitem>
-
- <listitem>
- <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
+ <listitem>
+ <para>Add some kernel options by pressing the <emphasis role="bold">F6</emphasis>
key for the legacy mode or the <emphasis role="bold">e</emphasis> key for
the UEFI mode.</para>
- <para>If the installation fails, then it may be necessary to try again using one
+ <para>If the installation fails, then it may be necessary to try again using one
of the extra options. The menu called by F6 displays a new line called
<guilabel>Boot options</guilabel> and propose four entries:</para>
- <para>- Default, it doesn't alter anything in the default options.</para>
+ <para>- Default, it doesn't alter anything in the default options.</para>
- <para>- Safe Settings, priority is given to the safer options to the detriment of
-performances.</para>
+ <para>- Default, it doesn't alter anything in the default options.</para>
- <para>- No ACPI (Advanced Configuration and Power Interface), power management
+ <para>- No ACPI (Advanced Configuration and Power Interface), power management
isn't taken into account.</para>
- <para>- No Local APIC (Local Advanced Programmable Interrupt Controller), it is
+ <para>- No Local APIC (Local Advanced Programmable Interrupt Controller), it is
about CPU interruptions, select this option if you are asked for.</para>
- <para>When you select one of these entries, it modifies the default options
+ <para>When you select one of these entries, it modifies the default options
displayed in the <guilabel>Boot Options</guilabel> line.</para>
- <note>
- <para>In some Mageia releases, it may happen that the entries selected with the
+ <note>
+ <para>In some Mageia releases, it may happen that the entries selected with the
key F6 does not appear in the <guilabel>Boot Options</guilabel> line,
however, they are really taken into account.</para>
- </note>
+ </note>
- <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx-welcome6opt.png"/>
-</imageobject></mediaobject>
- </listitem>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
+ </listitem>
- <listitem>
- <para>Add more kernel options by pressing the key F1 (Legacy mode only).</para>
+ <listitem>
+ <para>Add more kernel options by pressing the key F1 (Legacy mode only).</para>
- <para>Pressing F1 opens a new window with more available options. Select one with
+ <para>Pressing F1 opens a new window with more available options. Select one with
the arrow keys and press Enter to have more details or press the Esc key to
go back to the welcome screen.</para>
- <para/>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
- <mediaobject>
-<imageobject> <imagedata fileref="dx-welcomeHelp1.png" align="center"/>
-</imageobject></mediaobject>
-
- <para/>
-
- <para>The detailed view about the option splash. Press Esc or select
+ <para>The detailed view about the option splash. Press Esc or select
<guilabel>Return to Boot Options</guilabel> to go back to the options
list. These options can by added by hand in the <guilabel>Boot
options</guilabel> line.</para>
- <mediaobject>
-<imageobject> <imagedata align="center" fileref="dx-welcomeHelp2.png"/>
-</imageobject></mediaobject>
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
- <para/>
+ <note>
+ <para>The help is translated in the chosen language with the F2 key.</para>
+ </note>
- <note>
- <para>The help is translated in the chosen language with the F2 key.</para>
- </note>
- </listitem>
- </itemizedlist>
-
- <para>For more information about kernel options on legacy and UEFI systems, see:
+ <para>For more information about kernel options on legacy and UEFI systems, see:
<link
ns2:href="https://wiki.mageia.org/en/How_to_set_up_kernel_options">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link></para>
+ </listitem>
+ </itemizedlist></para>
+ </section>
+
+ <section>
+ <title>Using a Wired Network</title>
- <para>Here is the default welcome screen when using a Wired Network-based
-Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
+ <para>Here is the default welcome screen when using a Wired Network-based
+Installation CD (netinstall.iso or netinstall-nonfree.iso images):</para>
- <para>It does not allow to change the language, the available options are
+ <para>It does not allow to change the language, the available options are
described in the screen. For more information about using a Wired
Network-based Installation CD, see <link
ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
Wiki</link></para>
- <warning>
- <para>The keyboard layout is the American one.</para>
- </warning>
+ <warning>
+ <para>The keyboard layout is the American one.</para>
+ </warning>
- <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="installer-im2" align="center"
-format="PNG" fileref="../dx-help.png"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject> <imagedata fileref="../dx-help.png"/> </imageobject></mediaobject>
+ </section>
+ </section>
- <section xml:id="installationSteps">
- <info>
- <title xml:id="installationSteps-ti1">The installation steps</title>
- </info>
+ <section>
+ <title>The installation steps</title>
<para>The install process is divided into a number of steps, which can be followed
on the side panel of the screen.</para>
@@ -204,15 +163,11 @@ rebooting is what you want, go to a text terminal by pressing the three keys
</note>
</section>
- <section xml:id="installationProblems">
- <info>
- <title xml:id="installationProblems-ti1">Installation Problems and Possible Solutions</title>
- </info>
+ <section>
+ <title>Installation Problems and Possible Solutions</title>
- <section xml:id="noX">
- <info>
- <title xml:id="noX-ti2">No Graphical Interface</title>
- </info>
+ <section>
+ <title>No Graphical Interface</title>
<itemizedlist>
<listitem>
@@ -222,7 +177,7 @@ low resolution by typing <code>vgalo</code> at the prompt.</para>
</listitem>
<listitem>
- <para revision="2">If the hardware is very old, a graphical installation may not be
+ <para>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 hit ESC at the first welcome screen and confirm with ENTER. You will be
presented with a black screen with the word "boot:". Type "text" and hit
@@ -231,10 +186,8 @@ ENTER. Now continue with the installation in text mode.</para>
</itemizedlist>
</section>
- <section xml:id="installFreezes">
- <info>
- <title xml:id="installFreezes-ti1">The Install Freezes</title>
- </info>
+ <section>
+ <title>The Install Freezes</title>
<para>If the system appeared to freeze during the installation, this may be a
problem with hardware detection. In this case the automatic detection of
@@ -243,10 +196,8 @@ hardware may be bypassed and dealt with later. To try this, type
other options as necessary.</para>
</section>
- <section xml:id="kernelOptions">
- <info>
- <title xml:id="kernelOptions-ti1">RAM problem</title>
- </info>
+ <section>
+ <title>RAM problem</title>
<para>These will rarely be needed, but in some cases the hardware may report the
available RAM incorrectly. To specify this manually, you can use the
@@ -254,10 +205,8 @@ available RAM incorrectly. To specify this manually, you can use the
RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM.</para>
</section>
- <section xml:id="DynamicPartitions">
- <info>
- <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
- </info>
+ <section>
+ <title>Dynamic partitions</title>
<para>If you converted your hard disk from "basic" format to "dynamic" format on
Microsoft Windows, you must know that it is impossible to install Mageia on
@@ -266,5 +215,6 @@ this disc. To go back to a basic disk, see the Microsoft documentation:
ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
</section>
</section>
-</section>
+ <section/>
+</section> \ No newline at end of file
diff --git a/docs/installer/ja/selectLanguage.xml b/docs/installer/ja/selectLanguage.xml
index 111645f9..a63d206a 100644
--- a/docs/installer/ja/selectLanguage.xml
+++ b/docs/installer/ja/selectLanguage.xml
@@ -1,14 +1,9 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectLanguage" version="5.0" xml:lang="ja">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ja" xml:id="selectLanguage">
-
-
-
-
-
<info>
<!-- Made by marja on 2012 04 01, using barjac's text -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -19,42 +14,36 @@
up mess made of this header by xxe -->
<title xml:id="selectLanguage-ti1">使用する言語を選んでください。</title>
</info>
-
- <para>Select your preferred language, by first expanding the list for your
+ <para condition="classical">Select your preferred language, by first expanding the list for your
continent. <application>Mageia</application> will use this selection during
the installation and for your installed system.</para>
-
+ <para condition="live">Select your preferred language. <application>Mageia</application> will use
+this selection during the installation and for your installed system.</para>
<para condition="classical">If it is likely that you will require several languages installed on your
system, for yourself or other users, then you should use the
<guibutton>Multiple languages</guibutton> button to add them now. It will be
difficult to add extra language support after installation.</para>
-
<mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
-condition="live"> <imagedata fileref="live-language.png" format=""/>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata format="PNG"
+fileref="dx2-selectLanguage.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata fileref="live-language.png"
+format=""/> </imageobject></mediaobject>
<warning condition="classical">
<para>Even if you choose more than one language, you must first choose one of them
as your preferred language in the first language screen. It will also be
marked as chosen in the multiple languages screen .</para>
</warning>
-
<itemizedlist>
<listitem condition="classical">
<para>If your keyboard language is not the same as your preferred language, then
it is advisable to install the language of your keyboard as well.</para>
</listitem>
-
<listitem>
<para>Mageia uses UTF-8 (Unicode) support by default.</para>
-
<para condition="classical">This may be disabled in the "multiple languages" screen if you know that it
is inappropriate for your language. Disabling UTF-8 applies to all installed
languages.</para>
</listitem>
-
<listitem>
<para>You can change the language of your system after installation in the Mageia
Control Center -> System -> Manage localization for your system.</para>
diff --git a/docs/installer/ja/setupBootloader.xml b/docs/installer/ja/setupBootloader.xml
index f138bfb4..b7a3dd1a 100644
--- a/docs/installer/ja/setupBootloader.xml
+++ b/docs/installer/ja/setupBootloader.xml
@@ -127,7 +127,7 @@ fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject
</section>
<section>
- <title>Options</title>
+ <title>オプション</title>
<section>
<title>First page</title>
diff --git a/docs/installer/ja/setupBootloaderAddEntry.xml b/docs/installer/ja/setupBootloaderAddEntry.xml
index cb08a540..5f99908a 100644
--- a/docs/installer/ja/setupBootloaderAddEntry.xml
+++ b/docs/installer/ja/setupBootloaderAddEntry.xml
@@ -1,16 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ja" xml:id="setupBootloaderAddEntry">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/2000/svg" version="5.0" xml:lang="ja" xml:id="setupBootloaderAddEntry">
-
<info>
<!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
Lebarhon 2016 12 16 Updated for Mageia 6-->
<title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu Entry</title>
</info>
-
<para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
software grub-customizer instead (Available in the Mageia repositories).</para>
-
<note>
<para>For more information, see our wiki: <link
ns2:href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link></para>