From cfe6ff95a1d4100d35c0d20808a425d38234ba5e Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Fri, 18 Jan 2019 18:23:45 +0200
Subject: Update catalog
---
docs/docs/stable/bootiso/bootiso.pot | 159 +++++++++++-----------
docs/docs/stable/bootiso/en/netInstall-stage1.xml | 7 +-
docs/docs/stable/bootiso/en/netInstall-stage2.xml | 4 +-
3 files changed, 86 insertions(+), 84 deletions(-)
diff --git a/docs/docs/stable/bootiso/bootiso.pot b/docs/docs/stable/bootiso/bootiso.pot
index 9a396f00..d3ee815e 100644
--- a/docs/docs/stable/bootiso/bootiso.pot
+++ b/docs/docs/stable/bootiso/bootiso.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Boot ISO Help 6.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-09 00:34+0200\n"
+"POT-Creation-Date: 2019-01-18 18:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -232,17 +232,17 @@ msgid ""
msgstr ""
#. type: Content of: <section><title>
-#: en/netInstall-stage1.xml:13
+#: en/netInstall-stage1.xml:15
msgid "Stage 1 (Pre-installation Stage)"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/netInstall-stage1.xml:16
+#: en/netInstall-stage1.xml:18
msgid "Boot"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/netInstall-stage1.xml:18
+#: en/netInstall-stage1.xml:20
msgid ""
"The particular <emphasis>Welcome Screen</emphasis> that you will see when "
"booting with the NetInstall media depends on whether you are booting on a "
@@ -250,22 +250,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><figure><title>
-#: en/netInstall-stage1.xml:23
+#: en/netInstall-stage1.xml:25
msgid "BIOS Welcome Screen"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><figure><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:27
+#: en/netInstall-stage1.xml:29
msgid "../dx-help.png"
msgstr ""
#. type: Content of: <section><section><figure>
-#: en/netInstall-stage1.xml:25 en/netInstall-stage1.xml:40
+#: en/netInstall-stage1.xml:27 en/netInstall-stage1.xml:42
msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/netInstall-stage1.xml:32
+#: en/netInstall-stage1.xml:34
msgid ""
"When booting up, you can choose to read the advanced help by pressing "
"<keycap>F2</keycap> and return to the installer screen by pressing "
@@ -274,140 +274,140 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><figure><title>
-#: en/netInstall-stage1.xml:38
+#: en/netInstall-stage1.xml:40
msgid "UEFI Welcome Screen"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><figure><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:42
-msgid "../dx-welcome2.png"
+#: en/netInstall-stage1.xml:44
+msgid "../net-welcome2.png"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:49
+#: en/netInstall-stage1.xml:51
msgid ""
"Use the arrow keys to highlight <emphasis>Start Mageia Install</emphasis> "
"and then press <keycap>Enter</keycap>."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/netInstall-stage1.xml:54
+#: en/netInstall-stage1.xml:56
msgid ""
"For both BIOS and UEFI systems, you will then see a pop-up notification "
"saying that USB devices are being detected:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:59
+#: en/netInstall-stage1.xml:61
msgid "../netInstall-01.png"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/netInstall-stage1.xml:65
+#: en/netInstall-stage1.xml:67
msgid "Installation Method"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/netInstall-stage1.xml:67
+#: en/netInstall-stage1.xml:69
msgid ""
"You can now choose an installation method via CDROM/HDD or Server (NFS, FTP "
"or HTTP)."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/netInstall-stage1.xml:70
+#: en/netInstall-stage1.xml:72
msgid "You also have the option to load third-party modules at this point."
msgstr ""
#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:75
+#: en/netInstall-stage1.xml:77
msgid "../netInstall-02.png"
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:81
+#: en/netInstall-stage1.xml:83
msgid ""
"Move up or down the list using the arrow keys until the appropriate method "
"of installation is highlighted."
msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:86
+#: en/netInstall-stage1.xml:88
msgid ""
"Press the <keycap>Tab</keycap> key until <emphasis>Ok</emphasis> is "
"highlighted and then press <keycap>Enter</keycap>."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:92
+#: en/netInstall-stage1.xml:94
msgid "Server"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:96
+#: en/netInstall-stage1.xml:98
msgid ""
"If you don't know what to choose for a Network Installation, choose "
"<emphasis>FTP server</emphasis>."
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:101
+#: en/netInstall-stage1.xml:103
msgid ""
"On an enterprise network, FTP and rsync may be blocked, so using "
"<emphasis>HTTP server</emphasis> is a good choice in this case."
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:107
+#: en/netInstall-stage1.xml:109
msgid ""
"After choosing any of the server options you will automatically proceed to "
"the <emphasis><xref linkend=\"netConn\"/></emphasis> section."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:113
+#: en/netInstall-stage1.xml:115
msgid "CDROM/HDD"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:115
+#: en/netInstall-stage1.xml:117
msgid ""
"If you choose to install from either a CDROM or hard disk (or USB stick), a "
"scan for storage devices will be performed:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:120
+#: en/netInstall-stage1.xml:122
msgid "../netInstall-03.png"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:126
+#: en/netInstall-stage1.xml:128
msgid "First, select the relevant hard drive (or USB stick)"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:132
+#: en/netInstall-stage1.xml:134
msgid "../netInstall-04.png"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:138
+#: en/netInstall-stage1.xml:140
msgid "Followed by the relevant partition"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:144
+#: en/netInstall-stage1.xml:146
msgid "../netInstall-05.png"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:150
+#: en/netInstall-stage1.xml:152
msgid "Then specify the directory or the file name of the ISO"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:154
+#: en/netInstall-stage1.xml:156
msgid ""
"Leaving this open, or using the directory is easier, because the installer "
"then presents you with a list of directories and files from which you can "
@@ -416,17 +416,17 @@ msgid ""
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:161
+#: en/netInstall-stage1.xml:163
msgid "../netInstall-06.png"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:167
+#: en/netInstall-stage1.xml:169
msgid "../netInstall-07.png"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:171
+#: en/netInstall-stage1.xml:173
msgid ""
"Once the information has been provided for the location of the ISO, either "
"on CDROM or HDD, you will automatically proceed to <emphasis><xref "
@@ -434,85 +434,85 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:178
+#: en/netInstall-stage1.xml:180
msgid "Load Third-Party Modules"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:180
+#: en/netInstall-stage1.xml:182
msgid ""
"If you wish to <emphasis>Load third-party modules</emphasis>, then you will "
"be asked for the location of the directory containing the modules:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:186
+#: en/netInstall-stage1.xml:188
msgid "../netInstall-08.png"
msgstr ""
#. type: Content of: <section><section><title>
-#: en/netInstall-stage1.xml:193
+#: en/netInstall-stage1.xml:195
msgid "Network Connection"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:196
+#: en/netInstall-stage1.xml:198
msgid "Connection Device"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:198
+#: en/netInstall-stage1.xml:200
msgid ""
"If you chose any of the server options at the <emphasis>Installation "
"Method</emphasis> step, you will then be asked to choose a network device:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:204
+#: en/netInstall-stage1.xml:206
msgid "../netInstall-09.png"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:210
+#: en/netInstall-stage1.xml:212
msgid "Connection Type"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:212
+#: en/netInstall-stage1.xml:214
msgid ""
"Now you need to choose whether the network device will use a DHCP, Static or "
"ADSL connection:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:217
+#: en/netInstall-stage1.xml:219
msgid "../netInstall-10.png"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:221
+#: en/netInstall-stage1.xml:223
msgid ""
"If you are unsure which option is suitable, then you should probably accept "
"the default option (DHCP)."
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:226
+#: en/netInstall-stage1.xml:228
msgid "Host/Domain Names"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:228
+#: en/netInstall-stage1.xml:230
msgid "If necessary, you can now supply your Host and Domain names:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:233
+#: en/netInstall-stage1.xml:235
msgid "../netInstall-11.png"
msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-stage1.xml:239
+#: en/netInstall-stage1.xml:241
msgid ""
"If you are unsure what this means then you can just leave the fields blank, "
"highlight <emphasis>Ok</emphasis> and press <keycap>Enter</keycap> to "
@@ -520,64 +520,63 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:246
+#: en/netInstall-stage1.xml:248
msgid ""
"If you are using either FTP or HTTP, you will automatically proceed to the "
"<emphasis><xref linkend=\"netMirrors\"/></emphasis> section"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:250
+#: en/netInstall-stage1.xml:252
msgid ""
"If you are using NFS, you will be asked for the NFS server name and the "
"directory containing the Mageia distribution:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:255
+#: en/netInstall-stage1.xml:257
msgid "../netInstall-12.png"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:259
+#: en/netInstall-stage1.xml:261
msgid ""
-"After entering the NFS details, <emphasis><xref "
-"linkend=\"netStageTwo\"/></emphasis> you will automatically proceed to "
+"After entering the NFS details, you will automatically proceed to "
"<emphasis><xref linkend=\"netStageTwo\"/></emphasis> (the actual "
"installation stage)."
msgstr ""
#. type: Content of: <section><section><title>
-#: en/netInstall-stage1.xml:267
+#: en/netInstall-stage1.xml:268
msgid "Mirrors"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/netInstall-stage1.xml:269
+#: en/netInstall-stage1.xml:270
msgid ""
"If using FTP or HTTP, you now have to specify a mirror to use. This can be "
"done manually or by choosing from a list"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:274
+#: en/netInstall-stage1.xml:275
msgid "../netInstall-13.png"
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:279
+#: en/netInstall-stage1.xml:280
msgid "Specify Manually"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:281
+#: en/netInstall-stage1.xml:282
msgid ""
"You will find a list of all available mirrors here: <link "
"xlink:href=\"http://mirrors.mageia.org/\">http://mirrors.mageia.org/</link>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:284
+#: en/netInstall-stage1.xml:285
msgid ""
"Whichever mirror you choose, it should use the same tree-like structure from "
"\"mageia\" (or \"Mageia\") as used by the official Mageia mirrors. That "
@@ -585,56 +584,56 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:289
+#: en/netInstall-stage1.xml:290
msgid ""
"A correct entry (when using an official mirror) in the <emphasis>Mageia "
"directory</emphasis> field below, could be:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:292
+#: en/netInstall-stage1.xml:293
msgid "<filename>pub/linux/mageia/distrib/cauldron/i586</filename>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:294
+#: en/netInstall-stage1.xml:295
msgid "Another example (for Mageia 6 x86_64) could be:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:296
+#: en/netInstall-stage1.xml:297
msgid "<filename>pub/Mirrors/Mageia/distrib/6/x86_64</filename>"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:298
+#: en/netInstall-stage1.xml:299
msgid ""
"Other mirrors may have a different path structure and the screenshots below "
"show such examples:"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:301
+#: en/netInstall-stage1.xml:302
msgid "If you are using an FTP server:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:305
+#: en/netInstall-stage1.xml:306
msgid "../netInstall-14.png"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:309
+#: en/netInstall-stage1.xml:310
msgid "If you are using an HTTP server:"
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:313
+#: en/netInstall-stage1.xml:314
msgid "../netInstall-15.png"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:317 en/netInstall-stage1.xml:343
+#: en/netInstall-stage1.xml:318 en/netInstall-stage1.xml:344
msgid ""
"Once this information has been provided, you will automatically proceed to "
"<emphasis><xref linkend=\"netStageTwo\"/></emphasis> (the actual "
@@ -642,41 +641,41 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><title>
-#: en/netInstall-stage1.xml:323
+#: en/netInstall-stage1.xml:324
msgid "Select From a List"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:325
+#: en/netInstall-stage1.xml:326
msgid ""
"If you get a lot of missing dependency errors later in the install, reboot "
"and try a different mirror."
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:330
+#: en/netInstall-stage1.xml:331
msgid "../netInstall-16.png"
msgstr ""
#. type: Content of: <section><section><section><para>
-#: en/netInstall-stage1.xml:334
+#: en/netInstall-stage1.xml:335
msgid ""
"After choosing an FTP server, you will see a screen where you can optionally "
"add a login name and password if required."
msgstr ""
#. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
-#: en/netInstall-stage1.xml:339
+#: en/netInstall-stage1.xml:340
msgid "../netInstall-17.png"
msgstr ""
#. type: Content of: <section><title>
-#: en/netInstall-stage2.xml:13
+#: en/netInstall-stage2.xml:15
msgid "Stage 2 (Installation Stage)"
msgstr ""
#. type: Content of: <section><para>
-#: en/netInstall-stage2.xml:15
+#: en/netInstall-stage2.xml:17
msgid ""
"Nothing has been written to your hard disk at this point. Therefore, if you "
"decide not to proceed with the actual installation, then it is safe to "
diff --git a/docs/docs/stable/bootiso/en/netInstall-stage1.xml b/docs/docs/stable/bootiso/en/netInstall-stage1.xml
index fcd56f45..78f2eb4f 100644
--- a/docs/docs/stable/bootiso/en/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/en/netInstall-stage1.xml
@@ -10,6 +10,8 @@
<!-- 2019/01/06 apb: typo 2.2.2) -->
+ <!-- 2019/01/08 apb: Update UEFI SC (had to rename to net-welcome2, because the previous was shared with SC in Classical installer - however, the SC's are no longer the same. -->
+
<title>Stage 1 (Pre-installation Stage)</title>
<section>
@@ -39,7 +41,7 @@
<mediaobject>
<imageobject>
- <imagedata align="center" fileref="../dx-welcome2.png"/>
+ <imagedata align="center" fileref="../net-welcome2.png"/>
</imageobject>
</mediaobject>
</figure>
@@ -256,8 +258,7 @@
</imageobject>
</mediaobject>
- <para>After entering the NFS details, <emphasis><xref
- linkend="netStageTwo"/></emphasis> you will automatically proceed to
+ <para>After entering the NFS details, you will automatically proceed to
<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual
installation stage).</para>
</section>
diff --git a/docs/docs/stable/bootiso/en/netInstall-stage2.xml b/docs/docs/stable/bootiso/en/netInstall-stage2.xml
index 73cdb72a..64f73188 100644
--- a/docs/docs/stable/bootiso/en/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/en/netInstall-stage2.xml
@@ -10,6 +10,8 @@
xmlns:db="http://docbook.org/ns/docbook">
<!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage1.xml to replace the previously single xml for NetInstall. -->
+ <!-- 2019/01/17 apb: Changed xi:include for the 3 configureX xml's -> graphicalConfiguration.xml -->
+
<title>Stage 2 (Installation Stage)</title>
<para>Nothing has been written to your hard disk at this point. Therefore,
@@ -50,7 +52,7 @@
<xi:include href="addUser.xml"/>
- <xi:include href="configureX_chooser.xml"/>
+ <xi:include href="graphicalConfiguration.xml"/>
<xi:include href="setupBootloader.xml"/>
--
cgit v1.2.1