aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/ca.po185
-rw-r--r--docs/installer/ca/DrakLive-cover.xml77
-rw-r--r--docs/installer/ca/DrakLive.xml66
-rw-r--r--docs/installer/ca/SelectAndUseISOs2.xml122
-rw-r--r--docs/installer/ca/acceptLicense.xml26
-rw-r--r--docs/installer/ca/addUser.xml47
-rw-r--r--docs/installer/ca/ask_mntpoint_s.xml9
-rw-r--r--docs/installer/ca/bestTime.xml21
-rw-r--r--docs/installer/ca/bootLive.xml135
-rw-r--r--docs/installer/ca/configureTimezoneUTC.xml44
-rw-r--r--docs/installer/ca/diskdrake.xml8
-rw-r--r--docs/installer/ca/doPartitionDisks.xml84
-rw-r--r--docs/installer/ca/formatPartitions.xml9
-rw-r--r--docs/installer/ca/login.xml24
-rw-r--r--docs/installer/ca/reboot.xml20
-rw-r--r--docs/installer/ca/selectKeyboardLive.xml14
-rw-r--r--docs/installer/ca/selectLanguage.xml38
-rw-r--r--docs/installer/ca/setupBootloader.xml120
-rw-r--r--docs/installer/ca/setupBootloaderAddEntry.xml57
-rw-r--r--docs/installer/ca/takeOverHdConfirm.xml9
-rw-r--r--docs/installer/ca/testing.xml80
-rw-r--r--docs/installer/ca/uninstall-Mageia.xml2
-rw-r--r--docs/installer/ca/unused.xml27
-rw-r--r--docs/installer/fr.po43
-rw-r--r--docs/installer/fr/SelectAndUseISOs2.xml11
-rw-r--r--docs/installer/fr/bootLive.xml24
-rw-r--r--docs/installer/fr/reboot.xml9
-rw-r--r--docs/installer/fr/setupBootloader.xml15
-rw-r--r--docs/installer/fr/setupBootloaderAddEntry.xml10
-rw-r--r--docs/installer/sv.po81
-rw-r--r--docs/installer/sv/DrakLive-cover.xml4
-rw-r--r--docs/installer/sv/DrakLive.xml2
-rw-r--r--docs/installer/sv/SelectAndUseISOs2.xml6
-rw-r--r--docs/installer/sv/bestTime.xml2
-rw-r--r--docs/installer/sv/bootLive.xml8
-rw-r--r--docs/installer/sv/login.xml2
-rw-r--r--docs/installer/sv/selectKeyboardLive.xml2
-rw-r--r--docs/installer/sv/selectLanguage.xml4
-rw-r--r--docs/installer/sv/setupBootloader.xml6
-rw-r--r--docs/installer/sv/setupBootloaderAddEntry.xml4
-rw-r--r--docs/installer/sv/testing.xml24
41 files changed, 989 insertions, 492 deletions
diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index a5223536..115b1cc6 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -6,14 +6,15 @@
# Cristian Garde Zarza <cristian.garde@gmail.com>, 2015
# Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2013-2014
# Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2015
+# Davidmp <medipas@gmail.com>, 2016
# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2016-02-10 16:29+0200\n"
-"PO-Revision-Date: 2015-12-08 12:21+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
+"PO-Revision-Date: 2016-04-11 16:57+0000\n"
+"Last-Translator: Davidmp <medipas@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
"ca/)\n"
"Language: ca\n"
@@ -36,6 +37,11 @@ msgid ""
"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
"\"live-license.png\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/acceptLicense.xml:40
@@ -85,14 +91,11 @@ msgstr "Notes de la versió"
#. type: Content of: <section><section><para>
#: en/acceptLicense.xml:70
-#, fuzzy
msgid ""
"Important information are given about this release of <application>Mageia</"
"application> and are accessible clicking on the <guibutton>Release Notes</"
"guibutton> button."
msgstr ""
-"Per a veure què hi ha de nou en aquesta versió de <application>Mageia</"
-"application>, cliqueu al botó <guibutton>Notes de versió</guibutton>."
#. type: Attribute 'xml:lang' of: <section>
#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
@@ -194,16 +197,12 @@ msgstr "Gestió d'usuaris i superusuari"
#. marja 2013-04-26 added new note
#. type: Content of: <section><mediaobject>
#: en/addUser.xml:28
-#, fuzzy
msgid ""
"<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>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/addUser.xml:39
@@ -287,15 +286,11 @@ msgstr ""
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/addUser.xml:86
-#, fuzzy
msgid ""
"<guilabel>Password</guilabel>: In this text box you should type in the user "
"password. There is a shield at the end of the text box that indicates the "
"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
msgstr ""
-"<guilabel>Contrasenya</guilabel>: poseu-hi la contrasenya de l'usuari. Al "
-"final de la casella un escut indica la fortalesa de la contrasenya. (Vegeu "
-"també <xref linkend=\"givePassword\"/>)"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/addUser.xml:92
@@ -330,14 +325,10 @@ msgstr ""
#. type: Content of: <section><section><note><para>
#: en/addUser.xml:106
-#, fuzzy
msgid ""
"If you don't want a world readable home directory for anyone, it is advised "
"to only add a temporary user now and to add the real one(s) after reboot."
msgstr ""
-"Si no voleu que el directori d'usuari sigui llegible per tothom, és "
-"recomanable afegir ara un usuari temporal i afegir els usuaris reals un cop "
-"s'hagi arrencat de nou."
#. type: Content of: <section><section><note><para>
#: en/addUser.xml:110
@@ -363,14 +354,10 @@ msgstr "Gestió avançada d'usuaris"
#. type: Content of: <section><section><para>
#: en/addUser.xml:125
-#, fuzzy
msgid ""
"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
"screen that allows you to edit the settings for the user you are adding."
msgstr ""
-"Si feu clic al botó <guibutton>avançat</guibutton>, se us presentarà una "
-"pantalla on podeu editar la configuració per a l'usuari que s'està afegint. "
-"També podeu activar o desactivar el compte del convidat."
#. type: Content of: <section><section><para>
#: en/addUser.xml:129
@@ -451,7 +438,6 @@ msgstr "Tria dels punts de muntatge"
#. 2012-04-19 Language proofreading done
#. type: Content of: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
-#, fuzzy
msgid ""
"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -460,9 +446,6 @@ msgid ""
"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
"im1\"></imagedata> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"chooseMountPoints-im1\"></"
-"imagedata> </imageobject>"
#. type: Content of: <section><para>
#: en/ask_mntpoint_s.xml:37
@@ -558,13 +541,10 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/bestTime.xml:14
-#, fuzzy
msgid ""
"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/bestTime.xml:20
@@ -585,9 +565,8 @@ msgstr ""
#. type: Content of: <section><section><info><title>
#: en/bootLive.xml:8
-#, fuzzy
msgid "Booting the medium"
-msgstr "Suport CD només d'arrencada"
+msgstr ""
#. type: Content of: <section><section><section><info><title>
#: en/bootLive.xml:13
@@ -634,9 +613,8 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/bootLive.xml:47
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+msgstr ""
#. type: Content of: <section><section><mediaobject><caption><para>
#: en/bootLive.xml:52
@@ -724,13 +702,10 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/bootLive.xml:124
-#, fuzzy
msgid ""
"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
#. type: Content of: <section><section><mediaobject><caption><para>
#: en/bootLive.xml:129
@@ -974,7 +949,6 @@ msgstr "Configuració de la zona horària"
#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureTimezoneUTC.xml:11
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata xml:id="
"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -982,9 +956,6 @@ msgid ""
"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
"format=\"PNG\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
#. type: Content of: <section><para>
#: en/configureTimezoneUTC.xml:20
@@ -1695,9 +1666,8 @@ msgstr ""
#. type: Content of: <article><info><title>
#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
-#, fuzzy
msgid "Installation from LIVE medium"
-msgstr "Pantalla de benvinguda de la instal·lació"
+msgstr ""
#. type: Content of: <book><info>
#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
@@ -1706,15 +1676,13 @@ msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
#. type: Content of: <book><info><revhistory><revision><date>
#: en/DrakLive-cover.xml:10
-#, fuzzy
msgid "January 2015"
-msgstr "Febrer del 2014"
+msgstr ""
#. type: Content of: <book><info><revhistory><revision><revremark>
#: en/DrakLive-cover.xml:11
-#, fuzzy
msgid "Mageia 5"
-msgstr "Mageia 4"
+msgstr "Mageia 5"
#. type: Content of: <book><info><cover><para>
#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
@@ -1873,7 +1841,6 @@ msgstr "Formatació"
#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
#. type: Content of: <section><mediaobject>
#: en/formatPartitions.xml:18
-#, fuzzy
msgid ""
"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1882,9 +1849,6 @@ msgid ""
"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
"</imagedata> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"formatPartitions-im1\"> </"
-"imagedata> </imageobject>"
#. type: Content of: <section><para>
#: en/formatPartitions.xml:30
@@ -2390,13 +2354,10 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/login.xml:7
-#, fuzzy
msgid ""
"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
#. type: Content of: <section><mediaobject><caption><para>
#: en/login.xml:12
@@ -2418,13 +2379,10 @@ msgstr ""
#. type: Content of: <section><para>
#: en/login.xml:22
-#, fuzzy
msgid ""
"You can find another part of our documentation in <link linkend=\"https://"
"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
msgstr ""
-"Teniu més informació disponible al <link ns4:href=\"https://wiki.mageia.org/"
-"ca/Category:Documentation\">wiki de Mageia</link>."
#. type: Content of: <section><info><title>
#: en/media_selection.xml:3
@@ -2896,17 +2854,14 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/reboot.xml:9
msgid "Reboot"
-msgstr ""
+msgstr "Reinicia"
#. type: Content of: <section><mediaobject>
#: en/reboot.xml:13
-#, fuzzy
msgid ""
"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/reboot.xml:19
@@ -2984,7 +2939,7 @@ msgstr "Selecció i utilització de les ISOs"
#. type: Content of: <section><section><title>
#: en/SelectAndUseISOs2.xml:9
msgid "Introduction"
-msgstr ""
+msgstr "Introducció"
#. type: Content of: <section><section><para>
#: en/SelectAndUseISOs2.xml:11
@@ -3413,13 +3368,10 @@ msgstr ""
#. type: Content of: <section><section><section><para>
#: en/SelectAndUseISOs2.xml:372
-#, fuzzy
msgid ""
"To recover the original capacity, you must redo partitioning and re-format "
"the USB stick."
msgstr ""
-"Per a recuperar la capacitat original heu de reformatar el llapis de memòria "
-"USB."
#. type: Content of: <section><section><section><section><title>
#: en/SelectAndUseISOs2.xml:376
@@ -3445,11 +3397,10 @@ msgstr "Podeu provar:"
#. type: Content of: <section><section><section><section><para>
#: en/SelectAndUseISOs2.xml:386
-#, fuzzy
msgid ""
"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
"the \"ISO image\" option;"
-msgstr "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link>"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
#: en/SelectAndUseISOs2.xml:389
@@ -3768,20 +3719,16 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/selectKeyboardLive.xml:3
-#, fuzzy
msgid "Select keyboard"
-msgstr "Teclat"
+msgstr ""
#. type: Content of: <section><mediaobject>
#: en/selectKeyboardLive.xml:7
-#, fuzzy
msgid ""
"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/selectKeyboardLive.xml:12
@@ -3899,16 +3846,12 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/selectLanguage.xml:29
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
#. type: Content of: <section><warning><para>
#: en/selectLanguage.xml:39
@@ -3937,26 +3880,18 @@ msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/selectLanguage.xml:54
-#, fuzzy
msgid ""
"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."
msgstr ""
-"Mageia té la codificació UTF-8 (Unicode) com a predeterminada. Es pot "
-"inhabilitar a la pantalla «múltiples idiomes» si sabeu que no cal per al "
-"vostre idioma. La desactivació d'UTF-8 s'aplica a tots els idiomes "
-"instal·lats."
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/selectLanguage.xml:60
-#, fuzzy
msgid ""
"You can change the language of your system after installation in the Mageia "
"Control Center -> System -> Manage localization for your system."
msgstr ""
-"Podeu canviar l'idioma del sistema després de la instal·lació, al centre de "
-"control de Mageia --&gt; Sistema --&gt; Gestiona la localització del sistema."
#. type: Content of: <section><info><title>
#: en/selectMouse.xml:4
@@ -4083,13 +4018,10 @@ msgstr ""
#. type: Content of: <section><section><warning><para>
#: en/setupBootloaderAddEntry.xml:46
-#, fuzzy
msgid ""
"Editing other things can leave you with an unbootable system. Please don't "
"just try something without knowing what you are doing."
msgstr ""
-"L'edició d'altres coses us pot deixar amb un sistema que no pot arrencar. No "
-"proveu altres coses si no sabeu què esteu fent."
#. type: Content of: <section><section><title>
#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
@@ -4115,11 +4047,10 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloaderAddEntry.xml:66
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
#. type: Content of: <section><info><title>
#: en/setupBootloader.xml:7
@@ -4156,9 +4087,8 @@ msgstr ""
#. type: Content of: <section><section><tip><para>
#: en/setupBootloader.xml:29
-#, fuzzy
msgid "The Mageia graphical menus are nice :"
-msgstr "Els menús gràfics de Mageia són bonics :)"
+msgstr ""
#. type: Content of: <section><section><section><info><title>
#: en/setupBootloader.xml:34
@@ -4167,17 +4097,12 @@ msgstr "Ús del gestor d'arrencada de Mageia"
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:38
-#, fuzzy
msgid ""
"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
"(Master Boot Record) of your first hard drive. If you already have other "
"operating systems installed, Mageia attempts to add them to your new Mageia "
"boot menu."
msgstr ""
-"Per defecte, Mageia escriu un nou gestor d'arrencada GRUB (antic) a l'MBR "
-"(Master Boot Record) de la primera unitat de disc dur. Si ja teniu altres "
-"sistemes operatius instal·lats, Mageia provarà d'afegir-los al nou menú "
-"d'arrencada de Mageia."
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:44
@@ -4190,15 +4115,11 @@ msgstr ""
#. type: Content of: <section><section><section><warning><para>
#: en/setupBootloader.xml:48
-#, fuzzy
msgid ""
"Linux systems which use the GRUB2 bootloader are not currently supported by "
"GRUB (legacy) and will not be recognized if the default GRUB bootloader is "
"used."
msgstr ""
-"Els sistemes Linux que fan servir el gestor d'arrencada GRUB2 no estan "
-"admesos actualment per GRUB (antic) i no seran reconeguts si es fa servir el "
-"gestor d'arrencada predeterminat GRUB."
#. type: Content of: <section><section><section><warning><para>
#: en/setupBootloader.xml:53
@@ -4229,15 +4150,11 @@ msgstr ""
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:71
-#, fuzzy
msgid ""
"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
"You must select the root partition that you chose during the partitioning "
"phase earlier, e.g. sda7."
msgstr ""
-"No seleccioneu un dispositiu, com ara «sda», o se sobreescriurà l'MBR "
-"existent. Heu de seleccionar la partició arrel que heu triat durant la fase "
-"prèvia de particionament, per exemple sda7."
#. type: Content of: <section><section><section><para>
#: en/setupBootloader.xml:76
@@ -4298,11 +4215,10 @@ msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/setupBootloader.xml:115
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
#. type: Content of: <section><section><para>
#: en/setupBootloader.xml:120
@@ -4492,15 +4408,13 @@ msgstr ""
#. type: Content of: <section><section><info><title>
#: en/testing.xml:14
-#, fuzzy
msgid "Live mode"
-msgstr "Mitjà autònom"
+msgstr ""
#. type: Content of: <section><section><mediaobject>
#: en/testing.xml:18
-#, fuzzy
msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
#. type: Content of: <section><section><para>
#: en/testing.xml:23
@@ -4566,17 +4480,15 @@ msgstr ""
#. type: Content of: <section><section><section><info><title>
#: en/testing.xml:72
-#, fuzzy
msgid "Launch installation"
-msgstr "Instal·lació de Mageia"
+msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/testing.xml:76
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
#. type: Content of: <section><section><section><para>
#: en/testing.xml:81
@@ -4649,13 +4561,10 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/unused.xml:13
-#, fuzzy
msgid ""
"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/unused.xml:19
@@ -4668,11 +4577,10 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/unused.xml:25
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
#. type: Content of: <section><para>
#: en/unused.xml:30
@@ -4680,46 +4588,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 ""
-
-#~ msgid ""
-#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
-#~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
-#~ "imagedata> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
-#~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
-#~ "imagedata> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
-#~ "</imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
-#~ "</imageobject>"
-
-#~ msgid "Using Mageia"
-#~ msgstr "Des de Mageia"
-
-#~ msgid "Using Windows"
-#~ msgstr "Des de Windows"
-
-#~ msgid ""
-#~ "This step is detailed in <link ns4:href=\"http://www.mageia.org/en/doc/"
-#~ "\">the Mageia documentation</link>."
-#~ msgstr ""
-#~ "Aquest pas es detalla a <link ns4:href=\"http://www.mageia.org/ca/doc/"
-#~ "\">la documentació de Mageia</link>."
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center"
-#~ "\" format=\"PNG\" > </imagedata> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center"
-#~ "\" format=\"PNG\" > </imagedata> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format="
-#~ "\"PNG\" align=\"center\" ></imagedata> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format="
-#~ "\"PNG\" align=\"center\" ></imagedata> </imageobject>"
diff --git a/docs/installer/ca/DrakLive-cover.xml b/docs/installer/ca/DrakLive-cover.xml
new file mode 100644
index 00000000..313160cc
--- /dev/null
+++ b/docs/installer/ca/DrakLive-cover.xml
@@ -0,0 +1,77 @@
+<?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="ca" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+ <publisher> <publishername>Mageia.org</publishername> </publisher>
+ <revhistory>
+ <revision>
+ <date>January 2015</date>
+ <revremark>Mageia 5</revremark>
+ </revision>
+ </revhistory>
+ <cover>
+ <para role="tagline">Documentació oficial de Mageia</para>
+ <mediaobject>
+<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+ <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
+la llicència 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>Aquest manual ha estat creat amb l'ajuda de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.
+ </para>
+ <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
+millorar-lo, contacteu l'<link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
+documentació</link>.</para>
+ </cover>
+ </info>
+ <article>
+ <title>Installation from LIVE medium</title>
+ <para><note>
+ <para>No tothom veurà totes les pantalles d'instal·lació que apareixen en aquest
+manual. Les imatges que veureu dependran del vostre maquinari i de les
+decisions que aneu prenent durant la instal·lació.</para>
+ </note></para>
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <xi:include href="doPartitionDisks.xml"/>
+
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
+
+ <xi:include href="diskdrake.xml"/>
+
+ <xi:include href="formatPartitions.xml"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.xml"/>
+
+ <xi:include href="setupBootloaderAddEntry.xml"/>
+
+ <xi:include href="reboot.xml"/>
+
+ <xi:include href="addUser.xml"/>
+
+ <xi:include href="login.xml"/>
+
+ <xi:include href="uninstall-Mageia.xml"/>
+ </article>
+</book> \ No newline at end of file
diff --git a/docs/installer/ca/DrakLive.xml b/docs/installer/ca/DrakLive.xml
new file mode 100644
index 00000000..88bbceef
--- /dev/null
+++ b/docs/installer/ca/DrakLive.xml
@@ -0,0 +1,66 @@
+<?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="ca" xml:id="Quick-Startup">
+ <info>
+ <title>Installation from LIVE medium</title>
+
+ <cover>
+ <para><note>
+ <para>No tothom veurà totes les pantalles d'instal·lació que apareixen en aquest
+manual. Les imatges que veureu dependran del vostre maquinari i de les
+decisions que aneu prenent durant la instal·lació.</para>
+ </note></para>
+
+ <para xml:id="CC_BY-SA">Els textos i les captures de pantalla d'aquest manual estan disponibles sota
+la llicència 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>Aquest manual ha estat creat amb l'ajuda de <link
+ns6:href="http://www.calenco.com">Calenco CMS</link> desenvolupat per <link
+ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
+
+ <para>L'han escrit voluntaris durant el seu temps lliure. Si voleu ajudar a
+millorar-lo, contacteu l'<link
+ns6:href="https://wiki.mageia.org/en/Documentation_team">equip de
+documentació</link>.</para>
+ </cover>
+ </info>
+
+ <xi:include href="SelectAndUseISOs2.xml"/>
+
+ <xi:include href="bootLive.xml"/>
+
+ <xi:include href="selectLanguage.xml"/>
+
+ <xi:include href="acceptLicense.xml"/>
+
+ <xi:include href="configureTimezoneUTC.xml"/>
+
+ <xi:include href="bestTime.xml"/>
+
+ <xi:include href="selectKeyboardLive.xml"/>
+
+ <xi:include href="testing.xml"/>
+
+ <xi:include href="doPartitionDisks.xml"/>
+
+ <xi:include href="ask_mntpoint_s.xml"/>
+
+ <xi:include href="takeOverHdConfirm.xml"/>
+
+ <xi:include href="diskdrake.xml"/>
+
+ <xi:include href="formatPartitions.xml"/>
+
+ <xi:include href="unused.xml"/>
+
+ <xi:include href="setupBootloader.xml"/>
+
+ <xi:include href="setupBootloaderAddEntry.xml"/>
+
+ <xi:include href="reboot.xml"/>
+
+ <xi:include href="addUser.xml"/>
+
+ <xi:include href="login.xml"/>
+
+ <xi:include href="uninstall-Mageia.xml"/>
+</article> \ No newline at end of file
diff --git a/docs/installer/ca/SelectAndUseISOs2.xml b/docs/installer/ca/SelectAndUseISOs2.xml
index 10b5ed21..c3b4f6f2 100644
--- a/docs/installer/ca/SelectAndUseISOs2.xml
+++ b/docs/installer/ca/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
</info>
<section>
+ <title>Introducció</title>
+
+ <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+ <para>There is two families of media:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+ </listitem>
+
+ <listitem>
+ <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation. The
+installation process is simpler, but you get lesser choices.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Details are given in the next sections.</para>
+ </section>
+
+ <section>
<title>Suport</title>
<section>
@@ -263,12 +289,8 @@ http is chosen, you may also see something like</para>
<imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
<para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Both hexadecimal numbers have been calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download.Then this
-window appears:</para>
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
<mediaobject>
<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -277,7 +299,13 @@ window appears:</para>
</section>
<section>
- <title>Comprovació de la integritat del suport baixat</title>
+ <title xml:id="integrity">Comprovació de la integritat del suport baixat</title>
+
+ <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you have a
+failure. A failure infers that you should retry the download.</para>
<para>Obriu una consola, no cal que sigueu l'usuari primari, i:</para>
@@ -327,14 +355,35 @@ the device; any other data will be lost and the partition capacity will be
reduced to the image size.</para>
</warning>
- <para>Per a recuperar la capacitat original heu de reformatar el llapis de memòria
-USB.</para>
+ <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
<section>
- <title>Des de Mageia</title>
+ <title>Using a graphical tool within Mageia</title>
<para>You can use a graphical tool like <link
ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+ </section>
+
+ <section>
+ <title>Using a graphical tool within Windows</title>
+
+ <para>Podeu provar:</para>
+
+ <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+ <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+ </section>
+
+ <section>
+ <title>Using Command line within a GNU/Linux system</title>
+
+ <warning>
+ <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+ </warning>
<para>També podeu fer servir l'eina dd en una consola:</para>
@@ -361,11 +410,34 @@ application or file manager that could access or read it)</para>
<mediaobject>
<imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+ <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+ <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access JetFlash Transcend 2GB 1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251] <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
</listitem>
<listitem>
- <para>Find the device name for your USB stick (by its size), for example /dev/sdb
-in the screenshot above, it is a 8Go USB stick.</para>
+ <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
</listitem>
<listitem>
@@ -387,30 +459,6 @@ of=/dev/sdb bs=1M</userinput></para>
</listitem>
</orderedlist>
</section>
-
- <section>
- <title>Des de Windows</title>
-
- <para>Podeu provar:</para>
-
- <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
-
- <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
-Disk Imager</link></para>
-
- <para/>
- </section>
</section>
</section>
-
- <section>
- <title>Instal·lació de Mageia</title>
-
- <para>Aquest pas es detalla a <link ns4:href="http://www.mageia.org/ca/doc/">la
-documentació de Mageia</link>.</para>
-
- <para>Teniu més informació disponible al <link
-ns4:href="https://wiki.mageia.org/ca/Category:Documentation">wiki de
-Mageia</link>.</para>
- </section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/acceptLicense.xml b/docs/installer/ca/acceptLicense.xml
index 25532a61..ae3166fc 100644
--- a/docs/installer/ca/acceptLicense.xml
+++ b/docs/installer/ca/acceptLicense.xml
@@ -1,11 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="ca" xml:id="acceptLicense"
- 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 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="acceptLicense" version="5.0" xml:lang="ca">
@@ -41,9 +34,12 @@
<title xml:id="acceptLicense-ti1">Llicència i notes de la versió</title>
</info>
- <mediaobject condition="expert">
-<imageobject> <imagedata align="center" fileref="dx2-license.png"
-format="PNG" revision="1" xml:id="acceptLicense-im1"/> </imageobject></mediaobject>
+ <mediaobject>
+<imageobject condition="classical"> <imagedata xml:id="acceptLicense-im1"
+revision="4" align="center" format="PNG" fileref="dx2-license.png"/>
+</imageobject> <imageobject> <imagedata xml:id="acceptLicense-im2"
+revision="5" align="center" condition="live" format="PNG"
+fileref="live-license.png"/> </imageobject></mediaobject>
<section xml:id="license">
<info>
@@ -78,8 +74,8 @@ Release Notes</para>
- <para>Per a veure què hi ha de nou en aquesta versió de
-<application>Mageia</application>, cliqueu al botó <guibutton>Notes de
-versió</guibutton>.</para>
+ <para>Important information are given about this release of
+<application>Mageia</application> and are accessible clicking on the
+<guibutton>Release Notes</guibutton> button.</para>
</section>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/addUser.xml b/docs/installer/ca/addUser.xml
index bd8c2548..e7c1d983 100644
--- a/docs/installer/ca/addUser.xml
+++ b/docs/installer/ca/addUser.xml
@@ -1,5 +1,4 @@
-<?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="addUser" version="5.0" xml:lang="ca">
-
+<?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="addUser" version="5.0" xml:lang="ca">
<info>
<title xml:id="addUser-ti1">Gestió d'usuaris i superusuari</title>
</info>
@@ -15,10 +14,12 @@
+
+
-
- <mediaobject>
+
+ <mediaobject>
<!-- Started by marja,using Led43's text, on 2012 03 27 -->
<!-- NEEDS TO BE REVIEWED! -->
<!-- SimonNZG 2012-04-03 has taken a look but needs to come back -->
@@ -31,10 +32,11 @@
"rbash" in the xguest warning - is that correct? -->
<!-- JohnR 2012-04-19 Language proofreading -->
<!-- marja 2012-04-24 Added screenshot -->
-<!-- marja 2013-04-26 added new note -->
-<imageobject> <imagedata revision="1" fileref="dx2-setRootPassword.png"
-format="PNG" align="center" xml:id="setRootPassword-im1"></imagedata>
-</imageobject></mediaobject>
+<!-- marja 2013-04-26 added new note-->
+<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></mediaobject>
<section xml:id="root-password">
<info>
@@ -84,9 +86,9 @@ minúscules</emphasis></para>
</listitem>
<listitem>
- <para><guilabel>Contrasenya</guilabel>: poseu-hi la contrasenya de l'usuari. Al
-final de la casella un escut indica la fortalesa de la contrasenya. (Vegeu
-també <xref linkend="givePassword"/>)</para>
+ <para><guilabel>Password</guilabel>: In this text box you should type in the user
+password. There is a shield at the end of the text box that indicates the
+strength of the password. (See also <xref linkend="givePassword"/>)</para>
</listitem>
<listitem>
@@ -96,7 +98,7 @@ dues caselles.</para>
</listitem>
</itemizedlist>
- <note>
+ <note>
<para>Qualsevol usuari que creeu durant la instal·lació de Mageia tindrà un
directori d'usuari llegible per tothom (però protegit contra escriptura).</para>
@@ -105,29 +107,28 @@ afegits a <emphasis>MCC- Sistema - Gestiona els usuaris del
sistema</emphasis> tindran el directori d'usuari protegit contra lectura i
escriptura.</para>
- <para>Si no voleu que el directori d'usuari sigui llegible per tothom, és
-recomanable afegir ara un usuari temporal i afegir els usuaris reals un cop
-s'hagi arrencat de nou.</para>
+ <para>If you don't want a world readable home directory for anyone, it is advised
+to only add a temporary user now and to add the real one(s) after reboot.</para>
<para>Si preferiu directoris d'usuari llegibles per tothom, podeu afegir tots els
usuaris suplementaris al pas <emphasis>Configuració - Resum</emphasis>
durant la instal·lació. Trieu <emphasis>Gestió d'usuaris</emphasis>.</para>
<para>Els permisos d'accés també es poden modificar després de la instal·lació.</para>
- </note>
-
+ </note>
</section>
- <section xml:id="addUserAdvanced">
+ <section condition="classical" xml:id="addUserAdvanced">
<info>
<title xml:id="addUserAdvanced-ti3">Gestió avançada d'usuaris</title>
</info>
- <para>Si feu clic al botó <guibutton>avançat</guibutton>, se us presentarà una
-pantalla on podeu editar la configuració per a l'usuari que s'està
-afegint. També podeu activar o desactivar el compte del convidat.</para>
+ <para>If the <guibutton>advanced</guibutton> button is clicked you are offered a
+screen that allows you to edit the settings for the user you are adding.</para>
- <warning>
+ <para condition="classical">Additionally, you can disable or enable a guest account.</para>
+
+ <warning condition="classical">
<para>Tot allò que un convidat, amb un compte predeterminat
<emphasis>rbash</emphasis>, desi al seu directori /home serà esborrat quan
tanqui la sessió. El convidat hauria de desar els fitxers importants en una
@@ -135,7 +136,7 @@ memòria USB.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para><guilabel>Activa el compte del convidat</guilabel>: aquí podeu activar o
desactivar el compte d'un convidat. Aquest tipus de compte permet a un
convidat iniciar la sessió i fer servir el PC, però té un accés més
diff --git a/docs/installer/ca/ask_mntpoint_s.xml b/docs/installer/ca/ask_mntpoint_s.xml
index d2428e10..4efec803 100644
--- a/docs/installer/ca/ask_mntpoint_s.xml
+++ b/docs/installer/ca/ask_mntpoint_s.xml
@@ -33,9 +33,12 @@
write "it's type". And you're right about the redundant part, too, I removed it-->
<!-- And JohnR says the Americans are WRONG! :-)) -->
<!-- 2012-04-19 Language proofreading done -->
-<imageobject> <imagedata revision="1" fileref="dx2-chooseMountpoints.png"
-align="center" format="PNG" xml:id="chooseMountPoints-im1"></imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-chooseMountpoints.png" align="center" format="PNG"
+xml:id="chooseMountPoints-im1"></imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-chooseMountpoints.png" align="center" format="PNG"
+xml:id="live-chooseMountPoints-im1"></imagedata> </imageobject></mediaobject>
<para>Aquí podeu veure les particions Linux que s'han trobat a l'ordinador. Si no
esteu d'acord amb els suggeriments de <application>DrakX</application>,
diff --git a/docs/installer/ca/bestTime.xml b/docs/installer/ca/bestTime.xml
new file mode 100644
index 00000000..f43a17dc
--- /dev/null
+++ b/docs/installer/ca/bestTime.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="bestTime"
+ 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">
+ <info>
+ <title xml:id="bestTime-ti1">Clock settings</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-bestTime.png"
+format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
+
+ <para>In this step, you have to select on which time your internal clock is set,
+either local time or UTC time.</para>
+
+ <para>In advanced tab, you will find more options about clock settings.</para>
+</section>
diff --git a/docs/installer/ca/bootLive.xml b/docs/installer/ca/bootLive.xml
new file mode 100644
index 00000000..653ff692
--- /dev/null
+++ b/docs/installer/ca/bootLive.xml
@@ -0,0 +1,135 @@
+<?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="bootLive" version="5.0" xml:lang="ca">
+ <info>
+ <title xml:id="bootLive-ti1">Boot Mageia as Live system</title>
+ </info>
+
+ <section xml:id="bootLive-1">
+ <info>
+ <title xml:id="bootLive1-ti1">Booting the medium</title>
+ </info>
+
+ <section>
+ <info>
+ <title xml:id="bootLive11-ti1">From a disc</title>
+ </info>
+
+ <para>You can boot directly from the media you used to burn your image (CD-ROM,
+DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
+bootloader to launch the installation automatically after rebooting the
+computer. If that does not happen you may need to reconfigure your BIOS or
+press one key that will offer you to choose the peripheral from which the
+computer will boot.</para>
+
+ <para>According to which hardware you have, and how it is configured, you get
+either one or another of the two screens below.</para>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="bootLive12-ti1">From a USB device</title>
+ </info>
+
+ <para>You can boot from the USB device on which you dumped your image
+ISO. According to your BIOS settings, the computer boots perhaps directly on
+the USB device already plugged in a port. If that does not happen you may
+need to reconfigure your BIOS or press one key that will offer you to choose
+the peripheral from which the computer will boot.</para>
+ </section>
+ </section>
+
+ <section xml:id="biosmode">
+ <info>
+ <title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title>
+ </info>
+
+ <mediaobject>
+ <imageobject> <imagedata fileref="live-bootCSM.png"/> </imageobject>
+
+ <caption>
+ <para>First screen while booting in BIOS mode</para>
+ </caption>
+ </mediaobject>
+
+ <para>In the middle menu, you have the choice between three actions:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+or USB stick) without writing anything on the disk, so expect a very slow
+system. Once the boot is done, you can proceed to the installation on a hard
+disk.</para>
+ </listitem>
+
+ <listitem>
+ <para>Install Mageia: This choice will directly install Mageia on a hard disk.</para>
+ </listitem>
+
+ <listitem>
+ <para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
+when no media (CD/DVD or USB stick) is connected. (not working with Mageia
+5).</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>In the bottom menu, are the Boot Options:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para>
+ </listitem>
+
+ <listitem>
+ <para>F2 - Language. Choose the display language of the screens.</para>
+ </listitem>
+
+ <listitem>
+ <para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para>
+ </listitem>
+
+ <listitem>
+ <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+the inserted installation medium. Here, select other sources, like FTP or
+NFS servers. If the installation is carried out in a network with an SLP
+server, select one of the installation sources available on the server with
+this option.</para>
+ </listitem>
+
+ <listitem>
+ <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+optional disk with a driver update and will require its insertion during
+installation process.</para>
+ </listitem>
+
+ <listitem>
+ <para>F6 - Kernel options. This is a way to specify options according to your
+hardware and the drivers to use.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section xml:id="uefimode">
+ <info>
+ <title xml:id="uefimode-ti1">In UEFI mode</title>
+ </info>
+
+ <mediaobject condition="live">
+ <imageobject> <imagedata revision="1" align="center"
+fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
+</imageobject>
+
+ <caption>
+ <para>First screen while booting on UEFI system from disk</para>
+ </caption>
+ </mediaobject>
+
+ <para>You have only the choice to run Mageia in Live mode (first choice) or to
+process the installation (second choice).</para>
+ <para>If you booted from a USB stick, you get two supplemental lines which are a
+duplicata of the previous lines suffixed with "USB". You have to choose
+them.</para>
+
+ <para>In each case, the first steps will be the same to choose language, timezone
+and keyboard, then the processes differ, with <link
+linkend="testing">additional steps in Live mode</link>.</para>
+ </section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/configureTimezoneUTC.xml b/docs/installer/ca/configureTimezoneUTC.xml
index e645e91f..c691b04b 100644
--- a/docs/installer/ca/configureTimezoneUTC.xml
+++ b/docs/installer/ca/configureTimezoneUTC.xml
@@ -1,37 +1,29 @@
-<?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="configureTimezoneUTC" version="5.0" xml:lang="ca">
+<?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="ca" xml:id="configureTimezoneUTC">
+ <info>
+ <title xml:id="configureTimezoneUTC-ti6">Configuració de la zona horària</title>
+ </info>
+
- <info>
- <title xml:id="configureTimezoneUTC-ti6">Configuració de la zona horària</title>
- </info>
+
-
-
-
-<mediaobject>
+ <mediaobject>
<!-- 2012-12-25 marja - moved this part out of misc-params.xml -->
<!-- 2013-05-05 marja - added screenshot -->
-<imageobject> <imagedata revision="1" fileref="dx2-configureTimezoneUTC.png"
-align="center" format="PNG" xml:id="configureTimezoneUTC-im1"></imagedata>
-</imageobject></mediaobject>
-
+<imageobject condition="classical"> <imagedata
+xml:id="configureTimezoneUTC-im1" revision="1"
+fileref="dx2-configureTimezoneUTC.png" align="center" format="PNG"/>
+</imageobject> <imageobject> <imagedata fileref="live-timeZone.png"
+condition="live" format="PNG"/> </imageobject></mediaobject>
- <para revision="1" xml:id="configureTimezoneUTC-pa1">Trieu el fus horari escollint un país o bé una ciutat propera en el mateix
+ <para revision="1" xml:id="configureTimezoneUTC-pa1">Trieu el fus horari escollint un país o bé una ciutat propera en el mateix
fus horari.</para>
- <para revision="1" xml:id="configureTimezoneUTC-pa2">A la següent pantalla podreu triar si establiu el rellotge de maquinari a
+ <para revision="1" xml:id="configureTimezoneUTC-pa2">A la següent pantalla podreu triar si establiu el rellotge de maquinari a
l'hora local o bé a GMT, també coneguda com a UTC.</para>
- <note>
- <para revision="1" xml:id="configureTimezoneUTC-pa3">Si teniu més d'un sistema operatiu a l'ordinador, assegureu-vos que tots
+ <note>
+ <para revision="1" xml:id="configureTimezoneUTC-pa3">Si teniu més d'un sistema operatiu a l'ordinador, assegureu-vos que tots
estan configurats a l'hora local, o bé tots a l'hora UTC/GMT.</para>
- </note>
- </section>
-
+ </note>
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/diskdrake.xml b/docs/installer/ca/diskdrake.xml
index 888e94c6..6735b863 100644
--- a/docs/installer/ca/diskdrake.xml
+++ b/docs/installer/ca/diskdrake.xml
@@ -29,8 +29,9 @@
</info>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake.png" align="center"/>
-</imageobject></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">Si voleu fer servir xifratge a la partició <literal>/</literal>,
@@ -65,5 +66,4 @@ System Partition) is present and correctly mounted on /boot/EFI (see above)</par
<para><mediaobject>
<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject></para>
</note>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/doPartitionDisks.xml b/docs/installer/ca/doPartitionDisks.xml
index 8179cf78..12a68021 100644
--- a/docs/installer/ca/doPartitionDisks.xml
+++ b/docs/installer/ca/doPartitionDisks.xml
@@ -3,35 +3,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<info>
- <!-- Started by marja on 2012 03 29 -->
-<!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-<!-- JohnR 2012-04-10 - tidy up module formatting -->
-<!-- barjac 2012-04-20 Yes I agree with Lebarhon - reference to home partition removed -->
-<!-- Simonnzg - doing anything to a Windows partition is DANGEROUS. I would prefer
- if this was not an option, but... -->
-<!-- marja 2012-04-24 put the para xml id's back. -->
-<!-- marja 2012-04-29 changed text as discussed on the ml and with papoteur's approval
- lebarhon: 2012-08-18 warning added-->
-<!-- marja 2013-04-05 changed warning to text suggested by Dave Hodgings in bug 9594 -->
-<!-- marja 2013-04-05 adjusted last line of warning as suggested by obgr_seneca -->
-<!-- lebarhon 2013-04-11 adjusted last line of warning as suggested by Dave Hodgins/Marja-->
+ <!---->
+<!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
<title xml:id="doPartitionDisks-ti1">Particionament</title>
</info>
@@ -82,7 +56,7 @@ personals.</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 draging the gap between both partitions. See the screen-shot below.</para>
+and dragging the gap between both partitions. See the screen-shot below.</para>
<mediaobject>
<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
@@ -100,7 +74,7 @@ and draging the gap between both partitions. See the screen-shot below.</para>
teniu dades al disc que no voleu perdre, llavors no feu servir aquesta
opció.</para>
</listitem>
- </itemizedlist> <itemizedlist>
+ </itemizedlist><itemizedlist>
<listitem>
<para revision="1" xml:id="doPartitionDisks-pa16">Personalitzat</para>
@@ -109,6 +83,47 @@ al(s) disc(s) dur(s).</para>
</listitem>
</itemizedlist></para>
+ <para><emphasis role="bold">Partitions 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>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>
+ </note>
+
<warning>
<para>Alguns discs nous fan servir ara sectors lògics de 4096 bytes, en lloc dels
sectors lògics de 512 bytes, estàndards fins ara. A causa de la manca de
@@ -117,14 +132,13 @@ no s'ha pogut provar amb un dispositiu d'aquestes característiques. A més,
alguns discs SSD fan servir actualment un bloc d'esborrament de més d'1
MB. Si teniu algun d'aquests dispositius, us recomanem de fer un
preparticionament del disc, utilitzant alguna eina de partionament
-alternativa, com ara gparted, i feu servir la configuració següent: </para>
+alternativa, com ara gparted, i feu servir la configuració següent:</para>
- <para>"Alinea a" "MiB" </para>
+ <para>"Alinea a" "MiB"</para>
- <para>"Espai lliure que precedeix a (MiB)" "2" </para>
+ <para>"Espai lliure que precedeix a (MiB)" "2"</para>
<para>Assegureu-vos també que totes les particions s'han creat amb un nombre
parell de megabytes.</para>
</warning>
-</section>
-
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/formatPartitions.xml b/docs/installer/ca/formatPartitions.xml
index 8dc1a8be..ea257169 100644
--- a/docs/installer/ca/formatPartitions.xml
+++ b/docs/installer/ca/formatPartitions.xml
@@ -19,9 +19,12 @@
<!-- NEEDS TO BE REVIEWED! -->
<!-- marja 2012-04-24 added screenshot -->
<!-- marja 2012-04-24 added emphasis tags in formatPartitions-pa1 -->
-<imageobject> <imagedata revision="1" fileref="dx2-formatPartitions.png"
-format="PNG" align="center" xml:id="formatPartitions-im1"> </imagedata>
-</imageobject></mediaobject>
+<imageobject condition='classical'> <imagedata revision="1"
+fileref="dx2-formatPartitions.png" format="PNG" align="center"
+xml:id="formatPartitions-im1"> </imagedata> </imageobject> <imageobject
+condition='live'> <imagedata revision="1"
+fileref="live-formatPartitions.png" format="PNG" align="center"
+xml:id="live-formatPartitions-im1"> </imagedata> </imageobject></mediaobject>
<para revision="2" xml:id="formatPartitions-pa1">Aquí podeu triar les particions que voleu formatar. Es conservaran totes les
dades de les particions que <emphasis>no</emphasis> estiguin marcades per a
diff --git a/docs/installer/ca/login.xml b/docs/installer/ca/login.xml
new file mode 100644
index 00000000..f3572bb3
--- /dev/null
+++ b/docs/installer/ca/login.xml
@@ -0,0 +1,24 @@
+<?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="login" version="5.0" xml:lang="ca">
+ <info>
+ <title xml:id="label-to-adapt-ti1">Login screen</title>
+ </info>
+
+ <mediaobject condition="live">
+ <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
+format="PNG" fileref="live-login.png"/> </imageobject>
+
+ <caption>
+ <para>KDM login screen</para>
+ </caption>
+ </mediaobject>
+
+ <para>Finally, you will come to the login screen.</para>
+
+ <para>Enter your user name and user password, and in a few seconds you will find
+yourself with a loaded KDE or GNOME desktop, depending on which live medium
+you used. You can now start using your Mageia installation.</para>
+
+ <para>You can find another part of our documentation in <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
+wiki</link>.</para>
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/reboot.xml b/docs/installer/ca/reboot.xml
new file mode 100644
index 00000000..9fe129ed
--- /dev/null
+++ b/docs/installer/ca/reboot.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="reboot" 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">
+ <info>
+ <title xml:id="reboot-ti1">Reinicia</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-reboot.png"
+format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
+
+ <para>Once the bootloader has been installed, you will be prompted to halt your
+computer, remove the live CD and restart the computer. When you restart, you
+will see a succession of download progress bars. These indicate that the
+software media are being downloaded (see Software management).</para>
+</section>
diff --git a/docs/installer/ca/selectKeyboardLive.xml b/docs/installer/ca/selectKeyboardLive.xml
new file mode 100644
index 00000000..029ca70b
--- /dev/null
+++ b/docs/installer/ca/selectKeyboardLive.xml
@@ -0,0 +1,14 @@
+<?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" version="5.0" xml:lang="ca" xml:id="selectKeyboardLive">
+ <info>
+ <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata xml:id="selectKeyboardLive-im1" revision="1"
+align="center" format="PNG" fileref="live-selectKeyboard.png"/>
+</imageobject></mediaobject>
+
+ <para>You will be required to set the keyboard layout you wish to use in
+Mageia​​. The default one is selected according to your language and
+timezone previously selected.</para>
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/selectLanguage.xml b/docs/installer/ca/selectLanguage.xml
index f4df5992..93872956 100644
--- a/docs/installer/ca/selectLanguage.xml
+++ b/docs/installer/ca/selectLanguage.xml
@@ -1,12 +1,4 @@
-<?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"
- version="5.0" xml:lang="ca" xml:id="selectLanguage">
-
+<?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="ca">
@@ -32,38 +24,40 @@
vostre continent. <application>Mageia</application> farà servir aquesta
selecció durant la instal·lació i per al sistema instal·lat.</para>
- <para>Si és probable que us calguin diversos idiomes instal·lats al sistema, tant
+ <para condition="classical">Si és probable que us calguin diversos idiomes instal·lats al sistema, tant
per un o diversos usuaris, hauríeu de fer servir el botó
<guibutton>Múltiples idiomes</guibutton> i afegir-los ara. Serà difícil
afegir els idiomes extres un cop feta la instal·lació.</para>
<mediaobject>
-<imageobject> <imagedata fileref="dx2-selectLanguage.png" align="center"
-format="PNG" > </imagedata> </imageobject></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>
- <warning>
+ <warning condition="classical">
<para>Encara que trieu més d'un idioma, n'heu de triar un com a l'idioma de
preferència a la pantalla de primer idioma. També es marcarà com a
seleccionat a la pantalla de múltiples idiomes.</para>
</warning>
<itemizedlist>
- <listitem>
+ <listitem condition="classical">
<para>Si l'idioma del vostre teclat no es correspon amb l'idioma preferit, llavors
és recomanable instal·lar també l'idioma del vostre teclat.</para>
</listitem>
<listitem>
- <para>Mageia té la codificació UTF-8 (Unicode) com a predeterminada. Es pot
-inhabilitar a la pantalla «múltiples idiomes» si sabeu que no cal per al
-vostre idioma. La desactivació d'UTF-8 s'aplica a tots els idiomes
-instal·lats.</para>
+ <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>Podeu canviar l'idioma del sistema després de la instal·lació, al centre de
-control de Mageia --&gt; Sistema --&gt; Gestiona la localització del
-sistema.</para>
+ <para>You can change the language of your system after installation in the Mageia
+Control Center -> System -> Manage localization for your system.</para>
</listitem>
</itemizedlist>
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/ca/setupBootloader.xml b/docs/installer/ca/setupBootloader.xml
index b07f0482..a9c85aad 100644
--- a/docs/installer/ca/setupBootloader.xml
+++ b/docs/installer/ca/setupBootloader.xml
@@ -1,94 +1,114 @@
<?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" version="5.0" xml:lang="ca" xml:id="setupBootloader">
- <info>
- <title xml:id="setupBootloader-ti1">Opcions principals del menú d'arrencada</title>
- </info>
+
- <mediaobject>
-<!-- 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+ <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-->
+<title xml:id="setupBootloader-ti1">Opcions principals del menú d'arrencada</title>
+ </info>
- 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist-->
+ <mediaobject>
<imageobject> <imagedata revision="1" align="center"
fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
format="PNG"/> </imageobject></mediaobject>
- <para><note>
- <para>With an UEFI system, the user interface is slightly different as you cannot
-choose the boot loader (first drop down list) since only one is available</para>
- </note></para>
+ <section>
+ <title>With a Bios system</title>
- <para xml:id="setupBootloader-pa1" revision="4">Si preferiu una configuració del gestor d'arrencada diferent de la que ha
+ <para xml:id="setupBootloader-pa1" revision="4">Si preferiu una configuració del gestor d'arrencada diferent de la que ha
estat triada automàticament, la podeu canviar aquí.</para>
- <para xml:id="setupBootloader-pa2" revision="4">Potser ja teniu un altre sistema operatiu a l'ordinador. En aquest cas, heu
+ <para xml:id="setupBootloader-pa2" revision="4">Potser ja teniu un altre sistema operatiu a l'ordinador. En aquest cas, heu
de decidir si voleu afegir Mageia al gestor d'arrencada existent, o bé
permetre a Mageia que en creï un de nou.</para>
- <tip>
- <para revision="2" xml:id="setupBootloader-pa3">Els menús gràfics de Mageia són bonics :)</para>
- </tip>
+ <tip>
+ <para>The Mageia graphical menus are nice :</para>
+ </tip>
- <section xml:id="usingMageiaBootloader">
- <info>
- <title xml:id="usingMageiaBootloader-ti2">Ús del gestor d'arrencada de Mageia</title>
- </info>
+ <section xml:id="usingMageiaBootloader">
+ <info>
+ <title xml:id="usingMageiaBootloader-ti2">Ús del gestor d'arrencada de Mageia</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa4">Per defecte, Mageia escriu un nou gestor d'arrencada GRUB (antic) a l'MBR
-(Master Boot Record) de la primera unitat de disc dur. Si ja teniu altres
-sistemes operatius instal·lats, Mageia provarà d'afegir-los al nou menú
-d'arrencada de Mageia.</para>
+ <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+(Master Boot Record) of your first hard drive. If you already have other
+operating systems installed, Mageia attempts to add them to your new Mageia
+boot menu.</para>
- <para revision="3">Mageia també ofereix GRUB2 com a gestor d'arrencada opcional, a més de
+ <para revision="3">Mageia també ofereix GRUB2 com a gestor d'arrencada opcional, a més de
l'antic GRUB i Lilo.</para>
- <warning>
- <para revision="3" xml:id="setupBootloader-pa6">Els sistemes Linux que fan servir el gestor d'arrencada GRUB2 no estan
-admesos actualment per GRUB (antic) i no seran reconeguts si es fa servir el
-gestor d'arrencada predeterminat GRUB.</para>
+ <warning>
+ <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+GRUB (legacy) and will not be recognized if the default GRUB bootloader is
+used.</para>
- <para revision="3">Aquí la millor solució és fer servir el gestor d'arrencada GRUB2, que està
+ <para revision="3">Aquí la millor solució és fer servir el gestor d'arrencada GRUB2, que està
disponible a la pàgina de resum durant la instal·lació.</para>
- </warning>
- </section>
+ </warning>
+ </section>
- <section xml:id="usingExistingBootloader">
- <info>
- <title revision="2" xml:id="usingExistingBootloader-ti4">Ús d'un gestor d'arrencada existent</title>
- </info>
+ <section xml:id="usingExistingBootloader">
+ <info>
+ <title revision="2" xml:id="usingExistingBootloader-ti4">Ús d'un gestor d'arrencada existent</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa46">Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de
+ <para revision="3" xml:id="setupBootloader-pa46">Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de
pensar a fer ATURA a la pàgina del resum durant la instal·lació, i fer clic
el botó de <guibutton>Configuració</guibutton> del gestor d'arrencada, que
us permetrà canviar-ne la localització.</para>
- <para revision="1" xml:id="setupBootloader-pa47">No seleccioneu un dispositiu, com ara «sda», o se sobreescriurà l'MBR
-existent. Heu de seleccionar la partició arrel que heu triat durant la fase
-prèvia de particionament, per exemple sda7.</para>
+ <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+MBR. You must select the root partition that you chose during the
+partitioning phase earlier, e.g. sda7.</para>
- <para xml:id="setupBootloader-pa48" revision="1">Perquè quedi clar, sda és un dispositiu, mentre que sda7 n'és una partició.</para>
+ <para xml:id="setupBootloader-pa48" revision="1">Perquè quedi clar, sda és un dispositiu, mentre que sda7 n'és una partició.</para>
- <tip>
- <para revision="1" xml:id="setupBootloader-pa48a">Aneu a tty2 amb Ctrl+Alt+F2 i escriviu <literal>df</literal> per a comprovar
+ <tip>
+ <para revision="1" xml:id="setupBootloader-pa48a">Aneu a tty2 amb Ctrl+Alt+F2 i escriviu <literal>df</literal> per a comprovar
on és la partició <literal>/</literal> (root). Ctrl+Alt+F7 us torna a la
pantalla d'instal·lació.</para>
- </tip>
+ </tip>
- <para revision="2" xml:id="setupBootloader-pa49">El procediment exacte per a afegir Mageia a un gestor d'arrencada ja
+ <para revision="2" xml:id="setupBootloader-pa49">El procediment exacte per a afegir Mageia a un gestor d'arrencada ja
existent està fora de l'abast d'aquesta ajuda, tot i que normalment
implicarà executar el programa d'instal·lació del gestor d'arrencada en
qüestió, que el detectarà i afegirà automàticament. Vegeu la documentació
del sistema operatiu corresponent.</para>
- </section>
+ </section>
- <section xml:id="advancedOptionBootloader">
- <info>
- <title revision="2" xml:id="advancedOptionBootloader-ti5">Opció avançada del gestor d'arrencada</title>
- </info>
+ <section xml:id="advancedOptionBootloader">
+ <info>
+ <title revision="2" xml:id="advancedOptionBootloader-ti5">Opció avançada del gestor d'arrencada</title>
+ </info>
- <para revision="3" xml:id="setupBootloader-pa52">Si l'espai de disc per a la partició <literal>/</literal> que conté
+ <para revision="3" xml:id="setupBootloader-pa52">Si l'espai de disc per a la partició <literal>/</literal> que conté
<literal>/tmp</literal> és molt limitat, cliqueu a
<guibutton>Avançat</guibutton> i marqueu la casella <guilabel>Neteja /tmp en
cada arrencada</guilabel>. Això ajudarà a mantenir espai lliure.</para>
+ </section>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>With an UEFI system, the user interface is slightly different as you cannot
+choose the boot loader since only Grub2-efi is available. </para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+
+ <para>If Mageia is the first system installed on your computer, the installer
+created an ESP (EFI System Partition) to receive the bootloader
+(Grub2-efi). If there was already UEFI operating systems previously
+installed on your computer (Windows 8 for example), the Mageia installer
+detected the existing ESP created by Windows and added grub2-efi. Although
+it is possible to have several ESPs, only one is advised and enough whatever
+the number of operating systems you have.</para>
+
+ <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
</section>
</section> \ No newline at end of file
diff --git a/docs/installer/ca/setupBootloaderAddEntry.xml b/docs/installer/ca/setupBootloaderAddEntry.xml
index 00a3de8d..03791c5d 100644
--- a/docs/installer/ca/setupBootloaderAddEntry.xml
+++ b/docs/installer/ca/setupBootloaderAddEntry.xml
@@ -1,6 +1,9 @@
<?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" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="ca">
+
+
<info>
- <title xml:id="setupBootloaderAddEntry-ti1">Addició o modificació d'una entrada al menú d'arrencada</title>
+ <!--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-->
+<title xml:id="setupBootloaderAddEntry-ti1">Addició o modificació d'una entrada al menú d'arrencada</title>
</info>
<mediaobject>
@@ -8,33 +11,55 @@
fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
- <para>Podeu afegir una entrada o modificar la que heu triat, prement el botó
+ <section>
+ <title>With a Bios system</title>
+
+ <para>Podeu afegir una entrada o modificar la que heu triat, prement el botó
adequat a la pantalla de <emphasis>Configuració de l'arrencada</emphasis> i
editant la pantalla que hi apareix.</para>
- <note>
- <para>If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for
-UEFI systems, you cannot use this tool to edit entries at this step, press
-'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use
-<code>grub-customizer</code> instead.</para>
- </note>
+ <note>
+ <para>If you have chosen <code>Grub 2</code> as your bootloader, you cannot use
+this tool to edit entries at this step, press 'Next'. You need to manually
+edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead.</para>
+ </note>
- <mediaobject>
+ <mediaobject>
<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
</imageobject></mediaobject>
- <para>Algunes coses que es poden fer sense perill són canviar l'etiqueta d'una
+ <para>Algunes coses que es poden fer sense perill són canviar l'etiqueta d'una
entrada i marcar la casella per a fer-la predeterminada.</para>
- <para>Podeu afegir el número de versió d'una entrada, o bé reanomenar-la
+ <para>Podeu afegir el número de versió d'una entrada, o bé reanomenar-la
completament.</para>
- <para>L'entrada predeterminada és aquella que es farà servir si no es fa cap
+ <para>L'entrada predeterminada és aquella que es farà servir si no es fa cap
selecció mentre el sistema està arrencant.</para>
- <warning>
- <para>L'edició d'altres coses us pot deixar amb un sistema que no pot arrencar. No
-proveu altres coses si no sabeu què esteu fent.</para>
- </warning>
+ <warning>
+ <para>Editing other things can leave you with an unbootable system. Please don't
+just try something without knowing what you are doing.</para>
+ </warning>
+ </section>
+
+ <section>
+ <title>With an UEFI system</title>
+
+ <para>In this case you are using Grub2-efi and you cannot use this tool to edit
+entries at this step. To do that you need to manually edit
+<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead. All you can do here, is to choose the default entry in the drop
+down list.</para>
+
+ <para>After a click on the <guibutton>Next</guibutton> button, another drop down
+list allows to choose the video resolution for Grub2 which is a graphical
+boot loader.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
+</imageobject></mediaobject>
+ </section>
</section> \ No newline at end of file
diff --git a/docs/installer/ca/takeOverHdConfirm.xml b/docs/installer/ca/takeOverHdConfirm.xml
index 317240c5..10df193b 100644
--- a/docs/installer/ca/takeOverHdConfirm.xml
+++ b/docs/installer/ca/takeOverHdConfirm.xml
@@ -12,15 +12,18 @@
-<mediaobject>
+ <mediaobject>
<!-- Made by marja on 2012 04 03 -->
<!-- test comment - johnr -->
<!-- 2012-04-24 marja - replaced "if you are not sure you selected the correct
hard disk." with "if you are not sure about your choice", because I'm sure I
saw this help screen when I had only one HD -->
<!-- 2013-05-05 marja added screenshot -->
-<imageobject> <imagedata fileref="dx2-takeOverHdConfirm.png" format="PNG"
-align="center" ></imagedata> </imageobject></mediaobject>
+<imageobject condition='live'> <imagedata
+fileref="live-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject> <imageobject condition='classical'> <imagedata
+fileref="dx2-takeOverHdConfirm.png" format="PNG" align="center"
+></imagedata> </imageobject></mediaobject>
<para revision="1" xml:id="takeOverHdConfirm-pa1">Cliqueu a <guibutton>Anterior</guibutton> si no esteu segur sobre la tria.</para>
diff --git a/docs/installer/ca/testing.xml b/docs/installer/ca/testing.xml
new file mode 100644
index 00000000..e7c23d18
--- /dev/null
+++ b/docs/installer/ca/testing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="testing" 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">
+ <info>
+ <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ </info>
+
+ <section xml:id="testing-1">
+ <info>
+ <title xml:id="testing1-ti1">Live mode</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode.png"/> </imageobject></mediaobject>
+
+ <para>You get this screen if you selected "Boot Mageia". If not, you get the
+"<link linkend="doPartitionDisks">Partitioning</link> step"</para>
+
+ <section>
+ <info>
+ <title xml:id="testing2-ti1">Testing hardware</title>
+ </info>
+
+ <para>One of the Live mode goals is to test if the hardware is correctly managed
+by Mageia. You can check if all devices have a driver in the Hardware
+section of the Mageia Control Center. You can test the most current devices:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>network interface: configure it with net_applet</para>
+ </listitem>
+
+ <listitem>
+ <para>graphical card: if you see the previous screen, it's already OK.</para>
+ </listitem>
+
+ <listitem>
+ <para>webcam:</para>
+ </listitem>
+
+ <listitem>
+ <para>sound: a jingle has already been played</para>
+ </listitem>
+
+ <listitem>
+ <para>printer: configure it and print a test page</para>
+ </listitem>
+
+ <listitem>
+ <para>scanner: scan a document from ...</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>If all is OK for you, you can process to the installation. If not, you can
+leave with the quit button.</para>
+
+ <remark>The configuration settings you made here are kept for the installation.</remark>
+ </section>
+
+ <section>
+ <info>
+ <title xml:id="testing3-ti1">Launch installation</title>
+ </info>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-liveMode-install.png"/>
+</imageobject></mediaobject>
+
+ <para>To launch the installation of Mageia LiveCD or Live DVD to the hard disc or
+SSD drive, simply click on the icon "Install on Hard Disk". You will get
+this screen, and then the "<link
+linkend="doPartitionDisks">Partitioning</link> step" as for the direct
+installation.</para>
+ </section>
+ </section>
+</section>
diff --git a/docs/installer/ca/uninstall-Mageia.xml b/docs/installer/ca/uninstall-Mageia.xml
index 601523e8..71f9ae59 100644
--- a/docs/installer/ca/uninstall-Mageia.xml
+++ b/docs/installer/ca/uninstall-Mageia.xml
@@ -1,5 +1,5 @@
<?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="ca" xml:id="uninstall-Mageia">
- <!-- -->
+ <!--Lebarhon 2015-07-06 Not true with UEFI -->
<info>
<title xml:id="uninstall-Mageia-ti1">Desinstal·lació de Mageia</title>
</info>
diff --git a/docs/installer/ca/unused.xml b/docs/installer/ca/unused.xml
new file mode 100644
index 00000000..2f1de8f8
--- /dev/null
+++ b/docs/installer/ca/unused.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="ca" xml:id="unused" 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">
+ <info>
+ <title xml:id="unused-ti1">Keep or delete unused material</title>
+ </info>
+
+ <mediaobject condition="live">
+<imageobject> <imagedata align="center" fileref="live-unused.png"
+format="PNG" revision="1" xml:id="unused-im1"/> </imageobject></mediaobject>
+
+ <para>In this step, the installer looks for unused locales packages and unused
+hardware packages. Then it proposes you to delete them. It is a good idea to
+accept, except if you prepare an installation which has to run on different
+hardware.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+</imageobject></mediaobject>
+
+ <para>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.</para>
+</section>
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index d0a06ece..ece9f90b 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -22,7 +22,7 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2016-02-10 16:29+0200\n"
-"PO-Revision-Date: 2016-04-01 21:21+0000\n"
+"PO-Revision-Date: 2016-04-11 16:09+0000\n"
"Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
"fr/)\n"
@@ -627,6 +627,13 @@ msgid ""
"press one key that will offer you to choose the peripheral from which the "
"computer will boot."
msgstr ""
+"Vous pouvez démarrer directement depuis le média habituellement utilisé pour "
+"graver vos images (CD-ROM, DVD-ROM...). Vous avez juste besoin de l'insérer "
+"dans votre lecteur CD/DVD pour que le chargeur d'amorçage démarre "
+"l'installation automatiquement après le redémarrage de l'ordinateur. Si cela "
+"n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer sur "
+"une touche (ex : F8) afin de choisir le périphérique sur lequel l'ordinateur "
+"devra démarrer."
#. type: Content of: <section><section><section><para>
#: en/bootLive.xml:23
@@ -651,6 +658,12 @@ msgid ""
"to reconfigure your BIOS or press one key that will offer you to choose the "
"peripheral from which the computer will boot."
msgstr ""
+"Vous pouvez démarrer depuis le périphérique USB sur lequel se trouve votre "
+"image ISO. Selon les paramètres de votre BIOS, l'ordinateur démarrera peut-"
+"être directement sur le périphérique USB déjà inséré dans le port. Si cela "
+"n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer sur "
+"une touche (ex : F8) afin de choisir le périphérique sur lequel l'ordinateur "
+"devra démarrer."
#. type: Content of: <section><section><info><title>
#: en/bootLive.xml:43
@@ -3121,6 +3134,11 @@ msgid ""
"will see a succession of download progress bars. These indicate that the "
"software media are being downloaded (see Software management)."
msgstr ""
+"Une fois le chargeur d'amorçage installé, vous serez invité à arrêter "
+"l'ordinateur, retirer le live CD, puis redémarrer. Lors du redémarrage, "
+"vous pourrez observer une succession de barres de progression de chargement. "
+"Cela indique que le média logiciel est en cours de chargement (voir Gestion "
+"des logiciels)."
#. type: Content of: <section><info><title>
#: en/resizeFATChoose.xml:16
@@ -3566,6 +3584,12 @@ msgid ""
"downloaded file is correct, or the number is different and you have a "
"failure. A failure infers that you should retry the download."
msgstr ""
+"Les deux checksums sont des nombres hexadécimaux calculés par un algorithme "
+"à partir du fichier à télécharger. Lorsque vous demandez à ces algorithmes "
+"de recalculer ce nombre depuis votre fichier téléchargé, soit le nombre "
+"correspond et votre fichier téléchargé est correct, soit le nombre est "
+"différent et votre fichier est corrompu. La corruption du fichier vous "
+"obligera à retélécharger celui-ci."
#. type: Content of: <section><section><section><para>
#: en/SelectAndUseISOs2.xml:323
@@ -4202,6 +4226,10 @@ msgid ""
"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
#. type: Content of: <section><warning><para>
#: en/selectLanguage.xml:39
@@ -4403,6 +4431,11 @@ msgid ""
"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
"do here, is to choose the default entry in the drop down list."
msgstr ""
+"Dans ce cas, vous utilisez Grub2-efi et vous ne pouvez pas utiliser cet "
+"outil pour modifier les entrées à cette étape. Pour faire cela, vous devez "
+"modifier manuellement <code>/boot/grub2/custom.cfg</code> ou utiliser "
+"<code>grub-customizer</code> à la place. Tout ce que vous pouvez faire ici, "
+"c'est choisir l'entrée par défaut dans la liste déroulante."
#. type: Content of: <section><section><para>
#: en/setupBootloaderAddEntry.xml:61
@@ -4623,6 +4656,14 @@ msgid ""
"several ESPs, only one is advised and enough whatever the number of "
"operating systems you have."
msgstr ""
+"Si Mageia est le premier système installé sur votre ordinateur, "
+"l'installateur créé une partition ESP (Partition système EFI) pour reçevoir "
+"le chargeur d'amorçage (Grub2-efi). Si un système d'exploitation utilisant "
+"l'UEFI est déjà présent sur votre ordinateur (Windows 8 par exemple), "
+"l'installateur de Mageia détecte la partition ESP existante créée par "
+"Windows et ajoute grub2-efi. Bien qu'il soit possible d'avoir plusieurs "
+"ESPs, une seule est conseillée (et suffit), peu importe le nombre de "
+"systèmes d'exploitation que vous utilisez."
#. type: Content of: <section><section><para>
#: en/setupBootloader.xml:128
diff --git a/docs/installer/fr/SelectAndUseISOs2.xml b/docs/installer/fr/SelectAndUseISOs2.xml
index b4e687eb..adf174e5 100644
--- a/docs/installer/fr/SelectAndUseISOs2.xml
+++ b/docs/installer/fr/SelectAndUseISOs2.xml
@@ -303,11 +303,12 @@ suivante apparaît alors :</para>
<section>
<title xml:id="integrity">Vérification de l'intégrité du média téléchargé</title>
- <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate this
-number from your downloaded file, either you have the same number and your
-downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download.</para>
+ <para>Les deux checksums sont des nombres hexadécimaux calculés par un algorithme
+à partir du fichier à télécharger. Lorsque vous demandez à ces algorithmes
+de recalculer ce nombre depuis votre fichier téléchargé, soit le nombre
+correspond et votre fichier téléchargé est correct, soit le nombre est
+différent et votre fichier est corrompu. La corruption du fichier vous
+obligera à retélécharger celui-ci.</para>
<para>Ouvrir une console, sans être administrateur, et :</para>
diff --git a/docs/installer/fr/bootLive.xml b/docs/installer/fr/bootLive.xml
index 987735a2..e73ed489 100644
--- a/docs/installer/fr/bootLive.xml
+++ b/docs/installer/fr/bootLive.xml
@@ -13,12 +13,13 @@
<title xml:id="bootLive11-ti1">A partir d'un disque dur</title>
</info>
- <para>You can boot directly from the media you used to burn your image (CD-ROM,
-DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
-bootloader to launch the installation automatically after rebooting the
-computer. If that does not happen you may need to reconfigure your BIOS or
-press one key that will offer you to choose the peripheral from which the
-computer will boot.</para>
+ <para>Vous pouvez démarrer directement depuis le média habituellement utilisé pour
+graver vos images (CD-ROM, DVD-ROM...). Vous avez juste besoin de l'insérer
+dans votre lecteur CD/DVD pour que le chargeur d'amorçage démarre
+l'installation automatiquement après le redémarrage de l'ordinateur. Si cela
+n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer sur
+une touche (ex : F8) afin de choisir le périphérique sur lequel l'ordinateur
+devra démarrer.</para>
<para>En fonction du matériel dont vous disposez, et de la manière dont il est
configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous.</para>
@@ -29,11 +30,12 @@ configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous.</para>
<title xml:id="bootLive12-ti1">A partir d'un périphérique USB</title>
</info>
- <para>You can boot from the USB device on which you dumped your image
-ISO. According to your BIOS settings, the computer boots perhaps directly on
-the USB device already plugged in a port. If that does not happen you may
-need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para>
+ <para>Vous pouvez démarrer depuis le périphérique USB sur lequel se trouve votre
+image ISO. Selon les paramètres de votre BIOS, l'ordinateur démarrera
+peut-être directement sur le périphérique USB déjà inséré dans le port. Si
+cela n'arrive pas, vous devrez peut-être reconfigurer votre BIOS ou appuyer
+sur une touche (ex : F8) afin de choisir le périphérique sur lequel
+l'ordinateur devra démarrer.</para>
</section>
</section>
diff --git a/docs/installer/fr/reboot.xml b/docs/installer/fr/reboot.xml
index b25d1d53..3af8ea07 100644
--- a/docs/installer/fr/reboot.xml
+++ b/docs/installer/fr/reboot.xml
@@ -13,8 +13,9 @@
<imageobject> <imagedata align="center" fileref="live-reboot.png"
format="PNG" revision="1" xml:id="reboot-im1"/> </imageobject></mediaobject>
- <para>Once the bootloader has been installed, you will be prompted to halt your
-computer, remove the live CD and restart the computer. When you restart, you
-will see a succession of download progress bars. These indicate that the
-software media are being downloaded (see Software management).</para>
+ <para>Une fois le chargeur d'amorçage installé, vous serez invité à arrêter
+l'ordinateur, retirer le live CD, puis redémarrer. Lors du redémarrage,
+vous pourrez observer une succession de barres de progression de
+chargement. Cela indique que le média logiciel est en cours de chargement
+(voir Gestion des logiciels).</para>
</section>
diff --git a/docs/installer/fr/setupBootloader.xml b/docs/installer/fr/setupBootloader.xml
index 1054f71d..ecf34c0e 100644
--- a/docs/installer/fr/setupBootloader.xml
+++ b/docs/installer/fr/setupBootloader.xml
@@ -105,13 +105,14 @@ disponible. </para>
<mediaobject>
<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
- <para>If Mageia is the first system installed on your computer, the installer
-created an ESP (EFI System Partition) to receive the bootloader
-(Grub2-efi). If there was already UEFI operating systems previously
-installed on your computer (Windows 8 for example), the Mageia installer
-detected the existing ESP created by Windows and added grub2-efi. Although
-it is possible to have several ESPs, only one is advised and enough whatever
-the number of operating systems you have.</para>
+ <para>Si Mageia est le premier système installé sur votre ordinateur,
+l'installateur créé une partition ESP (Partition système EFI) pour reçevoir
+le chargeur d'amorçage (Grub2-efi). Si un système d'exploitation utilisant
+l'UEFI est déjà présent sur votre ordinateur (Windows 8 par exemple),
+l'installateur de Mageia détecte la partition ESP existante créée par
+Windows et ajoute grub2-efi. Bien qu'il soit possible d'avoir plusieurs
+ESPs, une seule est conseillée (et suffit), peu importe le nombre de
+systèmes d'exploitation que vous utilisez.</para>
<para>Ne modifiez pas le "Périphérique de démarrage", à moins que vous ne sachiez
réellement ce que vous faites.</para>
diff --git a/docs/installer/fr/setupBootloaderAddEntry.xml b/docs/installer/fr/setupBootloaderAddEntry.xml
index c497e9fc..332e0af8 100644
--- a/docs/installer/fr/setupBootloaderAddEntry.xml
+++ b/docs/installer/fr/setupBootloaderAddEntry.xml
@@ -52,11 +52,11 @@ faites.</para>
<section>
<title>Avec un système UEFI</title>
- <para>In this case you are using Grub2-efi and you cannot use this tool to edit
-entries at this step. To do that you need to manually edit
-<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
-instead. All you can do here, is to choose the default entry in the drop
-down list.</para>
+ <para>Dans ce cas, vous utilisez Grub2-efi et vous ne pouvez pas utiliser cet
+outil pour modifier les entrées à cette étape. Pour faire cela, vous devez
+modifier manuellement <code>/boot/grub2/custom.cfg</code> ou utiliser
+<code>grub-customizer</code> à la place. Tout ce que vous pouvez faire ici,
+c'est choisir l'entrée par défaut dans la liste déroulante.</para>
<para>Après avoir cliqué sur le bouton <guibutton>Suivant</guibutton>, une autre
liste déroulante permet de choisir la résolution vidéo pour Grub2, qui est
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index 18fd2b04..d4f7014f 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -12,8 +12,9 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2016-02-10 16:29+0200\n"
-"PO-Revision-Date: 2016-02-05 07:41+0000\n"
-"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"PO-Revision-Date: 2016-04-11 13:58+0000\n"
+"Last-Translator: Kristoffer Grundström <kristoffer.grundstrom1983@gmail."
+"com>\n"
"Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
"sv/)\n"
"Language: sv\n"
@@ -36,6 +37,11 @@ msgid ""
"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
"\"live-license.png\"/> </imageobject>"
msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
#: en/acceptLicense.xml:40
@@ -532,7 +538,7 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/bestTime.xml:10
msgid "Clock settings"
-msgstr ""
+msgstr "Inställningar för klocka"
#. type: Content of: <section><mediaobject>
#: en/bestTime.xml:14
@@ -668,7 +674,7 @@ msgstr "F2 - Språk. Välj skärmens visningsspråk."
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/bootLive.xml:93
msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr ""
+msgstr "F3 - Skärmupplösning. Välj mellan text, 640x400, 800x600, 1024x728"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/bootLive.xml:98
@@ -687,6 +693,9 @@ msgid ""
"optional disk with a driver update and will require its insertion during "
"installation process."
msgstr ""
+"F5 - Drivrutin. Ja eller Nej. Systemet är medvetet om närvaron av en "
+"alternativ disk med en drivrutinsuppdatering och kommer att kräva att den "
+"sätts in under installationsprocessen."
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/bootLive.xml:112
@@ -1674,7 +1683,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 "Installation från ett LIVE-media"
#. type: Content of: <book><info>
#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
@@ -2442,7 +2451,7 @@ msgstr "Inoggningsskärm för KDM"
#. type: Content of: <section><para>
#: en/login.xml:16
msgid "Finally, you will come to the login screen."
-msgstr ""
+msgstr "Slutligen så kommer du till inloggningsskärmen."
#. type: Content of: <section><para>
#: en/login.xml:18
@@ -3030,11 +3039,13 @@ msgid ""
"Mageia is distributed via ISO images. This page will help you to choose "
"which image match your needs."
msgstr ""
+"Mageia distribueras via ISO-avbilder. Den här sidan kommer att hjälpa dig "
+"att välja den avbild som passar dina behov bäst."
#. type: Content of: <section><section><para>
#: en/SelectAndUseISOs2.xml:14
msgid "There is two families of media:"
-msgstr ""
+msgstr "Det finns två media-familjer:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:18
@@ -3834,7 +3845,7 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/selectKeyboardLive.xml:3
msgid "Select keyboard"
-msgstr ""
+msgstr "Välj tangentbord"
#. type: Content of: <section><mediaobject>
#: en/selectKeyboardLive.xml:7
@@ -3843,6 +3854,9 @@ msgid ""
"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
#. type: Content of: <section><para>
#: en/selectKeyboardLive.xml:12
@@ -3960,19 +3974,16 @@ msgstr ""
#. type: Content of: <section><mediaobject>
#: en/selectLanguage.xml:29
-#, fuzzy
msgid ""
"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
"imageobject>"
msgstr ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
#. type: Content of: <section><warning><para>
#: en/selectLanguage.xml:39
@@ -3997,7 +4008,7 @@ msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/selectLanguage.xml:52
msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr ""
+msgstr "Mageia använder UTF-8 (Unicode)-stöd som standard."
#. type: Content of: <section><itemizedlist><listitem><para>
#: en/selectLanguage.xml:54
@@ -4078,7 +4089,7 @@ msgstr ""
#. type: Content of: <section><section><title>
#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
msgid "With a Bios system"
-msgstr ""
+msgstr "Med ett BIOS-system"
#. type: Content of: <section><section><para>
#: en/setupBootloaderAddEntry.xml:18
@@ -4151,7 +4162,7 @@ msgstr ""
#. type: Content of: <section><section><title>
#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
msgid "With an UEFI system"
-msgstr ""
+msgstr "Med ett UEFI-system"
#. type: Content of: <section><section><para>
#: en/setupBootloaderAddEntry.xml:55
@@ -4176,6 +4187,8 @@ msgid ""
"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><info><title>
#: en/setupBootloader.xml:7
@@ -4216,7 +4229,7 @@ msgstr ""
#. type: Content of: <section><section><tip><para>
#: en/setupBootloader.xml:29
msgid "The Mageia graphical menus are nice :"
-msgstr ""
+msgstr "Mageia's grafiska menyer är fina :"
#. type: Content of: <section><section><section><info><title>
#: en/setupBootloader.xml:34
@@ -4346,6 +4359,8 @@ msgid ""
"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
"imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><para>
#: en/setupBootloader.xml:120
@@ -4506,6 +4521,11 @@ msgid ""
"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
"imageobject>"
msgstr ""
+"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
+"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
+"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+"imageobject>"
#. type: Content of: <section><para>
#: en/takeOverHdConfirm.xml:27
@@ -4527,17 +4547,18 @@ msgstr ""
#. type: Content of: <section><info><title>
#: en/testing.xml:9
msgid "Testing Mageia as Live system"
-msgstr ""
+msgstr "Testar Mageia som ett Live-system"
#. type: Content of: <section><section><info><title>
#: en/testing.xml:14
msgid "Live mode"
-msgstr ""
+msgstr "Live-läge"
#. type: Content of: <section><section><mediaobject>
#: en/testing.xml:18
msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
#. type: Content of: <section><section><para>
#: en/testing.xml:23
@@ -4549,7 +4570,7 @@ msgstr ""
#. type: Content of: <section><section><section><info><title>
#: en/testing.xml:28
msgid "Testing hardware"
-msgstr ""
+msgstr "Testar hårdvara"
#. type: Content of: <section><section><section><para>
#: en/testing.xml:31
@@ -4562,32 +4583,32 @@ msgstr ""
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/testing.xml:38
msgid "network interface: configure it with net_applet"
-msgstr ""
+msgstr "nätverksgränssnitt: konfigurera det med net_applet"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/testing.xml:42
msgid "graphical card: if you see the previous screen, it's already OK."
-msgstr ""
+msgstr "grafik-kort: om du ser den föregående skärmen så är det redan OK."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/testing.xml:47
msgid "webcam:"
-msgstr ""
+msgstr "webbkamera:"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/testing.xml:51
msgid "sound: a jingle has already been played"
-msgstr ""
+msgstr "ljud: en jingel har redan spelats upp"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/testing.xml:55
msgid "printer: configure it and print a test page"
-msgstr ""
+msgstr "skrivare: konfigurera den och skriv ut en test-sida"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/testing.xml:59
msgid "scanner: scan a document from ..."
-msgstr ""
+msgstr "skanner: skanna ett dokument från ..."
#. type: Content of: <section><section><section><para>
#: en/testing.xml:63
@@ -4595,6 +4616,8 @@ msgid ""
"If all is OK for you, you can process to the installation. If not, you can "
"leave with the quit button."
msgstr ""
+"Om allt är OK för dig så kan du fortsätta till installationen. Om inte så "
+"kan du lämna med Avsluta-knappen."
#. type: Content of: <section><section><section><remark>
#: en/testing.xml:66
@@ -4604,7 +4627,7 @@ msgstr ""
#. type: Content of: <section><section><section><info><title>
#: en/testing.xml:72
msgid "Launch installation"
-msgstr ""
+msgstr "Påbörja installationen"
#. type: Content of: <section><section><section><mediaobject>
#: en/testing.xml:76
diff --git a/docs/installer/sv/DrakLive-cover.xml b/docs/installer/sv/DrakLive-cover.xml
index 0a422bd9..309ced02 100644
--- a/docs/installer/sv/DrakLive-cover.xml
+++ b/docs/installer/sv/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="sv" xml:id="Quick-Startup">
<info>
- <title>Installation from LIVE medium</title>
+ <title>Installation från ett LIVE-media</title>
<publisher> <publishername>Mageia.org</publishername> </publisher>
<revhistory>
<revision>
@@ -27,7 +27,7 @@ om du vill hjälpa till och förbättra den här manualen.</para>
</cover>
</info>
<article>
- <title>Installation from LIVE medium</title>
+ <title>Installation från ett LIVE-media</title>
<para><note>
<para>Ingen kommer att se alla installerarens skärmbilder som du ser i den här
handboken. Vilka skärmbilder som just du kommer att se beror på din hårdvara
diff --git a/docs/installer/sv/DrakLive.xml b/docs/installer/sv/DrakLive.xml
index ad9e3fd4..60a25288 100644
--- a/docs/installer/sv/DrakLive.xml
+++ b/docs/installer/sv/DrakLive.xml
@@ -1,6 +1,6 @@
<?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="sv" xml:id="Quick-Startup">
<info>
- <title>Installation from LIVE medium</title>
+ <title>Installation från ett LIVE-media</title>
<cover>
<para><note>
diff --git a/docs/installer/sv/SelectAndUseISOs2.xml b/docs/installer/sv/SelectAndUseISOs2.xml
index 451b8a84..410f8290 100644
--- a/docs/installer/sv/SelectAndUseISOs2.xml
+++ b/docs/installer/sv/SelectAndUseISOs2.xml
@@ -9,10 +9,10 @@
<section>
<title>Presentation</title>
- <para>Mageia is distributed via ISO images. This page will help you to choose
-which image match your needs.</para>
+ <para>Mageia distribueras via ISO-avbilder. Den här sidan kommer att hjälpa dig
+att välja den avbild som passar dina behov bäst.</para>
- <para>There is two families of media:</para>
+ <para>Det finns två media-familjer:</para>
<itemizedlist>
<listitem>
diff --git a/docs/installer/sv/bestTime.xml b/docs/installer/sv/bestTime.xml
index 1698ea08..caa27079 100644
--- a/docs/installer/sv/bestTime.xml
+++ b/docs/installer/sv/bestTime.xml
@@ -7,7 +7,7 @@
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title xml:id="bestTime-ti1">Clock settings</title>
+ <title xml:id="bestTime-ti1">Inställningar för klocka</title>
</info>
<mediaobject condition="live">
diff --git a/docs/installer/sv/bootLive.xml b/docs/installer/sv/bootLive.xml
index 8887a3e5..067b5703 100644
--- a/docs/installer/sv/bootLive.xml
+++ b/docs/installer/sv/bootLive.xml
@@ -84,7 +84,7 @@ anslutet. (fungerar inte med Mageia 5).</para>
</listitem>
<listitem>
- <para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para>
+ <para>F3 - Skärmupplösning. Välj mellan text, 640x400, 800x600, 1024x728</para>
</listitem>
<listitem>
@@ -96,9 +96,9 @@ this option.</para>
</listitem>
<listitem>
- <para>F5 - Driver. Yes or No. The system is aware about the presence of an
-optional disk with a driver update and will require its insertion during
-installation process.</para>
+ <para>F5 - Drivrutin. Ja eller Nej. Systemet är medvetet om närvaron av en
+alternativ disk med en drivrutinsuppdatering och kommer att kräva att den
+sätts in under installationsprocessen.</para>
</listitem>
<listitem>
diff --git a/docs/installer/sv/login.xml b/docs/installer/sv/login.xml
index 0a7f03b0..fb1c4102 100644
--- a/docs/installer/sv/login.xml
+++ b/docs/installer/sv/login.xml
@@ -12,7 +12,7 @@ format="PNG" fileref="live-login.png"/> </imageobject>
</caption>
</mediaobject>
- <para>Finally, you will come to the login screen.</para>
+ <para>Slutligen så kommer du till inloggningsskärmen.</para>
<para>Enter your user name and user password, and in a few seconds you will find
yourself with a loaded KDE or GNOME desktop, depending on which live medium
diff --git a/docs/installer/sv/selectKeyboardLive.xml b/docs/installer/sv/selectKeyboardLive.xml
index ea56c3ed..915061a3 100644
--- a/docs/installer/sv/selectKeyboardLive.xml
+++ b/docs/installer/sv/selectKeyboardLive.xml
@@ -1,6 +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/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" version="5.0" xml:lang="sv" xml:id="selectKeyboardLive">
<info>
- <title xml:id="selectKeyboardLive-ti1">Select keyboard</title>
+ <title xml:id="selectKeyboardLive-ti1">Välj tangentbord</title>
</info>
<mediaobject>
diff --git a/docs/installer/sv/selectLanguage.xml b/docs/installer/sv/selectLanguage.xml
index 86d6cca6..fae4985c 100644
--- a/docs/installer/sv/selectLanguage.xml
+++ b/docs/installer/sv/selectLanguage.xml
@@ -32,7 +32,7 @@ ytterligare språkstöd efter installationen.</para>
<mediaobject>
<imageobject condition="classical"> <imagedata align="center"
fileref="dx2-selectLanguage.png" format="PNG"/> </imageobject> <imageobject
-condition="live"> <imagedata format="PNG" fileref="live-language.png"/>
+condition="live"> <imagedata fileref="live-language.png" format=""/>
</imageobject></mediaobject>
<warning condition="classical">
@@ -48,7 +48,7 @@ rutan för flera språk.</para>
</listitem>
<listitem>
- <para>Mageia uses UTF-8 (Unicode) support by default. </para>
+ <para>Mageia använder UTF-8 (Unicode)-stöd som standard.</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
diff --git a/docs/installer/sv/setupBootloader.xml b/docs/installer/sv/setupBootloader.xml
index a6480e48..1adf9ffb 100644
--- a/docs/installer/sv/setupBootloader.xml
+++ b/docs/installer/sv/setupBootloader.xml
@@ -15,7 +15,7 @@ fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
format="PNG"/> </imageobject></mediaobject>
<section>
- <title>With a Bios system</title>
+ <title>Med ett BIOS-system</title>
<para xml:id="setupBootloader-pa1" revision="4">Om du föredrar olika inställningar för starthanteraren för de som är
automatiskt valda av installationen så kan du ändra dessa här.</para>
@@ -25,7 +25,7 @@ välja om du vill lägga till Mageia in den existerande starthanteraren, eller
tillåta Mageia att skapa en ny.</para>
<tip>
- <para>The Mageia graphical menus are nice :</para>
+ <para>Mageia's grafiska menyer är fina :</para>
</tip>
<section xml:id="usingMageiaBootloader">
@@ -93,7 +93,7 @@ ledigt utrymme.</para>
</section>
<section>
- <title>With an UEFI system</title>
+ <title>Med ett UEFI-system</title>
<para>With an UEFI system, the user interface is slightly different as you cannot
choose the boot loader since only Grub2-efi is available. </para>
diff --git a/docs/installer/sv/setupBootloaderAddEntry.xml b/docs/installer/sv/setupBootloaderAddEntry.xml
index a6cc9c96..c9f39988 100644
--- a/docs/installer/sv/setupBootloaderAddEntry.xml
+++ b/docs/installer/sv/setupBootloaderAddEntry.xml
@@ -12,7 +12,7 @@ fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
<section>
- <title>With a Bios system</title>
+ <title>Med ett BIOS-system</title>
<para>Du kan lägga till en post eller redigera förstavalet genom att klicka på
tillhörande knapp på skrärmen för <emphasis>Konfigurering av
@@ -46,7 +46,7 @@ just try something without knowing what you are doing.</para>
</section>
<section>
- <title>With an UEFI system</title>
+ <title>Med ett UEFI-system</title>
<para>In this case you are using Grub2-efi and you cannot use this tool to edit
entries at this step. To do that you need to manually edit
diff --git a/docs/installer/sv/testing.xml b/docs/installer/sv/testing.xml
index 9bde3a42..9164a652 100644
--- a/docs/installer/sv/testing.xml
+++ b/docs/installer/sv/testing.xml
@@ -6,12 +6,12 @@
xmlns:ns3="http://www.w3.org/1998/Math/MathML"
xmlns:ns="http://docbook.org/ns/docbook">
<info>
- <title xml:id="testing-ti1">Testing Mageia as Live system</title>
+ <title xml:id="testing-ti1">Testar Mageia som ett Live-system</title>
</info>
<section xml:id="testing-1">
<info>
- <title xml:id="testing1-ti1">Live mode</title>
+ <title xml:id="testing1-ti1">Live-läge</title>
</info>
<mediaobject>
@@ -22,7 +22,7 @@
<section>
<info>
- <title xml:id="testing2-ti1">Testing hardware</title>
+ <title xml:id="testing2-ti1">Testar hårdvara</title>
</info>
<para>One of the Live mode goals is to test if the hardware is correctly managed
@@ -31,39 +31,39 @@ section of the Mageia Control Center. You can test the most current devices:</pa
<itemizedlist>
<listitem>
- <para>network interface: configure it with net_applet</para>
+ <para>nätverksgränssnitt: konfigurera det med net_applet</para>
</listitem>
<listitem>
- <para>graphical card: if you see the previous screen, it's already OK.</para>
+ <para>grafik-kort: om du ser den föregående skärmen så är det redan OK.</para>
</listitem>
<listitem>
- <para>webcam:</para>
+ <para>webbkamera:</para>
</listitem>
<listitem>
- <para>sound: a jingle has already been played</para>
+ <para>ljud: en jingel har redan spelats upp</para>
</listitem>
<listitem>
- <para>printer: configure it and print a test page</para>
+ <para>skrivare: konfigurera den och skriv ut en test-sida</para>
</listitem>
<listitem>
- <para>scanner: scan a document from ...</para>
+ <para>skanner: skanna ett dokument från ...</para>
</listitem>
</itemizedlist>
- <para>If all is OK for you, you can process to the installation. If not, you can
-leave with the quit button.</para>
+ <para>Om allt är OK för dig så kan du fortsätta till installationen. Om inte så
+kan du lämna med Avsluta-knappen.</para>
<remark>The configuration settings you made here are kept for the installation.</remark>
</section>
<section>
<info>
- <title xml:id="testing3-ti1">Launch installation</title>
+ <title xml:id="testing3-ti1">Påbörja installationen</title>
</info>
<mediaobject>