aboutsummaryrefslogtreecommitdiffstats
path: root/docs/docs/stable/bootiso/nb
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2019-01-18 19:18:07 +0200
committerYuri Chornoivan <yurchor@ukr.net>2019-01-18 19:18:07 +0200
commit9f4f02328f292cbc49dd55f414708251734ef57d (patch)
tree2ee261171d906e9c28bfa1538c269c3c0a6600f5 /docs/docs/stable/bootiso/nb
parentd57052539a75189bffdaa2ab7c84c49be8b54f1f (diff)
downloadtools-9f4f02328f292cbc49dd55f414708251734ef57d.tar
tools-9f4f02328f292cbc49dd55f414708251734ef57d.tar.gz
tools-9f4f02328f292cbc49dd55f414708251734ef57d.tar.bz2
tools-9f4f02328f292cbc49dd55f414708251734ef57d.tar.xz
tools-9f4f02328f292cbc49dd55f414708251734ef57d.zip
Fix XML translations
Diffstat (limited to 'docs/docs/stable/bootiso/nb')
-rw-r--r--docs/docs/stable/bootiso/nb/netInstall-intro.xml2
-rw-r--r--docs/docs/stable/bootiso/nb/netInstall-stage1.xml11
-rw-r--r--docs/docs/stable/bootiso/nb/netInstall-stage2.xml5
3 files changed, 12 insertions, 6 deletions
diff --git a/docs/docs/stable/bootiso/nb/netInstall-intro.xml b/docs/docs/stable/bootiso/nb/netInstall-intro.xml
index b2a1bdfd..fa35f388 100644
--- a/docs/docs/stable/bootiso/nb/netInstall-intro.xml
+++ b/docs/docs/stable/bootiso/nb/netInstall-intro.xml
@@ -62,7 +62,7 @@ nettverksenheten, diskkontrolleren etc.</para>
<para>Begge versjonene er tilgjengelige i form av separate 32-biters og 64-bits
ISO-er. Se her: <link
-xlink:href="https://www.mageia.org/en/downloads/">https://www.mageia.org/no/downloads/</link></para>
+xlink:href="https://www.mageia.org/downloads/">https://www.mageia.org/downloads/</link></para>
</section>
<section>
diff --git a/docs/docs/stable/bootiso/nb/netInstall-stage1.xml b/docs/docs/stable/bootiso/nb/netInstall-stage1.xml
index ee677b58..0a85655a 100644
--- a/docs/docs/stable/bootiso/nb/netInstall-stage1.xml
+++ b/docs/docs/stable/bootiso/nb/netInstall-stage1.xml
@@ -10,8 +10,11 @@
+
+
<!-- 2018/05/18 apb: Created this xml, along with netInstall-intro.xml and netInstall-stage2.xml to replace the previously single xml for NetInstall. -->
<!-- 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>Trinn 1 (Pre-installasjonsfase)</title>
<section>
@@ -40,7 +43,7 @@ med standard insstillinger</para>
<mediaobject>
<imageobject>
- <imagedata align="center" fileref="../dx-welcome2.png"/>
+ <imagedata align="center" fileref="../net-welcome2.png"/>
</imageobject>
</mediaobject></figure>
@@ -246,9 +249,9 @@ inneholder Mageia-distribusjonen:</para>
</imageobject>
</mediaobject>
- <para>Når du har skrevet inn NFS-detaljene, <emphasis><xref
-linkend="netStageTwo"/></emphasis>tas du automatisk til <emphasis><xref
-linkend="netStageTwo"/></emphasis>(den faktiske installasjonsfasen).</para>
+ <para>After entering the NFS details, you will automatically proceed to
+<emphasis><xref linkend="netStageTwo"/></emphasis> (the actual installation
+stage).</para>
</section>
</section>
diff --git a/docs/docs/stable/bootiso/nb/netInstall-stage2.xml b/docs/docs/stable/bootiso/nb/netInstall-stage2.xml
index 86f521aa..240cb5da 100644
--- a/docs/docs/stable/bootiso/nb/netInstall-stage2.xml
+++ b/docs/docs/stable/bootiso/nb/netInstall-stage2.xml
@@ -10,7 +10,10 @@
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>Trinn 2 (Installasjon)</title>
<para>Ingenting ha blitt skrevet på harddisken din på dette tidspunktet. Derfor,
@@ -38,7 +41,7 @@ agrer deg).</para>
<xi:include href="addUser.xml"/>
- <xi:include href="configureX_chooser.xml"/>
+ <xi:include href="graphicalConfiguration.xml"/>
<xi:include href="setupBootloader.xml"/>