aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer/help.pot
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer/help.pot')
-rw-r--r--docs/installer/help.pot2000
1 files changed, 992 insertions, 1008 deletions
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index ad3ba003..bd965a78 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,13 +8,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Installer Help 3.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-07-07 10:48+0400\n"
+"POT-Creation-Date: 2013-10-09 20:39+0400\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"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <section><info><title>
@@ -75,6 +75,56 @@ msgid ""
"click on the <guibutton>Release Notes</guibutton> button."
msgstr ""
+#. type: Attribute 'xml:lang' of: <section>
+#: en/add_supplemental_media.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+msgid "en"
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/add_supplemental_media.xml:10
+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
+#. type: Content of: <section><mediaobject>
+#: en/add_supplemental_media.xml:18
+msgid ""
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/add_supplemental_media.xml:24
+msgid ""
+"This screen gives you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source. The "
+"source selection determines which packages will be available for selection "
+"during the next steps."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/add_supplemental_media.xml:29
+msgid "For a network source, there are two steps to follow:"
+msgstr ""
+
+#. type: Content of: <section><orderedlist><listitem><para>
+#: en/add_supplemental_media.xml:33
+msgid "Choosing and activation of the network, if not already up."
+msgstr ""
+
+#. type: Content of: <section><orderedlist><listitem><para>
+#: en/add_supplemental_media.xml:37
+msgid ""
+"Selecting a mirror or specifying a URL (very first entry). By selecting a "
+"mirror, you have access to the selection of all repositories managed by "
+"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
+"the URL, you can designate a specific repository or your own NFS "
+"installation."
+msgstr ""
+
#. type: Content of: <section><info><title>
#: en/addUser.xml:4
msgid "User and Superuser Management"
@@ -353,429 +403,523 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/installer.xml:18
-msgid "DrakX, the Mageia Installer"
+#: en/chooseDesktop.xml:5
+msgid "Desktop Selection"
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:21
+#: en/chooseDesktop.xml:11
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 "
-"possible."
+"Depending on your selection here, you may be offered further screens to fine "
+"tune your choice."
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:29
+#: en/chooseDesktop.xml:13
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."
+"After the selection step(s), you will see a slide show during package "
+"installation. The slide show can be disabled by pressing the "
+"<guilabel>Details</guilabel> button"
msgstr ""
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:35
-msgid "Installation Welcome Screen"
+#. type: Content of: <section><mediaobject>
+#: en/chooseDesktop.xml:20
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
msgstr ""
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:39
+#. type: Content of: <section><para>
+#: en/chooseDesktop.xml:26
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> "
-"</imageobject>"
+"Choose whether you prefer to use the <application>KDE</application> or "
+"<application>Gnome</application> desktop environment. Both come with a full "
+"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
+"you want to use neither or both, or if you want something other than the "
+"default software choices for these desktop environments. The "
+"<application>LXDE</application> desktop is lighter than the previous two, "
+"sporting less eye candy and fewer packages installed by default."
msgstr ""
-#. type: Content of: <section><section><figure>
-#: en/installer.xml:34 en/installer.xml:90
+#. type: Content of: <section><info><title>
+#: en/choosePackageGroups.xml:4
+msgid "Package Group Selection"
+msgstr ""
+
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. type: Content of: <section><mediaobject>
+#: en/choosePackageGroups.xml:10
msgid ""
-"<placeholder type=\"info\" id=\"0\"/> <placeholder type=\"mediaobject\" "
-"id=\"1\"/>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" "
+"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/installer.xml:47
+#: en/choosePackageGroups.xml:16
msgid ""
-"If there are problems during install, then it may be necessary to use "
-"special installation options, see <xref "
-"linkend=\"installationOptions\"></xref>."
+"Packages have been sorted into groups, to make choosing what you need on "
+"your system a lot easier. The groups are fairly self explanatory, however "
+"more information about the content of each is available in tool-tips which "
+"become visible as the mouse is hovered over them."
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:52
-msgid "The installation steps"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:23
+msgid "Workstation."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:55
-msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:27
+msgid "Server."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:58
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:31
+msgid "Graphical Environment."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/choosePackageGroups.xml:35
msgid ""
-"Each step has one or more screens which may also have "
-"<guibutton>Advanced</guibutton> buttons with extra, less commonly required, "
-"options."
+"Individual Package Selection: You can use this option to manually add or "
+"remove packages."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:62
+#. type: Content of: <section><para>
+#: en/choosePackageGroups.xml:39
msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
+"a minimal install."
msgstr ""
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:66
+#. type: Content of: <section><info><title>
+#: en/choosePackagesTree.xml:4
+msgid "Choose Individual Packages"
+msgstr ""
+
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. type: Content of: <section><mediaobject>
+#: en/choosePackagesTree.xml:11
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 "
-"partition has been formatted or updates have started to be installed, your "
-"computer is no longer in the same state and rebooting it could very well "
-"leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" "
+"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:80
-msgid "Installation options"
+#. type: Content of: <section><para>
+#: en/choosePackagesTree.xml:17
+msgid ""
+"Here you can add or remove any extra packages to customise your "
+"installation."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:83
+#. type: Content of: <section><para>
+#: en/choosePackagesTree.xml:20
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>"
+"After having made your choice, you can click on the <guibutton>floppy "
+"icon</guibutton> at the bottom of the page to save your choice of packages "
+"(saving to a USB key works, too). You can then use this file to install the "
+"same packages on another system, by pressing the same button during install "
+"and choosing to load it."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/installer.xml:87
-msgid "This will open the following text based help."
+#. type: Content of: <section><info><title>
+#: en/configureServices.xml:12
+msgid "Configure your Services"
msgstr ""
-#. type: Content of: <section><section><figure><info><title>
-#: en/installer.xml:91
-msgid "Installation Help Screen"
+#. 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 ""
+"<imageobject> <imagedata revision=\"1\" "
+"fileref=\"dx2-configureServices.png\" align=\"center\" format=\"PNG\" "
+"xml:id=\"configureServices-im1\"></imagedata> </imageobject>"
msgstr ""
-#. type: Content of: <section><section><figure><mediaobject>
-#: en/installer.xml:96
+#. type: Content of: <section><para>
+#: en/configureServices.xml:27
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-help.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> "
-"</imageobject>"
+"Here you can set which services should (not) start when you boot your "
+"system."
msgstr ""
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:105
-msgid "Installation Problems and Possible Solutions"
+#. type: Content of: <section><para>
+#: en/configureServices.xml:30
+msgid ""
+"There are four groups, click on the triangle before a group to expand it and "
+"see all services in it."
msgstr ""
-#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:111
-msgid "No Graphical Interface"
+#. type: Content of: <section><para>
+#: en/configureServices.xml:34
+msgid "The setting DrakX chose are usually good."
msgstr ""
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:116
+#. type: Content of: <section><para>
+#: en/configureServices.xml:37
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 resolution by typing <code>vgalo</code> at the prompt."
+"If you highlight a service, some information about it is shown in the info "
+"box below."
msgstr ""
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:123
-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>"
+#. type: Content of: <section><para>
+#: en/configureServices.xml:41
+msgid "Only change things when you know very well what you are doing."
msgstr ""
-#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:135
-msgid "The Install Freezes"
+#. type: Content of: <section><info><title>
+#: en/configureTimezoneUTC.xml:12
+msgid "Configure your Timezone"
msgstr ""
-#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:138
+#. 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 ""
-"If the system appeared to freeze during the installation, this may be a "
-"problem with hardware detection. In this case the automatic detection of "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"<imageobject> <imagedata revision=\"1\" "
+"fileref=\"dx2-configureTimezoneUTC.png\" align=\"center\" format=\"PNG\" "
+"xml:id=\"configureTimezoneUTC-im1\"></imagedata> </imageobject>"
msgstr ""
-#. type: Content of: <section><section><section><section><info><title>
-#: en/installer.xml:147
-msgid "Kernel Options"
+#. type: Content of: <section><para>
+#: en/configureTimezoneUTC.xml:26
+msgid ""
+"Choose your time zone by choosing your country or a city close to you in the "
+"same time zone."
msgstr ""
-#. type: Content of: <section><section><section><section><para>
-#: en/installer.xml:150
+#. type: Content of: <section><para>
+#: en/configureTimezoneUTC.xml:30
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 "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of "
-"RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM."
+"In next screen you can choose to set your hardware clock to local time or to "
+"GMT, also known as UTC."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/configureTimezoneUTC.xml:35
+msgid ""
+"If you have more than one operating system on your computer, make sure they "
+"are all set to local time, or all to UTC/GMT."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:23
-msgid "Install or Upgrade"
+#: en/configureX_card_list.xml:11
+msgid "Choose an X Server (Configure your Graphic Card)"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:27
+#: en/configureX_card_list.xml:16
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" "
-"align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" "
+"xml:id=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+"format=\"PNG\"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
-msgid "Install"
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:21
+msgid ""
+"DrakX has a very comprehensive database of video cards and will usually "
+"correctly identify your video device."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:36
-msgid "Use this option for a fresh <application>Mageia</application> installation."
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:24
+msgid ""
+"If the installer has not correctly detected your graphic card and you know "
+"which one you have, you can select it from the tree by:"
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
-msgid "Upgrade"
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+msgid "vendor"
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:43
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_card_list.xml:31
+msgid "then the name of your card"
+msgstr ""
+
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_card_list.xml:35
+msgid "and the type of card"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:39
msgid ""
-"If you have one or more <application>Mageia 2</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"If you cannot find your card in the vendor lists (because it's not yet in "
+"the database or it's an older card) you may find a suitable driver in the "
+"Xorg category"
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:49
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:43
msgid ""
-"If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been "
-"formatted or updates have started to be installed, your computer isn't in "
-"the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl "
-"Delete</guilabel> simultaneously to reboot."
+"The Xorg listing provides more than 40 generic and open source video card "
+"drivers. If you still can't find a named driver for your card there is the "
+"option of using the vesa driver which provides basic capabilities."
msgstr ""
-#. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:60
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:48
msgid ""
-"If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do "
-"<emphasis>not</emphasis> do this later in the install."
+"Be aware that if you select an incompatible driver you may only have access "
+"to the Commandline Interface."
msgstr ""
-#. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
-msgid "Keyboard"
+#. type: Content of: <section><para>
+#: en/configureX_card_list.xml:51
+msgid ""
+"Some video card manufacturers provide proprietary drivers for Linux which "
+"may only be available in the Nonfree repository and in some cases only from "
+"the card manufacturers' websites."
msgstr ""
#. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/configureX_card_list.xml:55
msgid ""
-"DrakX selects an appropriate keyboard for your language. If no suitable "
-"keyboard is found it will default to a US keyboard layout."
+"The Nonfree repository needs to be explicitly enabled to access them. If "
+"you didn't select it previously, you should do this after your first reboot."
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/configureX_chooser.xml:4
+msgid "Graphic Card and Monitor Configuration"
msgstr ""
+#. Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
#. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/configureX_chooser.xml:11
msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" "
-"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" format=\"PNG\" "
+"xml:id=\"configureX_chooser-im1\"> </imagedata> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/configureX_chooser.xml:18
+msgid ""
+"No matter which graphical environment (also known as desktop environment) "
+"you chose for this install of <application>Mageia</application>, they are "
+"all based on a graphical user interface system called <acronym>X Window "
+"System</acronym>, or simply <acronym>X</acronym>. So in order for "
+"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
+"any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if you can see that <application>DrakX</application> didn't make a "
+"choice, or if you think the choice is incorrect."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/configureX_chooser.xml:31
msgid ""
-"Make sure that the selection is correct or choose another keyboard "
-"layout. If you don't know which layout your keyboard has, look in the "
-"specifications that came with your system, or ask the computer vendor. There "
-"may even be a label on the keyboard that identifies the layout. You can also "
-"look here: <link "
-"xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
+"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
+"from the list if needed."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/configureX_chooser.xml:37
msgid ""
-"If your keyboard isn't in the list shown, click on "
-"<guibutton>More</guibutton> to get a full list, and select your keyboard "
-"there."
+"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
+"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
+"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> "
+"list. Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
+"horizontal and vertical refresh rates of your monitor."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/configureX_chooser.xml:45
+msgid "Incorrect refresh rates may damage your monitor"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:51
msgid ""
-"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
+"resolution and color depth of your monitor here."
msgstr ""
#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/configureX_chooser.xml:56
msgid ""
-"If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
+"always appear during install. If the button is there, you can control your "
+"settings by pressing it. If you see a question asking you whether your "
+"settings are correct, you can answer \"yes\", and the settings will be "
+"kept. If you don't see anything, you'll return to the configuration screen "
+"and be able to reconfigure everything until the test is good. <emphasis>Make "
+"sure your settings are on the safe side if the test button isn't "
+"available</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:67
+msgid ""
+"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
+"enable or disable various options."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
-msgid "Configure your Services"
+#: en/configureX_monitor.xml:18
+msgid "Choosing your Monitor"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/configureX_monitor.xml:21
+msgid ""
+"DrakX has a very comprehensive database of monitors and will usually "
+"correctly identify yours."
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/configureX_monitor.xml:26
+msgid ""
+"<emphasis>Selecting a monitor with different characteristics could damage "
+"your monitor or video hardware. Please don't try something without knowing "
+"what you are doing.</emphasis> If in doubt you should consult your monitor "
+"documentation"
msgstr ""
-#. 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
+#: en/configureX_monitor.xml:34
msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureServices.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureServices-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"configureX_monitor-im1\"/> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureX_monitor.xml:42
+msgid "<emphasis>Custom</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/configureX_monitor.xml:44
msgid ""
-"Here you can set which services should (not) start when you boot your "
-"system."
+"This option allows you to set two critical parameters, the vertical refresh "
+"rate and the horizontal sync rate. Vertical refresh determines how often the "
+"screen is refreshed and horizontal sync is the rate at which scan lines are "
+"displayed."
msgstr ""
#. type: Content of: <section><para>
-#: en/configureServices.xml:30
+#: en/configureX_monitor.xml:49
msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+"It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
+"type with a sync range that is beyond the capabilities of your monitor: you "
+"may damage your monitor. If in doubt, choose a conservative setting and "
+"consult your monitor documentation."
msgstr ""
#. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureX_monitor.xml:55
+msgid "<emphasis>Plug 'n Play</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureX_monitor.xml:58
msgid ""
-"If you highlight a service, some information about it is shown in the info "
-"box below."
+"This is the default option and tries to determine the monitor type from the "
+"monitor database."
msgstr ""
#. type: Content of: <section><para>
-#: en/configureServices.xml:41
-msgid "Only change things when you know very well what you are doing."
+#: en/configureX_monitor.xml:63
+msgid "<emphasis>Vendor</emphasis>"
msgstr ""
-#. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:23
-msgid "Please choose a language to use"
+#. type: Content of: <section><para>
+#: en/configureX_monitor.xml:65
+msgid ""
+"If the installer has not correctly detected your monitor and you know which "
+"one you have, you can select it from the tree by selecting:"
+msgstr ""
+
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:73
+msgid "the monitor manufacturers name"
+msgstr ""
+
+#. type: Content of: <section><para><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:77
+msgid "the monitor description"
msgstr ""
#. type: Content of: <section><para>
-#: en/selectLanguage.xml:26
-msgid ""
-"Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+#: en/configureX_monitor.xml:82
+msgid "<emphasis>Generic</emphasis>"
msgstr ""
#. type: Content of: <section><para>
-#: en/selectLanguage.xml:30
+#: en/configureX_monitor.xml:84
msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"selecting this group displays nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the Vesa card driver "
+"when your video hardware cannot be determined automatically. Once again it "
+"may be wise to be conservative in your selections."
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/diskdrake.xml:19
+msgid "Custom disk partitioning with DiskDrake"
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:36
+#: en/diskdrake.xml:26
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"></imagedata> </imageobject>"
msgstr ""
#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:44
+#: en/diskdrake.xml:33
msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"If you wish to use encryption on your <literal>/</literal> partition you "
+"must ensure that you have a separate <literal>/boot</literal> partition. The "
+"encryption option for the <literal>/boot</literal> partition must NOT be "
+"set, otherwise your system will be unbootable."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:51
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:39
msgid ""
-"If your keyboard language is not the same as your preferred language, then "
-"it is advisable to install the language of your keyboard as well."
+"Adjust the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem of a partition or change its size and even view what "
+"is in them before you start."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:57
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:42
msgid ""
-"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
-"\"multiple languages\" screen if you know that it is inappropriate for your "
-"language. Disabling UTF-8 applies to all installed languages."
+"There is a tab for every detected hard disk or other storage device, like an "
+"USB key. For example sda, sdb and sdc if there are three of them."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:45
msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -&gt; System -&gt; Manage localization for your system."
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
-msgid "Confirm hard disk to be formatted"
+"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
+"storage device"
msgstr ""
-#. 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
-#. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#. type: Content of: <section><para>
+#: en/diskdrake.xml:47
msgid ""
-"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" "
-"format=\"PNG\" align=\"center\" ></imagedata> </imageobject>"
+"For all other actions: click on the desired partition first. Then view it, "
+"or choose a filesystem and a mount point, resize it or wipe it."
msgstr ""
#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:24
-msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
-"choice."
+#: en/diskdrake.xml:49
+msgid "Continue until you adjusted everything to your wishes."
msgstr ""
#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml: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."
+#: en/diskdrake.xml:51
+msgid "Click <guibutton>Done</guibutton> when you're ready."
msgstr ""
#. type: Content of: <section><info><title>
@@ -922,184 +1066,51 @@ msgstr ""
msgid "Also make sure all partitions are created with an even number of megabytes."
msgstr ""
-#. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
-msgid "Desktop Selection"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
-msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
-"tune your choice."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
-msgid ""
-"After the selection step(s), you will see a slide show during package "
-"installation. The slide show can be disabled by pressing the "
-"<guilabel>Details</guilabel> button"
-msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
-msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
-msgid "Package Group Selection"
-msgstr ""
-
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
-#. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
-msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
-"your system a lot easier. The groups are fairly self explanatory, however "
-"more information about the content of each is available in tool-tips which "
-"become visible as the mouse is hovered over them."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
-msgid "Workstation."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
-msgid "Server."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
-msgid "Graphical Environment."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
-msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
-msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install."
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
-msgid "Choose Individual Packages"
-msgstr ""
-
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
-#. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
-msgid ""
-"Here you can add or remove any extra packages to customise your "
-"installation."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
-msgid ""
-"After having made your choice, you can click on the <guibutton>floppy "
-"icon</guibutton> at the bottom of the page to save your choice of packages "
-"(saving to a USB key works, too). You can then use this file to install the "
-"same packages on another system, by pressing the same button during install "
-"and choosing to load it."
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
-msgid "Custom disk partitioning with DiskDrake"
+#. type: Content of: <article><info><title>
+#: en/DrakX.xml:3
+msgid "Installation with DrakX"
msgstr ""
-#. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"></imagedata> </imageobject>"
+#. type: Content of: <article><info><cover><para><note>
+#: en/DrakX.xml:6
+msgid "<note>"
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#. type: Content of: <article><info><cover><para><note><para>
+#: en/DrakX.xml:7
msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"No one will see all the installer screens that you see in this manual. Which "
+"screens you will see, depends on your hardware and the choices you make "
+"while installing."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
-msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:10
+msgid "</note>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:12
msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"The texts and screenshots in this manual are available under the CC BY-SA "
+"3.0 license <link "
+"ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:16
msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"This manual was produced with the help of the <link "
+"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
+"ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
msgstr ""
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#. type: Content of: <article><info><cover><para>
+#: en/DrakX.xml:18
msgid ""
-"For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
-msgid "Continue until you adjusted everything to your wishes."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:51
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+"It was written by volunteers in their free time. Please contact <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
+"Team</link>, if you would like to help improve this manual."
msgstr ""
#. type: Content of: <section><info><title>
@@ -1206,6 +1217,182 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
+#: en/installer.xml:18
+msgid "DrakX, the Mageia Installer"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:21
+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 "
+"possible."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/installer.xml:29
+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
+msgid "Installation Welcome Screen"
+msgstr ""
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/installer.xml:39
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"BId-drakx-intro-im1\"> </imagedata> "
+"</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\"/>"
+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>."
+msgstr ""
+
+#. type: Content of: <section><section><info><title>
+#: en/installer.xml:52
+msgid "The installation steps"
+msgstr ""
+
+#. type: Content of: <section><section><para>
+#: en/installer.xml:55
+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
+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
+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
+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 "
+"partition has been formatted or updates have started to be installed, your "
+"computer is no longer in the same state and rebooting it could very well "
+"leave you with an unusable system. If in spite of this you are very sure "
+"rebooting is what you want, go to a text terminal by pressing the three keys "
+"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
+"<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
+msgid "Installation Problems and Possible Solutions"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><info><title>
+#: en/installer.xml:111
+msgid "No Graphical Interface"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:116
+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 resolution by typing <code>vgalo</code> at the prompt."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:123
+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>"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><info><title>
+#: en/installer.xml:135
+msgid "The Install Freezes"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><para>
+#: en/installer.xml:138
+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 "
+"hardware may be bypassed and dealt with later. To try this, type "
+"<code>noauto</code> at the prompt. This option may also be combined with "
+"other options as necessary."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><info><title>
+#: en/installer.xml:147
+msgid "Kernel Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><para>
+#: en/installer.xml:150
+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 "
+"<code>mem=xxxM</code> parameter, where xxx is the correct amount of "
+"RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM."
+msgstr ""
+
+#. type: Content of: <section><info><title>
#: en/installUpdates.xml:3
msgid "Updates"
msgstr ""
@@ -1243,6 +1430,96 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
msgstr ""
#. type: Content of: <section><info><title>
+#: en/media_selection.xml:3
+msgid "Media Selection (Nonfree)"
+msgstr ""
+
+#. 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-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
+#. type: Content of: <section><mediaobject>
+#: en/media_selection.xml:12
+msgid ""
+"<imageobject> <imagedata align=\"center\" "
+"fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" "
+"xml:id=\"media_selection-im1\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/media_selection.xml:18
+msgid ""
+"Here you have the list of available repositories. Not all repositories are "
+"available, according to which media you use for installing. The repositories "
+"selection determines which packages will be available for selection during "
+"the next steps."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/media_selection.xml:25
+msgid ""
+"The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
+"the base of the distribution."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/media_selection.xml:30
+msgid ""
+"The <emphasis>Nonfree</emphasis> repository includes packages that are "
+"free-of-charge, i.e. Mageia may redistribute them, but they contain "
+"closed-source software (hence the name - Nonfree). For example this "
+"repository includes nVidia and ATI graphics card proprietary drivers, "
+"firmware for various WiFi cards, etc."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/media_selection.xml:38
+msgid ""
+"The <emphasis>Tainted</emphasis> repository includes packages released under "
+"a free license. The main criteria for placing packages in this repository is "
+"that they may infringe patents and copyright laws in some countries, "
+"e.g. Multimedia codecs needed to play various audio/video files; packages "
+"needed to play commercial video DVD, etc."
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/minimal-install.xml:3
+msgid "Minimal Install"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/minimal-install.xml:9
+msgid ""
+"You can choose a Minimal Installation by de-selecting everything in the "
+"Package Group Selection screen, see <xref "
+"linkend=\"choosePackageGroups\"></xref>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/minimal-install.xml:10
+msgid ""
+"Minimal Installation is intended for those with specific uses in mind for "
+"their <application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with Manual Package "
+"Selection, see <xref linkend=\"choosePackagesTree\"></xref>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/minimal-install.xml:14
+msgid ""
+"If you choose this installation class, then the related screen will offer "
+"you a few useful extras to install, such as documentation and X."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/minimal-install.xml:19
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
+msgstr ""
+
+#. type: Content of: <section><info><title>
#: en/misc-params.xml:3
msgid "Summary of miscellaneous parameters"
msgstr ""
@@ -1441,7 +1718,7 @@ msgstr ""
msgid ""
"You can configure your network here, but for network cards with non-free "
"drivers it is better to do that after reboot, in the <application>Mageia "
-"Control Center</application>, if you have not yet enabled the non-free media "
+"Control Center</application>, if you have not yet enabled the Nonfree media "
"repositories."
msgstr ""
@@ -1519,574 +1796,309 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureTimezoneUTC.xml:12
-msgid "Configure your Timezone"
+#: en/securityLevel.xml:12
+msgid "Security Level"
msgstr ""
-#. 2012-12-25 marja - moved this part out of misc-params.xml
+#. 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 ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureTimezoneUTC.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureTimezoneUTC-im1\"></imagedata> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:26
-msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:30
-msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
-msgstr ""
-
-#. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:35
-msgid ""
-"If you have more than one operating system on your computer, make sure they "
-"are all set to local time, or all to UTC/GMT."
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/resizeFATChoose.xml:17
-msgid ""
-"Resize <application>Windows<superscript>®</superscript></application> "
-"partition"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/resizeFATChoose.xml:21
-msgid ""
-"You have more than one "
-"<application>Windows<superscript>®</superscript></application> partition. "
-"Choose which one should be made smaller to make space for installing "
-"<application>Mageia</application>."
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
-msgid "Setup SCSI"
-msgstr ""
-
-#. 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
-#. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/securityLevel.xml:19
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> "
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
"</imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
-msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
-msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
-"you have."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
-msgid "Select mouse"
-msgstr ""
-
-#. 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
-#. type: Content of: <section><mediaobject>
-#: en/selectMouse.xml:16
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/selectMouse.xml:23
-msgid ""
-"If you are not happy with how your mouse responds, you can select a "
-"different one here."
+#: en/securityLevel.xml:24
+msgid "You can adjust your security level here."
msgstr ""
#. type: Content of: <section><para>
-#: en/selectMouse.xml:25
-msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB "
-"mice</guilabel> is a good choice."
+#: en/securityLevel.xml:27
+msgid "Leave the default settings as they are, if you don't know what to choose."
msgstr ""
#. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/securityLevel.xml:30
msgid ""
-"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
-"configure the buttons that do not work on a mouse with six or more buttons."
+"After install, it will always be possible to adjust your security settings "
+"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:3
-msgid "Bootloader main options"
+#: en/selectCountry.xml:13
+msgid "Select your Country / Region"
msgstr ""
-#. 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
+#. 2012-12-25 marja - moved this section out of misc-params
+#. 2013-05-05 marja - added screenshot
#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#: en/selectCountry.xml:21
msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" "
-"format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/selectCountry.xml:27
msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"Select your country or region. This is important for all kinds of settings, "
+"like the currency and wireless regulatory domain. Setting the wrong country "
+"can lead to not being able to use a Wireless network."
msgstr ""
#. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
-msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
-msgstr ""
-
-#. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
-msgid "The Mageia graphical menus are nice :)"
-msgstr ""
-
-#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
-msgid "Using a Mageia bootloader"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
-msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record) of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
-msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
-msgstr ""
-
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/selectCountry.xml:32
msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
-"used."
+"If your country isn't in the list, click the <guilabel>Other "
+"Countries</guilabel> button and choose your country / region there."
msgstr ""
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#. type: Content of: <section><note><para>
+#: en/selectCountry.xml:37
msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"If your country is only in the <guilabel>Other Countries</guilabel> list, "
+"after clicking <guibutton>OK</guibutton> it may seem a country from the "
+"first list was chosen. Please ignore this, DrakX will follow your real "
+"choice."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
-msgid "Using an existing bootloader"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
-msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
-msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing "
-"MBR. You must select the root partition that you chose during the "
-"partitioning phase earlier, e.g. sda7."
+#: en/selectCountry.xml:46
+msgid "Input method"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr ""
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/selectCountry.xml:49
msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"input method (at the bottom of the list). Input methods allow users to input "
+"multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
+"default input method in Mageia DVDs, Africa/India and Asia/no-India "
+"Live-CDs. For Asian and African locales, IBus will be set as default input "
+"method so users should not need to configure it manually. Other input "
+"methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be "
+"installed if you added HTTP/FTP media before package selection."
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#. type: Content of: <section><section><note><para>
+#: en/selectCountry.xml:61
msgid ""
-"The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"If you missed the input method setup during installation, you can access it "
+"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"\"System\", or by running localedrake as root."
msgstr ""
-#. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
-msgid "Bootloader advanced option"
+#. type: Content of: <section><info><title>
+#: en/selectInstallClass.xml:23
+msgid "Install or Upgrade"
msgstr ""
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#. type: Content of: <section><mediaobject>
+#: en/selectInstallClass.xml:27
msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on "
-"<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp "
-"at each boot</guilabel>. This helps to maintain some free space."
-msgstr ""
-
-#. type: Attribute 'xml:lang' of: <section>
-#: en/DrakX.xml:1 en/media_selection.xml:1 en/add_supplemental_media.xml:2
-msgid "en"
-msgstr ""
-
-#. type: Content of: <article><info><title>
-#: en/DrakX.xml:3
-msgid "Installation with DrakX"
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" "
+"align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
msgstr ""
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX.xml:6
-msgid "<note>"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:34
+msgid "Install"
msgstr ""
-#. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX.xml:7
-msgid ""
-"No one will see all the installer screens that you see in this manual. Which "
-"screens you will see, depends on your hardware and the choices you make "
-"while installing."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:36
+msgid "Use this option for a fresh <application>Mageia</application> installation."
msgstr ""
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:10
-msgid "</note>"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:41
+msgid "Upgrade"
msgstr ""
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:12
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectInstallClass.xml:43
msgid ""
-"The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link "
-"ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
+"If you have one or more <application>Mageia 2</application> installations on "
+"your system, the installer will allow you to upgrade one of them to the "
+"latest release."
msgstr ""
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:16
+#. type: Content of: <section><note><para>
+#: en/selectInstallClass.xml:49
msgid ""
-"This manual was produced with the help of the <link "
-"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
-"ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
+"If during install you decide to stop the installation, it is possible to "
+"reboot, but please think twice before you do this. Once a partition has been "
+"formatted or updates have started to be installed, your computer isn't in "
+"the same state anymore and rebooting it could very well leave you with an "
+"unusable system. If in spite of that you are very sure rebooting is what you "
+"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
+"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
msgstr ""
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX.xml:18
+#. type: Content of: <section><tip><para>
+#: en/selectInstallClass.xml:60
msgid ""
-"It was written by volunteers in their free time. Please contact <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"Team</link>, if you would like to help improve this manual."
+"If you have discovered that you forgot to select an additional language, you "
+"can return from the \"Install or Upgrade\" screen to the language choice "
+"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do "
+"<emphasis>not</emphasis> do this later in the install."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
-msgid "Choose an X Server (Configure your Graphic Card)"
-msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
-msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"xml:id=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
-"format=\"PNG\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
-msgid ""
-"DrakX has a very comprehensive database of video cards and will usually "
-"correctly identify your video device."
+#: en/selectKeyboard.xml:14
+msgid "Keyboard"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/selectKeyboard.xml:17
msgid ""
-"If the installer has not correctly detected your graphic card and you know "
-"which one you have, you can select it from the tree by:"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
-msgid "vendor"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
-msgid "then the name of your card"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
-msgid "and the type of card"
+"DrakX selects an appropriate keyboard for your language. If no suitable "
+"keyboard is found it will default to a US keyboard layout."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#. type: Content of: <section><mediaobject>
+#: en/selectKeyboard.xml:22
msgid ""
-"If you cannot find your card in the vendor lists (because it's not yet in "
-"the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" "
+"/> </imageobject>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectKeyboard.xml:30
msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"Make sure that the selection is correct or choose another keyboard "
+"layout. If you don't know which layout your keyboard has, look in the "
+"specifications that came with your system, or ask the computer vendor. There "
+"may even be a label on the keyboard that identifies the layout. You can also "
+"look here: <link "
+"xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectKeyboard.xml:40
msgid ""
-"Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"If your keyboard isn't in the list shown, click on "
+"<guibutton>More</guibutton> to get a full list, and select your keyboard "
+"there."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
+#: en/selectKeyboard.xml:45
msgid ""
-"Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
+"you'll return to the first keyboard choice dialog and it will seem as though "
+"a keyboard from that screen was chosen. You can safely ignore this anomaly "
+"and continue the installation: Your keyboard is the one you chose from the "
+"full list."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectKeyboard.xml:55
msgid ""
-"The Nonfree repository need to be explicitly enabled to access them. If you "
-"didn't select it previously, you should do this after your first reboot."
+"If you choose a keyboard based on non-Latin characters, you will see an "
+"extra dialog screen asking how you would prefer to switch between the Latin "
+"and non-Latin keyboard layouts"
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
-msgid "Choosing your Monitor"
+#: en/selectLanguage.xml:23
+msgid "Please choose a language to use"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/selectLanguage.xml:26
msgid ""
-"DrakX has a very comprehensive database of monitors and will usually "
-"correctly identify yours."
+"Select your preferred language, by first expanding the list for your "
+"continent. <application>Mageia</application> will use this selection during "
+"the installation and for your installed system."
msgstr ""
-#. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:30
msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"If it is likely that you will require several languages installed on your "
+"system, for yourself or other users, then you should use the "
+"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
+"difficult to add extra language support after installation."
msgstr ""
#. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
-msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"configureX_monitor-im1\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
-msgid "<emphasis>Custom</emphasis>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/selectLanguage.xml:36
msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
-"rate and the horizontal sync rate. Vertical refresh determines how often the "
-"screen is refreshed and horizontal sync is the rate at which scan lines are "
-"displayed."
+"<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#. type: Content of: <section><warning><para>
+#: en/selectLanguage.xml:44
msgid ""
-"It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
-"type with a sync range that is beyond the capabilities of your monitor: you "
-"may damage your monitor. If in doubt, choose a conservative setting and "
-"consult your monitor documentation."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
-msgid "<emphasis>Plug 'n Play</emphasis>"
+"Even if you choose more than one language, you must first choose one of them "
+"as your preferred language in the first language screen. It will also be "
+"marked as chosen in the multiple languages screen ."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:51
msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
-msgid "<emphasis>Vendor</emphasis>"
+"If your keyboard language is not the same as your preferred language, then "
+"it is advisable to install the language of your keyboard as well."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:57
msgid ""
-"If the installer has not correctly detected your monitor and you know which "
-"one you have, you can select it from the tree by selecting:"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
-msgid "the monitor manufacturers name"
-msgstr ""
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
-msgid "the monitor description"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
-msgid "<emphasis>Generic</emphasis>"
+"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
+"\"multiple languages\" screen if you know that it is inappropriate for your "
+"language. Disabling UTF-8 applies to all installed languages."
msgstr ""
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:64
msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"You can change the language of your system after installation in the Mageia "
+"Control Center -&gt; System -&gt; Manage localization for your system."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
-msgid "Graphic Card and Monitor Configuration"
+#: en/selectMouse.xml:4
+msgid "Select mouse"
msgstr ""
-#. Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
+#. 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
#. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/selectMouse.xml:16
msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureX_chooser-im1\"> </imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
-msgid ""
-"No matter which graphical environment (also known as desktop environment) "
-"you chose for this install of <application>Mageia</application>, they are "
-"all based on a graphical user interface system called <acronym>X Window "
-"System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following "
-"<acronym>X</acronym> settings need to be correct. Choose the correct "
-"settings if you can see that <application>DrakX</application> didn't make a "
-"choice, or if you think the choice is incorrect."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
-msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
-msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> "
-"list. Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/selectMouse.xml:23
msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"If you are not happy with how your mouse responds, you can select a "
+"different one here."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#. type: Content of: <section><para>
+#: en/selectMouse.xml:25
msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be "
-"kept. If you don't see anything, you'll return to the configuration screen "
-"and be able to reconfigure everything until the test is good. <emphasis>Make "
-"sure your settings are on the safe side if the test button isn't "
-"available</emphasis>"
+"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB "
+"mice</guilabel> is a good choice."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#. type: Content of: <section><para>
+#: en/selectMouse.xml:27
msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
+"configure the buttons that do not work on a mouse with six or more buttons."
msgstr ""
#. type: Content of: <section><info><title>
@@ -2145,233 +2157,205 @@ msgid ""
msgstr ""
#. type: Content of: <section><info><title>
-#: en/minimal-install.xml:3
-msgid "Minimal Install"
+#: en/setupBootloader.xml:3
+msgid "Bootloader main options"
msgstr ""
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:9
+#. 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
msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref "
-"linkend=\"choosePackageGroups\"></xref>."
+"<imageobject> <imagedata revision=\"1\" align=\"center\" "
+"fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" "
+"format=\"PNG\" /> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/minimal-install.xml:10
+#: en/setupBootloader.xml:16
msgid ""
-"Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with Manual Package "
-"Selection, see <xref linkend=\"choosePackagesTree\"></xref>."
+"If you prefer different bootloader settings to those chosen automatically by "
+"the installer, you can change them here."
msgstr ""
#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#: en/setupBootloader.xml:20
msgid ""
-"If you choose this installation class, then the related screen will offer "
-"you a few useful extras to install, such as documentation and X."
+"You may already have another operating system on your machine, in which case "
+"you need to decide whether to add Mageia to your existing bootloader, or "
+"allow Mageia to create a new one."
msgstr ""
-#. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:19
-msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+#. type: Content of: <section><tip><para>
+#: en/setupBootloader.xml:26
+msgid "The Mageia graphical menus are nice :)"
msgstr ""
-#. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
-msgid "Security Level"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:32
+msgid "Using a Mageia bootloader"
msgstr ""
-#. 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
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:36
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
-"</imageobject>"
+"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+"(Master Boot Record) of your first hard drive. If you already have other "
+"operating systems installed, Mageia attempts to add them to your new Mageia "
+"boot menu."
msgstr ""
-#. type: Content of: <section><para>
-#: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:41
+msgid ""
+"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
+"legacy and Lilo."
msgstr ""
-#. type: Content of: <section><para>
-#: en/securityLevel.xml:27
-msgid "Leave the default settings as they are, if you don't know what to choose."
+#. type: Content of: <section><section><warning><para>
+#: en/setupBootloader.xml:45
+msgid ""
+"Linux systems which use the GRUB2 bootloader are not currently supported by "
+"GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
+"used."
msgstr ""
-#. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#. type: Content of: <section><section><warning><para>
+#: en/setupBootloader.xml:49
msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"The best solution here is to use the GRUB2 bootloader which is available at "
+"the Summary page during installation."
msgstr ""
-#. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
-msgid "Select your Country / Region"
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:56
+msgid "Using an existing bootloader"
msgstr ""
-#. 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
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:60
msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-"</imageobject>"
+"If you decide to use an existing bootloader then you will need to remember "
+"to STOP at the summary page during the installation and click the Bootloader "
+"<guibutton>Configure</guibutton> button, which will allow you to change the "
+"bootloader install location."
msgstr ""
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:66
msgid ""
-"Select your country or region. This is important for all kinds of settings, "
-"like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"Do not select a device e.g.\"sda\", or you will overwrite your existing "
+"MBR. You must select the root partition that you chose during the "
+"partitioning phase earlier, e.g. sda7."
msgstr ""
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:71
+msgid "To be clear, sda is a device, sda7 is a partition on that device."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:75
msgid ""
-"If your country isn't in the list, click the <guilabel>Other "
-"Countries</guilabel> button and choose your country / region there."
+"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
+"the installer screen."
msgstr ""
-#. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:81
msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
-"choice."
+"The exact procedure for adding your Mageia system to an existing bootloader "
+"is beyond the scope of this help, however in most cases it will involve "
+"running the relevant bootloader installation program which should detect and "
+"add it automatically. See the documentation for the operating system in "
+"question."
msgstr ""
#. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
-msgid "Input method"
+#: en/setupBootloader.xml:91
+msgid "Bootloader advanced option"
msgstr ""
#. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
-msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
-"input method (at the bottom of the list). Input methods allow users to input "
-"multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
-"default input method in Mageia DVDs, Africa/India and Asia/no-India "
-"Live-CDs. For Asian and African locales, IBus will be set as default input "
-"method so users should not need to configure it manually. Other input "
-"methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be "
-"installed if you added HTTP/FTP media before package selection."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/setupBootloader.xml:95
msgid ""
-"If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
-"\"System\", or by running localedrake as root."
+"If you have very limited disk space for the <literal>/</literal> partition "
+"that contains <literal>/tmp</literal>, click on "
+"<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp "
+"at each boot</guilabel>. This helps to maintain some free space."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
+#: en/setupSCSI.xml:11
+msgid "Setup SCSI"
msgstr ""
-#. 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-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
+#. 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
#. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/setupSCSI.xml:26
msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"media_selection-im1\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> "
+"</imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/media_selection.xml:18
-msgid ""
-"Here you have the list of available repositories. Not all repositories are "
-"available, according to which media you use for installing. The repositories "
-"selection determines which packages will be available for selection during "
-"the next steps."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/setupSCSI.xml:32
msgid ""
-"The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
-"the base of the distribution."
+"DrakX usually detects hard disks correctly. With some older SCSI controllers "
+"it may be unable to determine the correct drivers to use and subsequently "
+"fail to recognise the drive."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#. type: Content of: <section><para>
+#: en/setupSCSI.xml:36
msgid ""
-"The <emphasis>Non-free</emphasis> repository includes packages that are "
-"free-of-charge, i.e. Mageia may redistribute them, but they contain "
-"closed-source software (hence the name - Nonfree). For example this "
-"repository includes nVidia and ATI graphics card proprietary drivers, "
-"firmware for various WiFi cards, etc."
+"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"you have."
msgstr ""
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
-msgid ""
-"The <emphasis>Tainted</emphasis> repository includes packages released under "
-"a free license. The main criteria for placing packages in this repository is "
-"that they may infringe patents and copyright laws in some countries, "
-"e.g. Multimedia codecs needed to play various audio/video files; packages "
-"needed to play commercial video DVD, etc."
+#. type: Content of: <section><para>
+#: en/setupSCSI.xml:39
+msgid "DrakX should then be able to configure the drive(s) correctly."
msgstr ""
#. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
-msgid "Media Selection (Configure Supplemental Installation Media)"
+#: en/takeOverHdConfirm.xml:4
+msgid "Confirm hard disk to be formatted"
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
+#. 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
#. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/takeOverHdConfirm.xml:19
msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" "
+"format=\"PNG\" align=\"center\" ></imagedata> </imageobject>"
msgstr ""
#. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/takeOverHdConfirm.xml:24
msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"choice."
msgstr ""
#. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
-msgid "For a network source, there are two steps to follow:"
-msgstr ""
-
-#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
-msgid "Choosing and activation of the network, if not already up."
-msgstr ""
-
-#. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/takeOverHdConfirm.xml:27
msgid ""
-"Selecting a mirror or specifying a URL (very first entry). By selecting a "
-"mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the non-free , the tainted repositories and the updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"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 ""