From 1d5497be9684c7e71716301fd0e147d46f41c4a4 Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 25 Jun 2017 19:48:10 +0300 Subject: Update catalog --- docs/installer/en/DrakX.xml | 62 +-- docs/installer/en/diskdrake.xml | 39 +- docs/installer/en/doPartitionDisks.xml | 146 ++----- docs/installer/en/exitInstall.xml | 9 +- docs/installer/en/firewall.xml | 50 +++ docs/installer/en/installer.xml | 360 ++++++++--------- docs/installer/en/selectLanguage.xml | 28 +- docs/installer/en/setupBootloaderAddEntry.xml | 5 +- docs/installer/help.pot | 535 +++++++++++++++----------- 9 files changed, 606 insertions(+), 628 deletions(-) create mode 100644 docs/installer/en/firewall.xml diff --git a/docs/installer/en/DrakX.xml b/docs/installer/en/DrakX.xml index 90770389..b39e7186 100644 --- a/docs/installer/en/DrakX.xml +++ b/docs/installer/en/DrakX.xml @@ -1,4 +1,4 @@ -
+
Installation with DrakX @@ -9,24 +9,29 @@ choices you make while installing. - The texts and screenshots in this manual are available under the - CC BY-SA 3.0 license - http://creativecommons.org/licenses/by-sa/3.0/. + The texts and screenshots in this manual are + available under the CC BY-SA 3.0 license http://creativecommons.org/licenses/by-sa/3.0/. This manual was produced with the help of the Calenco CMS developed by NeoDoc. - It was written by volunteers in their free time. Please contact Documentation Team, if you would like to help improve this manual. + It was written by volunteers in their free time. Please contact + Documentation + Team, if you would like to help improve this manual. - - - - - - + + + + + + + + + + @@ -45,29 +50,29 @@ - - + - + - + - + - + - + - + @@ -91,18 +96,19 @@ - - - + + + - + - + - + - + + @@ -110,5 +116,5 @@ - -
+ +
\ No newline at end of file diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml index 71f78be6..7dfa23b6 100644 --- a/docs/installer/en/diskdrake.xml +++ b/docs/installer/en/diskdrake.xml @@ -1,23 +1,19 @@ -
+
- Custom disk partitioning with DiskDrake - - - If you wish to use encryption on your / partition you must ensure that you have a @@ -25,55 +21,38 @@ Lebarhon 20170902 added SC--> /boot partition must NOT be set, otherwise your system will be unbootable. - Adjust the layout of your disk(s) here. You can remove or create partitions, change the filesystem of a partition or change its size and even view what is in them before you start. - 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. - + sdc if there are three of them. Push Clear all to wipe all partitions on the selected storage device - 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. - + mount point, resize it or wipe it. Toggle to expert + mode (or Expert mode) gives some more + tools like to add a label or to choose a partition type. Continue until you adjusted everything to your wishes. - Click Done when you're ready. - 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 Legacy/GPT system, check that a - BIOS boot partition is present with a correct type - + If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot partition is present and of the correct type - + - - + diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml index 8bfd8903..149e7082 100644 --- a/docs/installer/en/doPartitionDisks.xml +++ b/docs/installer/en/doPartitionDisks.xml @@ -1,183 +1,94 @@ -
+
- - Partitioning - 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 Mageia. - The options available from the list below will vary depending on your particular hard drive(s) layout and content. - - - - - - Use Existing - Partitions - - If this option is + Use Existing + PartitionsIf this option is available, then existing Linux compatible partitions have been found - and may be used for the installation. - - - - Use Free Space - - If you have unused + and may be used for the installation.Use Free SpaceIf you have unused space on your hard drive then this option will use it for your new - Mageia installation. - - - - Use Free Space on a - Windows Partition - - If you have unused + Mageia installation.Use Free Space on a + Windows PartitionIf you have unused space on an existing Windows partition, the installer may offer to use - it. - - This can be a useful + it.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 important - files! - - Note that this + files!Note that this involves shrinking the size of the Windows partition. The partition must be "clean", meaning that Windows must have closed down correctly the last time it was used. It must also have been defragmented, although this is not a guarantee that all files in the partition have been moved out of the area that is about to be used. It is highly - recommended to back up your personal files. - - With this option, the installer displays the remaining Windows + recommended to back up your personal files.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. - - - - - - - - - - - - - - Erase and use Entire - Disk. - - This option will use - the complete drive for Mageia. - - Note! This will - erase ALL data on the selected hard drive. Take care! - - If you intend to use + partitions. See the screen-shot below. Erase and use Entire + Disk.This option will use + the complete drive for Mageia.Note! This will + erase ALL data on the selected hard drive. Take care!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 this - option. - - - - Custom - - This gives you + option.Custom disk + partitioningThis gives you complete control over the placing of the installation on your hard - drive(s). - - - - Partitions sizing: - + drive(s). + Partition sizing: The installer will share the available place out according to the following rules: - - - - If the total available place is lower than 50 GB, only one + 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 place is over 50 GB, then three - partitions are created - - - - 6/19 of the total available place is allocated to / with a - maximum of 50 GB - - - - 1/19 is allocated to swap with a maximum of 4 GB - - - - the rest (at least 12/19) is allocated to /home - - - - - + /home.If the total available place is over 50 GB, then three + partitions are created6/19 of the total available place is allocated to / with a + maximum of 50 GB1/19 is allocated to swap with a maximum of 4 GBthe rest (at least 12/19) is allocated to /home 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. - If you are using an UEFI system, the ESP (EFI System Partition) will be automatically detected, or created if it does not exist yet, and - mounted on /boot/EFI. The "Custom" option is the only one that allows to - check it has been correctly done + 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 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 the - "Custom disk partitioning" option to be able to create it with the - Installer like any other partition, just select BIOS boot partition as - filesystem type. - + existing. It is an about 1 MiB partition with no mount point. Choose to be able to create it with the Installer like any + other partition, just select BIOS boot partition as filesystem + type. - + - - - Some newer drives are now using 4096 byte logical sectors, instead of the previous standard of 512 byte logical sectors. Due to lack of @@ -186,11 +97,8 @@ lebarhon 20170209 added SC--> 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: - "Align to" "MiB" - "Free space preceding (MiB)" "2" - Also make sure all partitions are created with an even number of megabytes. diff --git a/docs/installer/en/exitInstall.xml b/docs/installer/en/exitInstall.xml index 7cf642d5..ff5d8d0d 100644 --- a/docs/installer/en/exitInstall.xml +++ b/docs/installer/en/exitInstall.xml @@ -1,30 +1,23 @@ -
+
Congratulations - - - You have finished installing and configuring Mageia and it is now safe to remove the installation medium and reboot your computer. - After reboot, in the bootloader screen, you can choose between the operating systems on your computer (if you have more than one). - If you didn't adjust the settings for the bootloader, your Mageia install will be automatically selected and started. - Enjoy! - Visit www.mageia.org if you have any questions or want to contribute to Mageia
\ No newline at end of file diff --git a/docs/installer/en/firewall.xml b/docs/installer/en/firewall.xml new file mode 100644 index 00000000..d363e197 --- /dev/null +++ b/docs/installer/en/firewall.xml @@ -0,0 +1,50 @@ +
+ + Firewall + + + 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. + + In the default setting, no button is checked - no service of the + system is accessibly from the network. The "Everything (no + firewall)" 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. + + 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. + + Advanced + + 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 "Advanced" button + opens a window where you can enable a series of services by typing a list of + couples (blank separated) + + <port-number>/<protocol> + + + - <port-number> is the value of the + port assigned to the service you want to enable (e.g. 873 for the RSYNC + service) as defined in RFC-433; + + - <protocol> is one of + TCP or UDP - the internet + protocol that is used by the service. + + + For instance, the entry for enabling access to the RSYNC service + therefore is 873/tcp. + + In case a service is implemented to use both protocols, you specify 2 + couples for the same port. +
\ No newline at end of file diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml index dabdb195..2b89e5d4 100644 --- a/docs/installer/en/installer.xml +++ b/docs/installer/en/installer.xml @@ -1,204 +1,186 @@ -
- - - - - - - - - - - - +
- DrakX, the Mageia Installer + DrakX, the Mageia + Installer Whether you are new to GNU-Linux or an experienced user, the Mageia Installer is designed to help make your installation or upgrade as easy as possible. - - The initial menu screen has various options, however the default one will start the installer, which will normally be all that you will need. -
- - Installation Welcome Screen - - - Here are the default welcome screens when using a Mageia DVD, The - first one with a legacy system and the second one with an UEFI system: - - - - - - - -
- - - - - - - - From this first screen, it is possible to set some personal - preferences: - - - - The language (for the installation only, may be different that the - chosen language for the system) by pressing the key F2 (Legacy mode - only) - - - - - - - - - - Use the arrow keys to select the language and press the key - Enter. - - Here is for example, the French welcome screen when using a Live - DVD/CD. Note that the Live DVD/CD menu does not propose: - Rescue System, Memory test and - Hardware Detection Tool. - - - - - - - - +
+ Installation Welcome Screen - - +
+ Using a Mageia DVD - - Change the screen resolution by pressing the F3 key (Legacy mode - only). + 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: - + - - - - Add some kernel options by pressing the F6 key for the legacy mode or the e key for the UEFI mode. - - 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 Boot options and propose four - entries: - - - Default, it doesn't alter anything in the default - options. - - - Safe Settings, priority is given to the safer options to the - detriment of performances. - - No ACPI (Advanced Configuration and Power Interface), power - management isn't taken into account. - - - No Local APIC (Local Advanced Programmable Interrupt - Controller), it is about CPU interruptions, select this option if you - are asked for. - - When you select one of these entries, it modifies the default - options displayed in the Boot Options line. - - - In some Mageia releases, it may happen that the entries selected - with the key F6 does not appear in the Boot - Options line, however, they are really taken into - account. - + 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. - + - - - Add more kernel options by pressing the key F1 (Legacy mode - only). - - 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. + From this screen, it is possible to set some personal + preferences: + + The language (for the installation only, may be different + that the chosen language for the system) by pressing the key F2 + (Legacy mode only) + + + + + + + + Use the arrow keys to select the language and press the key + Enter. + + Here is for example, the French welcome screen when using a + Live DVD/CD. Note that the Live DVD/CD menu does not propose: + Rescue System, Memory + test and Hardware Detection + Tool. + + + + + + + + + + Change the screen resolution by pressing the F3 key (Legacy + mode only). + + + + + + + + + + Add some kernel options by pressing the F6 key for the legacy mode or the e key for the UEFI mode. + + 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 Boot options and + propose four entries: + + - Default, it doesn't alter anything in the default + options. + + - Default, it doesn't alter anything in the default + options. + + - No ACPI (Advanced Configuration and Power Interface), + power management isn't taken into account. + + - No Local APIC (Local Advanced Programmable Interrupt + Controller), it is about CPU interruptions, select this option if + you are asked for. + + When you select one of these entries, it modifies the + default options displayed in the Boot Options + line. + + + In some Mageia releases, it may happen that the entries + selected with the key F6 does not appear in the Boot + Options line, however, they are really taken into + account. + + + + + + + + + + + Add more kernel options by pressing the key F1 (Legacy mode + only). + + 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. + + + + + + + + The detailed view about the option splash. Press Esc or + select Return to Boot Options to go back to + the options list. These options can by added by hand in the + Boot options line. + + + + + + + + + The help is translated in the chosen language with the F2 + key. + + + For more information about kernel options on legacy and UEFI + systems, see: https://wiki.mageia.org/en/How_to_set_up_kernel_options + + +
- +
+ Using a Wired Network - - - - - + Here is the default welcome screen when using a Wired + Network-based Installation CD (netinstall.iso or netinstall-nonfree.iso + images): - + 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 the Mageia + Wiki - The detailed view about the option splash. Press Esc or select - Return to Boot Options to go back to the options - list. These options can by added by hand in the Boot - options line. + + The keyboard layout is the American one. + - + +
+
- - - - The help is translated in the chosen language with the F2 - key. - - - - - For more information about kernel options on legacy and UEFI systems, - see: https://wiki.mageia.org/en/How_to_set_up_kernel_options - - Here is the default welcome screen when using a Wired Network-based - Installation CD (Boot.iso or Boot-Nonfree.iso images): - - 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 the Mageia - Wiki - - - The keyboard layout is the American one. - - - - - - - - -
- - The installation steps - +
+ The installation steps The install process is divided into a number of steps, which can be followed on the side panel of the screen. @@ -223,16 +205,11 @@
-
- - Installation Problems and - Possible Solutions - +
+ Installation Problems and Possible Solutions -
- - No Graphical Interface - +
+ No Graphical Interface @@ -243,20 +220,18 @@ - 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. + 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.
-
- - The Install Freezes - +
+ The Install Freezes If the system appeared to freeze during the installation, this may be a problem with hardware detection. In this case the automatic @@ -265,10 +240,8 @@ with other options as necessary.
-
- - RAM problem - +
+ RAM problem These will rarely be needed, but in some cases the hardware may report the available RAM incorrectly. To specify this manually, you can @@ -276,10 +249,8 @@ of RAM. e.g. mem=256M would specify 256MB of RAM.
-
- - Dynamic partitions - +
+ Dynamic partitions If you converted your hard disk from "basic" format to "dynamic" format on Microsoft Windows, you must know that it is impossible to @@ -287,5 +258,6 @@ Microsoft documentation: http://msdn.microsoft.com/en-us/library/cc776315.aspx.
-
+
+
\ No newline at end of file diff --git a/docs/installer/en/selectLanguage.xml b/docs/installer/en/selectLanguage.xml index ee1280d1..8469812c 100644 --- a/docs/installer/en/selectLanguage.xml +++ b/docs/installer/en/selectLanguage.xml @@ -1,61 +1,51 @@ -
+
- - - - - Please choose a language to use - - Select your preferred language, by first expanding the list for your - continent. Mageia will use this selection during - the installation and for your installed system. - + Select your preferred language, by first + expanding the list for your continent. Mageia + will use this selection during the installation and for your installed + system. + Select your preferred language. + Mageia will use this selection during the + installation and for your installed system. If it is likely that you will require several languages installed on your system, for yourself or other users, then you should use the Multiple languages button to add them now. It will be difficult to add extra language support after installation. - - + - - Even if you choose more than one language, you must first choose one of them as your preferred language in the first language screen. It will also be marked as chosen in the multiple languages screen . - If your keyboard language is not the same as your preferred language, then it is advisable to install the language of your keyboard as well. - Mageia uses UTF-8 (Unicode) support by default. - This may be disabled in the "multiple languages" screen if you know that it is inappropriate for your language. Disabling UTF-8 applies to all installed languages. - You can change the language of your system after installation in the Mageia Control Center -> System -> Manage localization for diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml index 0af54953..6f30d553 100644 --- a/docs/installer/en/setupBootloaderAddEntry.xml +++ b/docs/installer/en/setupBootloaderAddEntry.xml @@ -1,17 +1,14 @@ -
+
- Add or Modify a Boot Menu Entry - To do that you need to manually edit /boot/grub2/custom.cfg or use the software grub-customizer instead (Available in the Mageia repositories). - For more information, see our wiki: https://wiki.mageia.org/en/Grub2-efi_and_Mageia diff --git a/docs/installer/help.pot b/docs/installer/help.pot index 8e136f25..b027dddb 100644 --- a/docs/installer/help.pot +++ b/docs/installer/help.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Mageia Installer Help 3.0\n" +"Project-Id-Version: Mageia Installer Help 6.0\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2017-05-23 19:45+0300\n" +"POT-Creation-Date: 2017-06-25 19:47+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1061,12 +1061,12 @@ msgid "" msgstr "" #. type: Content of:
-#: en/diskdrake.xml:7 +#: en/diskdrake.xml:6 msgid "Custom disk partitioning with DiskDrake" msgstr "" #. type: Content of: <section><mediaobject> -#: en/diskdrake.xml:12 +#: en/diskdrake.xml:10 msgid "" "<imageobject condition=\"classical\"> <imagedata " "fileref=\"dx2-diskdrake.png\" align=\"center\"/> </imageobject> <imageobject " @@ -1075,7 +1075,7 @@ msgid "" msgstr "" #. type: Content of: <section><warning><para> -#: en/diskdrake.xml:22 +#: en/diskdrake.xml:18 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 " @@ -1084,7 +1084,7 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:29 +#: en/diskdrake.xml:24 msgid "" "Adjust the layout of your disk(s) here. You can remove or create " "partitions, change the filesystem of a partition or change its size and even " @@ -1092,80 +1092,83 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:34 +#: en/diskdrake.xml:28 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." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:38 +#: en/diskdrake.xml:31 msgid "" "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected " "storage device" msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:41 +#: en/diskdrake.xml:33 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." +"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." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:45 +#: en/diskdrake.xml:38 msgid "Continue until you adjusted everything to your wishes." msgstr "" #. type: Content of: <section><para> -#: en/diskdrake.xml:48 +#: en/diskdrake.xml:40 msgid "Click <guibutton>Done</guibutton> when you're ready." msgstr "" #. type: Content of: <section><note><para> -#: en/diskdrake.xml:52 +#: en/diskdrake.xml:43 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)" msgstr "" #. type: Content of: <section><note><para><mediaobject> -#: en/diskdrake.xml:57 +#: en/diskdrake.xml:46 msgid "" -"<imageobject condition=\"classical\"> <imagedata " -"fileref=\"dx2-diskdrake2.png\" align=\"center\"/> </imageobject> " -"<imageobject condition=\"live\"> <imagedata fileref=\"live-diskdrake2.png\" " -"align=\"center\"/> </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><figure> -#: en/diskdrake.xml:56 en/installer.xml:41 +#. type: Content of: <section><note><para> +#: en/diskdrake.xml:46 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>" msgstr "" #. type: Content of: <section><note><para> -#: en/diskdrake.xml:67 +#: en/diskdrake.xml:49 msgid "" "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot " -"partition is present with a correct type" +"partition is present and of the correct type" msgstr "" #. type: Content of: <section><note><mediaobject> -#: en/diskdrake.xml:71 +#: en/diskdrake.xml:51 msgid "" -"<imageobject condition=\"classical\"> <imagedata " -"fileref=\"dx2-doPartitionDisks3.png\" align=\"center\"/> </imageobject> " -"<imageobject condition=\"live\"> <imagedata " -"fileref=\"live-doPartitionDisks3.png\" align=\"center\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" " +"fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata align=\"center\" " +"fileref=\"live-doPartitionDisks3.png\"/> </imageobject>" msgstr "" #. type: Content of: <section><info><title> -#: en/doPartitionDisks.xml:9 +#: en/doPartitionDisks.xml:7 msgid "Partitioning" msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:12 +#: en/doPartitionDisks.xml:9 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 " @@ -1173,14 +1176,14 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:17 +#: en/doPartitionDisks.xml:13 msgid "" "The options available from the list below will vary depending on your " "particular hard drive(s) layout and content." msgstr "" #. type: Content of: <section><mediaobject> -#: en/doPartitionDisks.xml:22 +#: en/doPartitionDisks.xml:17 msgid "" "<imageobject condition=\"classical\"> <imagedata " "fileref=\"dx2-doPartitionDisks.png\" align=\"center\"/> </imageobject> " @@ -1189,43 +1192,43 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:33 +#: en/doPartitionDisks.xml:24 msgid "Use Existing Partitions" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:36 +#: en/doPartitionDisks.xml:25 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:42 +#: en/doPartitionDisks.xml:27 msgid "Use Free Space" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:44 +#: en/doPartitionDisks.xml:27 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:50 +#: en/doPartitionDisks.xml:29 msgid "Use Free Space on a Windows Partition" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:53 +#: en/doPartitionDisks.xml:30 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:57 +#: en/doPartitionDisks.xml:32 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 " @@ -1233,7 +1236,7 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:62 +#: en/doPartitionDisks.xml:35 msgid "" "Note that this involves shrinking the size of the Windows partition. The " "partition must be \"clean\", meaning that Windows must have closed down " @@ -1244,7 +1247,7 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:70 +#: en/doPartitionDisks.xml:41 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 " @@ -1253,31 +1256,31 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><mediaobject> -#: en/doPartitionDisks.xml:77 +#: en/doPartitionDisks.xml:45 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:88 +#: en/doPartitionDisks.xml:45 msgid "Erase and use Entire Disk." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:91 +#: en/doPartitionDisks.xml:46 msgid "This option will use the complete drive for Mageia." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:94 +#: en/doPartitionDisks.xml:47 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:97 +#: en/doPartitionDisks.xml:48 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 " @@ -1285,102 +1288,102 @@ msgid "" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:104 -msgid "Custom" +#: en/doPartitionDisks.xml:51 +msgid "Custom disk partitioning" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:106 +#: en/doPartitionDisks.xml:52 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:112 -msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>" +#: en/doPartitionDisks.xml:55 +msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>" msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:114 +#: en/doPartitionDisks.xml:56 msgid "" "The installer will share the available place out according to the following " "rules:" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:119 +#: en/doPartitionDisks.xml:58 msgid "" "If the total available place is lower than 50 GB, only one partition is " "created for /, there is no separate partition for /home." msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:125 +#: en/doPartitionDisks.xml:60 msgid "" "If the total available place is over 50 GB, then three partitions are " "created" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:130 +#: en/doPartitionDisks.xml:61 msgid "6/19 of the total available place is allocated to / with a maximum of 50 GB" msgstr "" #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para> -#: en/doPartitionDisks.xml:135 +#: en/doPartitionDisks.xml:62 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:139 +#: en/doPartitionDisks.xml:62 msgid "the rest (at least 12/19) is allocated to /home" msgstr "" #. type: Content of: <section><para> -#: en/doPartitionDisks.xml:145 +#: en/doPartitionDisks.xml:63 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." msgstr "" #. type: Content of: <section><note><para> -#: en/doPartitionDisks.xml:150 +#: en/doPartitionDisks.xml:67 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\" option is the only one that allows to check it has " -"been correctly done" +"/boot/EFI. The \"Custom disk partitioning\" option is the only one that " +"allows to check it has been correctly done" msgstr "" #. type: Content of: <section><note><para> -#: en/doPartitionDisks.xml:157 +#: en/doPartitionDisks.xml:73 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 the \"Custom disk " -"partitioning\" option to be able to create it with the Installer like any " +"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." msgstr "" #. type: Content of: <section><note><mediaobject> -#: en/doPartitionDisks.xml:165 +#: en/doPartitionDisks.xml:79 msgid "" -"<imageobject condition=\"classical\"> <imagedata " -"fileref=\"dx2-doPartitionDisks3.png\" align=\"center\"/> </imageobject> " -"<imageobject condition=\"live\"> <imagedata " -"fileref=\"live-doPartitionDisks3.png\"/> </imageobject>" +"<imageobject condition=\"classical\"> <imagedata align=\"center\" " +"fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject " +"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> " +"</imageobject>" msgstr "" #. type: Content of: <section><note><mediaobject> -#: en/doPartitionDisks.xml:175 +#: en/doPartitionDisks.xml:87 msgid "" "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> " "</imageobject>" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:182 +#: en/doPartitionDisks.xml:93 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 " @@ -1392,17 +1395,17 @@ msgid "" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:190 +#: en/doPartitionDisks.xml:100 msgid "\"Align to\" \"MiB\"" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:192 +#: en/doPartitionDisks.xml:101 msgid "\"Free space preceding (MiB)\" \"2\"" msgstr "" #. type: Content of: <section><warning><para> -#: en/doPartitionDisks.xml:194 +#: en/doPartitionDisks.xml:102 msgid "Also make sure all partitions are created with an even number of megabytes." msgstr "" @@ -1445,7 +1448,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:16 +#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24 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 " @@ -1453,7 +1456,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:18 +#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26 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 " @@ -1500,14 +1503,14 @@ msgstr "" #. Lebarhon 20170209 updated SC #. type: Content of: <section><mediaobject> -#: en/exitInstall.xml:9 +#: en/exitInstall.xml:7 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:14 +#: en/exitInstall.xml:11 msgid "" "You have finished installing and configuring " "<application>Mageia</application> and it is now safe to remove the " @@ -1515,31 +1518,116 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:18 +#: en/exitInstall.xml:14 msgid "" "After reboot, in the bootloader screen, you can choose between the operating " "systems on your computer (if you have more than one)." msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:22 +#: en/exitInstall.xml:17 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:26 +#: en/exitInstall.xml:20 msgid "Enjoy!" msgstr "" #. type: Content of: <section><para> -#: en/exitInstall.xml:28 +#: en/exitInstall.xml:21 msgid "" "Visit www.mageia.org if you have any questions or want to contribute to " "Mageia" msgstr "" +#. type: Content of: <section><info><title> +#: en/firewall.xml:3 +msgid "Firewall" +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." +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." +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." +msgstr "" + +#. type: Content of: <section><para> +#: en/firewall.xml:25 +msgid "<emphasis role=\"bold\">Advanced</emphasis>" +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)" +msgstr "" + +#. type: Content of: <section><para> +#: en/firewall.xml:33 +msgid "<emphasis><port-number>/<protocol></emphasis>" +msgstr "" + +#. type: Content of: <section><simplelist><member> +#: en/firewall.xml:36 +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 " +"in <emphasis>RFC-433</emphasis>;" +msgstr "" + +#. type: Content of: <section><simplelist><member> +#: en/firewall.xml:40 +msgid "" +"- <emphasis><protocol></emphasis> is one of <emphasis>TCP</emphasis> or " +"<emphasis>UDP</emphasis> - the internet protocol that is used by the " +"service." +msgstr "" + +#. type: Content of: <section><para> +#: en/firewall.xml:45 +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 +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 msgid "Formatting" @@ -1596,12 +1684,12 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/installer.xml:17 +#: en/installer.xml:3 msgid "DrakX, the Mageia Installer" msgstr "" #. type: Content of: <section><para> -#: en/installer.xml:20 +#: en/installer.xml:7 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 " @@ -1609,70 +1697,72 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/installer.xml:28 +#: en/installer.xml:11 msgid "" "The initial menu screen has various options, however the default one will " "start the installer, which will normally be all that you will need." msgstr "" -#. type: Content of: <section><figure><info><title> -#: en/installer.xml:34 +#. type: Content of: <section><section><title> +#: en/installer.xml:16 msgid "Installation Welcome Screen" msgstr "" -#. type: Content of: <section><figure> -#: en/installer.xml:33 -msgid "<placeholder type=\"info\" id=\"0\"/>" +#. type: Content of: <section><section><section><title> +#: en/installer.xml:19 +msgid "Using a Mageia DVD" msgstr "" -#. type: Content of: <section><figure><para> -#: en/installer.xml:37 +#. type: Content of: <section><section><section><para> +#: en/installer.xml:21 msgid "" "Here are the default welcome screens when using a Mageia DVD, The first one " -"with a legacy system and the second one with an UEFI system:" +"with an UEFI system and the second one with a Legacy system:" msgstr "" -#. type: Content of: <section><figure><mediaobject> -#: en/installer.xml:42 -msgid "" -"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" " -"align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> " -"</imageobject>" +#. type: Content of: <section><section><section><mediaobject> +#: en/installer.xml:26 +msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><mediaobject> -#: en/installer.xml:49 +#. type: Content of: <section><section><section><para> +#: en/installer.xml:31 msgid "" -"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> " -"</imageobject>" +"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." msgstr "" -#. type: Content of: <section><para> -#: en/installer.xml:54 -msgid "From this first screen, it is possible to set some personal preferences:" +#. type: Content of: <section><section><section><mediaobject> +#: en/installer.xml:37 +msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:59 +#. 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><itemizedlist><listitem><mediaobject> -#: en/installer.xml:66 -msgid "" -"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> " -"</imageobject>" +#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> +#: en/installer.xml:50 +msgid "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:71 +#. 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." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:74 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:58 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 " @@ -1680,111 +1770,96 @@ msgid "" "Detection Tool</guilabel>." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><mediaobject> -#: en/installer.xml:82 -msgid "" -"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> " -"</imageobject>" +#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> +#: en/installer.xml:65 +msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:91 +#. 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)." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><mediaobject> -#: en/installer.xml:95 -msgid "" -"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> " -"</imageobject>" +#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> +#: en/installer.xml:76 +msgid "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:102 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:83 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." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:104 +#. 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:" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:109 +#. 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." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:112 -msgid "" -"- Safe Settings, priority is given to the safer options to the detriment of " -"performances." -msgstr "" - -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:115 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:96 msgid "" "- No ACPI (Advanced Configuration and Power Interface), power management " "isn't taken into account." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:118 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:99 msgid "" "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is " "about CPU interruptions, select this option if you are asked for." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:122 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:103 msgid "" "When you select one of these entries, it modifies the default options " "displayed in the <guilabel>Boot Options</guilabel> line." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><note><para> -#: en/installer.xml:126 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para> +#: en/installer.xml:108 msgid "" "In some Mageia releases, it may happen that the entries selected with the " "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, " "however, they are really taken into account." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><mediaobject> -#: en/installer.xml:133 -msgid "" -"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> " -"</imageobject>" +#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> +#: en/installer.xml:115 +msgid "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:140 +#. 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><itemizedlist><listitem><para> -#: en/installer.xml:143 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:125 msgid "" -"Pressing F1 opens a new window with more available options. Select one with " +"Pressing F1 opens a new window with more available options. Select one with " "the arrow keys and press Enter to have more details or press the Esc key to " "go back to the welcome screen." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><mediaobject> -#: en/installer.xml:150 -msgid "" -"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> " -"</imageobject>" +#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> +#: en/installer.xml:131 +msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><para> -#: en/installer.xml:157 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:136 msgid "" "The detailed view about the option splash. Press Esc or select " "<guilabel>Return to Boot Options</guilabel> to go back to the options " @@ -1792,35 +1867,38 @@ msgid "" "options</guilabel> line." msgstr "" -#. type: Content of: <section><itemizedlist><listitem><mediaobject> -#: en/installer.xml:163 -msgid "" -"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> " -"</imageobject>" +#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject> +#: en/installer.xml:142 +msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>" msgstr "" -#. type: Content of: <section><itemizedlist><listitem><note><para> -#: en/installer.xml:171 +#. 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." msgstr "" -#. type: Content of: <section><para> -#: en/installer.xml:177 +#. type: Content of: <section><section><section><para><itemizedlist><listitem><para> +#: en/installer.xml:152 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><para> -#: en/installer.xml:180 +#. 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 (Boot.iso or Boot-Nonfree.iso images):" +"Installation CD (netinstall.iso or netinstall-nonfree.iso images):" msgstr "" -#. type: Content of: <section><para> -#: en/installer.xml:183 +#. 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 " @@ -1829,32 +1907,30 @@ msgid "" "Wiki</link>" msgstr "" -#. type: Content of: <section><warning><para> -#: en/installer.xml:189 +#. 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><mediaobject> -#: en/installer.xml:193 -msgid "" -"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" " -"align=\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>" +#. 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><info><title> -#: en/installer.xml:200 +#. type: Content of: <section><section><title> +#: en/installer.xml:183 msgid "The installation steps" msgstr "" #. type: Content of: <section><section><para> -#: en/installer.xml:203 +#: en/installer.xml:185 msgid "" "The install process is divided into a number of steps, which can be followed " "on the side panel of the screen." msgstr "" #. type: Content of: <section><section><para> -#: en/installer.xml:206 +#: en/installer.xml:188 msgid "" "Each step has one or more screens which may also have " "<guibutton>Advanced</guibutton> buttons with extra, less commonly required, " @@ -1862,14 +1938,14 @@ msgid "" msgstr "" #. type: Content of: <section><section><para> -#: en/installer.xml:210 +#: en/installer.xml:192 msgid "" "Most screens have <guibutton>Help</guibutton> buttons which give further " "explanations about the current step." msgstr "" #. type: Content of: <section><section><note><para> -#: en/installer.xml:214 +#: en/installer.xml:196 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 " @@ -1881,18 +1957,18 @@ msgid "" "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot." msgstr "" -#. type: Content of: <section><section><info><title> -#: en/installer.xml:228 +#. type: Content of: <section><section><title> +#: en/installer.xml:209 msgid "Installation Problems and Possible Solutions" msgstr "" -#. type: Content of: <section><section><section><info><title> -#: en/installer.xml:234 +#. type: Content of: <section><section><section><title> +#: en/installer.xml:212 msgid "No Graphical Interface" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/installer.xml:239 +#: en/installer.xml:216 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 " @@ -1900,7 +1976,7 @@ msgid "" msgstr "" #. type: Content of: <section><section><section><itemizedlist><listitem><para> -#: en/installer.xml:246 +#: en/installer.xml:223 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 " @@ -1909,13 +1985,13 @@ msgid "" "ENTER. Now continue with the installation in text mode." msgstr "" -#. type: Content of: <section><section><section><info><title> -#: en/installer.xml:258 +#. type: Content of: <section><section><section><title> +#: en/installer.xml:234 msgid "The Install Freezes" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:261 +#: en/installer.xml:236 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 " @@ -1924,13 +2000,13 @@ msgid "" "other options as necessary." msgstr "" -#. type: Content of: <section><section><section><info><title> -#: en/installer.xml:270 +#. type: Content of: <section><section><section><title> +#: en/installer.xml:244 msgid "RAM problem" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:273 +#: en/installer.xml:246 msgid "" "These will rarely be needed, but in some cases the hardware may report the " "available RAM incorrectly. To specify this manually, you can use the " @@ -1938,13 +2014,13 @@ msgid "" "RAM. e.g. <code>mem=256M</code> would specify 256MB of RAM." msgstr "" -#. type: Content of: <section><section><section><info><title> -#: en/installer.xml:281 +#. type: Content of: <section><section><section><title> +#: en/installer.xml:253 msgid "Dynamic partitions" msgstr "" #. type: Content of: <section><section><section><para> -#: en/installer.xml:284 +#: en/installer.xml:255 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 " @@ -3275,12 +3351,12 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/selectLanguage.xml:15 +#: en/selectLanguage.xml:10 msgid "Please choose a language to use" msgstr "" #. type: Content of: <section><para> -#: en/selectLanguage.xml:18 +#: en/selectLanguage.xml:12 msgid "" "Select your preferred language, by first expanding the list for your " "continent. <application>Mageia</application> will use this selection during " @@ -3288,7 +3364,14 @@ msgid "" msgstr "" #. type: Content of: <section><para> -#: en/selectLanguage.xml:22 +#: en/selectLanguage.xml:16 +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 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 " @@ -3297,16 +3380,16 @@ msgid "" msgstr "" #. type: Content of: <section><mediaobject> -#: en/selectLanguage.xml:29 +#: en/selectLanguage.xml:25 msgid "" -"<imageobject condition=\"classical\"> <imagedata align=\"center\" " -"fileref=\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> " +"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" " +"fileref=\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> " "<imageobject condition=\"live\"> <imagedata fileref=\"live-language.png\" " "format=\"\"/> </imageobject>" msgstr "" #. type: Content of: <section><warning><para> -#: en/selectLanguage.xml:39 +#: en/selectLanguage.xml:33 msgid "" "Even if you choose more than one language, you must first choose one of them " "as your preferred language in the first language screen. It will also be " @@ -3314,19 +3397,19 @@ msgid "" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectLanguage.xml:46 +#: en/selectLanguage.xml:39 msgid "" "If your keyboard language is not the same as your preferred language, then " "it is advisable to install the language of your keyboard as well." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectLanguage.xml:52 +#: en/selectLanguage.xml:44 msgid "Mageia uses UTF-8 (Unicode) support by default." msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectLanguage.xml:54 +#: en/selectLanguage.xml:45 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 " @@ -3334,7 +3417,7 @@ msgid "" msgstr "" #. type: Content of: <section><itemizedlist><listitem><para> -#: en/selectLanguage.xml:60 +#: en/selectLanguage.xml:50 msgid "" "You can change the language of your system after installation in the Mageia " "Control Center -> System -> Manage localization for your system." @@ -3378,19 +3461,19 @@ msgid "" msgstr "" #. type: Content of: <section><info><title> -#: en/setupBootloaderAddEntry.xml:7 +#: en/setupBootloaderAddEntry.xml:6 msgid "Add or Modify a Boot Menu Entry" msgstr "" #. type: Content of: <section><para> -#: en/setupBootloaderAddEntry.xml:11 +#: en/setupBootloaderAddEntry.xml:9 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)." msgstr "" #. type: Content of: <section><note><para> -#: en/setupBootloaderAddEntry.xml:16 +#: en/setupBootloaderAddEntry.xml:13 msgid "" "For more information, see our wiki: <link " "ns2:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>" -- cgit v1.2.1