aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2026-02-08 10:55:35 +0200
committerYuri Chornoivan <yurchor@ukr.net>2026-02-08 10:55:35 +0200
commitaa43b7e1e2b3630db9a708bdf7d998a2d4f105fc (patch)
tree6310f91afe97cc957e51be6c0b095ceb4eec9fa9
parent7821736aa8f7bec4681ba5f0a1d75a5f9e6cbf47 (diff)
downloadtools-aa43b7e1e2b3630db9a708bdf7d998a2d4f105fc.tar
tools-aa43b7e1e2b3630db9a708bdf7d998a2d4f105fc.tar.gz
tools-aa43b7e1e2b3630db9a708bdf7d998a2d4f105fc.tar.bz2
tools-aa43b7e1e2b3630db9a708bdf7d998a2d4f105fc.tar.xz
tools-aa43b7e1e2b3630db9a708bdf7d998a2d4f105fc.zip
Update translations
-rw-r--r--docs/docs/stable/installer/ca/DrakX-inline.xml2
-rw-r--r--docs/docs/stable/installer/de/DrakX-inline.xml2
-rw-r--r--docs/docs/stable/installer/el/DrakX-inline.xml2
-rw-r--r--docs/docs/stable/installer/es/DrakLive-cover.xml11
-rw-r--r--docs/docs/stable/installer/es/DrakLive.xml12
-rw-r--r--docs/docs/stable/installer/es/DrakX-cover.xml22
-rw-r--r--docs/docs/stable/installer/es/DrakX-inline.xml21
-rw-r--r--docs/docs/stable/installer/es/DrakX.xml29
-rw-r--r--docs/docs/stable/installer/es/configureTimezoneUTC.xml39
-rw-r--r--docs/docs/stable/installer/es/diskPartitioning.xml4
-rw-r--r--docs/docs/stable/installer/es/locale.xml7
-rw-r--r--docs/docs/stable/installer/es/misc-params.xml12
-rw-r--r--docs/docs/stable/installer/fr/DrakLive-cover.xml11
-rw-r--r--docs/docs/stable/installer/fr/DrakLive.xml12
-rw-r--r--docs/docs/stable/installer/fr/DrakX-cover.xml22
-rw-r--r--docs/docs/stable/installer/fr/DrakX-inline.xml21
-rw-r--r--docs/docs/stable/installer/fr/DrakX.xml29
-rw-r--r--docs/docs/stable/installer/fr/configureTimezoneUTC.xml41
-rw-r--r--docs/docs/stable/installer/fr/diskPartitioning.xml4
-rw-r--r--docs/docs/stable/installer/fr/locale.xml7
-rw-r--r--docs/docs/stable/installer/fr/misc-params.xml12
-rw-r--r--docs/docs/stable/installer/nb/DrakX-inline.xml2
-rw-r--r--docs/docs/stable/installer/nl/DrakX-inline.xml2
-rw-r--r--docs/docs/stable/installer/ru/DrakX-inline.xml2
-rw-r--r--docs/docs/stable/installer/uk/DrakX-inline.xml2
25 files changed, 213 insertions, 117 deletions
diff --git a/docs/docs/stable/installer/ca/DrakX-inline.xml b/docs/docs/stable/installer/ca/DrakX-inline.xml
index 416066dd..848accac 100644
--- a/docs/docs/stable/installer/ca/DrakX-inline.xml
+++ b/docs/docs/stable/installer/ca/DrakX-inline.xml
@@ -134,6 +134,8 @@ documentació</link>.</para>
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
diff --git a/docs/docs/stable/installer/de/DrakX-inline.xml b/docs/docs/stable/installer/de/DrakX-inline.xml
index 3cc97b8f..85def7b5 100644
--- a/docs/docs/stable/installer/de/DrakX-inline.xml
+++ b/docs/docs/stable/installer/de/DrakX-inline.xml
@@ -135,6 +135,8 @@ wenn Sie dazu beitragen möchten, diese Anleitung zu verbessern.</para>
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
diff --git a/docs/docs/stable/installer/el/DrakX-inline.xml b/docs/docs/stable/installer/el/DrakX-inline.xml
index 9aae8605..3cc9dbac 100644
--- a/docs/docs/stable/installer/el/DrakX-inline.xml
+++ b/docs/docs/stable/installer/el/DrakX-inline.xml
@@ -135,6 +135,8 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">Ομάδα της
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
diff --git a/docs/docs/stable/installer/es/DrakLive-cover.xml b/docs/docs/stable/installer/es/DrakLive-cover.xml
index a02b275e..539df6d6 100644
--- a/docs/docs/stable/installer/es/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/es/DrakLive-cover.xml
@@ -1,9 +1,11 @@
<?xml version='1.0' encoding='utf-8'?><book 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/xhtml" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="DrakLive-installer" version="5.0" xml:lang="es">
+
<info>
<!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<!--2026-02-01 marja: Update the reference to Calenco. Replace the configureTimezoneUTC.xml inclusion with now correct configureTimezone.xml-->
<title>Instalación desde un medio LIVE</title>
<publisher> <publishername>Mageia.org</publishername> </publisher>
<revhistory>
@@ -19,9 +21,8 @@
<para>Los textos y capturas de pantalla de este manual están disponibles bajo la
licencia CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Éste manual ha sido realizado con la ayuda de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
Documentación</link> si puede ayudar a mejorar este manual.</para>
@@ -35,7 +36,7 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
<xi:include href="bootLive.xml"/>
<xi:include href="selectLanguage.xml"/>
<xi:include href="acceptLicense.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="configureTimezone.xml"/>
<xi:include href="bestTime.xml"/>
<xi:include href="selectKeyboardLive.xml"/>
<xi:include href="testing.xml"/>
@@ -61,4 +62,4 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
<xi:include href="login.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
</article>
-</book> \ No newline at end of file
+</book>
diff --git a/docs/docs/stable/installer/es/DrakLive.xml b/docs/docs/stable/installer/es/DrakLive.xml
index 36748bb6..1d738f32 100644
--- a/docs/docs/stable/installer/es/DrakLive.xml
+++ b/docs/docs/stable/installer/es/DrakLive.xml
@@ -12,12 +12,15 @@
-
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
+<!--2026-01-30 marja: replace configureTimezoneUTC.xml with configureTimezone.xml, because bestTime.xml is about UTC for a Live install and configureTimezoneUTC.xml will be about UTC for traditional installer (mga#34909)-->
+<!--2026-02-01 marja: update the reference to Calenco-->
<title>Instalación desde un medio LIVE</title>
<cover>
@@ -30,9 +33,8 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
licencia CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Éste manual ha sido realizado con la ayuda de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Escrita por voluntarios en su tiempo libre. Por favor, póngase en contacto
con el <link
@@ -49,7 +51,7 @@ documentación</link> si quiere ayudar a mejorar este manual.</para>
<xi:include href="acceptLicense.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="configureTimezone.xml"/>
<xi:include href="bestTime.xml"/>
diff --git a/docs/docs/stable/installer/es/DrakX-cover.xml b/docs/docs/stable/installer/es/DrakX-cover.xml
index 228dfc8e..566a37f4 100644
--- a/docs/docs/stable/installer/es/DrakX-cover.xml
+++ b/docs/docs/stable/installer/es/DrakX-cover.xml
@@ -15,9 +15,8 @@
<para>Los textos y capturas de pantalla de este manual están disponibles bajo la
licencia CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Éste manual ha sido realizado con la ayuda de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
Documentación</link> si puede ayudar a mejorar este manual.</para>
@@ -30,12 +29,15 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
+
+
<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
+<!--2026-02-01 marja: apply yesterday's and todays's changes to DrakX.xml also to this file-->
<title>Instalación con DrakX</title>
<para><note><para>Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá
dependerán de su hardware y las decisiones que tomó durante la instalación.</para></note></para>
@@ -48,6 +50,8 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
<xi:include href="acceptLicense.xml"/>
<xi:include href="setupSCSI.xml"/>
<xi:include href="selectInstallClass.xml"/>
+ <xi:include href="configureTimezone.xml"/>
+ <xi:include href="configureTimezoneUTC.xml"/>
<xi:include href="selectKeyboard.xml"/>
@@ -104,13 +108,11 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="locale.xml"/>
-
- <!-- <xi:include href="configureTimezoneUTC.xml"/>
-
- <xi:include href="selectCountry.xml"/> -->
-<xi:include href="configureServices.xml"/>
+ <!-- <xi:include href="locale.xml"/>
+ -->
+<xi:include href="selectCountry.xml"/>
+ <xi:include href="configureServices.xml"/>
<xi:include href="selectMouse.xml"/>
<xi:include href="soundConfig.xml"/>
<xi:include href="securityLevel.xml"/>
@@ -122,4 +124,4 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
<xi:include href="exitInstall.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
</article>
-</book> \ No newline at end of file
+</book>
diff --git a/docs/docs/stable/installer/es/DrakX-inline.xml b/docs/docs/stable/installer/es/DrakX-inline.xml
index 5321c4c9..f55836a6 100644
--- a/docs/docs/stable/installer/es/DrakX-inline.xml
+++ b/docs/docs/stable/installer/es/DrakX-inline.xml
@@ -6,6 +6,8 @@
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!--2026-01-31 and 2026-02-01 add configureTimezone.xml before configureTimezoneUTC.xml and move both to immediately after selectInstallClass.xml, see mga#34909-->
+<!--2026-02-01 update our reference to Calenco-->
<!-- <xi:include href="drakx-intro.xml"/>
-->
<info>
@@ -21,9 +23,8 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
licencia CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Éste manual ha sido realizado con la ayuda de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
@@ -45,6 +46,10 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
+
+
+
+
<xi:include href="SelectAndUseISOs2.xml"/>
<xi:include href="installer.xml"/>
@@ -57,6 +62,10 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
<xi:include href="selectInstallClass.xml"/>
+ <xi:include href="configureTimezone.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
<xi:include href="selectKeyboard.xml"/>
<xi:include href="doPartitionDisks.xml"/>
@@ -113,8 +122,6 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
-
<xi:include href="selectCountry.xml"/>
<xi:include href="configureServices.xml"/>
@@ -125,6 +132,8 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
@@ -134,4 +143,4 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
<xi:include href="exitInstall.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
-</article> \ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/es/DrakX.xml b/docs/docs/stable/installer/es/DrakX.xml
index b9b16e69..f70da8c0 100644
--- a/docs/docs/stable/installer/es/DrakX.xml
+++ b/docs/docs/stable/installer/es/DrakX.xml
@@ -31,6 +31,12 @@
+
+
+
+
+
+
<!-- <xi:include href="drakx-intro.xml"/>
-->
<info>
@@ -47,6 +53,10 @@
b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<!--2026-01-31 and 2026-02-01 marja: include configureTimezone.xml and configureTimezoneUTC.xml
+ after selectInstallClass.xml, because that is where they now first appear in the installer.
+ Include selectCountry.xml instead of locale.xml, because it was the only inclusion left in locale.-->
+<!--2026-02-01 marja: update our reference to Calenco-->
<title>Instalación con DrakX</title>
<cover>
@@ -59,9 +69,8 @@ dependerán de su hardware y las decisiones que tomó durante la instalación.</
licencia CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Éste manual ha sido realizado con la ayuda de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> desarrollado por <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Fue escrito por voluntarios en sus ratos libres. Por favor contacte con el
<link ns6:href="https://wiki.mageia.org/en/Documentation_team">Equipo de
@@ -83,6 +92,10 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
<xi:include href="selectInstallClass.xml"/>
+ <xi:include href="configureTimezone.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
<xi:include href="selectKeyboard.xml"/>
@@ -153,15 +166,13 @@ Documentación</link> si puede ayudar a mejorar este manual.</para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="locale.xml"/>
-
- <!-- <xi:include href="configureTimezoneUTC.xml"/>
-
+ <!-- <xi:include href="locale.xml"/>
+ -->
+<xi:include href="selectCountry.xml"/>
- <xi:include href="selectCountry.xml"/> -->
-<xi:include href="configureServices.xml"/>
+ <xi:include href="configureServices.xml"/>
<xi:include href="selectMouse.xml"/>
diff --git a/docs/docs/stable/installer/es/configureTimezoneUTC.xml b/docs/docs/stable/installer/es/configureTimezoneUTC.xml
index bf2c575e..ad2e9043 100644
--- a/docs/docs/stable/installer/es/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/es/configureTimezoneUTC.xml
@@ -1,6 +1,6 @@
-<?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" xreflabel="Configurar Zona Horaria" xml:id="configureTimezoneUTC" version="5.0" xml:lang="es">
+<?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" xreflabel="Configure Timezone UTC" xml:id="configureTimezoneUTC" version="5.0" xml:lang="es">
<info>
- <title xml:id="configureTimezoneUTC-ti6">Configure su huso horario</title>
+ <title xml:id="configureTimezoneUTC-ti6">Date, Clock and Time Zone Settings</title>
</info>
@@ -11,29 +11,40 @@
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
<!--2018/02/13 apb: Minor text adjustment.-->
<!--2018/02/25 apb: Added xreflabel to this section.-->
+<!--2026-01-30 marja: Copy this page to new configureTimezone.xml, rewrite this
+ page to better match the traditional installer screen it is about-->
+<!--2026-02-01 marja: upload the better matching dx2-configureTimezoneUTC-1.png
+ screenshot-->
+<!-- <imageobject condition="live">
+
+ <imagedata format="png" fileref="live-timeZone.png" align="center"/>
+ </imageobject> Not needed, there is live-bestTime.png-->
<imageobject condition="classical"> <imagedata format="PNG"
xml:id="configureTimezoneUTC-im1" align="center"
-fileref="dx2-configureTimezoneUTC.png" revision="1"/> </imageobject>
-<imageobject condition="live"> <imagedata format="png"
-fileref="live-timeZone.png" align="center"/> </imageobject></mediaobject>
+fileref="dx2-configureTimezoneUTC-1.png" revision="2"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
- <para xml:id="configureTimezoneUTC-pa1" revision="1">Elija su zona horaria escogiedo su país o una ciudad cercana a usted en la
-misma zona horaria.</para>
+ <para xml:id="configureTimezoneUTC-pa1" revision="2">In this screen, you can choose between setting your hardware clock to UTC or
+to local time.
+ </para>
</listitem>
- </itemizedlist>
-
- <para xml:id="configureTimezoneUTC-pa2" revision="1">En la pantalla siguiente puede elegir configurar el reloj del hardware a la
-hora local o a GMT, también conocido como UTC.</para>
+ <listitem>
+ <para xml:id="configureTimezoneUTC-pa2" revision="2">Something else you can do here, is to enable automatic time synchronization
+with NTP. For that to work, you need to select an NTP server. Choose one
+that is close to you.</para>
+ </listitem>
+ </itemizedlist>
<note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">Si tiene más de un sistema operativo en su máquina, asegúrese de que todos
-están ajustados bien a la hora local bien a UTC/GMT.</para>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than one operating system on your computer, make sure they
+are all set to local time, or all to UTC.</para>
</note>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/diskPartitioning.xml b/docs/docs/stable/installer/es/diskPartitioning.xml
index 1e1f3ff2..5064c8e1 100644
--- a/docs/docs/stable/installer/es/diskPartitioning.xml
+++ b/docs/docs/stable/installer/es/diskPartitioning.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Particionando" xml:id="diskPartitioning" xml:lang="es" version="5.0" xml:lang="es">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Particionando" xml:id="diskPartitioning" version="5.0" xml:lang="es">
<!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
@@ -13,4 +13,4 @@
<xi:include href="diskdrake.xml"/>
<xi:include href="formatPartitions.xml"/>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/es/locale.xml b/docs/docs/stable/installer/es/locale.xml
index 6d3437b5..20fb923b 100644
--- a/docs/docs/stable/installer/es/locale.xml
+++ b/docs/docs/stable/installer/es/locale.xml
@@ -8,7 +8,8 @@
xmlns:db="http://docbook.org/ns/docbook">
<title>Idioma</title>
- <xi:include href="configureTimezoneUTC.xml"/>
-
- <xi:include href="selectCountry.xml"/>
+
+ <!-- remove selectTimezoneUTC.xml, because setting the timezone is now done
+ at the beginning of the installation-->
+<xi:include href="selectCountry.xml"/>
</section>
diff --git a/docs/docs/stable/installer/es/misc-params.xml b/docs/docs/stable/installer/es/misc-params.xml
index dc13cc76..44fabd00 100644
--- a/docs/docs/stable/installer/es/misc-params.xml
+++ b/docs/docs/stable/installer/es/misc-params.xml
@@ -15,6 +15,8 @@
+
+
<mediaobject>
<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
@@ -22,6 +24,8 @@
<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
<!--2018/02/24 apb: Changed list style-->
<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<!--2026-01-31 marja: Update the item about the time zone, now that the user
+ set it at the beginning of the installation-->
<imageobject><imagedata fileref="dx2-summaryTop.png"
align="center"/></imageobject></mediaobject>
@@ -57,9 +61,9 @@ un problema</para>
<listitem>
<para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Zona horaria</emphasis></para>
- <para xml:id="misc-params-system-pa2a" revision="1">DrakX selecciona una zona horaria para usted, dependiendo de su idioma
-preferido. Puede cambiarlo si es necesario. Ver también <xref
-linkend="configureTimezoneUTC"/></para>
+ <para xml:id="misc-params-system-pa2a" revision="2">If the time settings you chose before are wrong, you can correct them
+here. See also <xref linkend="configureTimezone"/> and <xref
+linkend="configureTimezoneUTC"/> </para>
</listitem>
<listitem>
@@ -223,4 +227,4 @@ puede ser muy arriesgado.</para>
</listitem>
</itemizedlist>
</section>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/DrakLive-cover.xml b/docs/docs/stable/installer/fr/DrakLive-cover.xml
index 658d7500..00b683aa 100644
--- a/docs/docs/stable/installer/fr/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/fr/DrakLive-cover.xml
@@ -1,9 +1,11 @@
<?xml version='1.0' encoding='utf-8'?><book 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/xhtml" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="DrakLive-installer" version="5.0" xml:lang="fr">
+
<info>
<!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
<!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
+<!--2026-02-01 marja: Update the reference to Calenco. Replace the configureTimezoneUTC.xml inclusion with now correct configureTimezone.xml-->
<title>Installation à partir du médium LIVE</title>
<publisher> <publishername>Mageia.org</publishername> </publisher>
<revhistory>
@@ -19,9 +21,8 @@
<para>Les textes et les copies d'écrans de ce manuel sont disponibles sous la
licence CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Ce manuel a été réalisé avec l'aide de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
à l'amélioration de ce manuel, veuillez contacter <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">l'Equipe de
@@ -37,7 +38,7 @@ vous faites.</para></note></para>
<xi:include href="bootLive.xml"/>
<xi:include href="selectLanguage.xml"/>
<xi:include href="acceptLicense.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="configureTimezone.xml"/>
<xi:include href="bestTime.xml"/>
<xi:include href="selectKeyboardLive.xml"/>
<xi:include href="testing.xml"/>
@@ -63,4 +64,4 @@ vous faites.</para></note></para>
<xi:include href="login.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
</article>
-</book> \ No newline at end of file
+</book>
diff --git a/docs/docs/stable/installer/fr/DrakLive.xml b/docs/docs/stable/installer/fr/DrakLive.xml
index e7723bb6..7d8b016e 100644
--- a/docs/docs/stable/installer/fr/DrakLive.xml
+++ b/docs/docs/stable/installer/fr/DrakLive.xml
@@ -12,12 +12,15 @@
-
+
+
<info>
<!--2018/02/16 apb: Comment-out setupBootloaderAddEntry because I have incorporated it at the end of setupBootloader-->
<!--2018/03/23 apb: a) Using diskPartitioning.xml to group doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml
b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml This is to reflect same arrangement in DrakX-->
<!--2020/06/20 apb: added installUpdates.xml to the includes list: Martin Witaker added this feature to the Live installer 2020/06/27.-->
+<!--2026-01-30 marja: replace configureTimezoneUTC.xml with configureTimezone.xml, because bestTime.xml is about UTC for a Live install and configureTimezoneUTC.xml will be about UTC for traditional installer (mga#34909)-->
+<!--2026-02-01 marja: update the reference to Calenco-->
<title>Installation à partir du médium LIVE</title>
<cover>
@@ -31,9 +34,8 @@ vous faites.</para>
licence CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Ce manuel a été réalisé avec l'aide de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Il a été écrit par des bénévoles sur leur temps libre. Si vous souhaitez
participer à l'amélioration de ce manuel, veuillez contacter <link
@@ -50,7 +52,7 @@ documentation</link>.</para>
<xi:include href="acceptLicense.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
+ <xi:include href="configureTimezone.xml"/>
<xi:include href="bestTime.xml"/>
diff --git a/docs/docs/stable/installer/fr/DrakX-cover.xml b/docs/docs/stable/installer/fr/DrakX-cover.xml
index f7d23bf2..af7cb8a2 100644
--- a/docs/docs/stable/installer/fr/DrakX-cover.xml
+++ b/docs/docs/stable/installer/fr/DrakX-cover.xml
@@ -15,9 +15,8 @@
<para>Les textes et les copies d'écrans de ce manuel sont disponibles sous la
licence CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Ce manuel a été réalisé avec l'aide de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
à l'amélioration de ce manuel, veuillez contacter <link
ns6:href="https://wiki.mageia.org/en/Documentation_team">l'Equipe de
@@ -31,12 +30,15 @@ documentation</link>.</para>
+
+
<!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
<!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
<!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
+<!--2026-02-01 marja: apply yesterday's and todays's changes to DrakX.xml also to this file-->
<title>Installation avec DrakX</title>
<para><note><para>Lors d'une installation, seuls certains écrans présentés ci-après
apparaissent, en fonction de votre matériel et des choix d'installation que
@@ -50,6 +52,8 @@ vous faites.</para></note></para>
<xi:include href="acceptLicense.xml"/>
<xi:include href="setupSCSI.xml"/>
<xi:include href="selectInstallClass.xml"/>
+ <xi:include href="configureTimezone.xml"/>
+ <xi:include href="configureTimezoneUTC.xml"/>
<xi:include href="selectKeyboard.xml"/>
@@ -106,13 +110,11 @@ vous faites.</para></note></para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="locale.xml"/>
-
- <!-- <xi:include href="configureTimezoneUTC.xml"/>
-
- <xi:include href="selectCountry.xml"/> -->
-<xi:include href="configureServices.xml"/>
+ <!-- <xi:include href="locale.xml"/>
+ -->
+<xi:include href="selectCountry.xml"/>
+ <xi:include href="configureServices.xml"/>
<xi:include href="selectMouse.xml"/>
<xi:include href="soundConfig.xml"/>
<xi:include href="securityLevel.xml"/>
@@ -124,4 +126,4 @@ vous faites.</para></note></para>
<xi:include href="exitInstall.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
</article>
-</book> \ No newline at end of file
+</book>
diff --git a/docs/docs/stable/installer/fr/DrakX-inline.xml b/docs/docs/stable/installer/fr/DrakX-inline.xml
index 0f2b4204..de73aad4 100644
--- a/docs/docs/stable/installer/fr/DrakX-inline.xml
+++ b/docs/docs/stable/installer/fr/DrakX-inline.xml
@@ -6,6 +6,8 @@
<!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
<!--2013-12-08 add soundConfig.xml -->
<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
+<!--2026-01-31 and 2026-02-01 add configureTimezone.xml before configureTimezoneUTC.xml and move both to immediately after selectInstallClass.xml, see mga#34909-->
+<!--2026-02-01 update our reference to Calenco-->
<!-- <xi:include href="drakx-intro.xml"/>
-->
<info>
@@ -22,9 +24,8 @@ vous faites.</para>
licence CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Ce manuel a été réalisé avec l'aide de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
à l'amélioration de ce manuel, veuillez contacter <link
@@ -47,6 +48,10 @@ documentation</link>.</para>
+
+
+
+
<xi:include href="SelectAndUseISOs2.xml"/>
<xi:include href="installer.xml"/>
@@ -59,6 +64,10 @@ documentation</link>.</para>
<xi:include href="selectInstallClass.xml"/>
+ <xi:include href="configureTimezone.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
<xi:include href="selectKeyboard.xml"/>
<xi:include href="doPartitionDisks.xml"/>
@@ -115,8 +124,6 @@ documentation</link>.</para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="configureTimezoneUTC.xml"/>
-
<xi:include href="selectCountry.xml"/>
<xi:include href="configureServices.xml"/>
@@ -127,6 +134,8 @@ documentation</link>.</para>
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
@@ -136,4 +145,4 @@ documentation</link>.</para>
<xi:include href="exitInstall.xml"/>
<xi:include href="uninstall-Mageia.xml"/>
-</article> \ No newline at end of file
+</article>
diff --git a/docs/docs/stable/installer/fr/DrakX.xml b/docs/docs/stable/installer/fr/DrakX.xml
index 1925b7bc..a41286a4 100644
--- a/docs/docs/stable/installer/fr/DrakX.xml
+++ b/docs/docs/stable/installer/fr/DrakX.xml
@@ -31,6 +31,12 @@
+
+
+
+
+
+
<!-- <xi:include href="drakx-intro.xml"/>
-->
<info>
@@ -47,6 +53,10 @@
b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml -->
<!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.-->
<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.-->
+<!--2026-01-31 and 2026-02-01 marja: include configureTimezone.xml and configureTimezoneUTC.xml
+ after selectInstallClass.xml, because that is where they now first appear in the installer.
+ Include selectCountry.xml instead of locale.xml, because it was the only inclusion left in locale.-->
+<!--2026-02-01 marja: update our reference to Calenco-->
<title>Installation avec DrakX</title>
<cover>
@@ -60,9 +70,8 @@ vous faites.</para>
licence CC BY-SA 3.0 <link
ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
- <para>Ce manuel a été réalisé avec l'aide de <link
-ns6:href="http://www.calenco.com">Calenco CMS</link> développé par <link
-ns6:href="http://www.neodoc.biz">NeoDoc</link></para>
+ <para>This manual was produced with the help of the <link
+ns6:href="https://www.calenco.com">Calenco CCMS</link>.</para>
<para>Il est rédigé par des bénévoles sur leur temps libre. Si vous désirez aider
à l'amélioration de ce manuel, veuillez contacter <link
@@ -85,6 +94,10 @@ documentation</link>.</para>
<xi:include href="selectInstallClass.xml"/>
+ <xi:include href="configureTimezone.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
<xi:include href="selectKeyboard.xml"/>
@@ -155,15 +168,13 @@ documentation</link>.</para>
<xi:include href="summary.xml"></xi:include> -->
<xi:include href="misc-params.xml"/>
- <xi:include href="locale.xml"/>
-
- <!-- <xi:include href="configureTimezoneUTC.xml"/>
-
+ <!-- <xi:include href="locale.xml"/>
+ -->
+<xi:include href="selectCountry.xml"/>
- <xi:include href="selectCountry.xml"/> -->
-<xi:include href="configureServices.xml"/>
+ <xi:include href="configureServices.xml"/>
<xi:include href="selectMouse.xml"/>
diff --git a/docs/docs/stable/installer/fr/configureTimezoneUTC.xml b/docs/docs/stable/installer/fr/configureTimezoneUTC.xml
index 31f55ce6..90db99e0 100644
--- a/docs/docs/stable/installer/fr/configureTimezoneUTC.xml
+++ b/docs/docs/stable/installer/fr/configureTimezoneUTC.xml
@@ -1,6 +1,6 @@
-<?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" xreflabel="Configurer le fuseau horaire" xml:id="configureTimezoneUTC" version="5.0" xml:lang="fr">
+<?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" xreflabel="Configure Timezone UTC" xml:id="configureTimezoneUTC" version="5.0" xml:lang="fr">
<info>
- <title xml:id="configureTimezoneUTC-ti6">Configurer le fuseau horaire</title>
+ <title xml:id="configureTimezoneUTC-ti6">Date, Clock and Time Zone Settings</title>
</info>
@@ -11,29 +11,40 @@
+
+
<mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
<!--2018/02/13 apb: Minor text adjustment.-->
<!--2018/02/25 apb: Added xreflabel to this section.-->
-<imageobject condition="classical"><imagedata format="PNG"
+<!--2026-01-30 marja: Copy this page to new configureTimezone.xml, rewrite this
+ page to better match the traditional installer screen it is about-->
+<!--2026-02-01 marja: upload the better matching dx2-configureTimezoneUTC-1.png
+ screenshot-->
+<!-- <imageobject condition="live">
+
+ <imagedata format="png" fileref="live-timeZone.png" align="center"/>
+ </imageobject> Not needed, there is live-bestTime.png-->
+<imageobject condition="classical"> <imagedata format="PNG"
xml:id="configureTimezoneUTC-im1" align="center"
-fileref="dx2-configureTimezoneUTC.png"
-revision="1"/></imageobject><imageobject condition="live"><imagedata
-format="png" fileref="live-timeZone.png" align="center"/></imageobject></mediaobject>
+fileref="dx2-configureTimezoneUTC-1.png" revision="2"/> </imageobject></mediaobject>
<itemizedlist>
<listitem>
- <para xml:id="configureTimezoneUTC-pa1" revision="1">Choisir le fuseau horaire en choisissant le pays ou la ville la plus proche
-dans le même fuseau.</para>
+ <para xml:id="configureTimezoneUTC-pa1" revision="2">In this screen, you can choose between setting your hardware clock to UTC or
+to local time.
+ </para>
</listitem>
- </itemizedlist>
-
- <para xml:id="configureTimezoneUTC-pa2" revision="1">À l'écran suivant, vous pourrez choisir de régler l'horloge système sur
-l'heure locale ou sur GMT, aussi appelée UTC.</para>
+ <listitem>
+ <para xml:id="configureTimezoneUTC-pa2" revision="2">Something else you can do here, is to enable automatic time synchronization
+with NTP. For that to work, you need to select an NTP server. Choose one
+that is close to you.</para>
+ </listitem>
+ </itemizedlist>
<note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">En cas de plusieurs systèmes d'exploitation sur l'ordinateur, il doivent
-tous être réglés sur la même heure (heure locale ou GMT/UTC).</para>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">If you have more than one operating system on your computer, make sure they
+are all set to local time, or all to UTC.</para>
</note>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/diskPartitioning.xml b/docs/docs/stable/installer/fr/diskPartitioning.xml
index c93cd595..0ae70aed 100644
--- a/docs/docs/stable/installer/fr/diskPartitioning.xml
+++ b/docs/docs/stable/installer/fr/diskPartitioning.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitionnement" xml:id="diskPartitioning" xml:lang="fr" version="5.0" xml:lang="fr">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitionnement" xml:id="diskPartitioning" version="5.0" xml:lang="fr">
<!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
@@ -13,4 +13,4 @@
<xi:include href="diskdrake.xml"/>
<xi:include href="formatPartitions.xml"/>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/fr/locale.xml b/docs/docs/stable/installer/fr/locale.xml
index 83fda461..c06218ee 100644
--- a/docs/docs/stable/installer/fr/locale.xml
+++ b/docs/docs/stable/installer/fr/locale.xml
@@ -8,7 +8,8 @@
xmlns:db="http://docbook.org/ns/docbook">
<title>Localisation</title>
- <xi:include href="configureTimezoneUTC.xml"/>
-
- <xi:include href="selectCountry.xml"/>
+
+ <!-- remove selectTimezoneUTC.xml, because setting the timezone is now done
+ at the beginning of the installation-->
+<xi:include href="selectCountry.xml"/>
</section>
diff --git a/docs/docs/stable/installer/fr/misc-params.xml b/docs/docs/stable/installer/fr/misc-params.xml
index 9a65f4a7..70ee58e4 100644
--- a/docs/docs/stable/installer/fr/misc-params.xml
+++ b/docs/docs/stable/installer/fr/misc-params.xml
@@ -15,6 +15,8 @@
+
+
<mediaobject>
<!-- Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC-->
<!--2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.-->
@@ -22,6 +24,8 @@
<!--2018/02/23 apb: Updated dx2-summaryBottom.png-->
<!--2018/02/24 apb: Changed list style-->
<!--2018/02/24 apb: Centre-align dx2-summaryTop.png-->
+<!--2026-01-31 marja: Update the item about the time zone, now that the user
+ set it at the beginning of the installation-->
<imageobject><imagedata fileref="dx2-summaryTop.png"
align="center"/></imageobject></mediaobject>
@@ -57,9 +61,9 @@ problème.</para>
<listitem>
<para xml:id="misc-params-system-pa2" revision="1"><emphasis role="bold">Fuseau horaire</emphasis></para>
- <para xml:id="misc-params-system-pa2a" revision="1">DrakX sélectionne un fuseau horaire en fonction de la langue choisie. Vous
-pouvez le modifier si nécessaire. Voir aussi <xref
-linkend="configureTimezoneUTC"/></para>
+ <para xml:id="misc-params-system-pa2a" revision="2">If the time settings you chose before are wrong, you can correct them
+here. See also <xref linkend="configureTimezone"/> and <xref
+linkend="configureTimezoneUTC"/> </para>
</listitem>
<listitem>
@@ -225,4 +229,4 @@ est très risqué.</para>
</listitem>
</itemizedlist>
</section>
-</section> \ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/nb/DrakX-inline.xml b/docs/docs/stable/installer/nb/DrakX-inline.xml
index f148f570..8d12a2ae 100644
--- a/docs/docs/stable/installer/nb/DrakX-inline.xml
+++ b/docs/docs/stable/installer/nb/DrakX-inline.xml
@@ -133,6 +133,8 @@ Team</link>, hvis du vil hjelpe til med å forbedre denne manualen.</para>
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
diff --git a/docs/docs/stable/installer/nl/DrakX-inline.xml b/docs/docs/stable/installer/nl/DrakX-inline.xml
index ced6fe1c..6056b5a0 100644
--- a/docs/docs/stable/installer/nl/DrakX-inline.xml
+++ b/docs/docs/stable/installer/nl/DrakX-inline.xml
@@ -134,6 +134,8 @@ Team</link>, als u mee wilt helpen deze handleiding te verbeteren.</para>
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
diff --git a/docs/docs/stable/installer/ru/DrakX-inline.xml b/docs/docs/stable/installer/ru/DrakX-inline.xml
index 43984cce..799fac5f 100644
--- a/docs/docs/stable/installer/ru/DrakX-inline.xml
+++ b/docs/docs/stable/installer/ru/DrakX-inline.xml
@@ -134,6 +134,8 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команды
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">
diff --git a/docs/docs/stable/installer/uk/DrakX-inline.xml b/docs/docs/stable/installer/uk/DrakX-inline.xml
index 33ca859c..e18da19c 100644
--- a/docs/docs/stable/installer/uk/DrakX-inline.xml
+++ b/docs/docs/stable/installer/uk/DrakX-inline.xml
@@ -134,6 +134,8 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команди
<xi:include href="securityLevel.xml"/>
+ <xi:include href="firewall.xml"/>
+
<!-- <xi:include href="configureNetwork.xml">