aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
authorDimitris Tsiamasiotis <dtsiamasiotis@gmail.com>2014-05-03 17:26:45 +0300
committerDimitris Tsiamasiotis <dtsiamasiotis@gmail.com>2014-05-03 17:26:45 +0300
commit2c589098b7232e9cc5b410b65dc9ae934df9deb0 (patch)
tree22251727f790aeac020416df5b086689c33735bb /docs/installer
parentd718e339162413d0586a97fce107c4d421504d9e (diff)
parentd835ec1715f20bf2c4b73674f7901848f447b178 (diff)
downloadtools-2c589098b7232e9cc5b410b65dc9ae934df9deb0.tar
tools-2c589098b7232e9cc5b410b65dc9ae934df9deb0.tar.gz
tools-2c589098b7232e9cc5b410b65dc9ae934df9deb0.tar.bz2
tools-2c589098b7232e9cc5b410b65dc9ae934df9deb0.tar.xz
tools-2c589098b7232e9cc5b410b65dc9ae934df9deb0.zip
update greek translation
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/ca.po502
-rw-r--r--docs/installer/cs.po322
-rw-r--r--docs/installer/de.po355
-rw-r--r--docs/installer/el.po482
-rw-r--r--docs/installer/en/installer.xml185
-rw-r--r--docs/installer/eo.po357
-rw-r--r--docs/installer/es.po353
-rw-r--r--docs/installer/et.po353
-rw-r--r--docs/installer/fr.po343
-rw-r--r--docs/installer/help.pot264
-rw-r--r--docs/installer/id.po342
-rw-r--r--docs/installer/nl.po356
-rw-r--r--docs/installer/pl.po353
-rw-r--r--docs/installer/pt_BR.po356
-rw-r--r--docs/installer/ro.po356
-rw-r--r--docs/installer/ru.po350
-rw-r--r--docs/installer/sl.po330
-rw-r--r--docs/installer/sq.po311
-rw-r--r--docs/installer/sv.po332
-rw-r--r--docs/installer/tr.po343
-rw-r--r--docs/installer/uk.po389
-rw-r--r--docs/installer/uk/installer.xml162
22 files changed, 5804 insertions, 1692 deletions
diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index c2967319..b90b5234 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help 3.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-02-28 09:40+0100\n"
"Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
"Language-Team: Catalan <>\n"
@@ -97,9 +97,9 @@ msgstr "ca"
msgid "Media Selection (Configure Supplemental Installation Media)"
msgstr "Selecció dels suports (configura suports d'instal·lació suplementaris)"
-#. papoteur 2013-04-13 - created
-#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#. papoteur 2013-04-13 - created
+#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
+#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
#. type: Content of: <section><mediaobject>
#: en/add_supplemental_media.xml:18
msgid ""
@@ -153,19 +153,19 @@ msgstr ""
msgid "User and Superuser Management"
msgstr "Gestió d'usuaris i superusuari"
-#. 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
+#. 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
#. removed para xml:id's, finished the page using Led43's text in the wiki, but
-#. changed his text about the Advanced User Managment screen (the only thing
-#. about guest account there, is the box you can tick or untick to enable or
+#. changed his text about the Advanced User Managment screen (the only thing
+#. about guest account there, is the box you can tick or untick to enable or
#. disable it, the rest is about the normal user you're adding in the previous
#. screen), marja, 20120409
#. barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#. "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
+#. "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
#. type: Content of: <section><mediaobject>
#: en/addUser.xml:27
msgid ""
@@ -404,17 +404,17 @@ msgstr ""
msgid "Choose the mount points"
msgstr "Trieu els punts de muntatge"
-#. Made by marja on 2012 03 28
-#. NEEDS TO BE REVIEWED!
-#. SimonNZG 2012-04-03 has taken a look but needs to come back
-#. removed para xml:id's, marja, 20120409
+#. Made by marja on 2012 03 28
+#. NEEDS TO BE REVIEWED!
+#. SimonNZG 2012-04-03 has taken a look but needs to come back
+#. removed para xml:id's, marja, 20120409
#. barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#. with "a", as I can't imagine having more than one root partition ;)
-#. Lebarhon : I put [] where it seems having mistakes
+#. with "a", as I can't imagine having more than one root partition ;)
+#. Lebarhon : I put [] where it seems having mistakes
#. Marja: you're right, in English English it is "its type", however, the Americans
#. 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
+#. And JohnR says the Americans are WRONG! :-))
+#. 2012-04-19 Language proofreading done
#. type: Content of: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
msgid ""
@@ -670,8 +670,8 @@ msgstr ""
msgid "Configure your Services"
msgstr "Configura els serveis"
-#. 2012-12-25 marja - moved this section out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this section out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureServices.xml:21
msgid ""
@@ -723,8 +723,8 @@ msgstr "Canvieu coses només si teniu molt clar què esteu fent."
msgid "Configure your Timezone"
msgstr "Configura la zona horària"
-#. 2012-12-25 marja - moved this part out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureTimezoneUTC.xml:20
msgid ""
@@ -982,8 +982,7 @@ msgid ""
"correctly identify yours."
msgstr ""
"DrakX té una base de dades de monitors força completa i normalment "
-"identificarà "
-"correctament el vostre."
+"identificarà correctament el vostre."
#. type: Content of: <section><warning><para>
#: en/configureX_monitor.xml:26
@@ -1451,9 +1450,9 @@ msgstr ""
msgid "Congratulations"
msgstr "Enhorabona"
-#. Started by marja on 2012 03 29
-#. NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#. marja - 2012-04-24 added screenshot and text
+#. Started by marja on 2012 03 29
+#. NEEDS TO BE WRITTEN AND THEN REVIEWED!
+#. marja - 2012-04-24 added screenshot and text
#. same day, added "s" to "sytems"
#. type: Content of: <section><mediaobject>
#: en/exitInstall.xml:14
@@ -1512,10 +1511,10 @@ msgstr ""
msgid "Formatting"
msgstr "Formatació"
-#. Made by marja on 2012 03 29
-#. NEEDS TO BE REVIEWED!
-#. marja 2012-04-24 added screenshot
-#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#. Made by marja on 2012 03 29
+#. NEEDS TO BE REVIEWED!
+#. marja 2012-04-24 added screenshot
+#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
#. type: Content of: <section><mediaobject>
#: en/formatPartitions.xml:18
msgid ""
@@ -1576,12 +1575,12 @@ msgstr ""
"per a continuar."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, l'instal·lador de Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1592,7 +1591,7 @@ msgstr ""
"instal·lació o actualització tan fàcil com sigui possible."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1601,26 +1600,37 @@ msgstr ""
"predeterminada engegarà l'instal·lador, que normalment és tot el que cal."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Pantalla de benvinguda de la instal·lació"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1628,21 +1638,211 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Si hi ha problemes durant la instal·lació, llavors potser cal utilitzar "
-"paràmetres especials d'instal·lació. Vegeu <xref linkend="
-"\"installationOptions\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Si la instal·lació falla, potser és necessari tornar-ho a provar utilitzant "
+"alguna de les opcions addicionals disponibles prement el botó <guibutton>F1 "
+"(Ajuda)</guibutton>. Vegeu <xref linkend=\"dx-welcome\"/>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Els passos de la instal·lació"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1651,7 +1851,7 @@ msgstr ""
"veure en el plafó lateral de la pantalla."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1661,7 +1861,7 @@ msgstr ""
"habituals."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1670,7 +1870,7 @@ msgstr ""
"dóna més explicacions sobre el pas actual."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1690,56 +1890,18 @@ msgstr ""
"<guibutton>Alt Ctrl F2</guibutton>. Després premeu alhora <guibutton>Alt "
"Ctrl Delete </guibutton> per a reiniciar."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opcions d'instal·lació"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Si la instal·lació falla, potser és necessari tornar-ho a provar utilitzant "
-"alguna de les opcions addicionals disponibles prement "
-"el botó <guibutton>F1 (Ajuda)</guibutton>. "
-"Vegeu <xref linkend=\"dx-welcome\"/>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Això obrirà l'ajuda següent en mode text."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Pantalla d'ajuda de la instal·lació"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Problemes en la instal·lació i possibles solucions"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Sense interfície gràfica"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1751,13 +1913,14 @@ msgstr ""
"consola."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Si el maquinari és molt antic, potser la instal·lació gràfica no és "
"possible. En aquest cas val la pena provar una instal·lació en mode text. "
@@ -1767,12 +1930,12 @@ msgstr ""
"instal·lació en mode text.<emphasis></emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "La instal·lació es penja"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1787,12 +1950,12 @@ msgstr ""
"d'altres."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opcions del nucli"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -1810,10 +1973,10 @@ msgstr ""
msgid "Updates"
msgstr "Actualitzacions"
-#. Made by marja on 2012 03 30
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 03 30
+#. NEEDS TO BE REVIEWED!
#. marja 20120418 removed 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"" from section tag, trying to restore correct html filename
-#. marja, 2012-04-24 added screenshot
+#. marja, 2012-04-24 added screenshot
#. type: Content of: <section><mediaobject>
#: en/installUpdates.xml:13
msgid ""
@@ -1855,9 +2018,9 @@ msgstr "Llavors premeu <guibutton>Següent</guibutton> per a continuar."
msgid "Media Selection (Nonfree)"
msgstr "Selecció del suport (Nonfree)"
-#. papoteur 2013-04-11 - created
+#. papoteur 2013-04-11 - created
#. marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
#. type: Content of: <section><mediaobject>
#: en/media_selection.xml:12
@@ -1947,11 +2110,10 @@ msgid ""
"Selection, see <xref linkend=\"choosePackagesTree\"></xref>."
msgstr ""
"La instal·lació mínima és per a aquelles persones que tenen en ment uns usos "
-"específics de <application>Mageia</application>, com ara un servidor o bé una "
-"estació de treball especialitzada. Probablement es farà servir aquesta opció "
-"combinada amb la Selecció Manual de Paquets, vegeu <xref "
-"linkend=\"choosePackagesTree"
-"\"></xref>."
+"específics de <application>Mageia</application>, com ara un servidor o bé "
+"una estació de treball especialitzada. Probablement es farà servir aquesta "
+"opció combinada amb la Selecció Manual de Paquets, vegeu <xref linkend="
+"\"choosePackagesTree\"></xref>."
#. type: Content of: <section><para>
#: en/minimal-install.xml:14
@@ -1978,18 +2140,18 @@ msgstr ""
msgid "Summary of miscellaneous parameters"
msgstr "Resum dels paràmetres diversos"
-#. Started by marja on 2012 03 31
-#. NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
+#. Started by marja on 2012 03 31
+#. NEEDS TO BE WRITTEN AND REVIEWED!
+#. marja - 2012 04 15 added some text, not much, unfortunately :(
+#. marja 2012-04-24 added screenshots
#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#. the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#. 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#. 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
+#. marja 2012-04-24 added 2 links to other help pages
+#. marja 2012-04-24 added some text in the drakxid-configureServices and
+#. the drakxid-miscellaneous section
+#. marja 2012-04-24 corrected "Magaia" in the last paragraph
+#. marja 2012-04-24 corrected para xml:id number in the last paragraph
+#. 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
+#. 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
#. type: Content of: <section><mediaobject>
#: en/misc-params.xml:33
@@ -2323,8 +2485,8 @@ msgstr ""
msgid "Security Level"
msgstr "Nivell de seguretat"
-#. 2012-12-25 marja - moved this part out of misc-params.xml"
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml"
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/securityLevel.xml:19
msgid ""
@@ -2362,8 +2524,8 @@ msgstr ""
msgid "Select your Country / Region"
msgstr "Seleccioneu país / regió"
-#. 2012-12-25 marja - moved this section out of misc-params
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this section out of misc-params
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/selectCountry.xml:21
msgid ""
@@ -2700,10 +2862,10 @@ msgstr ""
msgid "Select mouse"
msgstr "Seleccioneu el ratolí"
-#. Made by marja on 2012 04 11
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 04 11
+#. NEEDS TO BE REVIEWED!
#. adding some "real" text now that we know the page shows up in the right place
-#. marja 2012-04-24 adding screenshot
+#. marja 2012-04-24 adding screenshot
#. type: Content of: <section><mediaobject>
#: en/selectMouse.xml:16
msgid ""
@@ -2819,7 +2981,7 @@ msgid "Bootloader main options"
msgstr "Opcions principals del menú d'arrencada"
#
-#. 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+#. 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
#. 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
#. type: Content of: <section><mediaobject>
#: en/setupBootloader.xml:11
@@ -2988,14 +3150,14 @@ msgstr ""
msgid "Setup SCSI"
msgstr "Configuració SCSI"
-#. Made by marja on 2012 04 02
-#. NEEDS TO BE REVIEWED!
-#. JohnR - edited 2012-03-03
-#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#. marja 2012-04-24 added screenshot
+#. Made by marja on 2012 04 02
+#. NEEDS TO BE REVIEWED!
+#. JohnR - edited 2012-03-03
+#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
+#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
+#. marja 2012-04-24 added screenshot
#. marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#. Mdv doc instead of on our setupSCSI file
+#. Mdv doc instead of on our setupSCSI file
#. type: Content of: <section><mediaobject>
#: en/setupSCSI.xml:26
msgid ""
@@ -3035,7 +3197,7 @@ msgstr ""
msgid "Sound Configuration"
msgstr "Configuració del so"
-#. Started by marja on 2013-12-07
+#. Started by marja on 2013-12-07
#. type: Content of: <section><mediaobject>
#: en/soundConfig.xml:17
msgid ""
@@ -3114,12 +3276,12 @@ msgstr ""
msgid "Confirm hard disk to be formatted"
msgstr "Confirmeu el disc dur que es formatarà"
-#. Made by marja on 2012 04 03
-#. test comment - johnr
+#. 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
+#. saw this help screen when I had only one HD
+#. 2013-05-05 marja added screenshot
#. type: Content of: <section><mediaobject>
#: en/takeOverHdConfirm.xml:19
msgid ""
@@ -3146,3 +3308,41 @@ msgstr ""
"Feu clic a <guibutton>Següent</guibutton> si esteu segur i voleu esborrar "
"totes les particions, tots els sistemes operatius i totes les dades del disc."
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Si hi ha problemes durant la instal·lació, llavors potser cal utilitzar "
+#~ "paràmetres especials d'instal·lació. Vegeu <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opcions d'instal·lació"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Això obrirà l'ajuda següent en mode text."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Pantalla d'ajuda de la instal·lació"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opcions del nucli"
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index 36ee2674..d8c1345d 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2013-12-16 08:48+0000\n"
"Last-Translator: jui <appukonrad@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
@@ -1308,12 +1308,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1321,33 +1321,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
msgstr ""
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr ""
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1355,39 +1366,228 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1399,52 +1599,18 @@ msgid ""
"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr ""
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1452,22 +1618,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1477,12 +1643,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
+#: en/installer.xml:256
+msgid "RAM problem"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -2584,3 +2750,21 @@ msgid ""
"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
"partition, every operating system and all data on that hard disk."
msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
diff --git a/docs/installer/de.po b/docs/installer/de.po
index 553ca917..f1d787e6 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2013-12-08 18:35+0000\n"
"Last-Translator: latte <marc.lattemann@web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/mageia/language/"
@@ -1627,12 +1627,12 @@ msgstr ""
"guibutton>, um mit der Installation fortzufahren."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, das Mageia Installationsprogramm"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1643,7 +1643,7 @@ msgstr ""
"Installation oder eine Aktualisierung so leicht wie möglich macht."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1653,25 +1653,38 @@ msgstr ""
"Sie tun müssen."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Willkommensbildschirm der Installation"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1679,21 +1692,212 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Treten während der Installation Probleme auf, kann es nötig sein, spezielle "
-"Installationsoptionen zu verwenden, siehe <xref linkend=\"installationOptions"
-"\"/>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Falls die Installation nicht funktioniert, kann es nötig sein, sie mit einer "
+"der zusätzlichen Optionen zu wiederholen. Betätigen Sie dafür den Knopf "
+"<guibutton>\"F1\" (Hilfe)</guibutton>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Die Installationsschritte"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1702,7 +1906,7 @@ msgstr ""
"linken Seite des Bildschirms verfolgt werden können."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1712,7 +1916,7 @@ msgstr ""
"zusätzlichen Optionen haben."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1721,7 +1925,7 @@ msgstr ""
"über den Sie weitere Erklärungen zum momentan ausgeführten Schritt erhalten."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1743,54 +1947,18 @@ msgstr ""
"\">Alt+Strg+F2</emphasis>. Anschließend betätigen Sie <emphasis role=\"bold"
"\">Alt+Strg+Entf</emphasis>, um einen Neustart auszulösen."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Installationsoptionen"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Falls die Installation nicht funktioniert, kann es nötig sein, sie mit einer "
-"der zusätzlichen Optionen zu wiederholen. Betätigen Sie dafür den Knopf "
-"<guibutton>\"F1\" (Hilfe)</guibutton>."
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Dies öffnet die die nachfolgend gezeigte textbasierte Hilfe."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Hilfebildschirm der Installation"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Installationsprobleme und mögliche Lösungen"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Keine grafische Schnittstelle"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1802,13 +1970,14 @@ msgstr ""
"code> eingeben."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Ist die Hardware sehr alt, kann unter Umständen eine grafische Installation "
"nicht möglich sein. In diesem Falle sollten Sie eine Installation im "
@@ -1819,12 +1988,12 @@ msgstr ""
"Textmodus des Installationsprogramms zu gelangen."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Die Installation friert ein"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1842,12 +2011,12 @@ msgstr ""
"ist."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kernel Optionen"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3242,3 +3411,41 @@ msgstr ""
"Klicken Sie auf <guibutton>Weiter</guibutton>, wenn Sie sich sicher sind und "
"jede Partition, jedes Betriebssystem und alle Daten auf dem Laufwerk löschen "
"wollen."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Treten während der Installation Probleme auf, kann es nötig sein, "
+#~ "spezielle Installationsoptionen zu verwenden, siehe <xref linkend="
+#~ "\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Installationsoptionen"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Dies öffnet die die nachfolgend gezeigte textbasierte Hilfe."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Hilfebildschirm der Installation"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kernel Optionen"
diff --git a/docs/installer/el.po b/docs/installer/el.po
index d782ae22..34a72622 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help 3.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-02-28 07:16+0100\n"
"Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
"Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -98,9 +98,9 @@ msgstr "el"
msgid "Media Selection (Configure Supplemental Installation Media)"
msgstr "Επιλογή μέσων (Διαμόρφωση επιπρόσθετων μέσων εγκατάστασης)"
-#. papoteur 2013-04-13 - created
-#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#. papoteur 2013-04-13 - created
+#. marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
+#. marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
#. type: Content of: <section><mediaobject>
#: en/add_supplemental_media.xml:18
msgid ""
@@ -155,19 +155,19 @@ msgstr ""
msgid "User and Superuser Management"
msgstr "Διαχείριση χρήστη και διαχειριστή"
-#. 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
+#. 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
#. removed para xml:id's, finished the page using Led43's text in the wiki, but
-#. changed his text about the Advanced User Managment screen (the only thing
-#. about guest account there, is the box you can tick or untick to enable or
+#. changed his text about the Advanced User Managment screen (the only thing
+#. about guest account there, is the box you can tick or untick to enable or
#. disable it, the rest is about the normal user you're adding in the previous
#. screen), marja, 20120409
#. barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#. "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
+#. "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
#. type: Content of: <section><mediaobject>
#: en/addUser.xml:27
msgid ""
@@ -416,17 +416,17 @@ msgstr ""
msgid "Choose the mount points"
msgstr "Επιλογή των σημείων προσάρτησης"
-#. Made by marja on 2012 03 28
-#. NEEDS TO BE REVIEWED!
-#. SimonNZG 2012-04-03 has taken a look but needs to come back
-#. removed para xml:id's, marja, 20120409
+#. Made by marja on 2012 03 28
+#. NEEDS TO BE REVIEWED!
+#. SimonNZG 2012-04-03 has taken a look but needs to come back
+#. removed para xml:id's, marja, 20120409
#. barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#. with "a", as I can't imagine having more than one root partition ;)
-#. Lebarhon : I put [] where it seems having mistakes
+#. with "a", as I can't imagine having more than one root partition ;)
+#. Lebarhon : I put [] where it seems having mistakes
#. Marja: you're right, in English English it is "its type", however, the Americans
#. 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
+#. And JohnR says the Americans are WRONG! :-))
+#. 2012-04-19 Language proofreading done
#. type: Content of: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
msgid ""
@@ -688,8 +688,8 @@ msgstr ""
msgid "Configure your Services"
msgstr "Διαμορφώστε τις υπηρεσίες σας"
-#. 2012-12-25 marja - moved this section out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this section out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureServices.xml:21
msgid ""
@@ -742,8 +742,8 @@ msgstr "Αλλάξτε κάτι μόνο αν γνωρίζετε πολύ καλ
msgid "Configure your Timezone"
msgstr "Διαμόρφωση της ζώνης ώρας"
-#. 2012-12-25 marja - moved this part out of misc-params.xml
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/configureTimezoneUTC.xml:20
msgid ""
@@ -1476,9 +1476,9 @@ msgstr ""
msgid "Congratulations"
msgstr "Συγχαρητήρια"
-#. Started by marja on 2012 03 29
-#. NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#. marja - 2012-04-24 added screenshot and text
+#. Started by marja on 2012 03 29
+#. NEEDS TO BE WRITTEN AND THEN REVIEWED!
+#. marja - 2012-04-24 added screenshot and text
#. same day, added "s" to "sytems"
#. type: Content of: <section><mediaobject>
#: en/exitInstall.xml:14
@@ -1539,10 +1539,10 @@ msgstr ""
msgid "Formatting"
msgstr "Μορφοποίηση"
-#. Made by marja on 2012 03 29
-#. NEEDS TO BE REVIEWED!
-#. marja 2012-04-24 added screenshot
-#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#. Made by marja on 2012 03 29
+#. NEEDS TO BE REVIEWED!
+#. marja 2012-04-24 added screenshot
+#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1
#. type: Content of: <section><mediaobject>
#: en/formatPartitions.xml:18
msgid ""
@@ -1606,12 +1606,12 @@ msgstr ""
"guibutton> για να συνεχίσετε."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, ο οδηγός εγκατάστασης της Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1623,7 +1623,7 @@ msgstr ""
"ευκολότερα."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1632,26 +1632,37 @@ msgstr ""
"εκκινήσει τον οδηγό εγκατάστασης, και τυπικά είναι αυτό που χρειαζόσαστε."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Η πρώτη οθόνη καλωσορίσματος στην εγκατάσταση"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1659,21 +1670,199 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Αν παρουσιαστούν προβλήματα κατά την εγκατάσταση, τότε ίσως να χρειαστεί να "
-"χρησιμοποιήσετε ειδικές επιλογές, δείτε <xref linkend=\"installationOptions"
-"\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Αν αποτύχει η εγκατάσταση τότε ίσως να χρειαστεί να δοκιμάσετε ξανά "
+"χρησιμοποιώντας μια από τις επιπλέον επιλογές διαθέσιμες με το πάτημα του "
+"κουμπιού F1 (Βοήθεια) δείτε <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Τα βήματα εγκατάστασης"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1682,7 +1871,7 @@ msgstr ""
"οποία μπορείτε να παρακολουθήσετε στον πλευρικό πίνακα της οθόνης."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1692,7 +1881,7 @@ msgstr ""
"συνήθως δεν θα χρειαστεί να επιλέξετε."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1701,7 +1890,7 @@ msgstr ""
"όπου θα βρείτε περισσότερες πληροφορίες σχετικά με το τρέχον βήμα."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1723,57 +1912,18 @@ msgstr ""
"πατήστε <guibutton>Alt Ctrl Delete</guibutton> ταυτόχρονα για να κάνετε "
"επανεκκίνηση."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Επιλογές εγκατάστασης"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Αν αποτύχει η εγκατάσταση τότε ίσως να χρειαστεί να δοκιμάσετε ξανά "
-"χρησιμοποιώντας μια από τις επιπλέον επιλογές διαθέσιμες με το πάτημα του "
-"κουμπιού F1 (Βοήθεια) δείτε <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-"Στη συνέχεια θα ανοίξει το παρακάτω παράθυρο κειμένου βοήθειας για την "
-"εγκατάσταση."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Η πρώτη οθόνη βοήθειας εγκατάστασης"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Προβλήματα στην εγκατάσταση και πιθανές λύσεις"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Δεν λειτουργεί το γραφικό περιβάλλον"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1785,13 +1935,14 @@ msgstr ""
"<code>vgalo</code> στην προτροπή."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Αν πρόκειται για πολύ παλιό υλικό, ίσως η εγκατάσταση σε γραφικό περιβάλλον "
"να είναι αδύνατη. Σε αυτή την περίπτωση μπορείτε να δοκιμάσετε την "
@@ -1801,12 +1952,12 @@ msgstr ""
"Τώρα συνεχίστε την εγκατάσταση σε λειτουργία κειμένου.<emphasis></emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Πάγωμα της εγκατάστασης"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1822,12 +1973,12 @@ msgstr ""
"κριθεί απαραίτητο."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Επιλογές πυρήνα"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -1845,10 +1996,10 @@ msgstr ""
msgid "Updates"
msgstr "Ενημερώσεις"
-#. Made by marja on 2012 03 30
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 03 30
+#. NEEDS TO BE REVIEWED!
#. marja 20120418 removed 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"" from section tag, trying to restore correct html filename
-#. marja, 2012-04-24 added screenshot
+#. marja, 2012-04-24 added screenshot
#. type: Content of: <section><mediaobject>
#: en/installUpdates.xml:13
msgid ""
@@ -1891,9 +2042,9 @@ msgstr "Έπειτα κάντε κλικ στο <guibutton>Επόμενο</guibu
msgid "Media Selection (Nonfree)"
msgstr "Επιλογή μέσων (Nonfree)"
-#. papoteur 2013-04-11 - created
+#. papoteur 2013-04-11 - created
#. marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#. marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
#. type: Content of: <section><mediaobject>
#: en/media_selection.xml:12
@@ -2016,18 +2167,18 @@ msgstr ""
msgid "Summary of miscellaneous parameters"
msgstr "Σύνοψη των διάφορων παραμέτρων"
-#. Started by marja on 2012 03 31
-#. NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
+#. Started by marja on 2012 03 31
+#. NEEDS TO BE WRITTEN AND REVIEWED!
+#. marja - 2012 04 15 added some text, not much, unfortunately :(
+#. marja 2012-04-24 added screenshots
#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#. the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#. 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#. 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
+#. marja 2012-04-24 added 2 links to other help pages
+#. marja 2012-04-24 added some text in the drakxid-configureServices and
+#. the drakxid-miscellaneous section
+#. marja 2012-04-24 corrected "Magaia" in the last paragraph
+#. marja 2012-04-24 corrected para xml:id number in the last paragraph
+#. 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
+#. 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
#. type: Content of: <section><mediaobject>
#: en/misc-params.xml:33
@@ -2373,8 +2524,8 @@ msgstr ""
msgid "Security Level"
msgstr "Επίπεδο ασφάλειας"
-#. 2012-12-25 marja - moved this part out of misc-params.xml"
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this part out of misc-params.xml"
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/securityLevel.xml:19
msgid ""
@@ -2413,8 +2564,8 @@ msgstr ""
msgid "Select your Country / Region"
msgstr "Επιλέξτε τη χώρα/περιοχή σας"
-#. 2012-12-25 marja - moved this section out of misc-params
-#. 2013-05-05 marja - added screenshot
+#. 2012-12-25 marja - moved this section out of misc-params
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
#: en/selectCountry.xml:21
msgid ""
@@ -2761,10 +2912,10 @@ msgstr ""
msgid "Select mouse"
msgstr "Επιλογή ποντικιού"
-#. Made by marja on 2012 04 11
-#. NEEDS TO BE REVIEWED!
+#. Made by marja on 2012 04 11
+#. NEEDS TO BE REVIEWED!
#. adding some "real" text now that we know the page shows up in the right place
-#. marja 2012-04-24 adding screenshot
+#. marja 2012-04-24 adding screenshot
#. type: Content of: <section><mediaobject>
#: en/selectMouse.xml:16
msgid ""
@@ -2883,7 +3034,7 @@ msgstr ""
msgid "Bootloader main options"
msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
-#. 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+#. 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
#. 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
#. type: Content of: <section><mediaobject>
#: en/setupBootloader.xml:11
@@ -3055,14 +3206,14 @@ msgstr ""
msgid "Setup SCSI"
msgstr "Διαμόρφωση SCSI"
-#. Made by marja on 2012 04 02
-#. NEEDS TO BE REVIEWED!
-#. JohnR - edited 2012-03-03
-#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#. marja 2012-04-24 added screenshot
+#. Made by marja on 2012 04 02
+#. NEEDS TO BE REVIEWED!
+#. JohnR - edited 2012-03-03
+#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
+#. barjac has re-reviewed and made some minor tweaks. Revisions incremented.
+#. marja 2012-04-24 added screenshot
#. marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#. Mdv doc instead of on our setupSCSI file
+#. Mdv doc instead of on our setupSCSI file
#. type: Content of: <section><mediaobject>
#: en/setupSCSI.xml:26
msgid ""
@@ -3105,7 +3256,7 @@ msgstr ""
msgid "Sound Configuration"
msgstr "Ρύθμιση του ήχου"
-#. Started by marja on 2013-12-07
+#. Started by marja on 2013-12-07
#. type: Content of: <section><mediaobject>
#: en/soundConfig.xml:17
msgid ""
@@ -3185,12 +3336,12 @@ msgstr ""
msgid "Confirm hard disk to be formatted"
msgstr "Επιβεβαίωση του σκληρού δίσκου προς μορφοποίηση"
-#. Made by marja on 2012 04 03
-#. test comment - johnr
+#. 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
+#. saw this help screen when I had only one HD
+#. 2013-05-05 marja added screenshot
#. type: Content of: <section><mediaobject>
#: en/takeOverHdConfirm.xml:19
msgid ""
@@ -3220,6 +3371,47 @@ msgstr ""
"συστημάτων και όλων των δεδομένων στον συγκεκριμένο σκληρό δίσκο."
#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Αν παρουσιαστούν προβλήματα κατά την εγκατάσταση, τότε ίσως να χρειαστεί "
+#~ "να χρησιμοποιήσετε ειδικές επιλογές, δείτε <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Επιλογές εγκατάστασης"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr ""
+#~ "Στη συνέχεια θα ανοίξει το παρακάτω παράθυρο κειμένου βοήθειας για την "
+#~ "εγκατάσταση."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Η πρώτη οθόνη βοήθειας εγκατάστασης"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Επιλογές πυρήνα"
+
+#~ msgid ""
#~ "This section allows you to fine tune your sound card. In most cases the "
#~ "options selected will work with your computer."
#~ msgstr ""
diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
index eb7e9fca..da773cf5 100644
--- a/docs/installer/en/installer.xml
+++ b/docs/installer/en/installer.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/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:id="installer">
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installer" version="5.0">
<!-- Made by marja on 2012 03 30, using barjac's text -->
<!-- NEEDS TO BE REVIEWED! -->
@@ -35,17 +34,151 @@
<title xml:id="installer-ti2">Installation Welcome Screen</title>
</info>
+ <para>Here is the default welcome screen when using a Mageia
+ DVD:</para>
+
<mediaobject>
<imageobject>
- <imagedata revision="1" fileref="../dx-welcome.png" align="center"
- format="PNG" xml:id="BId-drakx-intro-im1">
- </imagedata>
+ <imagedata xml:id="BId-drakx-intro-im1" revision="1" align="center" format="PNG" fileref="../dx-welcome.png"/>
</imageobject>
</mediaobject>
</figure>
- <para>If there are problems during install, then it may be necessary to use
- special installation options, see <xref linkend="installationOptions"></xref>.</para>
+ <para>From this first screen, it is possible to set some personal
+ preferences:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>The language (for the installation only, may be different that the
+ chosen language for the system) by pressing the key F2</para>
+
+ <para/>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome-lang.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para>Use the arrow keys to select the language and press the key
+ Enter.</para>
+
+ <para>Here is for example, the French welcome screen when using a Live
+ DVD/CD. Note that the Live DVD/CD menu does not propose:
+ <guilabel>Rescue System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
+ Detection Tool</guilabel>.</para>
+
+ <para/>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome4fr.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para/>
+ </listitem>
+
+ <listitem>
+ <para>Change the screen resolution by pressing the F3 key.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome5def.png"/>
+ </imageobject>
+ </mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>Add some kernel options by pressing the F6 key.</para>
+
+ <para>If the installation fails, then it may be necessary to try again
+ using one of the extra options. The menu called by F6 displays a new
+ line called <guilabel>Boot options</guilabel> and propose four
+ entries:</para>
+
+ <para>- Default, it doesn't alter anything in the default
+ options.</para>
+
+ <para>- Safe Settings, priority is given to the safer options to the
+ detriment of performances.</para>
+
+ <para>- No ACPI (Advanced Configuration and Power Interface), power
+ management isn't taken into account.</para>
+
+ <para>- No Local APIC (Local Advanced Programmable Interrupt
+ Controller), it is about CPU interruptions, select this option if you
+ are asked for.</para>
+
+ <para>When you select one of these entries, it modifies the default options
+ displayed in the <guilabel>Boot Options</guilabel> line.</para>
+
+ <note>
+ <para>In some Mageia releases, it may happen that the entries selected
+ with the key F6 does not appear in the <guilabel>Boot Options</guilabel> line, however, they
+ are really taken into account.</para>
+ </note>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcome6opt.png"/>
+ </imageobject>
+ </mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>Add more kernel options by pressing the key F1</para>
+
+ <para>Pressing F1 opens a new window with more available options. Select
+ one with the arrow keys and press Enter to have more details or press
+ the Esc key to go back to the welcome screen.</para>
+
+ <para/>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcomeHelp1.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para/>
+
+ <para>The detailed view about the option splash. Press Esc or select
+ <guilabel>Return to Boot Options</guilabel> to go back to the options
+ list. These options can by added by hand in the <guilabel>Boot
+ options</guilabel> line.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="dx-welcomeHelp2.png"/>
+ </imageobject>
+ </mediaobject>
+
+ <para/>
+
+ <note>
+ <para>The help is translated in the chosen language with the F2
+ key.</para>
+ </note>
+ </listitem>
+ </itemizedlist>
+
+ <para>Here is the default welcome screen when using a Wired Network-based
+ Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
+
+ <para>It does not allow to change the language, the available options are
+ described in the screen. For more information about using a Wired
+ Network-based Installation CD, see <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia Wiki</link></para>
+
+ <warning>
+ <para>The keyboard layout is the American one.</para>
+ </warning>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata revision="1" xml:id="installer-im2" align="center" format="PNG" fileref="../dx-help.png"/>
+ </imageobject>
+ </mediaobject>
<section xml:id="installationSteps">
<info>
@@ -76,30 +209,6 @@
</section>
<section xml:id="installationOptions">
- <info>
- <title xml:id="installationOptions-ti1">Installation options</title>
- </info>
-
- <para>If the installation fails then it may be necessary to try again by
- using one of the extra options available by hitting the <guibutton>F1
- (Help)</guibutton> key see <xref linkend="dx-welcome"></xref></para>
-
- <para>This will open the following text based help.</para>
-
- <figure xml:id="dx-help">
- <info>
- <title xml:id="installationOptions-ti2">Installation Help
- Screen</title>
- </info>
-
- <mediaobject>
- <imageobject>
- <imagedata revision="1" fileref="../dx-help.png" align="center"
- format="PNG" xml:id="installer-im2"></imagedata>
- </imageobject>
- </mediaobject>
- </figure>
-
<section xml:id="installationProblems">
<info>
<title xml:id="installationProblems-ti1">Installation Problems and
@@ -120,12 +229,12 @@
</listitem>
<listitem>
- <para revision="2">If the hardware is very old, a graphical installation may
- not be possible. In this case it is worth trying a text mode
- installation. To use this hit ESC at the first welcome screen and
- confirm with ENTER. You will be presented with a black screen with
- the word "boot:". Type "text" and hit ENTER. Now continue with the
- installation in text mode.<emphasis></emphasis></para>
+ <para revision="2">If the hardware is very old, a graphical
+ installation may not be possible. In this case it is worth trying
+ a text mode installation. To use this hit ESC at the first welcome
+ screen and confirm with ENTER. You will be presented with a black
+ screen with the word "boot:". Type "text" and hit ENTER. Now
+ continue with the installation in text mode.</para>
</listitem>
</itemizedlist>
</section>
@@ -144,7 +253,7 @@
<section xml:id="kernelOptions">
<info>
- <title xml:id="kernelOptions-ti1">Kernel Options</title>
+ <title xml:id="kernelOptions-ti1">RAM problem</title>
</info>
<para>These will rarely be needed, but in some cases the hardware may
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index c39a5e1e..3df87063 100644
--- a/docs/installer/eo.po
+++ b/docs/installer/eo.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-01-16 06:20+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/"
@@ -1518,12 +1518,12 @@ msgstr ""
"por daŭrigi."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, la instalilo de Magejo"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1533,7 +1533,7 @@ msgstr ""
"estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1542,26 +1542,38 @@ msgstr ""
"mageja instalilo, kiu kutime havos ĉion kion oni bezonas."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Bonveniga instal-ekrano"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" width="
-"\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"BId-drakx-"
-"intro-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summary-im2\"></imagedata> </"
+"imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1569,20 +1581,212 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Se okazus problemoj dum la instalado, tiam povus esti necese uzi specialajn "
-"instalajn elektojn, vidu <xref linkend=\"installationOptions\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Se la instalo malsukcesas tiam povas esti necese provi denove kaj uzi unu el "
+"la aldonaj elektoj aperontaj per la premo de la klavo F1 (Helpo), vidu <xref "
+"linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summary-im2\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "La instal-paŝoj"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1591,7 +1795,7 @@ msgstr ""
"la flanka panelo de la ekrano."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1601,7 +1805,7 @@ msgstr ""
"bezonataj elektoj."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1610,7 +1814,7 @@ msgstr ""
"havigantan pliajn karigojn pri tiu paŝo."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1629,55 +1833,18 @@ msgstr ""
"<guibutton>Alt Ctrl F2</guibutton> samtempe. Post tio, premu <guibutton>Alt "
"Ctrl Delete</guibutton> samtempe por reŝarĝi."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Instal-elektoj"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Se la instalo malsukcesas tiam povas esti necese provi denove kaj uzi unu el "
-"la aldonaj elektoj aperontaj per la premo de la klavo F1 (Helpo), vidu <xref "
-"linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Ĉi tio malfermos la jenan teksto-bazitan helpon."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Instala helpo-ekrano"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" width=\"720\" format=\"PNG\" depth=\"400\" xml:id=\"installer-"
-"im2\"></imagedata> </imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Instal-problemoj kaj eblaj solvoj"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Sen grafika interfaco"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1688,13 +1855,14 @@ msgstr ""
"utiligi malaltan rezolucion per la tajpo de \"vgalo\" en la komand-linio."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Se la aparataro estas tre malnova, grafika instalo povas esti neebla. Ĉikaze "
"povas esti rekomendinde provi teksto-bazitan instalon. Por tio premu la "
@@ -1703,12 +1871,12 @@ msgstr ""
"daŭrigu la instaladon tekste. <emphasis></emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Instal-paneoj"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1722,12 +1890,12 @@ msgstr ""
"Ĉi tiu elekto povas ankaŭ esti miksita kun la antaŭa se estas necese."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kernaj elektoj"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -2999,3 +3167,42 @@ msgid ""
"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
"partition, every operating system and all data on that hard disk."
msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"BId-"
+#~ "drakx-intro-im1\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Se okazus problemoj dum la instalado, tiam povus esti necese uzi "
+#~ "specialajn instalajn elektojn, vidu <xref linkend=\"installationOptions"
+#~ "\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Instal-elektoj"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Ĉi tio malfermos la jenan teksto-bazitan helpon."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Instala helpo-ekrano"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" width=\"720\" format=\"PNG\" depth=\"400\" xml:id=\"installer-"
+#~ "im2\"></imagedata> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kernaj elektoj"
diff --git a/docs/installer/es.po b/docs/installer/es.po
index cc23cdbe..d992cf4b 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2013-12-20 16:26+0100\n"
"Last-Translator: Marja van Waes <marja@mageia.org>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -1584,12 +1584,12 @@ msgstr ""
"guibutton> para continuar."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, el instalador de Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1600,7 +1600,7 @@ msgstr ""
"posible."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1609,25 +1609,37 @@ msgstr ""
"iniciará el instalador, que normalmente será todo lo que necesite."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Pantalla de bienvenida del Instalador"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
-msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </imageobject>"
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1635,21 +1647,211 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Si tiene problemas durante la instalación, puede que sea necesario usar "
-"opciones especiales de instalación, vea <xref linkend=\"installationOptions"
-"\"/>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Si la instalación falla, puede ser necesario volver a intentarlo usando una "
+"de las opciones extra disponibles pulsando <guibutton>F1 (Help)</guibutton>. "
+"Vea <xref linkend=\"dx-welcome\"/>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Los pasos de la instalación"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1658,7 +1860,7 @@ msgstr ""
"seguidos en el panel lateral de la pantalla."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1667,7 +1869,7 @@ msgstr ""
"<guibutton>Avanzados</guibutton> con opciones extra, normalmente poco usadas."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1676,7 +1878,7 @@ msgstr ""
"que le darán explicaciones sobre el paso en cuestión."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1695,54 +1897,18 @@ msgstr ""
"pulsando al mismo tiempo <guibutton>Alt Ctrl F2</guibutton>. Después, pulse "
"<guibutton>Alt Ctrl Delete</guibutton> simultáneamente para reiniciar."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opciones de instalación"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Si la instalación falla, puede ser necesario volver a intentarlo usando una "
-"de las opciones extra disponibles pulsando <guibutton>F1 (Help)</guibutton>. "
-"Vea <xref linkend=\"dx-welcome\"/>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Esto abrirá la siguiente página de ayuda en texto."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Pantalla de Ayuda de la Instalación"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\" /> </imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Problemas en la Instalación y Posibles Soluciones."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "No hay Interfaz Gráfica"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1754,13 +1920,14 @@ msgstr ""
"code> en la terminal."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Si el hardware es muy antiguo, puede que no sea posible hacer una "
"instalación gráfica. En este caso merece la pena intentar una instalación en "
@@ -1770,12 +1937,12 @@ msgstr ""
"texto."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "La Instalación se congela"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1790,12 +1957,12 @@ msgstr ""
"con otras si es necesario."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opciones del Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3144,3 +3311,41 @@ msgid ""
msgstr ""
"Haga click en <guibutton>Siguiente</guibutton> si está seguro y quiereborrar "
"todas las particiones, sistemas operativos y datos de su disco duro."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Si tiene problemas durante la instalación, puede que sea necesario usar "
+#~ "opciones especiales de instalación, vea <xref linkend="
+#~ "\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opciones de instalación"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Esto abrirá la siguiente página de ayuda en texto."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Pantalla de Ayuda de la Instalación"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\" /> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opciones del Kernel"
diff --git a/docs/installer/et.po b/docs/installer/et.po
index 29634120..539c0d28 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-01-02 18:46+0000\n"
"Last-Translator: Marek Laane <bald@smail.ee>\n"
"Language-Team: Estonian <i18n-discuss@ml.mageia.org>\n"
@@ -1569,12 +1569,12 @@ msgstr ""
"guibutton>."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "Mageia paigaldusprogramm DrakX"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1585,7 +1585,7 @@ msgstr ""
"uuendamine oleks kõigile võimalikult lihtne."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1594,25 +1594,37 @@ msgstr ""
"paigaldusprogrammi, mida tavaliselt ongi vaja."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Paigaldusprogrammi avaekraan"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-summaryBottom.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"summaryBottom-im1\"/> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1620,21 +1632,211 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Kui paigaldamise ajal tekib probleeme, võib olla vajalik kasutada "
-"spetsiaalseid paigaldusvõtmeid, mille kohta vaadake <xref linkend="
-"\"installationOptions\"/>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
+"kasutades mõnda lisavõtit, mille nägemiseks tuleb vajutada klahvi "
+"<guibutton>F1 (Abi)</guibutton>, vt ka <xref linkend=\"dx-welcome\"/>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-summaryBottom.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"summaryBottom-im1\"/> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Paigaldamise etapid"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1643,7 +1845,7 @@ msgstr ""
"külgpaneelil."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1653,7 +1855,7 @@ msgstr ""
"vajalikud valikud."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1662,7 +1864,7 @@ msgstr ""
"etappi põhjalikumalt."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1682,54 +1884,18 @@ msgstr ""
"guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
"<guibutton>Alt Ctrl Delete</guibutton>."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Paigaldamisvõtmed"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
-"kasutades mõnda lisavõtit, mille nägemiseks tuleb vajutada klahvi "
-"<guibutton>F1 (Abi)</guibutton>, vt ka <xref linkend=\"dx-welcome\"/>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "See avab järgmise tekstipõhise abiekraani."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Paigaldamise abiekraan"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Graafiline liides puudub"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1740,13 +1906,14 @@ msgstr ""
"ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik "
"olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage "
@@ -1756,12 +1923,12 @@ msgstr ""
"<emphasis/>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Paigaldamine hangub"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1776,12 +1943,12 @@ msgstr ""
"võtmetega."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kerneli võtmed"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3119,6 +3286,44 @@ msgstr ""
"kõik andmed."
#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-welcome.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"BId-drakx-intro-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Kui paigaldamise ajal tekib probleeme, võib olla vajalik kasutada "
+#~ "spetsiaalseid paigaldusvõtmeid, mille kohta vaadake <xref linkend="
+#~ "\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Paigaldamisvõtmed"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "See avab järgmise tekstipõhise abiekraani."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Paigaldamise abiekraan"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kerneli võtmed"
+
+#~ msgid ""
#~ "This section allows you to fine tune your sound card. In most cases the "
#~ "options selected will work with your computer."
#~ msgstr ""
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index ca58a9f1..0a271409 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-02-17 21:46+0000\n"
"Last-Translator: Dune <dune06@free.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -1605,12 +1605,12 @@ msgstr ""
"<guibutton>Suivant</guibutton> pour continuer."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, l'installateur de Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1621,7 +1621,7 @@ msgstr ""
"mise à jour aussi aisée que possible."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1631,25 +1631,38 @@ msgstr ""
"plupart du temps ."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Ecran d'accueil de l'installation"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
-msgstr ""
"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </imageobject>"
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1657,21 +1670,200 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Si des problèmes se présentent pendant l'installation, il peut alors être "
-"nécessaire d'employer des options d'installation particulières, voir <xref "
-"linkend=\"installationOptions\"/>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Si l'installation échoue, alors il peut être nécessaire d'essayer à nouveau "
+"en faisant appel à l'une des options disponibles en appuyant sur la touche "
+"<guibutton>F1 (Aide) </guibutton> voir <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Les étapes de l'installation"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1680,7 +1872,7 @@ msgstr ""
"suivies dans le panneau latéral à gauche de l'écran."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1690,7 +1882,7 @@ msgstr ""
"supplémentaires moins communes."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1699,7 +1891,7 @@ msgstr ""
"apporte davantage d'explications au sujet de l'étape en cours."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1720,54 +1912,18 @@ msgstr ""
"simultanément sur les trois touches <guibutton>alt ctrl suppr</guibutton> "
"pour redémarrer."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Options d'installation"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Si l'installation échoue, alors il peut être nécessaire d'essayer à nouveau "
-"en faisant appel à l'une des options disponibles en appuyant sur la touche "
-"<guibutton>F1 (Aide) </guibutton> voir <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Cela affichera l'aide suivante en mode texte."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Ecran d'aide de l'installation"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Problèmes d'installation et solutions possibles"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Pas d'interface graphique"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1779,13 +1935,14 @@ msgstr ""
"l'invite."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Si le matériel est très vieux, une installation graphique peut être "
"impossible. Dans ce cas il est nécessaire de tenter une installation en mode "
@@ -1795,12 +1952,12 @@ msgstr ""
"ensuite avec l'installation en mode texte.<emphasis></emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "L'installation se fige"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1815,12 +1972,12 @@ msgstr ""
"avec les précédentes si nécessaire.."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Options du noyau"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3193,3 +3350,41 @@ msgstr ""
"Cliquer sur <guibutton>Suivant</guibutton> en cas de certitude avec la "
"volonté d'effacer toutes les partitions, tous les systèmes d'exploitation et "
"toutes les données présents sur ce disque dur."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Si des problèmes se présentent pendant l'installation, il peut alors être "
+#~ "nécessaire d'employer des options d'installation particulières, voir "
+#~ "<xref linkend=\"installationOptions\"/>."
+
+#~ msgid "Installation options"
+#~ msgstr "Options d'installation"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Cela affichera l'aide suivante en mode texte."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Ecran d'aide de l'installation"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Options du noyau"
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index a7bc1d57..317a963c 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help 3.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1242,12 +1242,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1255,54 +1255,225 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
msgstr ""
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr ""
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> "
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> "
"</imageobject>"
msgstr ""
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" "
-"id=\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
+msgid "From this first screen, it is possible to set some personal preferences:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+msgid "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live "
+"DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue "
+"System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+"Detection Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+msgid "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref "
-"linkend=\"installationOptions\"></xref>."
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+msgid "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options "
+"list. These options can by added by hand in the <guilabel>Boot "
+"options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired "
+"Network-based Installation CD, see <link "
+"ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">the Mageia "
+"Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" "
+"align=\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/installer.xml:52
+#: en/installer.xml:185
msgid "The installation steps"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have "
"<guibutton>Advanced</guibutton> buttons with extra, less commonly required, "
@@ -1310,14 +1481,14 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1329,49 +1500,18 @@ msgid ""
"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 "
-"(Help)</guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr ""
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> "
-"</imageobject>"
-msgstr ""
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection "
"screen. This can happen with some graphic cards and older systems. Try using "
@@ -1379,22 +1519,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
msgid ""
"If the hardware is very old, a graphical installation may not be "
"possible. In this case it is worth trying a text mode installation. To use "
"this hit ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1404,12 +1544,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
+#: en/installer.xml:256
+msgid "RAM problem"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
diff --git a/docs/installer/id.po b/docs/installer/id.po
index afc8caac..1d804da5 100644
--- a/docs/installer/id.po
+++ b/docs/installer/id.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-02-17 07:47+0000\n"
"Last-Translator: kiki.syahadat <kiki.syahadat@yahoo.co.id>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -1574,12 +1574,12 @@ msgstr ""
"guibutton> untuk melanjutkan."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, Installer Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1590,7 +1590,7 @@ msgstr ""
"mungkin."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1599,26 +1599,37 @@ msgstr ""
"memulai installer, yang normalnya adalah yang Anda inginkan."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Layar Selamat Datang untuk Instalasi"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1626,20 +1637,199 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Jika ada masalah saat instalasi, mungkin perlu menggunakan pilihan instalasi "
-"khusus, lihat <xref linkend=\"installationOptions\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Jika instalasi gagal, mungkin perlu dicoba lagi dengan menggunakan salah "
+"satu pilihan tambahan yang tersedia dengan menekan tombol <guibutton>F1 "
+"(Bantuan)</guibutton> lihat <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Langkah-langkah instalasi"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1648,7 +1838,7 @@ msgstr ""
"panel samping dari layar."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1658,7 +1848,7 @@ msgstr ""
"terlalu dibutuhkan."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1667,7 +1857,7 @@ msgstr ""
"penjelasan lebih tentang langkah yang sedang dijalani."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1688,55 +1878,18 @@ msgstr ""
"bersamaan. Setelahnya, tekan <guibutton>Alt Ctrl Delete</guibutton> secara "
"bersamaan untuk menjalankan ulang."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Pilihan instalasi"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Jika instalasi gagal, mungkin perlu dicoba lagi dengan menggunakan salah "
-"satu pilihan tambahan yang tersedia dengan menekan tombol <guibutton>F1 "
-"(Bantuan)</guibutton> lihat <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Ini akan membuka bantuan berbasis teks berikut."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Layar Bantuan Instalasi"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Masalah Instalasi dan Kemungkinan Solusinya"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Tidak Ada Antarmuka Grafis"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1748,13 +1901,14 @@ msgstr ""
"pada baris perintah."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Jika hardware sangat tua, instalasi dengan gambar mungkin tidak bisa. Dalam "
"kasus seperti ini, patut dicoba untuk menginstall dengan mode teks. Untuk "
@@ -1763,12 +1917,12 @@ msgstr ""
"lalu tekan ENTER. Lanjutkan instalasi dengan mode teks.<emphasis></emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Instalasi Membeku"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1783,12 +1937,12 @@ msgstr ""
"pilihan lain seperlunya."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Pilihan Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3133,3 +3287,41 @@ msgstr ""
"Klik pada <guibutton>Selanjutnya</guibutton> jika Anda yakin dan ingin "
"menghapus semua partisi, semua sistem operasi dan semua data pada harddisk "
"tersebut."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Jika ada masalah saat instalasi, mungkin perlu menggunakan pilihan "
+#~ "instalasi khusus, lihat <xref linkend=\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Pilihan instalasi"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Ini akan membuka bantuan berbasis teks berikut."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Layar Bantuan Instalasi"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Pilihan Kernel"
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index 6b889426..3f5bf6f9 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2013-12-18 18:49+0100\n"
"Last-Translator: Marja van Waes <marja@mageia.org>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/mageia/language/"
@@ -1589,12 +1589,12 @@ msgstr ""
"uw keus."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, het Mageia-installatieprogramma"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1605,7 +1605,7 @@ msgstr ""
"ervaren gebruiker bent."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1615,26 +1615,37 @@ msgstr ""
"nodig heeft."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Allereerste installatiewelkomsscherm"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1642,21 +1653,211 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Als er tijdens het installeren problemen zijn, kan het nodig zijn speciale "
-"installatie-opties te gebruiken, zie <xref linkend=\"installationOptions\"></"
-"xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Als de installatie misgaat, kan het nodig zijn opnieuw te beginnen en één of "
+"meer van de opties te gebruiken die u ziet als u op de F1 (Help) toets "
+"klikt, zie <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "De Installatiestappen"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1665,7 +1866,7 @@ msgstr ""
"de volgende schermen zichtbaar zijn."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1675,7 +1876,7 @@ msgstr ""
"gebruikelijke opties."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1684,7 +1885,7 @@ msgstr ""
"uitleg geven over de desbetreffende stap."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1705,55 +1906,18 @@ msgstr ""
"<guibutton>Alt Ctrl F2</guibutton> in te drukken. Druk vervolgens simultaan "
"op <guibutton>Alt Ctrl Delete</guibutton> om opnieuw op te starten."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Installatie-opties"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Als de installatie misgaat, kan het nodig zijn opnieuw te beginnen en één of "
-"meer van de opties te gebruiken die u ziet als u op de F1 (Help) toets "
-"klikt, zie <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Het volgende tekstscherm wordt dan zichtbaar."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Eerste installatiehulpscherm"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Installatieproblemen en mogelijke oplossingen"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Geen grafische interface"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1764,13 +1928,14 @@ msgstr ""
"resolutie te gebruiken door \"vgalo\" te typen bij de \"boot:\"-prompt."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Als de hardware erg oud is, kan grafisch installeren zelfs onmogelijk zijn. "
"In dat geval is het de moeite waard een installatie in tekstmodus te doen. "
@@ -1780,12 +1945,12 @@ msgstr ""
"druk vervolgens op de entertoets. Ga nu verder met installeren in textmodus."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Installatieblokkades"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1800,12 +1965,12 @@ msgstr ""
"beide vorige gecombineerd worden."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Kernelopties"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3157,3 +3322,42 @@ msgstr ""
"Klik op <guibutton>Volgende</guibutton> als u het zeker weet en elke "
"partitie, elk besturingssysteem en alle gegevens op deze harde schijf wilt "
"wissen."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Als er tijdens het installeren problemen zijn, kan het nodig zijn "
+#~ "speciale installatie-opties te gebruiken, zie <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Installatie-opties"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Het volgende tekstscherm wordt dan zichtbaar."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Eerste installatiehulpscherm"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Kernelopties"
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index 734b2a99..52557fb5 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2013-12-19 12:07+0100\n"
"Last-Translator: Daniel Napora <napcok@gmail.com>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -1344,12 +1344,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX instalator Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1360,7 +1360,7 @@ msgstr ""
"aktualizację łatwą i przyjemną. "
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1370,26 +1370,37 @@ msgstr ""
"potrzebujesz."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr ""
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1397,21 +1408,211 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Jeśli napotkasz na jakieś problemy podczas instalacji, może się jednak "
-"okazać, że będzie potrzebne skorzystanie ze specjalnych opcji instalacji, "
-"zobacz <xref linkend=\"installationOptions\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Jeśli instalacja się nie powiedzie, może być konieczne rozpoczęcie od "
+"początku i użycie dodatkowych opcji dostępnych pod klawiszem <guibutton>F1 "
+"(Pomoc)</guibutton> zobacz <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Etapy instalacji"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1420,7 +1621,7 @@ msgstr ""
"lewej stronie ekranu instalatora."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1430,7 +1631,7 @@ msgstr ""
"używanych opcji."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1440,7 +1641,7 @@ msgstr ""
"instalacji."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1461,55 +1662,18 @@ msgstr ""
"wciskając jednocześnie klawisze<guibutton>Alt Ctrl F2</guibutton>. Następnie "
"zrebootuj komputer za pomocą klawiszy <guibutton>Alt Ctrl Delete</guibutton>."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opcje instalatora"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Jeśli instalacja się nie powiedzie, może być konieczne rozpoczęcie od "
-"początku i użycie dodatkowych opcji dostępnych pod klawiszem <guibutton>F1 "
-"(Pomoc)</guibutton> zobacz <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Zostanie wyświetlony następujący ekran z pomocą."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr ""
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Problemy z instalacją oraz możliwe rozwiązania"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Brak graficznego interfejsu"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1520,13 +1684,14 @@ msgstr ""
"użyć niskiej rozdzielczości wpisując w linii komend <code>vgalo</code>."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Jeśli sprzęt jest bardzo stary, użycie graficznego instalatora może być "
"niemożliwe. W tym przypadku warto wypróbować instalację w trybie tekstowym. "
@@ -1535,12 +1700,12 @@ msgstr ""
"kontynuować instalację w trybie tekstowym."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Zawieszenie się instalacji"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1554,12 +1719,12 @@ msgstr ""
"łączona z innymi opcjami jeśli zajdzie taka potrzeba."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opcje jądra"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -2704,3 +2869,39 @@ msgid ""
"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
"partition, every operating system and all data on that hard disk."
msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Jeśli napotkasz na jakieś problemy podczas instalacji, może się jednak "
+#~ "okazać, że będzie potrzebne skorzystanie ze specjalnych opcji instalacji, "
+#~ "zobacz <xref linkend=\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opcje instalatora"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Zostanie wyświetlony następujący ekran z pomocą."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opcje jądra"
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index 52c5c748..3a319f7b 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2013-12-08 20:54+0000\n"
"Last-Translator: Padula <padula1000@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -1595,12 +1595,12 @@ msgstr ""
"<guibutton>Próximo</guibutton> para continuar."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, o Instalador da Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1611,7 +1611,7 @@ msgstr ""
"possível."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1620,26 +1620,38 @@ msgstr ""
"instalador, que será, normalmente, tudo o que você irá precisar."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Primeira Tela da Instalação"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"></imagedata> </"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
"imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1647,21 +1659,212 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Se houver problemas durante a instalação, então pode ser necessário usar "
-"opções de instalação especiais, consulte <xref linkend=\"installationOptions"
-"\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Se a instalação falhar, então pode ser necessário tentar de novo usando uma "
+"das opções extras disponíveis pressionando <guibutton>F1 (Help)</guibutton>. "
+"Veja em <xref linkend=\"dx-welcome\"></xref>Tela de Ajuda da Instalação"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
+"imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "As etapas de instalação"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1670,7 +1873,7 @@ msgstr ""
"seguido no painel lateral da tela."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1680,7 +1883,7 @@ msgstr ""
"necessárias."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1689,7 +1892,7 @@ msgstr ""
"explicações sobre a etapa atual."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1710,55 +1913,18 @@ msgstr ""
"guibutton> ao mesmo tempo. Depois disso, pressione <guibutton>Ctrl Alt "
"Delete</guibutton> simultaneamente, para reiniciar."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opções de Instalação"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Se a instalação falhar, então pode ser necessário tentar de novo usando uma "
-"das opções extras disponíveis pressionando <guibutton>F1 (Help)</guibutton>. "
-"Veja em <xref linkend=\"dx-welcome\"></xref>Tela de Ajuda da Instalação"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Isto abrirá o seguinte ajuda em modo texto."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Tela de Ajuda da Instalação"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Problemas de Instalação e Possíveis Soluções"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Sem Interface Gráfica"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1770,13 +1936,14 @@ msgstr ""
"texto)."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Se o hardware é muito antigo, uma instalação gráfica pode não ser possível. "
"Neste caso, vale a pena tentar uma instalação em modo de texto. Para usar "
@@ -1785,12 +1952,12 @@ msgstr ""
"clique ENTER. Agora continue com a instalação em modo-texto."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "A Instalação Congela"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1805,12 +1972,12 @@ msgstr ""
"combinada com outras opções, conforme necessário."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opções do Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3172,3 +3339,42 @@ msgstr ""
"Clique em <guibutton>Avançar</guibutton> se você tem certeza e deseja apagar "
"todas as partições, cada sistema operacional e todos os dados no disco "
"rígido."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Se houver problemas durante a instalação, então pode ser necessário usar "
+#~ "opções de instalação especiais, consulte <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opções de Instalação"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Isto abrirá o seguinte ajuda em modo texto."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Tela de Ajuda da Instalação"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opções do Kernel"
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 71374491..dc0fd0a2 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-01-07 10:05+0000\n"
"Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -1590,12 +1590,12 @@ msgstr ""
"guibutton> pentru a continua."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, instalatorul Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1606,7 +1606,7 @@ msgstr ""
"se poate de ușor."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1615,26 +1615,37 @@ msgstr ""
"care va lansa instalatorul, care în mod normal este tot ceea ce vă trebuie."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Ecranul de bun venit al instalării"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1642,21 +1653,211 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Dacă aveți probleme în timpul instalării, atunci va fi nevoie să utilizați "
-"instrucțiunile de instalare speciale, vedeți <xref linkend="
-"\"installationOptions\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Dacă instalarea eșuează, atunci poate fi necesar să încercați din nou "
+"utilizînd una din opțiunile suplimentare disponibile apăsînd <guibutton>F1 "
+"(Ajutor)</guibutton>, vedeți <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Etapele instalării"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1665,7 +1866,7 @@ msgstr ""
"fi urmărite în acest panou lateral al ecranului."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1675,7 +1876,7 @@ msgstr ""
"mai puțin necesare."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1684,7 +1885,7 @@ msgstr ""
"multe explicații pentru etapa actuală."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1704,55 +1905,18 @@ msgstr ""
"<guibutton>Alt Ctrl F2</guibutton> în același timp, apoi apăsați "
"<guibutton>Alt Ctrl Delete</guibutton> simultan pentru a reporni."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opțiuni de instalare"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Dacă instalarea eșuează, atunci poate fi necesar să încercați din nou "
-"utilizînd una din opțiunile suplimentare disponibile apăsînd <guibutton>F1 "
-"(Ajutor)</guibutton>, vedeți <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Aceasta va deschide ajutorul următor în mod text."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Ecranul de ajutor al instalării"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Probleme de instalare și soluții posibile"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Fără interfață grafică"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1763,13 +1927,14 @@ msgstr ""
"utilizați o rezoluție mai mică tastînd <code>vgalo</code> la prompter."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Dacă mașina este foarte veche, instalarea grafică poate să nu fie posibilă. "
"În acest caz merită încercată o instalare în mod text. Pentru aceasta "
@@ -1779,12 +1944,12 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Instalarea îngheață"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1800,12 +1965,12 @@ msgstr ""
"opțiuni."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opțiuni nucleu"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3164,3 +3329,42 @@ msgid ""
msgstr ""
"Apăsați pe <guibutton>Înainte</guibutton> dacă sigur doriți să ștergeți "
"toate partițiile, toate sistemele de operare și toate datele de pe acel disc."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Dacă aveți probleme în timpul instalării, atunci va fi nevoie să "
+#~ "utilizați instrucțiunile de instalare speciale, vedeți <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Opțiuni de instalare"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Aceasta va deschide ajutorul următor în mod text."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Ecranul de ajutor al instalării"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opțiuni nucleu"
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 213823b3..9f4ab06b 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 15:01+0700\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-02-18 12:55+0300\n"
"Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
"Language-Team: Russian <saikov.vb@gmail.com>\n"
@@ -1621,12 +1621,12 @@ msgstr ""
"чтобы продолжить работу с программой."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, программа для установки Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1637,7 +1637,7 @@ msgstr ""
"системы прошло как можно проще для вас."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1647,26 +1647,37 @@ msgstr ""
"именно тот пункт, который вам нужен."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Приветственное окно программы установки"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1674,21 +1685,200 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Если при установке у вас возникнут проблемы, вам придется воспользоваться "
-"особыми параметрами установке см. <xref linkend=\"installationOptions\"></"
-"xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Если программе установки не удается выполнить свое назначение должным "
+"образом, вы можете повторить попытку, воспользовавшись дополнительными "
+"вариантами, описание которых можно получить после нажатия клавиши "
+"<guibutton>F1 (Справка)</guibutton> см. <xref linkend=\"dx-welcome\"></xref>."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Шаги установки"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1697,7 +1887,7 @@ msgstr ""
"показан на боковой панели экрана."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1708,7 +1898,7 @@ msgstr ""
"пользуются не так часто, как основными."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1718,7 +1908,7 @@ msgstr ""
"относительно текущего шага."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1739,58 +1929,18 @@ msgstr ""
"одновременно. После этого нажмите комбинацию клавиш <guibutton>Alt Ctrl "
"Delete</guibutton> одновременно, чтобы перезагрузить компьютер."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Параметры установки"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Если программе установки не удается выполнить свое назначение должным "
-"образом, вы можете повторить попытку, воспользовавшись дополнительными "
-"вариантами, описание которых можно получить после нажатия клавиши "
-"<guibutton>F1 (Справка)</guibutton> см. <xref linkend=\"dx-welcome\"></xref>."
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-"В ответ на нажатие этой клавиши будет открыто текстовое окно справочных "
-"данных."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Справочное окно инсталлятора"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Проблемы с установкой и возможные пути их решения"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Нет графического интерфейса"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1802,13 +1952,14 @@ msgstr ""
"впишите <code>vgalo</code> в строку запроса."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Если компьютер очень старый, установка в графическом режиме может быть "
"просто невозможна. В таком случае стоит воспользоваться установкой в "
@@ -1818,12 +1969,12 @@ msgstr ""
"Enter. Установка будет продолжена в текстовом режиме.<emphasis></emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Остановка установки"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1839,12 +1990,12 @@ msgstr ""
"При необходимости эту команду можно совместить с вышеуказанными командами."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Параметры ядра"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3238,6 +3389,47 @@ msgstr ""
"хранящиеся на этом диске."
#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Если при установке у вас возникнут проблемы, вам придется воспользоваться "
+#~ "особыми параметрами установке см. <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Параметры установки"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr ""
+#~ "В ответ на нажатие этой клавиши будет открыто текстовое окно справочных "
+#~ "данных."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Справочное окно инсталлятора"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Параметры ядра"
+
+#~ msgid ""
#~ "This section allows you to fine tune your sound card. In most cases the "
#~ "options selected will work with your computer."
#~ msgstr ""
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index d6075cea..69ee3590 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2013-12-09 19:12+0000\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/mageia/"
@@ -1300,12 +1300,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1313,33 +1313,44 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
msgstr ""
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr ""
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1347,39 +1358,228 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1391,52 +1591,18 @@ msgid ""
"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Možnosti namestitve"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr ""
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1444,22 +1610,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1469,12 +1635,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Možnosti jedra"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -2574,3 +2740,27 @@ msgid ""
"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
"partition, every operating system and all data on that hard disk."
msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid "Installation options"
+#~ msgstr "Možnosti namestitve"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Možnosti jedra"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index 66eb4985..9b146bb6 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-01-20 14:34+0000\n"
"Last-Translator: ard1t <ardit.dani@gmail.com>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -1260,12 +1260,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1273,68 +1273,272 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
msgstr ""
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr ""
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Nëse instalimi dështon atëherë ajo mund të jetë e nevojshme të provoni "
+"përsëri duke përdorur një nga opsionet shtesë në dispozicion duke shtypur "
+"<guibutton>F1 (Ndihmë) </ guibutton> çeles të shihni <xref linkend=\"dx-"
+"welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
msgstr ""
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1346,53 +1550,18 @@ msgid ""
"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Opsione Instalimi"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Nëse instalimi dështon atëherë ajo mund të jetë e nevojshme të provoni "
-"përsëri duke përdorur një nga opsionet shtesë në dispozicion duke shtypur "
-"<guibutton>F1 (Ndihmë) </ guibutton> çeles të shihni <xref linkend=\"dx-"
-"welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr ""
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1400,22 +1569,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1430,12 +1599,12 @@ msgstr ""
"opsione të tjera të nevojshme."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Opsionet Kernel"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -2495,3 +2664,9 @@ msgid ""
"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
"partition, every operating system and all data on that hard disk."
msgstr ""
+
+#~ msgid "Installation options"
+#~ msgstr "Opsione Instalimi"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Opsionet Kernel"
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index a02a091e..ecbdcb5a 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-01-11 12:34+0000\n"
"Last-Translator: Kristoffer Grundströ <kristoffer.grundstrom1983@gmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
@@ -1498,12 +1498,12 @@ msgstr ""
"fortsätta."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "Mageia-installeraren DrakX"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1511,50 +1511,246 @@ msgid ""
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
msgstr ""
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Välkomstskärm till installationen"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Installationsstegen"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1563,14 +1759,14 @@ msgstr ""
"sidopanelen på skärmen."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
msgstr ""
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1579,7 +1775,7 @@ msgstr ""
"information om det nuvarande steget."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1591,52 +1787,18 @@ msgid ""
"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Installationsalternativ"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Detta kommer att öppna följande text-baserad hjälp."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Hjälpskärm för installation"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Problem vid installation och möjliga lösningar"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Inget grafiskt gränssnitt"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1644,22 +1806,22 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Installationen hänger sig"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1669,12 +1831,12 @@ msgid ""
msgstr ""
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Alternativ för kärna"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -2900,3 +3062,33 @@ msgid ""
"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
"partition, every operating system and all data on that hard disk."
msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid "Installation options"
+#~ msgstr "Installationsalternativ"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Detta kommer att öppna följande text-baserad hjälp."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Hjälpskärm för installation"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Alternativ för kärna"
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index c70f9d60..84968169 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
"PO-Revision-Date: 2014-03-01 03:24+0300\n"
"Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
"Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -1579,12 +1579,12 @@ msgstr ""
"guibutton> düğmesini tıklayın."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, Mageia Kurulum Aracı"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1595,7 +1595,7 @@ msgstr ""
"yapmanıza yardımcı olmak için tasarlanmıştır."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1604,26 +1604,37 @@ msgstr ""
"tüm ihtiyacınızı karşılayacak, kurulum aracını başlatacaktır."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Kurulum Karşılama Ekranı"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+#, fuzzy
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr ""
+"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
+"\"1\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr ""
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
+#, fuzzy
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
-msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+#, fuzzy
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
msgstr ""
"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
"\"1\"/>"
@@ -1631,20 +1642,199 @@ msgstr ""
#. type: Content of: <section><para>
#: en/installer.xml:47
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"From this first screen, it is possible to set some personal preferences:"
msgstr ""
-"Kurulum sırasında sorun yaşarsanız, özel kurulum seçeneklerini kullanmanız "
-"gerekebilir. Bkz: <xref linkend=\"installationOptions\"></xref>."
-#. type: Content of: <section><section><info><title>
+#. type: Content of: <section><itemizedlist><listitem><para>
#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+#, fuzzy
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Kurulum başarısız olursa, <guibutton>F1 (Yardım- Help)</guibutton> düğmesine "
+"basarak erişebileceğiniz ek seçenekleri kullanarak yeniden denemeniz "
+"gerekebilir. Bkz: <xref linkend=\"dx-welcome\"></xref>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:166
+msgid ""
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Kurulum adımları"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1653,7 +1843,7 @@ msgstr ""
"bölünmüştür."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1662,7 +1852,7 @@ msgstr ""
"düğmesini içerebilen bir veya bir kaç ekrana sahiptir."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1671,7 +1861,7 @@ msgstr ""
"guibutton> düğmesine sahiptir."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1692,55 +1882,18 @@ msgstr ""
"sonra yeniden başlatmak için <guibutton>Alt Ctrl Delete</guibutton> "
"tuşlarına aynı anda basın."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Kurulum seçenekleri"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Kurulum başarısız olursa, <guibutton>F1 (Yardım- Help)</guibutton> düğmesine "
-"basarak erişebileceğiniz ek seçenekleri kullanarak yeniden denemeniz "
-"gerekebilir. Bkz: <xref linkend=\"dx-welcome\"></xref>"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr "Böylece yardım temelli aşağıdaki metin açılacaktır."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Kurulum Yardım Ekranı"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Kurulum Sorunları ve Muhtemel Çözümleri"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Grafiksel Arabirim Yok"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1751,13 +1904,14 @@ msgstr ""
"<code>vgalo</code> yazarak düşük çözünürlük kullanmayı deneyin."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
+#, fuzzy
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Donanım çok eskiyse, grafiksel bir kurulum mümkün olmayabilir. Bu durumda "
"metin tabanlı kurulumu denemelisiniz. Bunu kullanmak için, ilk karşılama "
@@ -1767,12 +1921,12 @@ msgstr ""
"emphasis>"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Kurulum Donuyor"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1787,12 +1941,12 @@ msgstr ""
"seçeneklerle birlikte kullanılabilir."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Çekirdek Seçenekleri"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr ""
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3142,6 +3296,45 @@ msgstr ""
"veriyi silmeyi istiyorsanız <guibutton>İleri</guibutton>' yi tıklayın."
#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Kurulum sırasında sorun yaşarsanız, özel kurulum seçeneklerini "
+#~ "kullanmanız gerekebilir. Bkz: <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Kurulum seçenekleri"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr "Böylece yardım temelli aşağıdaki metin açılacaktır."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Kurulum Yardım Ekranı"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Çekirdek Seçenekleri"
+
+#~ msgid ""
#~ "This section allows you to fine tune your sound card. In most cases the "
#~ "options selected will work with your computer."
#~ msgstr ""
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index e669eddb..9bb9b52a 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-02-17 08:45+0200\n"
-"PO-Revision-Date: 2014-02-17 08:48+0200\n"
+"POT-Creation-Date: 2014-05-02 11:24+0300\n"
+"PO-Revision-Date: 2014-05-02 11:35+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
"Language: uk\n"
@@ -1625,12 +1625,12 @@ msgstr ""
"щоб продовжити роботу з програмою."
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
+#: en/installer.xml:17
msgid "DrakX, the Mageia Installer"
msgstr "DrakX, програма для встановлення Mageia"
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/installer.xml:20
msgid ""
"Whether you are new to GNU-Linux or an experienced user, the Mageia "
"Installer is designed to help make your installation or upgrade as easy as "
@@ -1641,7 +1641,7 @@ msgstr ""
"оновлення системи якомога простішим для вас."
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/installer.xml:28
msgid ""
"The initial menu screen has various options, however the default one will "
"start the installer, which will normally be all that you will need."
@@ -1651,48 +1651,270 @@ msgstr ""
"саме той пункт, який вам потрібен."
#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
+#: en/installer.xml:34
msgid "Installation Welcome Screen"
msgstr "Вітальне вікно програми для встановлення"
+#. type: Content of: <section><figure>
+#: en/installer.xml:33
+msgid "<placeholder type=\"info\" id=\"0\"/>"
+msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#. type: Content of: <section><figure><para>
+#: en/installer.xml:37
+msgid "Here is the default welcome screen when using a Mageia DVD:"
+msgstr "Нижче наведено типове вікно вітання DVD Mageia:"
+
#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#: en/installer.xml:41
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/installer.xml:40
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
+#. type: Content of: <section><para>
+#: en/installer.xml:47
+msgid ""
+"From this first screen, it is possible to set some personal preferences:"
+msgstr "За допомогою першої сторінки можна вказати деякі особисті уподобання:"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:52
+msgid ""
+"The language (for the installation only, may be different that the chosen "
+"language for the system) by pressing the key F2"
+msgstr ""
+"Мову (лише на час встановлення, у системі може бути вибрано зовсім іншу "
+"мову) можна вибрати після натискання клавіші F2."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:58
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:63
+msgid "Use the arrow keys to select the language and press the key Enter."
+msgstr ""
+"Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у "
+"списку, і натисніть клавішу Enter."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:66
+msgid ""
+"Here is for example, the French welcome screen when using a Live DVD/CD. "
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+"Нижче наведено приклад вікна вітання, перекладеного французькою, у "
+"портативній версії системи на DVD або компакти диску. Зауважте, що у меню "
+"портативної системи немає таких пунктів: <guilabel>Порятунок системи</"
+"guilabel>, <guilabel>Тест пам’яті</guilabel> та <guilabel>Інструмент пошуку "
+"обладнання</guilabel>."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:74
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:83
+msgid "Change the screen resolution by pressing the F3 key."
+msgstr ""
+"Змінити роздільну здатність екрана можна за допомогою натискання клавіші F3."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:86
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:93
+msgid "Add some kernel options by pressing the F6 key."
+msgstr "Деякі параметри роботи ядра можна вказати після натискання клавіші F6."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:95
+msgid ""
+"If the installation fails, then it may be necessary to try again using one "
+"of the extra options. The menu called by F6 displays a new line called "
+"<guilabel>Boot options</guilabel> and propose four entries:"
+msgstr ""
+"Якщо програмі для встановлення не вдається виконати своє призначення "
+"належним чином, ви можете повторити спробу, скориставшись додатковими "
+"варіантами. У меню, яке можна викликати натисканням клавіші F6, буде "
+"показано новий пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметри "
+"завантаження</guilabel>) з такими чотирма підпунктами:"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:100
+msgid "- Default, it doesn't alter anything in the default options."
+msgstr "- Default (типовий), не змінювати нічого у типових параметрах."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:103
+msgid ""
+"- Safe Settings, priority is given to the safer options to the detriment of "
+"performances."
+msgstr ""
+"- Safe Settings (безпечні параметри), перевага безпечності параметрів над "
+"швидкодією."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:106
+msgid ""
+"- No ACPI (Advanced Configuration and Power Interface), power management "
+"isn't taken into account."
+msgstr ""
+"- No ACPI (без розширеного інтерфейсу налаштовування та керування "
+"живленням), не брати до уваги параметри керування живленням."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:109
+msgid ""
+"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
+"about CPU interruptions, select this option if you are asked for."
+msgstr ""
+"- No Local APIC (без локального розширеного контролера переривань з "
+"можливістю програмування), цей варіант пов’язано з перериваннями роботи "
+"центрального процесора, виберіть його, якщо маєте відповідні настанови."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:113
+msgid ""
+"When you select one of these entries, it modifies the default options "
+"displayed in the <guilabel>Boot Options</guilabel> line."
+msgstr ""
+"Вибір одного з пунктів призводить до внесення змін до типових параметрів, "
+"показаних у рядку <guilabel>Параметри завантаження</guilabel>."
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:117
+msgid ""
+"In some Mageia releases, it may happen that the entries selected with the "
+"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
+"however, they are really taken into account."
+msgstr ""
+"У деяких випусках Mageia параметри, вибрані за допомогою F6, не буде "
+"показано у рядку <guilabel>Параметри завантаження</guilabel>. Втім, ці "
+"параметри буде враховано під час завантаження системи."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:123
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:130
+msgid "Add more kernel options by pressing the key F1"
+msgstr ""
+"Додаткові параметри роботи ядра можна вказати після натискання клавіші F1"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:132
+msgid ""
+"Pressing F1 opens a new window with more available options. Select one with "
+"the arrow keys and press Enter to have more details or press the Esc key to "
+"go back to the welcome screen."
+msgstr ""
+"Натискання клавіші F1 відкриває нове вікно зі списком пунктів. Виберіть один "
+"з пунктів за допомогою клавіш зі стрілками і натисніть клавішу Enter, щоб "
+"отримати докладнішу довідку, або натисніть клавішу Esc, щоб повернутися до "
+"вікна вітання."
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:139
msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
msgstr ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" id="
-"\"1\"/>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installer.xml:146
+msgid ""
+"The detailed view about the option splash. Press Esc or select "
+"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
+"These options can by added by hand in the <guilabel>Boot options</guilabel> "
+"line."
+msgstr ""
+"Нижче наведено знімок вікна з докладним описом параметрів вікна вітання "
+"системи. Натисніть клавішу Esc або виберіть пункт <guilabel>Return to Boot "
+"Options</guilabel> (Повернутися до параметрів завантаження), щоб повернутися "
+"до списку параметрів. Описані у вікні параметри можна додати вручну до рядка "
+"<guilabel>Параметри завантаження</guilabel>."
+
+#. type: Content of: <section><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:152
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+
+#. type: Content of: <section><itemizedlist><listitem><note><para>
+#: en/installer.xml:160
+msgid "The help is translated in the chosen language with the F2 key."
+msgstr ""
+"Переглянути переклад довідки вибраною мовою можна за допомогою натискання "
+"клавіші F2."
#. type: Content of: <section><para>
-#: en/installer.xml:47
+#: en/installer.xml:166
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref linkend=\"installationOptions\"></"
-"xref>."
+"Here is the default welcome screen when using a Wired Network-based "
+"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+msgstr ""
+"Нижче наведено типове вікно вітання образу для встановлення з мережі (назви "
+"— Boot.iso або Boot-Nonfree.iso):"
+
+#. type: Content of: <section><para>
+#: en/installer.xml:169
+msgid ""
+"It does not allow to change the language, the available options are "
+"described in the screen. For more information about using a Wired Network-"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+"Мову тут змінити не можна. Список доступних параметрів наведено на екрані. "
+"Докладніший опис використання образу для встановлення з мережі наведено у "
+"<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">вікі Mageia</"
+"link>."
+
+#. type: Content of: <section><warning><para>
+#: en/installer.xml:174
+msgid "The keyboard layout is the American one."
+msgstr "Розкладка клавіатури відповідає американській англійській."
+
+#. type: Content of: <section><mediaobject>
+#: en/installer.xml:178
+msgid ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
msgstr ""
-"Якщо під час встановлення у вас виникнуть проблеми, вам доведеться "
-"скористатися особливими параметрами встановлення, див. <xref linkend="
-"\"installationOptions\"></xref>."
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
#. type: Content of: <section><section><info><title>
-#: en/installer.xml:52
+#: en/installer.xml:185
msgid "The installation steps"
msgstr "Кроки встановлення"
#. type: Content of: <section><section><para>
-#: en/installer.xml:55
+#: en/installer.xml:188
msgid ""
"The install process is divided into a number of steps, which can be followed "
"on the side panel of the screen."
@@ -1701,7 +1923,7 @@ msgstr ""
"показано на бічній панелі екрана."
#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#: en/installer.xml:191
msgid ""
"Each step has one or more screens which may also have <guibutton>Advanced</"
"guibutton> buttons with extra, less commonly required, options."
@@ -1712,7 +1934,7 @@ msgstr ""
"часто як основними."
#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#: en/installer.xml:195
msgid ""
"Most screens have <guibutton>Help</guibutton> buttons which give further "
"explanations about the current step."
@@ -1722,7 +1944,7 @@ msgstr ""
"поточного кроку."
#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#: en/installer.xml:199
msgid ""
"If somewhere during install you decide to stop the installation, it is "
"possible to reboot, but please think twice before you do this. Once a "
@@ -1743,58 +1965,18 @@ msgstr ""
"Після цього, натисніть комбінацію клавіш <guibutton>Alt Ctrl Delete</"
"guibutton> одночасно, щоб перезавантажити комп’ютер."
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
-msgstr "Параметри встановлення"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
-msgid ""
-"If the installation fails then it may be necessary to try again by using one "
-"of the extra options available by hitting the <guibutton>F1 (Help)</"
-"guibutton> key see <xref linkend=\"dx-welcome\"></xref>"
-msgstr ""
-"Якщо програмі для встановлення не вдається виконати своє призначення "
-"належним чином, ви можете повторити спробу, скориставшись додатковими "
-"варіантами, опис яких можна отримати після натискання клавіші <guibutton>F1 "
-"(Довідка)</guibutton> див. <xref linkend=\"dx-welcome\"></xref>."
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
-msgstr ""
-"У відповідь на натискання цієї клавіші буде відкрито таке текстове вікно "
-"довідкових даних."
-
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
-msgstr "Довідкове вікно системи встановлення"
-
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
-"imageobject>"
-
#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
+#: en/installer.xml:214
msgid "Installation Problems and Possible Solutions"
msgstr "Проблеми зі встановленням та можливі шляхи їх вирішення"
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
+#: en/installer.xml:220
msgid "No Graphical Interface"
msgstr "Немає графічного інтерфейсу"
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#: en/installer.xml:225
msgid ""
"After the initial screen you did not reach the language selection screen. "
"This can happen with some graphic cards and older systems. Try using low "
@@ -1806,28 +1988,28 @@ msgstr ""
"впишіть <code>vgalo</code> у рядок запиту."
#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
+#: en/installer.xml:232
msgid ""
"If the hardware is very old, a graphical installation may not be possible. "
"In this case it is worth trying a text mode installation. To use this hit "
"ESC at the first welcome screen and confirm with ENTER. You will be "
"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode.<emphasis></emphasis>"
+"ENTER. Now continue with the installation in text mode."
msgstr ""
"Якщо комп’ютер є дуже застарілим, встановлення у графічному режимі може бути "
"просто неможливим. У такому випадку варто скористатися встановленням у "
"текстовому режимі. Щоб скористатися цим режимом, натисніть клавішу Esc, коли "
"буде показано перший вітальний екран, і підтвердіть виконання дії "
"натисканням клавіші Enter. Введіть <code>text</code> і натисніть клавішу "
-"Enter. Встановлення буде продовжено у текстовому режимі.<emphasis></emphasis>"
+"Enter. Встановлення буде продовжено у текстовому режимі."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
+#: en/installer.xml:244
msgid "The Install Freezes"
msgstr "Встановлення зупиняється"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#: en/installer.xml:247
msgid ""
"If the system appeared to freeze during the installation, this may be a "
"problem with hardware detection. In this case the automatic detection of "
@@ -1843,12 +2025,12 @@ msgstr ""
"потреби, цю команду можна поєднати з вищевказаними командами."
#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
-msgstr "Параметри ядра"
+#: en/installer.xml:256
+msgid "RAM problem"
+msgstr "Проблеми з оперативною пам’яттю"
#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#: en/installer.xml:259
msgid ""
"These will rarely be needed, but in some cases the hardware may report the "
"available RAM incorrectly. To specify this manually, you can use the "
@@ -3238,6 +3420,47 @@ msgstr ""
"цьому диску."
#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "If there are problems during install, then it may be necessary to use "
+#~ "special installation options, see <xref linkend=\"installationOptions\"></"
+#~ "xref>."
+#~ msgstr ""
+#~ "Якщо під час встановлення у вас виникнуть проблеми, вам доведеться "
+#~ "скористатися особливими параметрами встановлення, див. <xref linkend="
+#~ "\"installationOptions\"></xref>."
+
+#~ msgid "Installation options"
+#~ msgstr "Параметри встановлення"
+
+#~ msgid "This will open the following text based help."
+#~ msgstr ""
+#~ "У відповідь на натискання цієї клавіші буде відкрито таке текстове вікно "
+#~ "довідкових даних."
+
+#~ msgid "Installation Help Screen"
+#~ msgstr "Довідкове вікно системи встановлення"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Kernel Options"
+#~ msgstr "Параметри ядра"
+
+#~ msgid ""
#~ "This section allows you to fine tune your sound card. In most cases the "
#~ "options selected will work with your computer."
#~ msgstr ""
diff --git a/docs/installer/uk/installer.xml b/docs/installer/uk/installer.xml
index 17a398f0..89d62de0 100644
--- a/docs/installer/uk/installer.xml
+++ b/docs/installer/uk/installer.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/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="uk" xml:id="installer">
-
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="installer" version="5.0" xml:lang="uk">
@@ -39,16 +38,134 @@ If you have peripherals like printers or scanners, it is [best] to
це саме той пункт, який вам потрібен.</para>
<figure xml:id="dx-welcome">
-<info>
+ <info>
<title xml:id="installer-ti2">Вітальне вікно програми для встановлення</title>
- </info> <mediaobject>
-<imageobject> <imagedata revision="1" fileref="../dx-welcome.png"
-align="center" format="PNG" xml:id="BId-drakx-intro-im1"> </imagedata>
-</imageobject></mediaobject></figure>
+ </info>
+
+ <para>Нижче наведено типове вікно вітання DVD Mageia:</para>
+
+<mediaobject>
+<imageobject> <imagedata xml:id="BId-drakx-intro-im1" revision="1"
+align="center" format="PNG" fileref="../dx-welcome.png"/> </imageobject></mediaobject></figure>
+
+ <para>За допомогою першої сторінки можна вказати деякі особисті уподобання:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Мову (лише на час встановлення, у системі може бути вибрано зовсім іншу
+мову) можна вибрати після натискання клавіші F2.</para>
+
+ <para/>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+
+ <para>Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у
+списку, і натисніть клавішу Enter.</para>
+
+ <para>Нижче наведено приклад вікна вітання, перекладеного французькою, у
+портативній версії системи на DVD або компакти диску. Зауважте, що у меню
+портативної системи немає таких пунктів: <guilabel>Порятунок
+системи</guilabel>, <guilabel>Тест пам’яті</guilabel> та
+<guilabel>Інструмент пошуку обладнання</guilabel>.</para>
+
+ <para/>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
+
+ <para/>
+ </listitem>
+
+ <listitem>
+ <para>Змінити роздільну здатність екрана можна за допомогою натискання клавіші F3.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>Деякі параметри роботи ядра можна вказати після натискання клавіші F6.</para>
+
+ <para>Якщо програмі для встановлення не вдається виконати своє призначення
+належним чином, ви можете повторити спробу, скориставшись додатковими
+варіантами. У меню, яке можна викликати натисканням клавіші F6, буде
+показано новий пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметри
+завантаження</guilabel>) з такими чотирма підпунктами:</para>
+
+ <para>- Default (типовий), не змінювати нічого у типових параметрах.</para>
+
+ <para>- Safe Settings (безпечні параметри), перевага безпечності параметрів над
+швидкодією.</para>
+
+ <para>- No ACPI (без розширеного інтерфейсу налаштовування та керування
+живленням), не брати до уваги параметри керування живленням.</para>
+
+ <para>- No Local APIC (без локального розширеного контролера переривань з
+можливістю програмування), цей варіант пов’язано з перериваннями роботи
+центрального процесора, виберіть його, якщо маєте відповідні настанови.</para>
- <para>Якщо під час встановлення у вас виникнуть проблеми, вам доведеться
-скористатися особливими параметрами встановлення, див. <xref
-linkend="installationOptions"></xref>.</para>
+ <para>Вибір одного з пунктів призводить до внесення змін до типових параметрів,
+показаних у рядку <guilabel>Параметри завантаження</guilabel>.</para>
+
+ <note>
+ <para>У деяких випусках Mageia параметри, вибрані за допомогою F6, не буде
+показано у рядку <guilabel>Параметри завантаження</guilabel>. Втім, ці
+параметри буде враховано під час завантаження системи.</para>
+ </note>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
+ </listitem>
+
+ <listitem>
+ <para>Додаткові параметри роботи ядра можна вказати після натискання клавіші F1</para>
+
+ <para>Натискання клавіші F1 відкриває нове вікно зі списком пунктів. Виберіть один
+з пунктів за допомогою клавіш зі стрілками і натисніть клавішу Enter, щоб
+отримати докладнішу довідку, або натисніть клавішу Esc, щоб повернутися до
+вікна вітання.</para>
+
+ <para/>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+
+ <para/>
+
+ <para>Нижче наведено знімок вікна з докладним описом параметрів вікна вітання
+системи. Натисніть клавішу Esc або виберіть пункт <guilabel>Return to Boot
+Options</guilabel> (Повернутися до параметрів завантаження), щоб повернутися
+до списку параметрів. Описані у вікні параметри можна додати вручну до рядка
+<guilabel>Параметри завантаження</guilabel>.</para>
+
+ <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+
+ <para/>
+
+ <note>
+ <para>Переглянути переклад довідки вибраною мовою можна за допомогою натискання
+клавіші F2.</para>
+ </note>
+ </listitem>
+ </itemizedlist>
+
+ <para>Нижче наведено типове вікно вітання образу для встановлення з мережі (назви
+— Boot.iso або Boot-Nonfree.iso):</para>
+
+ <para>Мову тут змінити не можна. Список доступних параметрів наведено на
+екрані. Докладніший опис використання образу для встановлення з мережі
+наведено у <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">вікі
+Mageia</link>.</para>
+
+ <warning>
+ <para>Розкладка клавіатури відповідає американській англійській.</para>
+ </warning>
+
+ <mediaobject>
+<imageobject> <imagedata revision="1" xml:id="installer-im2" align="center"
+format="PNG" fileref="../dx-help.png"/> </imageobject></mediaobject>
<section xml:id="installationSteps">
<info>
@@ -82,26 +199,6 @@ F2</guibutton> одночасно. Після цього, натисніть к
</section>
<section xml:id="installationOptions">
- <info>
- <title xml:id="installationOptions-ti1">Параметри встановлення</title>
- </info>
-
- <para>Якщо програмі для встановлення не вдається виконати своє призначення
-належним чином, ви можете повторити спробу, скориставшись додатковими
-варіантами, опис яких можна отримати після натискання клавіші <guibutton>F1
-(Довідка)</guibutton> див. <xref linkend="dx-welcome"></xref>.</para>
-
- <para>У відповідь на натискання цієї клавіші буде відкрито таке текстове вікно
-довідкових даних.</para>
-
- <figure xml:id="dx-help">
-<info>
- <title xml:id="installationOptions-ti2">Довідкове вікно системи встановлення</title>
- </info> <mediaobject>
-<imageobject> <imagedata revision="1" fileref="../dx-help.png"
-align="center" format="PNG" xml:id="installer-im2"></imagedata>
-</imageobject></mediaobject></figure>
-
<section xml:id="installationProblems">
<info>
<title xml:id="installationProblems-ti1">Проблеми зі встановленням та можливі шляхи їх вирішення</title>
@@ -126,8 +223,7 @@ align="center" format="PNG" xml:id="installer-im2"></imagedata>
текстовому режимі. Щоб скористатися цим режимом, натисніть клавішу Esc, коли
буде показано перший вітальний екран, і підтвердіть виконання дії
натисканням клавіші Enter. Введіть <code>text</code> і натисніть клавішу
-Enter. Встановлення буде продовжено у текстовому
-режимі.<emphasis></emphasis></para>
+Enter. Встановлення буде продовжено у текстовому режимі.</para>
</listitem>
</itemizedlist>
</section>
@@ -147,7 +243,7 @@ Enter. Встановлення буде продовжено у текстов
<section xml:id="kernelOptions">
<info>
- <title xml:id="kernelOptions-ti1">Параметри ядра</title>
+ <title xml:id="kernelOptions-ti1">Проблеми з оперативною пам’яттю</title>
</info>
<para>Потреба у визначенні параметрів ядра виникає нечасто, але у певних випадках