diff options
| author | Yuri Chornoivan <yurchor@ukr.net> | 2018-04-10 17:29:50 +0300 |
|---|---|---|
| committer | Yuri Chornoivan <yurchor@ukr.net> | 2018-04-10 17:29:50 +0300 |
| commit | 7f53d03dd6c402f07f487e888b3b9c8b132fd8fe (patch) | |
| tree | 1a5fcb4a4b78ed54b4a1eb6be20c0fd1cb366ca3 /docs/docs/stable/installer/help.pot | |
| parent | 563c928968054fa706280d7cd32b4250027c4be8 (diff) | |
| download | tools-7f53d03dd6c402f07f487e888b3b9c8b132fd8fe.tar tools-7f53d03dd6c402f07f487e888b3b9c8b132fd8fe.tar.gz tools-7f53d03dd6c402f07f487e888b3b9c8b132fd8fe.tar.bz2 tools-7f53d03dd6c402f07f487e888b3b9c8b132fd8fe.tar.xz tools-7f53d03dd6c402f07f487e888b3b9c8b132fd8fe.zip | |
Update translation templates
Diffstat (limited to 'docs/docs/stable/installer/help.pot')
| -rw-r--r-- | docs/docs/stable/installer/help.pot | 2181 |
1 files changed, 1100 insertions, 1081 deletions
diff --git a/docs/docs/stable/installer/help.pot b/docs/docs/stable/installer/help.pot index a615dc24..08c0ad6b 100644 --- a/docs/docs/stable/installer/help.pot +++ b/docs/docs/stable/installer/help.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Mageia Installer Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2017-06-25 20:39+0300\n" +"POT-Creation-Date: 2018-04-10 17:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,12 +25,11 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/acceptLicense.xml:29 msgid "" -"<imageobject condition=\"classical\"> <imagedata " -"xml:id=\"acceptLicense-im1\" revision=\"4\" align=\"center\" format=\"PNG\" " -"fileref=\"dx2-license.png\"/> </imageobject> <imageobject> <imagedata " -"xml:id=\"acceptLicense-im2\" revision=\"5\" align=\"center\" " -"condition=\"live\" format=\"PNG\" fileref=\"live-license.png\"/> " -"</imageobject>" +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " +"xml:id=\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" " +"revision=\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" " +"fileref=\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" " +"align=\"center\" condition=\"live\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><info><title> @@ -56,7 +55,7 @@ msgstr "" #. type: Content of: <section><section><para> #: en/acceptLicense.xml:50 msgid "" -"To accept, simply select <guilabel>Accept</guilabel> and then click on " +"To proceed, simply select <guilabel>Accept</guilabel> and then click on " "<guibutton>Next</guibutton>." msgstr "" @@ -75,18 +74,18 @@ msgstr "" #. type: Content of: <section><section><para> #: en/acceptLicense.xml:70 msgid "" -"Important information are given about this release of " -"<application>Mageia</application> and are accessible clicking on the " +"Important information about this release of " +"<application>Mageia</application> can be viewed by clicking on the " "<guibutton>Release Notes</guibutton> button." msgstr "" #. type: Attribute 'xml:lang' of: <section> -#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1 en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1 +#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1 en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1 msgid "en" msgstr "" #. type: Content of: <section><info><title> -#: en/add_supplemental_media.xml:10 +#: en/add_supplemental_media.xml:3 msgid "Media Selection (Configure Supplemental Installation Media)" msgstr "" @@ -94,51 +93,53 @@ msgstr "" #. 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 +#: en/add_supplemental_media.xml:14 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 format=\"PNG\" " +"fileref=\"dx2-add_supplemental_media.png\" " +"xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision=\"1\"/> " +"</imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/add_supplemental_media.xml:24 +#: en/add_supplemental_media.xml:19 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." +"This screen shows 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 during the " +"next steps." msgstr "" #. type: Content of: <section><para> -#: en/add_supplemental_media.xml:29 +#: en/add_supplemental_media.xml:24 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 +#: en/add_supplemental_media.xml:28 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/add_supplemental_media.xml:32 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." +"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis " +"role=\"bold\">Tainted</emphasis> repositories and the <emphasis " +"role=\"bold\">Updates</emphasis>. With the URL, you can designate a specific " +"repository or your own NFS installation." msgstr "" #. type: Content of: <section><note><para> -#: en/add_supplemental_media.xml:46 +#: en/add_supplemental_media.xml:42 msgid "" "If you are updating a 64 bit installation which may contain some 32 bit " "packages, it is advised to use this screen to add an online mirror by " -"ticking one of the Network protocols here. The 64 bit DVD iso only contains " -"64 bit and noarch packages, it will not be able to update the 32 bit " -"packages. However, after adding an online mirror, installer will find the " -"needed 32 bit packages there." +"ticking one of the Network protocols here. The 64-bit DVD ISO only contains " +"64-bit and noarch packages, it will not be able to update the 32-bit " +"packages. However, after adding an online mirror, the installer will find " +"the needed 32-bit packages there." msgstr "" #. type: Content of: <section><info><title> @@ -148,7 +149,7 @@ msgstr "" #. Lebarhon: 20170210 updated for Mageia 6 (umask) #. type: Content of: <section><mediaobject> -#: en/addUser.xml:7 +#: en/addUser.xml:9 msgid "" "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " "fileref=\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" " @@ -157,160 +158,138 @@ msgid "" msgstr "" #. type: Content of: <section><section><info><title> -#: en/addUser.xml:16 +#: en/addUser.xml:20 msgid "Set Administrator (root) Password:" msgstr "" #. type: Content of: <section><section><para> -#: en/addUser.xml:19 +#: en/addUser.xml:24 msgid "" "It is advisable for all <application>Mageia</application> installations to " -"set a superuser or administrator's password, usually called the " -"<emphasis>root password</emphasis> in Linux. As you type a password into the " -"top box the colour of its shield will change from red to yellow to green " +"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, " +"usually called the <emphasis>root password</emphasis> in Linux. As you type " +"a password into the top box a shield will change from red to yellow to green " "depending on the strength of the password. A green shield shows you are " "using a strong password. You need to repeat the same password in the box " -"just below the first password box, this checks that you have not mistyped " -"the first password by comparing them." +"underneath, to check that the first entry was not mistyped." msgstr "" #. type: Content of: <section><section><note><para> -#: en/addUser.xml:28 +#: en/addUser.xml:34 msgid "" -"All passwords are case sensitive, it is best to use a mixture of letters " +"All passwords are case sensitive. It is best to use a mixture of letters " "(upper and lower case), numbers and other characters in a password." msgstr "" #. type: Content of: <section><section><info><title> -#: en/addUser.xml:35 +#: en/addUser.xml:42 msgid "Enter a user" msgstr "" #. type: Content of: <section><section><para> -#: en/addUser.xml:37 +#: en/addUser.xml:45 msgid "" -"Add a user here. A user has fewer rights than the superuser (root), but " -"enough to use the internet, office applications or play games and anything " -"else the average user does with his computer" +"Add a user here. A regular user has fewer privileges than the <emphasis " +"role=\"bold\">superuser</emphasis> (root), but enough to use the internet, " +"office applications or play games and anything else the average user might " +"use their computer for." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:40 +#: en/addUser.xml:52 msgid "" "<guibutton>Icon</guibutton>: if you click on this button it will change the " "user's icon." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:43 +#: en/addUser.xml:57 msgid "" "<guilabel>Real Name</guilabel>: Insert the user's real name into this text " "box." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:46 +#: en/addUser.xml:62 msgid "" -"<guilabel>Login Name</guilabel>: Here you enter the user login name or let " -"drakx use a version of the user's real name. <emphasis>The login name is " +"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use " +"a version of the user's real name. <emphasis role=\"bold\">The login name is " "case sensitive.</emphasis>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:50 +#: en/addUser.xml:67 msgid "" -"<guilabel>Password</guilabel>: In this text box you should type in the user " -"password. There is a shield at the end of the text box that indicates the " -"strength of the password. (See also <xref linkend=\"givePassword\"/>)" +"<guilabel>Password</guilabel>: Type in the user password. There is a shield " +"at the end of the text box that indicates the strength of the password. (See " +"also <xref linkend=\"givePassword\"/>)" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:55 +#: en/addUser.xml:73 msgid "" -"<guilabel>Password (again)</guilabel>: Retype the user password into this " -"text box and drakx will check you have the same password in each of the user " -"password text boxes." +"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will " +"check that you have not mistyped the password." msgstr "" #. type: Content of: <section><section><note><para> -#: en/addUser.xml:61 +#: en/addUser.xml:79 msgid "" -"Any user you add while installing Mageia, will have a both read and write " -"protected home directory (umask=0027)." +"Any users you added while installing Mageia, will have a home directory that " +"is both read and write protected (umask=0027)." msgstr "" #. type: Content of: <section><section><note><para> -#: en/addUser.xml:63 +#: en/addUser.xml:82 msgid "" -"You can add all extra needed users in the <emphasis>Configuration - " +"You can add any extra needed users in the <emphasis>Configuration - " "Summary</emphasis> step during the install. Choose <emphasis>User " "management</emphasis>." msgstr "" #. type: Content of: <section><section><note><para> -#: en/addUser.xml:66 +#: en/addUser.xml:86 msgid "The access permissions can also be changed after the install." msgstr "" #. type: Content of: <section><section><info><title> -#: en/addUser.xml:72 +#: en/addUser.xml:93 msgid "Advanced User Management" msgstr "" #. type: Content of: <section><section><para> -#: en/addUser.xml:74 -msgid "" -"If the <guibutton>advanced</guibutton> button is clicked you are offered a " -"screen that allows you to edit the settings for the user you are adding." -msgstr "" - -#. type: Content of: <section><section><para> -#: en/addUser.xml:77 -msgid "Additionally, you can disable or enable a guest account." -msgstr "" - -#. type: Content of: <section><section><warning><para> -#: en/addUser.xml:80 -msgid "" -"Anything a guest with a default <emphasis>rbash</emphasis> guest account " -"saves to his /home directory will be erased when he logs out. The guest " -"should save his important files to a USB key." -msgstr "" - -#. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:86 +#: en/addUser.xml:96 msgid "" -"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a " -"guest account. The guest account allows a guest to log into and use the PC, " -"but he has more restricted access than normal users." +"The <guibutton>Advanced</guibutton> option allows you to edit further " +"settings for the user you are adding." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:92 +#: en/addUser.xml:101 msgid "" -"<guilabel>Shell</guilabel>: This drop down list allows you to change the " -"shell used by the user you are adding in the previous screen, options are " -"Bash, Dash and Sh" +"<guilabel>Shell</guilabel>: This drop-down list allows you to change the " +"shell available to any user you added in the previous screen. Options are " +"<emphasis role=\"bold\">Bash</emphasis>, <emphasis " +"role=\"bold\">Dash</emphasis> and <emphasis role=\"bold\">Sh</emphasis>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:97 +#: en/addUser.xml:107 msgid "" -"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you " -"are adding in the previous screen. This is a number. Leave it blank unless " -"you know what you are doing." +"<guilabel>User ID</guilabel>: Here you can set the <emphasis " +"role=\"bold\">user ID</emphasis> for any user you added in the previous " +"screen. If you are unsure what the purpose of this is, then leave it blank." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/addUser.xml:102 +#: en/addUser.xml:113 msgid "" -"<guilabel>Group ID</guilabel>: This lets you set the group ID. Also a " -"number, usually the same one as for the user. Leave it blank unless you know " -"what you are doing." +"<guilabel>Group ID</guilabel>: This lets you set the <emphasis " +"role=\"bold\">group ID</emphasis>. Again, if unsure, leave it blank." msgstr "" #. type: Content of: <section><info><title> -#: en/ask_mntpoint_s.xml:11 +#: en/ask_mntpoint_s.xml:3 msgid "Choose the mount points" msgstr "" @@ -328,16 +307,16 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/ask_mntpoint_s.xml:27 msgid "" -"<imageobject condition='classical'> <imagedata revision=\"1\" " -"fileref=\"dx2-chooseMountpoints.png\" align=\"center\" format=\"PNG\" " -"xml:id=\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject " -"condition='live'> <imagedata revision=\"1\" " -"fileref=\"live-chooseMountpoints.png\" align=\"center\" format=\"PNG\" " -"xml:id=\"live-chooseMountPoints-im1\"></imagedata> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " +"xml:id=\"chooseMountPoints-im1\" align=\"center\" " +"fileref=\"dx2-chooseMountpoints.png\" revision=\"1\"/> </imageobject> " +"<imageobject condition=\"live\"> <imagedata format=\"PNG\" " +"fileref=\"live-chooseMountpoints.png\" align=\"center\" " +"xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/ask_mntpoint_s.xml:37 +#: en/ask_mntpoint_s.xml:36 msgid "" "Here you see the Linux partitions that have been found on your computer. If " "you don't agree with the <application>DrakX</application> suggestions, you " @@ -345,54 +324,59 @@ msgid "" msgstr "" #. type: Content of: <section><note><para> -#: en/ask_mntpoint_s.xml:42 +#: en/ask_mntpoint_s.xml:41 msgid "" -"If you change anything, make sure you still have a <literal>/</literal> " -"(root) partition." +"If you change anything, make sure you still have a <emphasis " +"role=\"bold\"><literal>/</literal></emphasis> (root) partition." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/ask_mntpoint_s.xml:48 +#: en/ask_mntpoint_s.xml:46 msgid "" -"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount " -"point\", \"Type\")." +"Every partition is shown to the left as: <emphasis role=\"bold\">Device " +"(capacity, mount point, type).</emphasis>" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/ask_mntpoint_s.xml:53 +#: en/ask_mntpoint_s.xml:50 msgid "" -"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], " -"\"partition number\" (for example, \"sda5\")." +"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis " +"role=\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive " +"name</emphasis> (letter)], <emphasis role=\"bold\">partition " +"number</emphasis> (for example, <emphasis role=\"bold\">sda5</emphasis>)." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/ask_mntpoint_s.xml:59 +#: en/ask_mntpoint_s.xml:56 msgid "" -"If you have many partitions, you can choose many different mount points from " -"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> " -"and <literal>/var</literal>. You can even make your own mount points, for " -"instance <literal>/video</literal> for a partition where you want to store " -"your films, or <literal>/cauldron-home</literal> for the " -"<literal>/home</literal> partition of a cauldron install." +"If you have several partitions, you can choose various different mount " +"points from the drop down menu, such as <emphasis " +"role=\"bold\">/</emphasis>, <emphasis " +"role=\"bold\"><literal>/home</literal></emphasis> and <emphasis " +"role=\"bold\">/var</emphasis>. You can even make your own mount points, for " +"instance <emphasis role=\"bold\"><literal>/video</literal></emphasis> for a " +"partition where you want to store your films, or <emphasis " +"role=\"bold\">/Data</emphasis> (or some other name) for your data." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/ask_mntpoint_s.xml:69 +#: en/ask_mntpoint_s.xml:63 msgid "" -"For partitions you don't need to have access to, you can leave the mount " -"point field blank." +"For any partitions that you don't need to make use of, you can leave the " +"mount point field blank." msgstr "" #. type: Content of: <section><warning><para> -#: en/ask_mntpoint_s.xml:75 +#: en/ask_mntpoint_s.xml:69 msgid "" -"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, " -"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen " -"that follows, you can click on a partition to see its type and size." +"If you are not sure what to choose, click <emphasis " +"role=\"bold\">Previous</emphasis> to go back and then tick <guilabel>Custom " +"disk partitioning</guilabel>, where, you can click on a partition to see its " +"type and size." msgstr "" #. type: Content of: <section><para> -#: en/ask_mntpoint_s.xml:81 +#: en/ask_mntpoint_s.xml:74 msgid "" "If you are sure the mount points are correct, click on " "<guibutton>Next</guibutton>, and choose whether you only want to format the " @@ -606,14 +590,14 @@ msgstr "" #. type: Content of: <section><para> #: en/chooseDesktop.xml:8 msgid "" -"Depending on your selection here, you may be offered further screens to fine " -"tune your choice." +"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:11 msgid "" -"After the selection step(s), you will see a slide show during package " +"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 "" @@ -628,13 +612,15 @@ msgstr "" #. type: Content of: <section><para> #: en/chooseDesktop.xml:21 msgid "" -"Choose whether you prefer to use the <application>KDE</application> or " -"<application>Gnome</application> desktop environment. Both come with a full " +"Choose whether you prefer to use the <application>KDE</application> " +"<emphasis role=\"bold\">Plasma </emphasis>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 " +"you wish to use neither (or even use both), or if you want to modify 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." +"<application>LXDE</application> desktop, for instance, is lighter than the " +"previous two, sporting less eye candy and fewer packages installed by " +"default." msgstr "" #. type: Content of: <section><info><title> @@ -653,7 +639,7 @@ msgstr "" #. type: Content of: <section><para> #: en/choosePackageGroups.xml:14 msgid "" -"Packages have been sorted into groups, to make choosing what you need on " +"Packages are arranged into common 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." @@ -661,55 +647,55 @@ msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> #: en/choosePackageGroups.xml:21 -msgid "Workstation." +msgid "<emphasis role=\"bold\">Workstation</emphasis>" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> #: en/choosePackageGroups.xml:25 -msgid "Server." +msgid "<emphasis role=\"bold\">Server</emphasis>" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> #: en/choosePackageGroups.xml:29 -msgid "Graphical Environment." +msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> #: en/choosePackageGroups.xml:33 msgid "" -"Individual Package Selection: You can use this option to manually add or " -"remove packages." +"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can " +"use this option to manually add or remove packages" msgstr "" #. type: Content of: <section><para> #: en/choosePackageGroups.xml:38 msgid "" -"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a " +"See <xref linkend=\"minimal-install\"/> for instructions on how to do a " "minimal install (without or with X & IceWM)." msgstr "" #. type: Content of: <section><info><title> -#: en/choosePackagesTree.xml:4 +#: en/choosePackagesTree.xml:3 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 +#: en/choosePackagesTree.xml:9 msgid "" -"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" " -"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" " +"fileref=\"dx2-choosePackagesTree.png\" align=\"center\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/choosePackagesTree.xml:17 +#: en/choosePackagesTree.xml:14 msgid "" -"Here you can add or remove any extra packages to customise your " +"Here you can add or remove any extra packages to customize your " "installation." msgstr "" #. type: Content of: <section><para> -#: en/choosePackagesTree.xml:20 +#: en/choosePackagesTree.xml:17 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 " @@ -719,48 +705,44 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/configureServices.xml:12 +#: en/configureServices.xml:3 msgid "Configure your Services" 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/configureServices.xml:11 msgid "" -"<imageobject> <imagedata revision=\"1\" " -"fileref=\"dx2-configureServices.png\" align=\"center\" format=\"PNG\" " -"xml:id=\"configureServices-im1\"></imagedata> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" " +"fileref=\"dx2-configureServices.png\" xml:id=\"configureServices-im1\" " +"align=\"center\" revision=\"1\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/configureServices.xml:27 -msgid "" -"Here you can set which services should (not) start when you boot your " -"system." +#: en/configureServices.xml:16 +msgid "Here you can choose which services should start when you boot your system." msgstr "" #. 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." +#: en/configureServices.xml:19 +msgid "Click on a triangle to expand a group to all the relevant services." msgstr "" #. type: Content of: <section><para> -#: en/configureServices.xml:34 -msgid "The setting DrakX chose are usually good." +#: en/configureServices.xml:22 +msgid "The settings DrakX chose are usually good." msgstr "" #. type: Content of: <section><para> -#: en/configureServices.xml:37 +#: en/configureServices.xml:25 msgid "" "If you highlight a service, some information about it is shown in the info " "box below." msgstr "" #. type: Content of: <section><para> -#: en/configureServices.xml:41 +#: en/configureServices.xml:28 msgid "Only change things when you know very well what you are doing." msgstr "" @@ -774,25 +756,25 @@ msgstr "" #. type: Content of: <section><mediaobject> #: en/configureTimezoneUTC.xml:11 msgid "" -"<imageobject condition=\"classical\"> <imagedata " -"xml:id=\"configureTimezoneUTC-im1\" revision=\"1\" " -"fileref=\"dx2-configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> " -"</imageobject> <imageobject> <imagedata fileref=\"live-timeZone.png\" " -"condition=\"live\" format=\"PNG\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " +"xml:id=\"configureTimezoneUTC-im1\" align=\"center\" " +"fileref=\"dx2-configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> " +"<imageobject> <imagedata format=\"PNG\" fileref=\"live-timeZone.png\" " +"condition=\"live\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> #: en/configureTimezoneUTC.xml:20 msgid "" -"Choose your time zone by choosing your country or a city close to you in the " -"same time zone." +"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:24 msgid "" -"In next screen you can choose to set your hardware clock to local time or to " -"GMT, also known as UTC." +"In the 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> @@ -803,198 +785,193 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/configureX_card_list.xml:11 +#: en/configureX_card_list.xml:13 msgid "Choose an X Server (Configure your Graphic Card)" msgstr "" #. type: Content of: <section><mediaobject> -#: en/configureX_card_list.xml:16 +#: en/configureX_card_list.xml:18 msgid "" -"<imageobject> <imagedata revision=\"1\" align=\"center\" " -"xml:id=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" " -"format=\"PNG\"/> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" " +"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> " +"</imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/configureX_card_list.xml:21 +#: en/configureX_card_list.xml:23 msgid "" "DrakX has a very comprehensive database of video cards and will usually " "correctly identify your video device." msgstr "" #. type: Content of: <section><para> -#: en/configureX_card_list.xml:24 +#: en/configureX_card_list.xml:26 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 +#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57 msgid "vendor" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/configureX_card_list.xml:31 +#: en/configureX_card_list.xml:33 msgid "then the name of your card" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/configureX_card_list.xml:35 +#: en/configureX_card_list.xml:37 msgid "and the type of card" msgstr "" #. type: Content of: <section><para> -#: en/configureX_card_list.xml:39 +#: en/configureX_card_list.xml:41 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" +"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than " +"40 generic and open source video card drivers. If you still can't find a " +"specific driver for your card there is the option of using the <emphasis " +"role=\"bold\">vesa</emphasis> driver which provides basic capabilities." msgstr "" #. type: Content of: <section><para> -#: en/configureX_card_list.xml:43 -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." -msgstr "" - -#. type: Content of: <section><para> -#: en/configureX_card_list.xml:48 +#: en/configureX_card_list.xml:47 msgid "" "Be aware that if you select an incompatible driver you may only have access " -"to the Commandline Interface." +"to the <emphasis role=\"bold\">Command-line</emphasis> Interface." msgstr "" #. 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." +"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> " +"repository and in some cases only from the card manufacturers' websites." msgstr "" #. type: Content of: <section><para> -#: en/configureX_card_list.xml:55 +#: en/configureX_card_list.xml:56 msgid "" -"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." +"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be " +"explicitly enabled to access them. If you didn't enable it previously, you " +"should do this after your first reboot." msgstr "" #. type: Content of: <section><info><title> -#: en/configureX_chooser.xml:4 +#: en/configureX_chooser.xml:3 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/configureX_chooser.xml:11 +#: en/configureX_chooser.xml:10 msgid "" -"<imageobject> <imagedata revision=\"1\" " -"fileref=\"dx2-configureX_chooser.png\" align=\"center\" format=\"PNG\" " -"xml:id=\"configureX_chooser-im1\"> </imagedata> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" " +"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> " +"</imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/configureX_chooser.xml:18 +#: en/configureX_chooser.xml:15 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." +"<acronym>KDE</acronym> Plasma, <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 none are shown, or if you think the details are " +"incorrect." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/configureX_chooser.xml:31 +#: en/configureX_chooser.xml:27 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 +#: en/configureX_chooser.xml:33 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." +"<guilabel>Plug'n Play</guilabel> if 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 +#: en/configureX_chooser.xml:41 msgid "Incorrect refresh rates may damage your monitor" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/configureX_chooser.xml:51 +#: en/configureX_chooser.xml:47 msgid "" -"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired " -"resolution and color depth of your monitor here." +"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and " +"color depth of your monitor ca be set here." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/configureX_chooser.xml:56 +#: en/configureX_chooser.xml:52 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>" +"always appear during install. If the option is there, and you test your " +"settings, you should be ask whether your settings are correct. If you answer " +"<emphasis role=\"bold\">yes</emphasis>, 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 result is satisfactory. If the test " +"option is not available, then make sure your settings are on the safe side." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/configureX_chooser.xml:67 +#: en/configureX_chooser.xml:63 msgid "" "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to " "enable or disable various options." msgstr "" #. type: Content of: <section><info><title> -#: en/configureX_monitor.xml:18 +#: en/configureX_monitor.xml:11 msgid "Choosing your Monitor" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:21 +#: en/configureX_monitor.xml:14 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 +#: en/configureX_monitor.xml:19 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" +"<emphasis role=\"bold\">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 "" #. type: Content of: <section><mediaobject> -#: en/configureX_monitor.xml:34 +#: en/configureX_monitor.xml:26 msgid "" -"<imageobject> <imagedata align=\"center\" " -"fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" " -"xml:id=\"configureX_monitor-im1\"/> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" " +"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> " +"</imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:42 +#: en/configureX_monitor.xml:31 msgid "<emphasis>Custom</emphasis>" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:44 +#: en/configureX_monitor.xml:33 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 " @@ -1003,7 +980,7 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:49 +#: en/configureX_monitor.xml:38 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 " @@ -1012,61 +989,62 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:55 +#: en/configureX_monitor.xml:44 msgid "<emphasis>Plug 'n Play</emphasis>" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:58 +#: en/configureX_monitor.xml:47 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 +#: en/configureX_monitor.xml:51 msgid "<emphasis>Vendor</emphasis>" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:65 +#: en/configureX_monitor.xml:53 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 +#: en/configureX_monitor.xml:61 msgid "the monitor manufacturers name" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/configureX_monitor.xml:77 +#: en/configureX_monitor.xml:65 msgid "the monitor description" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:82 +#: en/configureX_monitor.xml:69 msgid "<emphasis>Generic</emphasis>" msgstr "" #. type: Content of: <section><para> -#: en/configureX_monitor.xml:84 +#: en/configureX_monitor.xml:71 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." +"selecting this group will list 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 <emphasis " +"role=\"bold\">Vesa</emphasis> 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:6 +#: en/diskdrake.xml:7 msgid "Custom disk partitioning with DiskDrake" msgstr "" #. type: Content of: <section><mediaobject> -#: en/diskdrake.xml:10 +#: en/diskdrake.xml:12 msgid "" "<imageobject condition=\"classical\"> <imagedata " "fileref=\"dx2-diskdrake.png\" align=\"center\"/> </imageobject> <imageobject " @@ -1075,86 +1053,88 @@ msgid "" msgstr "" #. type: Content of: <section><warning><para> -#: en/diskdrake.xml:18 +#: en/diskdrake.xml:22 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." +"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> " +"partition you must ensure that you have a separate <emphasis " +"role=\"bold\">/boot</emphasis> partition. The encryption option for the " +"<emphasis role=\"bold\">/boot</emphasis> partition must NOT be set, " +"otherwise your system will be unbootable." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:24 +#: en/diskdrake.xml:29 msgid "" -"Adjust the layout of your disk(s) here. You can remove or create " +"Modify 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." +"view their details before you start." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:28 +#: en/diskdrake.xml:34 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." +"There is a tab at the top for every detected hard disk (or other storage " +"device like a USB key). In the screen-shot above there are two available " +"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis " +"role=\"bold\">sdb</emphasis>." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:31 +#: en/diskdrake.xml:39 msgid "" -"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected " -"storage device" +"Take care with the <guibutton>Clear all</guibutton> option, use it only if " +"you are sure you want to wipe all partitions on the selected storage device." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:33 +#: en/diskdrake.xml:43 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. <guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert " -"mode</guibutton>) gives some more tools like to add a label or to choose a " -"partition type." +"it. <guibutton>Expert mode</guibutton> provides more options such as a label " +"(give a name to) a partition, or to choose a partition type." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:38 -msgid "Continue until you adjusted everything to your wishes." +#: en/diskdrake.xml:49 +msgid "Continue until you have adjusted everything to your satisfaction." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:40 +#: en/diskdrake.xml:52 msgid "Click <guibutton>Done</guibutton> when you're ready." msgstr "" #. type: Content of: <section><note><para> -#: en/diskdrake.xml:43 +#: en/diskdrake.xml:56 msgid "" -"If you are installing Mageia on an UEFI system, check that an ESP (EFI " -"System Partition) is present and correctly mounted on /boot/EFI (see below)" +"If you are installing Mageia on a UEFI system, check that an ESP (EFI System " +"Partition) is present and correctly mounted on /boot/EFI (see below)" msgstr "" #. type: Content of: <section><note><para><mediaobject> -#: en/diskdrake.xml:46 +#: en/diskdrake.xml:61 msgid "" -"<imageobject condition=\"classical\"><imagedata " -"fileref=\"dx2-diskdrake2.png\" align=\"center\"/></imageobject><imageobject " -"condition=\"live\"><imagedata align=\"center\" " -"fileref=\"live-diskdrake2.png\"/></imageobject>" +"<imageobject condition=\"classical\"> <imagedata " +"fileref=\"dx2-diskdrake2.png\" align=\"center\"/> </imageobject> " +"<imageobject condition=\"live\"> <imagedata align=\"center\" " +"fileref=\"live-diskdrake2.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><note><para> -#: en/diskdrake.xml:46 +#: en/diskdrake.xml:60 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>" msgstr "" #. type: Content of: <section><note><para> -#: en/diskdrake.xml:49 +#: en/diskdrake.xml:72 msgid "" "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot " "partition is present and of the correct type" msgstr "" #. type: Content of: <section><note><mediaobject> -#: en/diskdrake.xml:51 +#: en/diskdrake.xml:76 msgid "" "<imageobject condition=\"classical\"> <imagedata align=\"center\" " "fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject " @@ -1163,27 +1143,27 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/doPartitionDisks.xml:7 +#: en/doPartitionDisks.xml:9 msgid "Partitioning" msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:9 +#: en/doPartitionDisks.xml:12 msgid "" -"In this screen you can see the content of your hard drive(s) and see the " -"solutions the DrakX partitioning wizard found for where to install " +"In this screen you can see the content of your hard drive(s) along with the " +"DrakX partitioning proposals for where to install " "<application>Mageia</application>." msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:13 +#: en/doPartitionDisks.xml:16 msgid "" -"The options available from the list below will vary depending on your " -"particular hard drive(s) layout and content." +"The options available from those shown below will vary according to the " +"layout and content of your particular hard drive(s)." msgstr "" #. type: Content of: <section><mediaobject> -#: en/doPartitionDisks.xml:17 +#: en/doPartitionDisks.xml:21 msgid "" "<imageobject condition=\"classical\"> <imagedata " "fileref=\"dx2-doPartitionDisks.png\" align=\"center\"/> </imageobject> " @@ -1192,43 +1172,43 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:24 +#: en/doPartitionDisks.xml:32 msgid "Use Existing Partitions" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:25 +#: en/doPartitionDisks.xml:35 msgid "" "If this option is available, then existing Linux compatible partitions have " "been found and may be used for the installation." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:27 +#: en/doPartitionDisks.xml:41 msgid "Use Free Space" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:27 +#: en/doPartitionDisks.xml:43 msgid "" "If you have unused space on your hard drive then this option will use it for " "your new Mageia installation." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:29 +#: en/doPartitionDisks.xml:49 msgid "Use Free Space on a Windows Partition" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:30 +#: en/doPartitionDisks.xml:52 msgid "" "If you have unused space on an existing Windows partition, the installer may " "offer to use it." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:32 +#: en/doPartitionDisks.xml:56 msgid "" "This can be a useful way of making room for your new Mageia installation, " "but is a risky operation so you should make sure you have backed up all " @@ -1236,7 +1216,7 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:35 +#: en/doPartitionDisks.xml:61 msgid "" "Note that this involves shrinking the size of the Windows partition. The " "partition must be \"clean\", meaning that Windows must have closed down " @@ -1247,40 +1227,41 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:41 +#: en/doPartitionDisks.xml:69 msgid "" "With this option, the installer displays the remaining Windows partition in " -"light blue and the future Mageia partition in dark blue with their intended " -"sizes just under. You have the possibility to adapt these sizes by clicking " -"and dragging the gap between both partitions. See the screen-shot below." +"light blue and the proposed Mageia partition in dark blue with their " +"intended sizes just underneath. You have the option to modify these sizes by " +"clicking and dragging the gap between both partitions. See the following " +"screen-shot." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><mediaobject> -#: en/doPartitionDisks.xml:45 +#: en/doPartitionDisks.xml:76 msgid "" -"<imageobject condition=\"classical\"><imagedata " -"fileref=\"dx2-doPartitionDisks2.png\" " -"align=\"center\"/></imageobject><imageobject condition=\"live\"><imagedata " -"fileref=\"live-doPartitionDisks2.png\" align=\"center\"/></imageobject>" +"<imageobject condition=\"classical\"> <imagedata " +"fileref=\"dx2-doPartitionDisks2.png\" align=\"center\"/> </imageobject> " +"<imageobject condition=\"live\"> <imagedata " +"fileref=\"live-doPartitionDisks2.png\" align=\"center\"/> </imageobject>" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:45 +#: en/doPartitionDisks.xml:87 msgid "Erase and use Entire Disk." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:46 -msgid "This option will use the complete drive for Mageia." +#: en/doPartitionDisks.xml:90 +msgid "This option will allocate the entire drive for Mageia." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:47 +#: en/doPartitionDisks.xml:93 msgid "Note! This will erase ALL data on the selected hard drive. Take care!" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:48 +#: en/doPartitionDisks.xml:96 msgid "" "If you intend to use part of the disk for something else, or you already " "have data on the drive that you are not prepared to lose, then do not use " @@ -1288,86 +1269,94 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:51 +#: en/doPartitionDisks.xml:103 msgid "Custom disk partitioning" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:52 +#: en/doPartitionDisks.xml:106 msgid "" "This gives you complete control over the placing of the installation on your " "hard drive(s)." msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:55 +#: en/doPartitionDisks.xml:112 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>" msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:56 +#: en/doPartitionDisks.xml:114 msgid "" -"The installer will share the available place out according to the following " -"rules:" +"If you are not using the <emphasis role=\"bold\">Custom disk " +"partitioning</emphasis> option, the installer will allocate the available " +"space according to the following rules:" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:58 +#: en/doPartitionDisks.xml:120 msgid "" -"If the total available place is lower than 50 GB, only one partition is " -"created for /, there is no separate partition for /home." +"If the total available space is less than 50 GB, then only one partition is " +"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) " +"partition." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:60 +#: en/doPartitionDisks.xml:125 msgid "" -"If the total available place is over 50 GB, then three partitions are " -"created" +"If the total available space is greater than 50 GB, then three partitions " +"are created" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:61 -msgid "6/19 of the total available place is allocated to / with a maximum of 50 GB" +#: en/doPartitionDisks.xml:130 +msgid "" +"6/19 of the total available place is allocated to <emphasis " +"role=\"bold\">/</emphasis> with a maximum of 50 GB" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:62 +#: en/doPartitionDisks.xml:134 msgid "1/19 is allocated to swap with a maximum of 4 GB" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:62 -msgid "the rest (at least 12/19) is allocated to /home" +#: en/doPartitionDisks.xml:138 +msgid "" +"the rest (at least 12/19) is allocated to <emphasis " +"role=\"bold\">/home.</emphasis>" msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:63 +#: en/doPartitionDisks.xml:144 msgid "" -"That means that from 160 GB and over of available place, the installer will " -"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home." +"That means that from 160 GB or greater available space, the installer will " +"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 " +"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for " +"<emphasis role=\"bold\">/home</emphasis>." msgstr "" #. type: Content of: <section><note><para> -#: en/doPartitionDisks.xml:67 +#: en/doPartitionDisks.xml:150 msgid "" -"If you are using an UEFI system, the ESP (EFI System Partition) will be " -"automatically detected, or created if it does not exist yet, and mounted on " -"/boot/EFI. The \"Custom disk partitioning\" option is the only one that " -"allows to check it has been correctly done" +"If you are using a UEFI system, the ESP (EFI System Partition) will be " +"automatically detected - or created if it does not exist yet, and mounted on " +"/boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</emphasis> " +"option is the only one that allows to check it has been correctly done" msgstr "" #. type: Content of: <section><note><para> -#: en/doPartitionDisks.xml:73 +#: en/doPartitionDisks.xml:158 msgid "" -"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, " -"you need to create a Bios boot partition if not already existing. It is an " -"about 1 MiB partition with no mount point. Choose <xref " -"linkend=\"diskdrake\"/> to be able to create it with the Installer like any " -"other partition, just select BIOS boot partition as filesystem type." +"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to " +"create a BIOS boot partition if not already existing. It is a roughly 1 MiB " +"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be " +"able to create it with the Installer like any other partition, just select " +"BIOS boot partition as the filesystem type." msgstr "" #. type: Content of: <section><note><mediaobject> -#: en/doPartitionDisks.xml:79 +#: en/doPartitionDisks.xml:165 msgid "" "<imageobject condition=\"classical\"> <imagedata align=\"center\" " "fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject " @@ -1376,37 +1365,37 @@ msgid "" msgstr "" #. type: Content of: <section><note><mediaobject> -#: en/doPartitionDisks.xml:87 +#: en/doPartitionDisks.xml:175 msgid "" "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> " "</imageobject>" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:93 +#: en/doPartitionDisks.xml:182 msgid "" "Some newer drives are now using 4096 byte logical sectors, instead of the " -"previous standard of 512 byte logical sectors. Due to lack of available " -"hardware, the partitioning tool used in the installer has not been tested " -"with such a drive. Also some ssd drives now use an erase block size over 1 " -"MB. We suggest to pre-partition the drive, using an alternative partitioning " -"tool like gparted, if you own such a device, and to use the following " -"settings:" +"previous standard of 512. Due to lack of available hardware, the " +"partitioning tool used in the installer has not been tested with such a " +"drive. Also some SSD devices now use an erase block size over 1 MB. If you " +"have such a device we suggest that you partition the drive in advance, using " +"an alternative partitioning tool like <emphasis " +"role=\"bold\">gparted</emphasis>, and to use the following settings:" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:100 -msgid "\"Align to\" \"MiB\"" +#: en/doPartitionDisks.xml:189 +msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:101 -msgid "\"Free space preceding (MiB)\" \"2\"" +#: en/doPartitionDisks.xml:191 +msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:102 -msgid "Also make sure all partitions are created with an even number of megabytes." +#: en/doPartitionDisks.xml:194 +msgid "Also make sure all partitions are created using an even number of megabytes." msgstr "" #. type: Content of: <article><info><title> @@ -1415,7 +1404,7 @@ msgid "Installation from LIVE medium" msgstr "" #. type: Content of: <book><info> -#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5 +#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>" msgstr "" @@ -1430,17 +1419,17 @@ msgid "Mageia 5" msgstr "" #. type: Content of: <book><info><cover><para> -#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15 +#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14 msgid "The Official Documentation for Mageia" msgstr "" #. type: Content of: <book><info><cover><mediaobject> -#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17 +#: en/DrakLive-cover.xml:17 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>" msgstr "" #. type: Content of: <article><info><cover><para> -#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21 en/DrakX.xml:12 +#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20 en/DrakX.xml:12 msgid "" "The texts and screenshots in this manual are available under the CC BY-SA " "3.0 license <link " @@ -1448,7 +1437,7 @@ msgid "" msgstr "" #. type: Content of: <article><info><cover><para> -#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24 en/DrakX.xml:15 +#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23 en/DrakX.xml:15 msgid "" "This manual was produced with the help of the <link " "ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link " @@ -1456,7 +1445,7 @@ msgid "" msgstr "" #. type: Content of: <article><info><cover><para> -#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26 en/DrakX.xml:17 +#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25 en/DrakX.xml:17 msgid "" "It was written by volunteers in their free time. Please contact <link " "ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation " @@ -1464,12 +1453,12 @@ msgid "" msgstr "" #. type: Content of: <article><info><cover><para><note> -#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37 en/DrakX.xml:6 +#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36 en/DrakX.xml:6 msgid "<note>" msgstr "" #. type: Content of: <article><info><cover><para><note><para> -#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38 en/DrakX.xml:7 +#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37 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 " @@ -1477,25 +1466,30 @@ msgid "" msgstr "" #. type: Content of: <article><info><cover><para> -#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41 en/DrakX.xml:10 +#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40 en/DrakX.xml:10 msgid "</note>" msgstr "" #. type: Content of: <article><info><title> -#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3 +#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3 msgid "Installation with DrakX" msgstr "" #. type: Content of: <book><info><revhistory><revision><date> -#: en/DrakX-cover.xml:10 +#: en/DrakX-cover.xml:9 msgid "February 2014" msgstr "" #. type: Content of: <book><info><revhistory><revision><revremark> -#: en/DrakX-cover.xml:11 +#: en/DrakX-cover.xml:10 msgid "Mageia 4" msgstr "" +#. type: Content of: <book><info><cover><mediaobject> +#: en/DrakX-cover.xml:16 +msgid "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>" +msgstr "" + #. type: Content of: <section><info><title> #: en/exitInstall.xml:3 msgid "Congratulations" @@ -1503,14 +1497,14 @@ msgstr "" #. Lebarhon 20170209 updated SC #. type: Content of: <section><mediaobject> -#: en/exitInstall.xml:7 +#: en/exitInstall.xml:9 msgid "" "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" " "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:11 +#: en/exitInstall.xml:14 msgid "" "You have finished installing and configuring " "<application>Mageia</application> and it is now safe to remove the " @@ -1518,26 +1512,26 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:14 +#: en/exitInstall.xml:18 msgid "" "After reboot, in the bootloader screen, you can choose between the operating " -"systems on your computer (if you have more than one)." +"systems (if there are more than one) on your computer." msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:17 +#: en/exitInstall.xml:22 msgid "" "If you didn't adjust the settings for the bootloader, your Mageia install " "will be automatically selected and started." msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:20 +#: en/exitInstall.xml:26 msgid "Enjoy!" msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:21 +#: en/exitInstall.xml:28 msgid "" "Visit www.mageia.org if you have any questions or want to contribute to " "Mageia" @@ -1551,31 +1545,31 @@ msgstr "" #. type: Content of: <section><para> #: en/firewall.xml:6 msgid "" -"This section allows to configure some simple firewall rules: they determine " -"which type of message from the Internet will be accepted by the target " -"system. This, in turn, allows the corresponding services on the system to be " -"accessible from the Internet." +"This section allows you to configure some simple firewall rules: they " +"determine which type of message from the Internet will be accepted by the " +"target system. This, in turn, allows the corresponding services on the " +"system to be accessible from the Internet." msgstr "" #. type: Content of: <section><para> #: en/firewall.xml:12 msgid "" -"In the default setting, no button is checked - no service of the system is " -"accessibly from the network. The \"<emphasis>Everything (no " -"firewall)</emphasis>\" button has a particular role: it enables access to " -"all services of the machine - an option that does not make much sense in the " -"context of the installer since it would create a totally unprotected " -"system. Its veritable use is in the context of the Mageia Control Center " -"(which uses the same GUI layout) for temporarily disabling the entire set of " -"firewall rules for testing and debugging purposes." +"In the default setting (no button is checked), no service of the system is " +"accessible from the network. The <emphasis role=\"bold\">Everything (no " +"firewall)</emphasis> enables access to all services of the machine - an " +"option that does not make much sense in the context of the installer since " +"it would create a totally unprotected system. Its veritable use is in the " +"context of the Mageia Control Center (which uses the same GUI layout) for " +"temporarily disabling the entire set of firewall rules for testing and " +"debugging purposes." msgstr "" #. type: Content of: <section><para> #: en/firewall.xml:21 msgid "" -"All other checkbuttons are more or less self-explanatory. As an example, you " -"will check the \"CUPS server\" button if you want printers on your machine " -"to be accessible from the network." +"All other options are more or less self-explanatory. As an example, you will " +"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want " +"printers on your machine to be accessible from the network." msgstr "" #. type: Content of: <section><para> @@ -1586,20 +1580,18 @@ msgstr "" #. type: Content of: <section><para> #: en/firewall.xml:27 msgid "" -"The set of checkbuttons only comprises the most common services. The " -"\"Advanced\" button allows to enable messages that correspond to a service " -"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" " -"button opens a window where you can enable a series of services by typing a " -"list of couples (blank separated)" +"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where " +"you can enable a series of services by typing a list of couples (blank " +"separated)" msgstr "" #. type: Content of: <section><para> -#: en/firewall.xml:33 +#: en/firewall.xml:31 msgid "<emphasis><port-number>/<protocol></emphasis>" msgstr "" #. type: Content of: <section><simplelist><member> -#: en/firewall.xml:36 +#: en/firewall.xml:34 msgid "" "- <emphasis><port-number></emphasis> is the value of the port assigned to " "the service you want to enable (e.g. 873 for the RSYNC service) as defined " @@ -1607,7 +1599,7 @@ msgid "" msgstr "" #. type: Content of: <section><simplelist><member> -#: en/firewall.xml:40 +#: en/firewall.xml:38 msgid "" "- <emphasis><protocol></emphasis> is one of <emphasis>TCP</emphasis> or " "<emphasis>UDP</emphasis> - the internet protocol that is used by the " @@ -1615,21 +1607,21 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/firewall.xml:45 +#: en/firewall.xml:43 msgid "" "For instance, the entry for enabling access to the RSYNC service therefore " "is <emphasis>873/tcp</emphasis>." msgstr "" #. type: Content of: <section><para> -#: en/firewall.xml:48 +#: en/firewall.xml:46 msgid "" "In case a service is implemented to use both protocols, you specify 2 " "couples for the same port." msgstr "" #. type: Content of: <section><info><title> -#: en/formatPartitions.xml:4 +#: en/formatPartitions.xml:3 msgid "Formatting" msgstr "" @@ -1638,58 +1630,58 @@ msgstr "" #. marja 2012-04-24 added screenshot #. marja 2012-04-24 added emphasis tags in formatPartitions-pa1 #. type: Content of: <section><mediaobject> -#: en/formatPartitions.xml:18 +#: en/formatPartitions.xml:15 msgid "" -"<imageobject condition='classical'> <imagedata revision=\"1\" " -"fileref=\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" " -"xml:id=\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject " -"condition='live'> <imagedata revision=\"1\" " -"fileref=\"live-formatPartitions.png\" format=\"PNG\" align=\"center\" " -"xml:id=\"live-formatPartitions-im1\"> </imagedata> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " +"fileref=\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" " +"align=\"center\" revision=\"1\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata format=\"PNG\" " +"xml:id=\"live-formatPartitions-im1\" align=\"center\" " +"fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/formatPartitions.xml:30 +#: en/formatPartitions.xml:24 msgid "" "Here you can choose which partition(s) you wish to format. Any data on " -"partitions <emphasis>not</emphasis> marked for formatting will be saved." +"partitions <emphasis>not</emphasis> marked for formatting will be preserved." msgstr "" #. type: Content of: <section><para> -#: en/formatPartitions.xml:34 +#: en/formatPartitions.xml:28 msgid "Usually at least the partitions DrakX selected, need to be formatted" msgstr "" #. type: Content of: <section><para> -#: en/formatPartitions.xml:37 +#: en/formatPartitions.xml:31 msgid "" "Click on <guibutton>Advanced</guibutton> to choose partitions you want to " "check for so called <emphasis>bad blocks</emphasis>" msgstr "" #. type: Content of: <section><tip><para> -#: en/formatPartitions.xml:42 +#: en/formatPartitions.xml:36 msgid "" "If you're not sure you have made the right choice, you can click on " "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> " -"and then on <guibutton>Custom</guibutton> to get back to the main screen. " -"In that screen you can choose to view what is in your partitions." +"and then on <guibutton>Custom</guibutton> to get back to the main screen, " +"where you can choose to view details of your partitions." msgstr "" #. type: Content of: <section><para> -#: en/formatPartitions.xml:49 +#: en/formatPartitions.xml:43 msgid "" "When you are confident about the selection, click on " "<guibutton>Next</guibutton> to continue." msgstr "" #. type: Content of: <section><info><title> -#: en/installer.xml:3 +#: en/installer.xml:10 msgid "DrakX, the Mageia Installer" msgstr "" #. type: Content of: <section><para> -#: en/installer.xml:7 +#: en/installer.xml:13 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 " @@ -1697,258 +1689,228 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/installer.xml:11 +#: en/installer.xml:17 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><section><title> -#: en/installer.xml:16 +#: en/installer.xml:22 msgid "Installation Welcome Screen" msgstr "" #. type: Content of: <section><section><section><title> -#: en/installer.xml:19 +#: en/installer.xml:25 msgid "Using a Mageia DVD" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:21 +#: en/installer.xml:27 msgid "" "Here are the default welcome screens when using a Mageia DVD, The first one " -"with an UEFI system and the second one with a Legacy system:" +"is what you will see if you have a UEFI system, the second one is for a " +"Legacy system:" msgstr "" #. type: Content of: <section><section><section><mediaobject> -#: en/installer.xml:26 +#: en/installer.xml:32 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:31 +#: en/installer.xml:37 msgid "" -"From this screen, you can access to options by pressing the \"e\" letter to " -"enter the \"edit mode\". To come back to this screen, press either the key " -"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit " -"with saving." +"From this screen, you have access to options by pressing \"<emphasis " +"role=\"bold\">e</emphasis>\" to enter the edit mode. To come back to this " +"screen, press either <emphasis role=\"bold\">Esc</emphasis> key to quit " +"without saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or " +"<emphasis role=\"bold\">F10</emphasis> to quit with saving." msgstr "" #. type: Content of: <section><section><section><mediaobject> -#: en/installer.xml:37 +#: en/installer.xml:45 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:42 -msgid "From this screen, it is possible to set some personal preferences:" -msgstr "" - -#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:45 -msgid "" -"The language (for the installation only, may be different that the chosen " -"language for the system) by pressing the key F2 (Legacy mode only)" -msgstr "" - -#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> #: en/installer.xml:50 -msgid "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>" +msgid "" +"From this screen, it is possible to set some preferences (note that the " +"options <emphasis role=\"bold\">F1</emphasis> to <emphasis " +"role=\"bold\">F6</emphasis> are available only on Legacy systems):" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> #: en/installer.xml:55 -msgid "Use the arrow keys to select the language and press the key Enter." +msgid "" +"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis " +"role=\"bold\">F6</emphasis> options, you can view relevant help by pressing " +"<emphasis role=\"bold\">F1</emphasis>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:58 +#: en/installer.xml:63 msgid "" -"Here is for example, the French welcome screen when using a Live " -"DVD/CD. Note that the Live DVD/CD menu does not propose: <guilabel>Rescue " -"System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware " -"Detection Tool</guilabel>." +"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a " +"specific language for the installation." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> -#: en/installer.xml:65 -msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>" +#: en/installer.xml:67 +msgid "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> #: en/installer.xml:72 -msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)." +msgid "" +"Use the arrow keys to select the language then press <emphasis " +"role=\"bold\">Enter</emphasis>." +msgstr "" + +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:77 +msgid "" +"If needed, change the screen resolution by pressing <emphasis " +"role=\"bold\">F3</emphasis> (Legacy mode only)." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> -#: en/installer.xml:76 +#: en/installer.xml:81 msgid "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:83 +#: en/installer.xml:88 msgid "" -"Add some kernel options by pressing the <emphasis " -"role=\"bold\">F6</emphasis> key for the legacy mode or the <emphasis " -"role=\"bold\">e</emphasis> key for the UEFI mode." +"If you experience problems with the installation, you could try modifying " +"the default settings using the <emphasis role=\"bold\">F6</emphasis> " +"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press " +"<emphasis role=\"bold\">e</emphasis> instead)." msgstr "" -#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:85 -msgid "" -"If the installation fails, then it may be necessary to try again using one " -"of the extra options. The menu called by F6 displays a new line called " -"<guilabel>Boot options</guilabel> and propose four entries:" +#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> +#: en/installer.xml:96 +msgid "Default: It doesn't alter anything in the default options." msgstr "" -#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:90 en/installer.xml:93 -msgid "- Default, it doesn't alter anything in the default options." +#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> +#: en/installer.xml:101 +msgid "" +"Safe Settings: Priority is given to the safer options at the price of a " +"performance detriment." msgstr "" -#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:96 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> +#: en/installer.xml:106 msgid "" -"- No ACPI (Advanced Configuration and Power Interface), power management " -"isn't taken into account." +"No ACPI: (Advanced Configuration and Power Interface): Power management " +"features are not used." msgstr "" -#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:99 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> +#: en/installer.xml:113 msgid "" -"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is " -"about CPU interruptions, select this option if you are asked for." +"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU " +"interrupt. Select this option if you experience system misbehaviour like a " +"kernel panic in relation to APIC." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:103 +#: en/installer.xml:120 msgid "" "When you select one of these entries, it modifies the default options " "displayed in the <guilabel>Boot Options</guilabel> line." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para> -#: en/installer.xml:108 +#: en/installer.xml:125 msgid "" -"In some Mageia releases, it may happen that the entries selected with the " -"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, " -"however, they are really taken into account." +"In some Mageia releases, it may happen that the entries selected with " +"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot " +"Options</guilabel> line, despite this, they will in fact be applied." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> -#: en/installer.xml:115 +#: en/installer.xml:132 msgid "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:122 -msgid "Add more kernel options by pressing the key F1 (Legacy mode only)." -msgstr "" - -#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:125 +#: en/installer.xml:139 msgid "" -"Pressing F1 opens a new window with more available options. Select one with " -"the arrow keys and press Enter to have more details or press the Esc key to " -"go back to the welcome screen." +"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for " +"various boot options. Select an item with the arrow keys and press <emphasis " +"role=\"bold\">Enter</emphasis> for more details or press <emphasis " +"role=\"bold\">Esc</emphasis> to go back to the welcome screen." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> -#: en/installer.xml:131 +#: en/installer.xml:146 msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:136 +#: en/installer.xml:151 msgid "" -"The detailed view about the option splash. Press Esc or select " -"<guilabel>Return to Boot Options</guilabel> to go back to the options " -"list. These options can by added by hand in the <guilabel>Boot " -"options</guilabel> line." +"The detailed view about the splash option. Press <emphasis " +"role=\"bold\">Esc</emphasis> or select <guilabel>Return to Boot " +"Options</guilabel> to go back to the options list. These options can be " +"added by hand in the <guilabel>Boot Options</guilabel> line." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> -#: en/installer.xml:142 +#: en/installer.xml:158 msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para> -#: en/installer.xml:148 -msgid "The help is translated in the chosen language with the F2 key." +#: en/installer.xml:164 +msgid "" +"The help is translated in the chosen language with <emphasis " +"role=\"bold\">F2</emphasis>." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/installer.xml:152 +#: en/installer.xml:168 msgid "" "For more information about kernel options on legacy and UEFI systems, see: " "<link " "ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>" msgstr "" -#. type: Content of: <section><section><section><title> -#: en/installer.xml:159 -msgid "Using a Wired Network" -msgstr "" - -#. type: Content of: <section><section><section><para> -#: en/installer.xml:161 -msgid "" -"Here is the default welcome screen when using a Wired Network-based " -"Installation CD (netinstall.iso or netinstall-nonfree.iso images):" -msgstr "" - -#. type: Content of: <section><section><section><para> -#: en/installer.xml:165 -msgid "" -"It does not allow to change the language, the available options are " -"described in the screen. For more information about using a Wired " -"Network-based Installation CD, see <link " -"ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">the Mageia " -"Wiki</link>" -msgstr "" - -#. type: Content of: <section><section><section><warning><para> -#: en/installer.xml:171 -msgid "The keyboard layout is the American one." -msgstr "" - -#. type: Content of: <section><section><section><mediaobject> -#: en/installer.xml:175 -msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>" -msgstr "" - #. type: Content of: <section><section><title> -#: en/installer.xml:183 +#: en/installer.xml:177 msgid "The installation steps" msgstr "" #. type: Content of: <section><section><para> -#: en/installer.xml:185 +#: en/installer.xml:179 msgid "" -"The install process is divided into a number of steps, which can be followed " -"on the side panel of the screen." +"The install process is divided into a number of steps, the status of which " +"is indicated in a panel to the left of the screen." msgstr "" #. type: Content of: <section><section><para> -#: en/installer.xml:188 +#: en/installer.xml:182 msgid "" "Each step has one or more screens which may also have " -"<guibutton>Advanced</guibutton> buttons with extra, less commonly required, " +"<guibutton>Advanced</guibutton> sections with extra, less commonly required, " "options." msgstr "" #. type: Content of: <section><section><para> -#: en/installer.xml:192 +#: en/installer.xml:186 msgid "" -"Most screens have <guibutton>Help</guibutton> buttons which give further " -"explanations about the current step." +"Most screens have <guibutton>Help</guibutton> buttons for further details " +"about the particular step." msgstr "" #. type: Content of: <section><section><note><para> -#: en/installer.xml:196 +#: en/installer.xml:190 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 " +"If at some points during the 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 " @@ -1958,17 +1920,17 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/installer.xml:209 +#: en/installer.xml:203 msgid "Installation Problems and Possible Solutions" msgstr "" #. type: Content of: <section><section><section><title> -#: en/installer.xml:212 +#: en/installer.xml:206 msgid "No Graphical Interface" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/installer.xml:216 +#: en/installer.xml:210 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 " @@ -1976,22 +1938,24 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/installer.xml:223 +#: en/installer.xml:217 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." +"this press <emphasis role=\"bold\">Esc</emphasis> at the first welcome " +"screen and confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will " +"be presented with a black screen with the word \"boot:\". Type \"text\" and " +"press <emphasis role=\"bold\">ENTER</emphasis> to continue with the " +"installation in text mode." msgstr "" #. type: Content of: <section><section><section><title> -#: en/installer.xml:234 +#: en/installer.xml:230 msgid "The Install Freezes" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:236 +#: en/installer.xml:232 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 " @@ -2001,31 +1965,32 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><title> -#: en/installer.xml:244 +#: en/installer.xml:240 msgid "RAM problem" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:246 +#: en/installer.xml:242 msgid "" -"These will rarely be needed, but in some cases the hardware may report the " +"This 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><section><section><title> -#: en/installer.xml:253 +#: en/installer.xml:249 msgid "Dynamic partitions" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:255 +#: en/installer.xml:251 msgid "" -"If you converted your hard disk from \"basic\" format to \"dynamic\" format " -"on Microsoft Windows, you must know that it is impossible to install Mageia " -"on this disc. To go back to a basic disk, see the Microsoft documentation: " -"<link " +"If you converted your hard disk from <emphasis " +"role=\"bold\">basic</emphasis> format to <emphasis " +"role=\"bold\">dynamic</emphasis> format in Microsoft Windows, then it is not " +"possible to install Mageia on this disc. To revert to a basic disk, see the " +"Microsoft documentation: <link " "ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>." msgstr "" @@ -2039,31 +2004,31 @@ msgstr "" #. marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename #. marja, 2012-04-24 added screenshot #. type: Content of: <section><mediaobject> -#: en/installUpdates.xml:13 +#: en/installUpdates.xml:15 msgid "" -"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" " -"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> " +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" " +"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> " "</imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/installUpdates.xml:19 +#: en/installUpdates.xml:20 msgid "" "Since this version of <application>Mageia</application> was released, some " "packages will have been updated or improved." msgstr "" #. type: Content of: <section><para> -#: en/installUpdates.xml:23 +#: en/installUpdates.xml:24 msgid "" -"Choose <guilabel>yes</guilabel> if you wish to download and install them, " -"select <guilabel>no</guilabel> if you don't want to do this now, or if you " +"Choose <guilabel>Yes</guilabel> if you wish to download and install them, " +"select <guilabel>No</guilabel> if you don't want to do this now, or if you " "aren't connected to the Internet" msgstr "" #. type: Content of: <section><para> -#: en/installUpdates.xml:28 -msgid "Then press <guibutton>Next</guibutton> to continue" +#: en/installUpdates.xml:29 +msgid "Press <guibutton>Next</guibutton> to continue" msgstr "" #. type: Content of: <section><info><title> @@ -2114,15 +2079,15 @@ msgstr "" #. 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 +#: en/media_selection.xml:15 msgid "" -"<imageobject> <imagedata align=\"center\" " -"fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" " -"xml:id=\"media_selection-im1\"/> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" " +"align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> " +"</imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/media_selection.xml:18 +#: en/media_selection.xml:20 msgid "" "Here you have the list of available repositories. Not all repositories are " "available, according to which media you use for installing. The repositories " @@ -2131,14 +2096,14 @@ msgid "" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/media_selection.xml:25 +#: en/media_selection.xml:27 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 +#: en/media_selection.xml:32 msgid "" "The <emphasis>Nonfree</emphasis> repository includes packages that are " "free-of-charge, i.e. Mageia may redistribute them, but they contain " @@ -2148,61 +2113,61 @@ msgid "" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/media_selection.xml:38 +#: en/media_selection.xml:40 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." +"e.g. multimedia codecs needed to play various audio/video files; packages " +"needed to play commercial video DVD's, etc." msgstr "" #. type: Content of: <section><info><title> -#: en/minimal-install.xml:12 +#: en/minimal-install.xml:3 msgid "Minimal Install" msgstr "" #. type: Content of: <section><para> -#: en/minimal-install.xml:19 +#: en/minimal-install.xml:11 msgid "" "You can choose a Minimal Installation by de-selecting everything in the " -"Package Group Selection screen, see <xref " -"linkend=\"choosePackageGroups\"></xref>." +"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>." msgstr "" #. type: Content of: <section><para> -#: en/minimal-install.xml:22 +#: en/minimal-install.xml:14 msgid "" -"If desired, you can additionally tick the \"Individual package selection\" " -"option in the same screen." +"If desired, you can additionally tick the <emphasis role=\"bold\">Individual " +"package selection</emphasis> option in the same screen." msgstr "" #. type: Content of: <section><para> -#: en/minimal-install.xml:24 +#: en/minimal-install.xml:17 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 the " -"\"Individual package selection\" option mentioned above, to fine-tune your " -"installation, see <xref linkend=\"choosePackagesTree\"></xref>." +"<application>Mageia</application>, such as a server or a specialised " +"workstation. You will probably use this option combined with the <emphasis " +"role=\"bold\">Individual package selection</emphasis> option mentioned " +"above, to fine-tune your installation, see <xref " +"linkend=\"choosePackagesTree\"/>." msgstr "" #. type: Content of: <section><para> -#: en/minimal-install.xml:29 +#: en/minimal-install.xml:22 msgid "" -"If you choose this installation class, then the related screen will offer " +"If you choose this installation method, then the relevant screen will offer " "you a few useful extras to install, such as documentation and X." msgstr "" #. type: Content of: <section><para> -#: en/minimal-install.xml:31 +#: en/minimal-install.xml:26 msgid "" -"If selected, \"With X\" will also include IceWM as lightweight desktop " -"environment." +"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a " +"lightweight desktop environment) will also be included." msgstr "" #. type: Content of: <section><para> -#: en/minimal-install.xml:33 +#: en/minimal-install.xml:29 msgid "" "The basic documentation is provided in the form of man and info pages. It " "contains the man pages from the <link " @@ -2213,10 +2178,10 @@ msgid "" msgstr "" #. type: Content of: <section><mediaobject> -#: en/minimal-install.xml:41 +#: en/minimal-install.xml:35 msgid "" -"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" " -"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> " +"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" " +"align=\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> " "</imageobject>" msgstr "" @@ -2234,17 +2199,17 @@ msgstr "" #. type: Content of: <section><para> #: en/misc-params.xml:15 msgid "" -"DrakX made smart choices for the configuration of your system depending on " -"the choices you made and on the hardware DrakX detected. You can check the " -"settings here and change them if you want after pressing " +"DrakX presents a proposal for the configuration of your system depending on " +"the choices you made and on the hardware detected. You can check the " +"settings here and change them if you want by pressing " "<guibutton>Configure</guibutton>." msgstr "" #. type: Content of: <section><note><para> #: en/misc-params.xml:21 msgid "" -"As a general rule, default settings are recommended and you can keep them " -"with 3 exceptions:" +"As a general rule, it is recommended that you accept the default settings " +"unless:" msgstr "" #. type: Content of: <section><note><para><itemizedlist><listitem><para> @@ -2259,161 +2224,160 @@ msgstr "" #. type: Content of: <section><note><para><itemizedlist><listitem><para> #: en/misc-params.xml:32 -msgid "something else is said in the detailed sections below" +msgid "some other factor mentionned in the detailed sections below is an issue." msgstr "" #. type: Content of: <section><section><info><title> -#: en/misc-params.xml:39 +#: en/misc-params.xml:40 msgid "System parameters" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:44 +#: en/misc-params.xml:45 msgid "<guilabel>Timezone</guilabel>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:46 +#: en/misc-params.xml:47 msgid "" -"DrakX selected a time zone for you, depending on your preferred " -"language. You can change it if needed. See also <xref " -"linkend=\"configureTimezoneUTC\"/>" +"DrakX selects a time zone for you, depending on your preferred language. You " +"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:52 +#: en/misc-params.xml:53 msgid "<guilabel>Country / Region</guilabel>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:55 +#: en/misc-params.xml:56 msgid "" -"If you are not in the selected country, it is very important that you " -"correct the setting. See <xref linkend=\"selectCountry\"/>" +"If the selected country is wrong, it is very important that you correct the " +"setting. See <xref linkend=\"selectCountry\"/>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:61 +#: en/misc-params.xml:62 msgid "<guilabel>Bootloader</guilabel>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:63 +#: en/misc-params.xml:64 msgid "DrakX has made good choices for the bootloader setting." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:66 -msgid "Do not change anything, unless you know how to configure Grub2" +#: en/misc-params.xml:67 +msgid "Do not change anything, unless you know how to configure GRUB2" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:69 +#: en/misc-params.xml:70 msgid "For more information, see <xref linkend=\"setupBootloader\"/>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:74 +#: en/misc-params.xml:75 msgid "<guilabel>User management</guilabel>" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:77 +#: en/misc-params.xml:78 msgid "" "You can add extra users here. They will each get their own " "<literal>/home</literal> directories." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:83 +#: en/misc-params.xml:84 msgid "<guilabel>Services</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:85 +#: en/misc-params.xml:86 msgid "" -"System services refer to those small programs which run the background " -"(daemons). This tool allows you to enable or disable certain tasks." +"System services refer to those small programs which run in the background " +"(daemons). This tool allows you to enable or disable certain processes." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:89 +#: en/misc-params.xml:90 msgid "" "You should check carefully before changing anything here - a mistake may " "prevent your computer from operating correctly." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:93 +#: en/misc-params.xml:94 msgid "For more information, see <xref linkend=\"configureServices\"/>" msgstr "" #. type: Content of: <section><section><info><title> -#: en/misc-params.xml:100 +#: en/misc-params.xml:101 msgid "Hardware parameters" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:105 +#: en/misc-params.xml:106 msgid "<guilabel>Keyboard</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:107 +#: en/misc-params.xml:108 msgid "" -"This is where you setup or change your keyboard layout which will depend on " -"your location, language or type of keyboard." +"Configure your keyboard layout according to your location, language and type " +"of keyboard." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><note><para> -#: en/misc-params.xml:112 +#: en/misc-params.xml:113 msgid "" "If you notice a wrong keyboard layout and want to change it, keep in mind " "that your passwords are going to change too." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:118 +#: en/misc-params.xml:119 msgid "<guilabel>Mouse</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:120 +#: en/misc-params.xml:121 msgid "" "Here you can add or configure other pointing devices, tablets, trackballs " "etc." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:125 +#: en/misc-params.xml:126 msgid "<guilabel>Sound card</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:128 +#: en/misc-params.xml:129 msgid "" -"The installer uses the default driver, if there is a default one. The option " -"to select a different driver is only given when there is more than one " -"driver for your card, but none of them is the default one." +"The installer uses the default driver - if there is a default one. The " +"option to select a different driver is only given when there is more than " +"one driver for your card, but where none of them is the default one." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:135 +#: en/misc-params.xml:137 msgid "<guilabel>Graphical interface</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:138 +#: en/misc-params.xml:140 msgid "This section allows you to configure your graphic card(s) and displays." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:141 +#: en/misc-params.xml:143 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>." msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/misc-params.xml:147 +#: en/misc-params.xml:149 msgid "" "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" " "align=\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> " @@ -2421,38 +2385,38 @@ msgid "" msgstr "" #. type: Content of: <section><section><info><title> -#: en/misc-params.xml:155 +#: en/misc-params.xml:157 msgid "Network and Internet parameters" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:161 +#: en/misc-params.xml:163 msgid "<guilabel>Network</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:163 +#: en/misc-params.xml:165 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 " +"drivers it is better to do that after reboot, using the <application>Mageia " "Control Center</application>, if you have not yet enabled the Nonfree media " "repositories." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><warning><para> -#: en/misc-params.xml:170 +#: en/misc-params.xml:172 msgid "" -"When you add a network card, do not forget to set your firewall to watch " +"When you add a network card, do not forget to set your firewall to monitor " "that interface as well." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:177 +#: en/misc-params.xml:179 msgid "<guilabel>Proxies</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:179 +#: en/misc-params.xml:181 msgid "" "A Proxy Server acts as an intermediary between your computer and the wider " "internet. This section allows you to configure your computer to utilize a " @@ -2460,48 +2424,48 @@ msgid "" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:184 +#: en/misc-params.xml:186 msgid "" "You may need to consult your systems administrator to get the parameters you " -"need to enter here" +"need to enter here." msgstr "" #. type: Content of: <section><section><info><title> -#: en/misc-params.xml:193 +#: en/misc-params.xml:195 msgid "Security" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:198 +#: en/misc-params.xml:200 msgid "<guilabel>Security Level</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:201 +#: en/misc-params.xml:203 msgid "" "Here you set the Security level for your computer, in most cases the default " "setting (Standard) is adequate for general use." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:205 +#: en/misc-params.xml:207 msgid "Check the option which best suits your usage." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:210 +#: en/misc-params.xml:212 msgid "<guilabel>Firewall</guilabel>:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:212 +#: en/misc-params.xml:214 msgid "" "A firewall is intended to be a barrier between your important data and the " "rascals out there on the internet who would compromise or steal it." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/misc-params.xml:216 +#: en/misc-params.xml:218 msgid "" "Select the services that you wish to have access to your system. Your " "selections will depend on what you use your computer for. For more " @@ -2509,7 +2473,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><warning><para> -#: en/misc-params.xml:222 +#: en/misc-params.xml:224 msgid "Bear in mind that allowing everything (no firewall) may be very risky." msgstr "" @@ -2564,35 +2528,67 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/securityLevel.xml:12 +#: en/securityLevel.xml:3 msgid "Security Level" 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 +#: en/securityLevel.xml:11 msgid "" -"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" " -"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> " +"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" " +"align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> " "</imageobject>" msgstr "" #. type: Content of: <section><para> +#: en/securityLevel.xml:16 +msgid "<emphasis role=\"bold\">Please choose the desired security level</emphasis>" +msgstr "" + +#. type: Content of: <section><para> +#: en/securityLevel.xml:19 +msgid "" +"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended " +"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> " +"setting will create a highly protected system - for instance if the system " +"is to be used as a public server." +msgstr "" + +#. type: Content of: <section><para> #: en/securityLevel.xml:24 -msgid "You can adjust your security level here." +msgid "<emphasis role=\"bold\">Security Administrator</emphasis>" +msgstr "" + +#. type: Content of: <section><para> +#: en/securityLevel.xml:26 +msgid "" +"This item allows you to configure an email address to which the system will " +"send <emphasis>security alert messages</emphasis> when it detects situations " +"which require notification to a system administrator." 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." +#: en/securityLevel.xml:31 +msgid "" +"A good, and easy-to-implement, choice is to enter <user>@localhost - " +"where <user> is the login name of the user to receive these messages." +msgstr "" + +#. type: Content of: <section><note><para> +#: en/securityLevel.xml:36 +msgid "" +"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool " +"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore " +"be configured for receiving such mail!" msgstr "" #. type: Content of: <section><para> -#: en/securityLevel.xml:30 +#: en/securityLevel.xml:41 msgid "" "After install, it will always be possible to adjust your security settings " -"in the <guilabel>Security</guilabel> part of the Mageia Control Center." +"in the <guilabel>Security</guilabel> section of the Mageia Control Center." msgstr "" #. type: Content of: <section><info><title> @@ -2609,192 +2605,195 @@ msgstr "" #: en/SelectAndUseISOs2.xml:10 msgid "" "Mageia is distributed via ISO images. This page will help you to choose " -"which image match your needs." +"which image best suits your needs." msgstr "" #. type: Content of: <section><section><para> #: en/SelectAndUseISOs2.xml:12 -msgid "There is two families of media:" +msgid "There are two families of media:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> #: en/SelectAndUseISOs2.xml:15 msgid "" -"Classical installer: After booting the media, it will follow a process " -"allowing to choose what to install and how to configure your target " -"system. This give you the maximal flexibility for a customized installation, " -"in particular to choose which Desktop Environment you will install." +"Classical installer: Booting with this media provides you with the maximum " +"flexibility when choosing what to install, and for configuring your " +"system. In particular, you have a choice of which Desktop environment to " +"install" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:22 +#: en/SelectAndUseISOs2.xml:21 msgid "" -"LIVE media: you can boot the media in a real Mageia system without " -"installing it, to see what you will get after installation. The " -"installation process is simpler, but you get lesser choices." +"LIVE media: This option allows you to try out Mageia without having to " +"actually install it, or make any changes to your computer. If the " +"installation is decided, the process is simpler, but you get fewer choices " +"than offered by the Classical installer" msgstr "" #. type: Content of: <section><section><para> -#: en/SelectAndUseISOs2.xml:28 +#: en/SelectAndUseISOs2.xml:27 msgid "Details are given in the next sections." msgstr "" #. type: Content of: <section><section><title> -#: en/SelectAndUseISOs2.xml:31 +#: en/SelectAndUseISOs2.xml:30 msgid "Media" msgstr "" #. type: Content of: <section><section><section><title> -#: en/SelectAndUseISOs2.xml:33 +#: en/SelectAndUseISOs2.xml:32 msgid "Definition" msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:34 +#: en/SelectAndUseISOs2.xml:33 msgid "" "Here, a medium (plural: media) is an ISO image file that allows you to " -"install and/or update Mageia and by extension any physical support the ISO " -"file is copied to." +"install and/or update Mageia and by extension any physical support (DVD, USB " +"stick, ...) the ISO file is copied to." msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:37 +#: en/SelectAndUseISOs2.xml:36 msgid "" -"You can find them <link " +"You can find Mageia ISO's <link " "ns4:href=\"http://www.mageia.org/en/downloads/\">here</link>." msgstr "" #. type: Content of: <section><section><section><title> -#: en/SelectAndUseISOs2.xml:40 +#: en/SelectAndUseISOs2.xml:39 msgid "Classical installation media" msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73 en/SelectAndUseISOs2.xml:142 +#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71 en/SelectAndUseISOs2.xml:141 msgid "Common features" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:45 -msgid "These ISOs use the traditional installer called drakx." +#: en/SelectAndUseISOs2.xml:44 +msgid "These ISOs use the Classical installer called drakx." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:49 -msgid "They are able to make a clean install or an update from previous releases." +#: en/SelectAndUseISOs2.xml:47 +msgid "" +"They are used for performing clean installs or to upgrade a previously " +"installed version of Mageia." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84 en/SelectAndUseISOs2.xml:159 -msgid "Different media for 32 or 64 bit architectures." +#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83 en/SelectAndUseISOs2.xml:158 +msgid "Different media for 32 and 64 bit architectures." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:56 +#: en/SelectAndUseISOs2.xml:54 msgid "" "Some tools are available in the Welcome screen: Rescue System, Memory Test, " "Hardware Detection Tool." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:60 +#: en/SelectAndUseISOs2.xml:58 msgid "Each DVD contains many available desktop environments and languages." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:64 +#: en/SelectAndUseISOs2.xml:62 msgid "You'll be given the choice during the installation to add non free software." msgstr "" #. type: Content of: <section><section><section><title> -#: en/SelectAndUseISOs2.xml:71 +#: en/SelectAndUseISOs2.xml:69 msgid "Live media" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:76 +#: en/SelectAndUseISOs2.xml:74 msgid "" -"Can be used to preview the distribution without installing it on a HDD, and " -"optionally install Mageia on to your HDD." +"Can be used to preview the Mageia operating system without having to install " +"it. Can also be used to install Mageia if you wish." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:80 +#: en/SelectAndUseISOs2.xml:79 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:87 +#: en/SelectAndUseISOs2.xml:86 msgid "" "<emphasis role=\"bold\">Live ISOs can only be used to create clean " -"installations, they cannot be used to upgrade from previous " +"installations, they cannot be used to upgrade previously installed Mageia " "releases.</emphasis>" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:92 +#: en/SelectAndUseISOs2.xml:91 msgid "They contain non free software." msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:97 +#: en/SelectAndUseISOs2.xml:96 msgid "Live DVD Plasma" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:100 +#: en/SelectAndUseISOs2.xml:99 msgid "Plasma desktop environment only." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117 en/SelectAndUseISOs2.xml:131 -msgid "All languages are present." +#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116 en/SelectAndUseISOs2.xml:130 +msgid "All available languages are present." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:106 +#: en/SelectAndUseISOs2.xml:105 msgid "64 bit architecture only." msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:111 +#: en/SelectAndUseISOs2.xml:110 msgid "Live DVD GNOME" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:114 +#: en/SelectAndUseISOs2.xml:113 msgid "GNOME desktop environment only." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:120 +#: en/SelectAndUseISOs2.xml:119 msgid "64 bit architecture only" msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:125 +#: en/SelectAndUseISOs2.xml:124 msgid "Live DVD Xfce" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:128 +#: en/SelectAndUseISOs2.xml:127 msgid "Xfce desktop environment only." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:134 +#: en/SelectAndUseISOs2.xml:133 msgid "32 or 64 bit architectures." msgstr "" #. type: Content of: <section><section><section><title> -#: en/SelectAndUseISOs2.xml:140 -msgid "Boot-only CD media" +#: en/SelectAndUseISOs2.xml:139 +msgid "Net install media" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:145 +#: en/SelectAndUseISOs2.xml:144 msgid "" -"Each one is a small image that contains no more than that which is needed to " +"These are minimal ISO's containing no more than that which is needed to " "start the drakx installer and find drakx-installer-stage2 and other packages " "that are needed to continue and complete the install. These packages may be " "on the PC hard disk, on a local drive, on a local network or on the " @@ -2802,25 +2801,25 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:153 +#: en/SelectAndUseISOs2.xml:152 msgid "" -"These media are very light (less than 100 MB) and are convenient when " -"bandwidth is too low to download a full DVD, a PC without a DVD drive or a " -"PC that can't boot from a USB stick." +"These media are very light (less than 100 MB) and are convenient if " +"bandwidth is too low to download a full DVD, or if you have a PC without a " +"DVD drive or is unable to boot from a USB stick." msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:162 -msgid "English language only." +#: en/SelectAndUseISOs2.xml:161 +msgid "First steps are English language only." msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:167 +#: en/SelectAndUseISOs2.xml:166 msgid "netinstall.iso" msgstr "" #. type: Content of: <section><section><section><section><itemizedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:170 +#: en/SelectAndUseISOs2.xml:169 msgid "" "Contains only free software, for those people who prefer not to use non-free " "software." @@ -2852,9 +2851,9 @@ msgstr "" #: en/SelectAndUseISOs2.xml:189 msgid "" "Once you have chosen your ISO file, you can download it using either http or " -"BitTorrent. In both cases, a window gives you some information, such as the " -"mirror in use and an opportunity to change if the bandwidth is to low. If " -"http is chosen, you may also see something like" +"BitTorrent. In both cases, you are provided with some information, such as " +"the mirror in use and an option to switch if the bandwidth is too low. If " +"http is chosen, you will also see something regarding checksums." msgstr "" #. type: Content of: <section><section><section><mediaobject> @@ -2865,9 +2864,9 @@ msgstr "" #. type: Content of: <section><section><section><para> #: en/SelectAndUseISOs2.xml:195 msgid "" -"md5sum and sha1sum are tools to check the ISO integrity. Use only one of " -"them. Keep one of them <link linkend=\"integrity\">for further " -"usage</link>. Then a window similar to this one appears:" +"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the " +"other, and copy the checksum <link linkend=\"integrity\">for later " +"use</link>. Then a window similar to this one appears:" msgstr "" #. type: Content of: <section><section><section><mediaobject> @@ -2877,7 +2876,7 @@ msgstr "" #. type: Content of: <section><section><section><para> #: en/SelectAndUseISOs2.xml:203 -msgid "Check the radio button Save File." +msgid "Select the Save File option, then, click OK." msgstr "" #. type: Content of: <section><section><section><title> @@ -2886,199 +2885,210 @@ msgid "Checking the integrity of the downloaded media" msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:207 +#: en/SelectAndUseISOs2.xml:208 msgid "" -"Both checksums are hexadecimal numbers calculated by an algorithm from the " -"file to be downloaded. When you ask these algorithms to recalculate this " -"number from your downloaded file, either you have the same number and your " -"downloaded file is correct, or the number is different and you have a " -"failure. A failure infers that you should retry the download or attempt a " -"repair using BitTorrent." +"The checksums referred to earlier, are digital fingerprints generated by an " +"algorithm from the file to be downloaded. You may compare the checksum of " +"your downloaded ISO against that of the original source ISO. If the " +"checksums do not match, it means that the actual data on the ISO's do not " +"match, and if it is the case, then you should retry the download or attempt " +"a repair using BitTorrent." msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:213 -msgid "Open a console, no need to be root, and:" +#: en/SelectAndUseISOs2.xml:214 +msgid "" +"To generate the checksum for your downloaded ISO, open a console, (no need " +"to be root), and:" msgstr "" -#. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:214 +#. type: Content of: <section><section><section><itemizedlist><listitem><para> +#: en/SelectAndUseISOs2.xml:218 msgid "" -"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum " +"To use md5sum, type: <userinput>md5sum " "path/to/the/image/file.iso</userinput>." msgstr "" -#. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:216 +#. type: Content of: <section><section><section><itemizedlist><listitem><para> +#: en/SelectAndUseISOs2.xml:222 msgid "" -"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum " -"path/to/the/image/file.iso</userinput>." +"To use sha1sum, type: <userinput>sha1sum " +"path/to/the/image/file.iso</userinput>" msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:218 -msgid "" -"and compare the obtained number on your computer (you may have to wait for a " -"while) with the number given by Mageia. Example:" +#: en/SelectAndUseISOs2.xml:226 +msgid "Example:" msgstr "" #. type: Content of: <section><section><section><mediaobject> -#: en/SelectAndUseISOs2.xml:221 +#: en/SelectAndUseISOs2.xml:228 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>" msgstr "" +#. type: Content of: <section><section><section><para> +#: en/SelectAndUseISOs2.xml:232 +msgid "" +"and compare the result (you may have to wait for a while) with the checksum " +"provided by Mageia." +msgstr "" + #. type: Content of: <section><section><title> -#: en/SelectAndUseISOs2.xml:229 +#: en/SelectAndUseISOs2.xml:237 msgid "Burn or dump the ISO" msgstr "" #. type: Content of: <section><section><para> -#: en/SelectAndUseISOs2.xml:230 +#: en/SelectAndUseISOs2.xml:238 msgid "" -"The checked ISO can now be burned to a CD or DVD or dumped to a USB " -"stick. These operations are not a simple copy and aim to make a bootable " -"medium." +"The verified ISO can now be burned to a CD/DVD or dumped to a USB " +"stick. This is not a standard copy operation as a bootable medium will " +"actually be created." msgstr "" #. type: Content of: <section><section><section><title> -#: en/SelectAndUseISOs2.xml:234 +#: en/SelectAndUseISOs2.xml:242 msgid "Burning the ISO to a CD/DVD" msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:235 +#: en/SelectAndUseISOs2.xml:243 msgid "" -"Use whatever burner you wish but ensure the burning device is set correctly " -"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is " -"not correct. There is more information in <link " +"Whichever software you use, ensure that the option to burn an<emphasis " +"role=\"bold\"> image</emphasis> is used, burn <emphasis " +"role=\"bold\">data</emphasis> or <emphasis role=\"bold\">files</emphasis> is " +"not correct. Seen the <link " "ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the Mageia " -"wiki</link>." +"wiki</link> for more information." msgstr "" #. type: Content of: <section><section><section><title> -#: en/SelectAndUseISOs2.xml:241 +#: en/SelectAndUseISOs2.xml:248 msgid "Dump the ISO to a USB stick" msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:242 +#: en/SelectAndUseISOs2.xml:249 msgid "" "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick " "and then use it to boot and install the system." msgstr "" #. type: Content of: <section><section><section><warning><para> -#: en/SelectAndUseISOs2.xml:245 +#: en/SelectAndUseISOs2.xml:252 msgid "" "\"Dumping\" an image onto a flash device destroys any previous file-system " -"on the device; any other data will be lost and the partition capacity will " -"be reduced to the image size." +"on the device; any existing data will be lost and the partition capacity " +"will be reduced to the image size." msgstr "" #. type: Content of: <section><section><section><para> -#: en/SelectAndUseISOs2.xml:249 +#: en/SelectAndUseISOs2.xml:256 msgid "" "To recover the original capacity, you must redo partitioning and re-format " "the USB stick." msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:252 +#: en/SelectAndUseISOs2.xml:259 msgid "Using a graphical tool within Mageia" msgstr "" #. type: Content of: <section><section><section><section><para> -#: en/SelectAndUseISOs2.xml:253 +#: en/SelectAndUseISOs2.xml:260 msgid "" "You can use a graphical tool like <link " "ns4:href=\"https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>" msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:256 +#: en/SelectAndUseISOs2.xml:263 msgid "Using a graphical tool within Windows" msgstr "" #. type: Content of: <section><section><section><section><para> -#: en/SelectAndUseISOs2.xml:257 +#: en/SelectAndUseISOs2.xml:264 msgid "You could try:" msgstr "" -#. type: Content of: <section><section><section><section><para> -#: en/SelectAndUseISOs2.xml:258 +#. type: Content of: <section><section><section><section><itemizedlist><listitem><para> +#: en/SelectAndUseISOs2.xml:267 msgid "" -"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using " -"the \"ISO image\" option;" +"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the " +"\"ISO image\" option;" msgstr "" -#. type: Content of: <section><section><section><section><para> -#: en/SelectAndUseISOs2.xml:260 +#. type: Content of: <section><section><section><section><itemizedlist><listitem><para> +#: en/SelectAndUseISOs2.xml:271 msgid "" -"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 " +"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 " "Disk Imager</link>" msgstr "" #. type: Content of: <section><section><section><section><title> -#: en/SelectAndUseISOs2.xml:264 +#: en/SelectAndUseISOs2.xml:277 msgid "Using Command line within a GNU/Linux system" msgstr "" #. type: Content of: <section><section><section><section><warning><para> -#: en/SelectAndUseISOs2.xml:266 +#: en/SelectAndUseISOs2.xml:279 msgid "" -"It is potentially *dangerous* to do this by hand. You risk to overwrite a " -"disc partition if you get the device-ID wrong." -msgstr "" - -#. type: Content of: <section><section><section><section><para> -#: en/SelectAndUseISOs2.xml:269 -msgid "You can also use the dd tool in a console:" +"It is potentially *dangerous* to do this by hand. You risk overwriting " +"potentially valuable existing data if you specify the wrong target device." msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:272 +#: en/SelectAndUseISOs2.xml:285 msgid "Open a console" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:275 +#: en/SelectAndUseISOs2.xml:288 msgid "" -"Become root with the command <userinput>su -</userinput> (don't forget the " -"final '-' )" +"Become a root (Administrator) user with the command <userinput>su " +"-</userinput> (don't forget the final '-' )" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject> -#: en/SelectAndUseISOs2.xml:278 +#: en/SelectAndUseISOs2.xml:291 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:284 +#: en/SelectAndUseISOs2.xml:297 msgid "" "Plug in your USB stick (do not mount it, this also means do not open any " "application or file manager that could access or read it)" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:289 +#: en/SelectAndUseISOs2.xml:302 msgid "Enter the command <userinput>fdisk -l</userinput>" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject> -#: en/SelectAndUseISOs2.xml:291 +#: en/SelectAndUseISOs2.xml:304 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:295 +#: en/SelectAndUseISOs2.xml:310 +msgid "" +"Find the device name for your USB stick (by its size), for example " +"<code>/dev/sdb</code> in the screenshot above, it is an 8GB USB stick." +msgstr "" + +#. type: Content of: <section><section><section><section><orderedlist><listitem><para> +#: en/SelectAndUseISOs2.xml:312 msgid "" -"Alternatively, you can get the device name with the command " -"<code>dmesg</code>: at end, you see the device name starting with " -"<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:" +"Alternatively, you can find the device name with the command " +"<code>dmesg</code>: towards the end of this example, you can see the device " +"name starting with <emphasis>sd</emphasis>, and in this case, <emphasis> " +"sdd</emphasis> is the actual device. You can also see thaat its size is 2GB:" msgstr "" -#. type: Content of: <section><section><section><section><orderedlist><listitem><screen> -#: en/SelectAndUseISOs2.xml:299 +#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen> +#: en/SelectAndUseISOs2.xml:317 #, no-wrap msgid "" "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n" @@ -3108,39 +3118,48 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:319 -msgid "" -"Find the device name for your USB stick (by its size), for example " -"<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick." +#: en/SelectAndUseISOs2.xml:317 +msgid "<placeholder type=\"screen\" id=\"0\"/>" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:324 +#: en/SelectAndUseISOs2.xml:337 msgid "" -"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX " -"bs=1M</userinput>" +"Enter the command: <emphasis role=\"bold\"># <userinput>dd " +"if=path/to/the/ISO/file of=/dev/sdX bs=1M</userinput></emphasis>" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:326 -msgid "Where X=your device name eg: /dev/sdc" +#: en/SelectAndUseISOs2.xml:340 +msgid "Where X=your device name eg: /dev/sdd" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:327 +#: en/SelectAndUseISOs2.xml:341 msgid "" -"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso " -"of=/dev/sdb bs=1M</userinput>" +"Example:<emphasis role=\"bold\"> # <userinput>dd " +"if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdd " +"bs=1M</userinput></emphasis>" +msgstr "" + +#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para> +#: en/SelectAndUseISOs2.xml:345 +msgid "" +"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands " +"for <emphasis role=\"bold\">i</emphasis>nput <emphasis " +"role=\"bold\">f</emphasis>ile and <emphasis role=\"bold\">of</emphasis> " +"stands for <emphasis role=\"bold\">o</emphasis>utput <emphasis " +"role=\"bold\">f</emphasis>ile" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:330 +#: en/SelectAndUseISOs2.xml:349 msgid "Enter the command: # <userinput>sync</userinput>" msgstr "" #. type: Content of: <section><section><section><section><orderedlist><listitem><para> -#: en/SelectAndUseISOs2.xml:333 -msgid "Unplug your USB stick, it is done" +#: en/SelectAndUseISOs2.xml:352 +msgid "This is the end of the process, and you may now unplug your USB stick." msgstr "" #. type: Content of: <section><info><title> @@ -3169,108 +3188,112 @@ msgstr "" #: en/selectCountry.xml:19 msgid "" "If your country isn't in the list, click the <guilabel>Other " -"Countries</guilabel> button and choose your country / region there." +"Countries</guilabel> option and choose your country / region there." msgstr "" #. type: Content of: <section><note><para> #: en/selectCountry.xml:24 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 " +"after clicking <guibutton>OK</guibutton> it may seem that a country from the " +"first list was chosen. Please ignore this, as DrakX will apply your actual " "choice." msgstr "" #. type: Content of: <section><section><info><title> -#: en/selectCountry.xml:32 +#: en/selectCountry.xml:33 msgid "Input method" msgstr "" #. type: Content of: <section><section><para> -#: en/selectCountry.xml:35 +#: en/selectCountry.xml:36 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, so users should not need to configure it " -"manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar " +"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:44 +#: en/selectCountry.xml:45 msgid "" "If you missed the input method setup during installation, you can access it " -"after you boot your installed system via \"Configure your Computer\" -> " -"\"System\", or by running localedrake as root." +"after you boot your installed system via <emphasis role=\"bold\">Configure " +"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by " +"running localedrake as root." msgstr "" #. type: Content of: <section><info><title> -#: en/selectInstallClass.xml:21 +#: en/selectInstallClass.xml:14 msgid "Install or Upgrade" msgstr "" #. type: Content of: <section><mediaobject> -#: en/selectInstallClass.xml:25 +#: en/selectInstallClass.xml:18 msgid "" -"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" " -"align=\"center\" format=\"PNG\"></imagedata> </imageobject>" +"<imageobject> <imagedata format=\"PNG\" align=\"center\" " +"fileref=\"dx2-selectInstallClass.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectInstallClass.xml:32 +#: en/selectInstallClass.xml:25 msgid "Install" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectInstallClass.xml:34 -msgid "Use this option for a fresh <application>Mageia</application> installation." +#: en/selectInstallClass.xml:27 +msgid "" +"Use this option to perform a fresh installation of " +"<application>Mageia</application>. This will format the root partition (/), " +"but can preserve a separated /home partition." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectInstallClass.xml:39 +#: en/selectInstallClass.xml:33 msgid "Upgrade" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectInstallClass.xml:41 +#: en/selectInstallClass.xml:35 msgid "" -"If you have one or more <application>Mageia</application> installations on " -"your system, the installer will allow you to upgrade one of them to the " -"latest release." +"This can be used to upgrade an existing installation of " +"<application>Mageia</application>." msgstr "" #. type: Content of: <section><itemizedlist><listitem><warning><para> -#: en/selectInstallClass.xml:45 +#: en/selectInstallClass.xml:39 msgid "" "Only upgrading from a previous Mageia version that was <emphasis>still " "supported</emphasis> when this installer's version was released, has been " -"thoroughly tested. If you want to upgrade a Mageia version that had already " -"reached its End\tOf Life when this one was released, then it is better to do " -"a clean install while preserving your <literal>/home</literal> partition." +"thoroughly tested. If you want to upgrade a Mageia version that has reached " +"its End Of Life, then it is better to do a clean install instead while " +"preserving your <literal>/home</literal> partition." msgstr "" #. type: Content of: <section><note><para> -#: en/selectInstallClass.xml:56 +#: en/selectInstallClass.xml:50 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 " +"unusable system. If in spite of that, and only if you are very sure " +"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt " +"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl " "Delete</guilabel> simultaneously to reboot." msgstr "" #. type: Content of: <section><tip><para> -#: en/selectInstallClass.xml:67 +#: en/selectInstallClass.xml:62 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." +"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> " +"screen to the language choice screen by pressing <guilabel>Alt Ctrl " +"Home</guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do " +"this later in the install." msgstr "" #. type: Content of: <section><info><title> @@ -3295,26 +3318,26 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/selectKeyboard.xml:14 +#: en/selectKeyboard.xml:7 msgid "Keyboard" msgstr "" #. type: Content of: <section><para> -#: en/selectKeyboard.xml:17 +#: en/selectKeyboard.xml:10 msgid "" "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><mediaobject> -#: en/selectKeyboard.xml:22 +#: en/selectKeyboard.xml:15 msgid "" -"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" " -"/> </imageobject>" +"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" " +"align=\"center\"/> </imageobject>" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectKeyboard.xml:30 +#: en/selectKeyboard.xml:22 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 " @@ -3325,38 +3348,38 @@ msgid "" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectKeyboard.xml:40 +#: en/selectKeyboard.xml:31 msgid "" "If your keyboard isn't in the list shown, click on " -"<guibutton>More</guibutton> to get a full list, and select your keyboard " +"<guibutton>More</guibutton> to get a fuller list, and select your keyboard " "there." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para><warning><para> -#: en/selectKeyboard.xml:45 +#: en/selectKeyboard.xml:36 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." +"a keyboard from that screen was chosen. You can safely ignore this and " +"continue the installation: the keyboard chosen from the full list will be " +"applied." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectKeyboard.xml:55 +#: en/selectKeyboard.xml:46 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" +"extra dialogue screen asking how you would prefer to switch between the " +"Latin and non-Latin keyboard layouts" msgstr "" #. type: Content of: <section><info><title> -#: en/selectLanguage.xml:10 +#: en/selectLanguage.xml:15 msgid "Please choose a language to use" msgstr "" #. type: Content of: <section><para> -#: en/selectLanguage.xml:12 +#: en/selectLanguage.xml:18 msgid "" "Select your preferred language, by first expanding the list for your " "continent. <application>Mageia</application> will use this selection during " @@ -3364,23 +3387,23 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/selectLanguage.xml:16 +#: en/selectLanguage.xml:23 msgid "" "Select your preferred language. <application>Mageia</application> will use " "this selection during the installation and for your installed system." msgstr "" #. type: Content of: <section><para> -#: en/selectLanguage.xml:19 +#: en/selectLanguage.xml:27 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." +"If it is likely that you (or others) will require several languages to be " +"installed on your system, then you should use the <guibutton>Multiple " +"languages</guibutton> option to add them now. It will be difficult to add " +"extra language support after installation." msgstr "" #. type: Content of: <section><mediaobject> -#: en/selectLanguage.xml:25 +#: en/selectLanguage.xml:33 msgid "" "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " "fileref=\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> " @@ -3389,35 +3412,35 @@ msgid "" msgstr "" #. type: Content of: <section><warning><para> -#: en/selectLanguage.xml:33 +#: en/selectLanguage.xml:43 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 ." +"Even if you choose more than one language, you must first choose one 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><itemizedlist><listitem><para> -#: en/selectLanguage.xml:39 +#: en/selectLanguage.xml:50 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." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectLanguage.xml:44 +#: en/selectLanguage.xml:56 msgid "Mageia uses UTF-8 (Unicode) support by default." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectLanguage.xml:45 +#: en/selectLanguage.xml:58 msgid "" -"This may be disabled in the \"multiple languages\" screen if you know that " -"it is inappropriate for your language. Disabling UTF-8 applies to all " -"installed languages." +"This may be disabled in the <emphasis role=\"bold\">Multiple " +"languages</emphasis> screen if you know that it is inappropriate for your " +"language. Disabling UTF-8 applies to all installed languages." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectLanguage.xml:50 +#: en/selectLanguage.xml:64 msgid "" "You can change the language of your system after installation in the Mageia " "Control Center -> System -> Manage localization for your system." @@ -3461,61 +3484,62 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/setupBootloaderAddEntry.xml:6 +#: en/setupBootloaderAddEntry.xml:7 msgid "Add or Modify a Boot Menu Entry" msgstr "" #. type: Content of: <section><para> -#: en/setupBootloaderAddEntry.xml:9 +#: en/setupBootloaderAddEntry.xml:11 msgid "" -"To do that you need to manually edit /boot/grub2/custom.cfg or use the " -"software grub-customizer instead (Available in the Mageia repositories)." +"To do this you need to manually edit /boot/grub2/custom.cfg or use the " +"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead " +"(available in the Mageia repositories)." msgstr "" #. type: Content of: <section><note><para> -#: en/setupBootloaderAddEntry.xml:13 +#: en/setupBootloaderAddEntry.xml:16 msgid "" -"For more information, see our wiki: <link " +"For more information, see: <link " "ns2:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>" msgstr "" #. type: Content of: <section><info><title> -#: en/setupBootloader.xml:9 +#: en/setupBootloader.xml:7 msgid "Bootloader main options" msgstr "" #. type: Content of: <section><section><title> -#: en/setupBootloader.xml:13 +#: en/setupBootloader.xml:10 msgid "Bootloader interface" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:15 +#: en/setupBootloader.xml:11 msgid "By default, Mageia uses exclusively:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:19 -msgid "Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system" +#: en/setupBootloader.xml:14 +msgid "GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:24 -msgid "Grub2-efi for a UEFI system." +#: en/setupBootloader.xml:18 +msgid "GRUB2-efi for a UEFI system." msgstr "" #. type: Content of: <section><section><tip><para> -#: en/setupBootloader.xml:29 +#: en/setupBootloader.xml:22 msgid "The Mageia graphical menus are nice :)" msgstr "" #. type: Content of: <section><section><section><title> -#: en/setupBootloader.xml:33 -msgid "Grub2 on Legacy/MBR and Legacy/GPT systems" +#: en/setupBootloader.xml:25 +msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems" msgstr "" #. type: Content of: <section><section><section><mediaobject> -#: en/setupBootloader.xml:36 +#: en/setupBootloader.xml:27 msgid "" "<imageobject condition=\"classical\"> <imagedata " "fileref=\"dx2-setupBootloader.png\" align=\"center\"/> </imageobject> " @@ -3524,24 +3548,27 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:45 en/setupBootloader.xml:73 -msgid "Don't modify the \"Boot Device\" unless you really know what you are doing." +#: en/setupBootloader.xml:34 en/setupBootloader.xml:56 +msgid "" +"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you " +"really know what you are doing." msgstr "" #. type: Content of: <section><section><section><title> -#: en/setupBootloader.xml:50 -msgid "Grub2-efi on UEFI systems" +#: en/setupBootloader.xml:38 +msgid "GRUB2-efi on UEFI systems" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:52 +#: en/setupBootloader.xml:39 msgid "" -"With an UEFI system, the user interface is slightly different as you cannot " -"choose between with or without graphical menu" +"With a UEFI system, the user interface is slightly different as you cannot " +"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis " +"role=\"bold\">without graphical menu</emphasis> options." msgstr "" #. type: Content of: <section><section><section><mediaobject> -#: en/setupBootloader.xml:56 +#: en/setupBootloader.xml:42 msgid "" "<imageobject condition=\"classical\"> <imagedata " "fileref=\"dx2-setupBootloader2.png\" align=\"center\"/> </imageobject> " @@ -3550,50 +3577,52 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><para> -#: en/setupBootloader.xml:65 +#: en/setupBootloader.xml:49 msgid "" "If Mageia is the only system installed on your computer, the installer " -"created an ESP (EFI System Partition) to receive the bootloader " -"(Grub2-efi). If there are already UEFI operating systems installed on your " +"created an ESP (EFI System Partition) to house the bootloader " +"(GRUB2-efi). If there are already UEFI operating systems installed on your " "computer (Windows 8 for example), the Mageia installer detects the existing " -"ESP created by Windows and adds grub2-efi. Although it is possible to have " -"several ESPs, only one is advised and enough whatever the number of " +"ESP created by Windows and adds GRUB2-efi. Although it is possible to have " +"several ESPs, only one is required (and advised), whatever the number of " "operating systems you have." msgstr "" #. type: Content of: <section><section><title> -#: en/setupBootloader.xml:79 +#: en/setupBootloader.xml:61 msgid "Using a Mageia bootloader" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:81 -msgid "By default, according to your system, Mageia writes a new:" +#: en/setupBootloader.xml:62 +msgid "" +"By default, and according to your system, Mageia writes one of the " +"following:" msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:85 +#: en/setupBootloader.xml:66 msgid "" -"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard " -"drive or in the BIOS boot partition." +"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first " +"hard drive or in the BIOS boot partition." msgstr "" #. type: Content of: <section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:90 -msgid "Grub2-efi bootloader into the ESP" +#: en/setupBootloader.xml:70 +msgid "a GRUB2-efi bootloader into the ESP" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:94 +#: en/setupBootloader.xml:73 msgid "" "If you already have other operating systems installed, Mageia attempts to " "add them to your new Mageia boot menu. If you don't want this behaviour, " -"click on <guibutton>Next</guibutton> and then uncheck the box " -"<guilabel>Probe Foreign OS</guilabel>" +"click on <guibutton>Next</guibutton> and then untick the <emphasis " +"role=\"bold\">Probe Foreign OS </emphasis>option" msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/setupBootloader.xml:100 +#: en/setupBootloader.xml:78 msgid "" "<imageobject condition=\"classical\"> <imagedata align=\"center\" " "fileref=\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject " @@ -3602,36 +3631,36 @@ msgid "" msgstr "" #. type: Content of: <section><section><title> -#: en/setupBootloader.xml:111 +#: en/setupBootloader.xml:87 msgid "Using an existing bootloader" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:113 +#: en/setupBootloader.xml:88 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." +"is beyond the scope of this documentation, 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><title> -#: en/setupBootloader.xml:121 +#: en/setupBootloader.xml:95 msgid "Using chain loading" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:123 +#: en/setupBootloader.xml:96 msgid "" -"If you don't want a bootable Mageia, but to chain load it from another OS, " +"If you don't want a bootable Mageia, but to chain-load it from another OS, " "click on <guibutton>Next</guibutton>, then on " -"<guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP " +"<guibutton>Advanced</guibutton> and tick the box <guilabel>Do not touch ESP " "or MBR</guilabel>." msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/setupBootloader.xml:129 +#: en/setupBootloader.xml:101 msgid "" "<imageobject condition=\"classical\"> <imagedata " "fileref=\"dx2-setupBootloader4.png\" align=\"center\"/> </imageobject> " @@ -3640,140 +3669,135 @@ msgid "" msgstr "" #. type: Content of: <section><section><para> -#: en/setupBootloader.xml:138 +#: en/setupBootloader.xml:108 msgid "" "You will get a warning that the bootloader is missing, ignore it by clicking " "<guibutton>OK</guibutton>." msgstr "" #. type: Content of: <section><section><mediaobject> -#: en/setupBootloader.xml:142 +#: en/setupBootloader.xml:111 msgid "" "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> " "</imageobject>" msgstr "" #. type: Content of: <section><section><title> -#: en/setupBootloader.xml:149 +#: en/setupBootloader.xml:117 msgid "Options" msgstr "" #. type: Content of: <section><section><section><title> -#: en/setupBootloader.xml:152 +#: en/setupBootloader.xml:119 msgid "First page" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:156 +#: en/setupBootloader.xml:120 msgid "" -"<guilabel>Delay before booting the default image</guilabel>: This text box " -"lets you set a delay in seconds before the default operating system is " -"started up." +"<guilabel>Delay before booting the default image</guilabel>: This lets you " +"set a delay in seconds before the default operating system is started up." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:162 +#: en/setupBootloader.xml:122 msgid "" "<guilabel>Security</guilabel>: This allows you to set a password for the " -"bootloader. This means a username and password will be asked at the boot " -"time to select a booting entry or change settings. The username is \"root\" " -"and the password is the one chosen here after." +"bootloader. This means a username and password will be required when booting " +"to select a booting entry or change settings. The username is <emphasis " +"role=\"bold\">root</emphasis> and the password is the one chosen here-after." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:170 -msgid "" -"<guilabel>Password</guilabel>: This text box is where you actually put the " -"password" +#: en/setupBootloader.xml:125 +msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:175 +#: en/setupBootloader.xml:126 msgid "" -"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will " -"check that it matches with the one set above." +"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will " +"check that it matches with the one above." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:181 en/setupBootloader.xml:239 +#: en/setupBootloader.xml:127 en/setupBootloader.xml:159 msgid "<guilabel>Advanced</guilabel>" msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:185 +#: en/setupBootloader.xml:127 msgid "" "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power " -"Interface) is a standard for the power management. It can save energy by " -"stopping unused devices, this was the method used before APM. Unchecking it " -"could be useful if, for example, your computer does not support ACPI or if " -"you think the ACPI implementation might cause some problems (for instance " -"random reboots or system lockups)." +"Interface) is a standard for power management. It can save energy by " +"stopping unused devices. Deselecting it could be useful if, for example, " +"your computer does not support ACPI or if you think the ACPI implementation " +"might cause some problems (for instance random reboots or system lockups)." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:195 +#: en/setupBootloader.xml:133 msgid "" -"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric " +"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric " "multiprocessing for multi core processors." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:201 +#: en/setupBootloader.xml:135 msgid "" -"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the " -"operating system access to the Advanced Programmable Interrupt " -"Controller. APIC devices permit more complex priority models, and Advanced " -"IRQ (Interrupt Request) management." +"<guilabel>Enable APIC</guilabel>: This gives the operating system access to " +"the Advanced Programmable Interrupt Controller. APIC devices permit more " +"complex priority models, and Advanced IRQ (Interrupt Request) management." msgstr "" #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/setupBootloader.xml:209 +#: en/setupBootloader.xml:138 msgid "" -"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which " -"manages all external interrupts for a specific processor in an SMP system." +"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external " +"interrupts for a specific processor in an SMP system." msgstr "" #. type: Content of: <section><section><section><title> -#: en/setupBootloader.xml:219 +#: en/setupBootloader.xml:143 msgid "Next page" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:223 +#: en/setupBootloader.xml:146 msgid "<guilabel>Default:</guilabel> Operating system started up by default" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:228 +#: en/setupBootloader.xml:150 msgid "" "<guilabel>Append:</guilabel> This option lets you pass the kernel " "information or tell the kernel to give you more information as it boots." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/setupBootloader.xml:234 +#: en/setupBootloader.xml:155 msgid "" "<guilabel>Probe foreign OS</guilabel>: see above <link " "linkend=\"setupMageiaBootloader\">Using a Mageia bootloader</link>" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:241 +#: en/setupBootloader.xml:159 msgid "" "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth " -"the boot menu will use. If you click the down triangle you will be offered " -"other size and colour depth options." +"to be used by the boot menu. If you click the down triangle you will be " +"offered other size and colour depth options." msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para> -#: en/setupBootloader.xml:248 +#: en/setupBootloader.xml:162 msgid "" "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link " "linkend=\"setupChainLoading\">Using the chain loading</link>" msgstr "" #. type: Content of: <section><info><title> -#: en/setupSCSI.xml:11 +#: en/setupSCSI.xml:3 msgid "Setup SCSI" msgstr "" @@ -3786,30 +3810,29 @@ msgstr "" #. 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/setupSCSI.xml:22 msgid "" -"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" " -"format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> " -"</imageobject>" +"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" " +"align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> -#: en/setupSCSI.xml:32 +#: en/setupSCSI.xml:27 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." +"DrakX will normally detect hard disks correctly. However, 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 +#: en/setupSCSI.xml:32 msgid "" -"If this happens, you will need to manually tell Drakx which SCSI drive(s) " +"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 +#: en/setupSCSI.xml:35 msgid "DrakX should then be able to configure the drive(s) correctly." msgstr "" @@ -3830,8 +3853,7 @@ msgstr "" #: en/soundConfig.xml:14 msgid "" "In this screen the name of the driver that the installer chose for your " -"sound card is given, which will be the default driver if we have a default " -"one." +"sound card is given, which will be the default driver if one exists." msgstr "" #. type: Content of: <section><para> @@ -3847,34 +3869,35 @@ msgstr "" #. type: Content of: <section><para> #: en/soundConfig.xml:24 msgid "" -"Then, in the draksound or \"Sound Configuration\" tool screen, click on " -"<guibutton>Advanced</guibutton> and then on " -"<guibutton>Troubleshooting</guibutton> to find very useful advice about how " -"to solve the problem." +"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis " +"role=\"bold\">Sound Configuration</emphasis> tool screen, click on " +"<guibutton>Troubleshooting</guibutton> to find useful advice about how to " +"solve the problem." msgstr "" #. type: Content of: <section><section><info><title> -#: en/soundConfig.xml:31 +#: en/soundConfig.xml:30 msgid "Advanced" msgstr "" #. type: Content of: <section><section><para> -#: en/soundConfig.xml:34 +#: en/soundConfig.xml:33 msgid "" -"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is " -"useful if there is no default driver and there are several drivers " -"available, but you think the installer selected the wrong one." +"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> " +"in this screen, during install, is useful if there is no default driver and " +"there are several drivers available, but you think the installer selected " +"the wrong one." msgstr "" #. type: Content of: <section><section><para> -#: en/soundConfig.xml:39 +#: en/soundConfig.xml:38 msgid "" -"In that case you can select a different driver after clicking on " -"<guibutton>Let me pick any driver</guibutton>." +"In that case you can select a different driver after clicking on <emphasis " +"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>." msgstr "" #. type: Content of: <section><info><title> -#: en/takeOverHdConfirm.xml:4 +#: en/takeOverHdConfirm.xml:3 msgid "Confirm hard disk to be formatted" msgstr "" @@ -3885,27 +3908,27 @@ msgstr "" #. 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 +#: en/takeOverHdConfirm.xml:18 msgid "" -"<imageobject condition='live'> <imagedata " -"fileref=\"live-takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" " -"></imagedata> </imageobject> <imageobject condition='classical'> <imagedata " -"fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" " -"></imagedata> </imageobject>" +"<imageobject condition=\"live\"> <imagedata format=\"PNG\" " +"fileref=\"live-takeOverHdConfirm.png\" align=\"center\"/> </imageobject> " +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " +"fileref=\"dx2-takeOverHdConfirm.png\" align=\"center\"/> </imageobject>" msgstr "" #. type: Content of: <section><para> #: en/takeOverHdConfirm.xml:27 msgid "" -"Click on <guibutton>Previous</guibutton> if you are not sure about your " +"Click on <guibutton>Previous</guibutton> if you are at all unsure about your " "choice." msgstr "" #. type: Content of: <section><para> -#: en/takeOverHdConfirm.xml:30 +#: en/takeOverHdConfirm.xml:31 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." +"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is " +"ok to erase every partition, every operating system and all data that might " +"be on that hard disk." msgstr "" #. type: Content of: <section><info><title> @@ -4012,54 +4035,50 @@ msgstr "" msgid "Uninstalling Mageia" msgstr "" -#. type: Content of: <section><section><title> -#: en/uninstall-Mageia.xml:10 -msgid "Howto" -msgstr "" - -#. type: Content of: <section><section><para> -#: en/uninstall-Mageia.xml:12 +#. type: Content of: <section><para> +#: en/uninstall-Mageia.xml:9 msgid "" -"If Mageia didn't convince you or you can't install it correctly, in short " -"you want get rid of it. That is your right and Mageia also gives you the " +"If Mageia didn't convince you or you can't install it correctly - in short " +"you want get rid of it - that is your right and Mageia also gives you the " "possibility to uninstall. This is not true for every operating system." msgstr "" -#. type: Content of: <section><section><para> -#: en/uninstall-Mageia.xml:17 +#. type: Content of: <section><para> +#: en/uninstall-Mageia.xml:14 msgid "" -"After your data backup, reboot your installation Mageia DVD and select " -"Rescue system, then, Restore Windows boot loader. At the next boot, you will " -"only have Windows with no option to choose your operating system." +"After your data backup, reboot your Mageia installation DVD and select " +"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis " +"role=\"bold\">Restore Windows boot loader</emphasis>. At the next boot, you " +"will only have Windows, with no option to choose your operating system." msgstr "" -#. type: Content of: <section><section><para> -#: en/uninstall-Mageia.xml:22 +#. type: Content of: <section><para> +#: en/uninstall-Mageia.xml:19 msgid "" -"To recover the space used by Mageia partitions on Windows, click on " +"In Windows to recover the space used by Mageia partitions: click on " "<code>Start -> Control Panel -> Administrative Tools -> Computer Management " -"-> Storage -> Disk Management</code> to access to the partition " -"management. You will recognize the Mageia partition because they are labeled " -"<guilabel>Unknown</guilabel>, and also by their size and place in the " -"disk. Right click on each of these partitions and select " -"<guibutton>Delete</guibutton>. The space will be freed." +"-> Storage -> Disk Management</code>. You will recognize a Mageia partition " +"because they are labeled <guilabel>Unknown</guilabel>, and also by their " +"size and place on the disk. Right click on each of these partitions and " +"select <guibutton>Delete</guibutton> to free up the space." msgstr "" -#. type: Content of: <section><section><para> -#: en/uninstall-Mageia.xml:30 +#. type: Content of: <section><para> +#: en/uninstall-Mageia.xml:27 msgid "" "If you are using Windows XP, you can create a new partition and format it " "(FAT32 or NTFS). It will get a partition letter." msgstr "" -#. type: Content of: <section><section><para> -#: en/uninstall-Mageia.xml:33 +#. type: Content of: <section><para> +#: en/uninstall-Mageia.xml:30 msgid "" "If you have Vista or 7, you have one more possibility, you can extend the " -"existing partition that is at the left of the freed space. There are other " -"partitioning tools that can be used, such as gparted, available for both " -"windows and linux. As always, when changing partitions, be very careful, and " -"make sure all important things have been backed up." +"existing partition that is at the left of the freed space. There are other " +"partitioning tools that can be used, such as <emphasis " +"role=\"bold\">gparted</emphasis>, available for both Windows and Linux. As " +"always, when changing partitions, be very careful to back up anything " +"important to you." msgstr "" #. type: Content of: <section><info><title> |