Update Installer translations

1 files changed, 2815 insertions, 2046 deletions

diff --git a/docs/docs/stable/installer/pl.po b/docs/docs/stable/installer/pl.po
index 3e21c789..4f6af8b9 100644
--- a/docs/docs/stable/installer/pl.po
+++ b/docs/docs/stable/installer/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-04-19 16:32+0300\n"
+"POT-Creation-Date: 2019-01-06 12:43+0200\n"
 "PO-Revision-Date: 2017-02-10 17:18+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -27,12 +27,12 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. type: Content of: <section><info><title>
-#: en/acceptLicense.xml:25
+#: en/acceptLicense.xml:31
 msgid "License and Release Notes"
 msgstr "Licencja oraz informacje o wydaniu"
 
 #. type: Content of: <section><mediaobject>
-#: en/acceptLicense.xml:29
+#: en/acceptLicense.xml:35
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
@@ -48,81 +48,87 @@ msgstr ""
 "\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:40
+#: en/acceptLicense.xml:46
 msgid "License Agreement"
 msgstr "Umowa Licencyjna"
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:43
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:51
+#, fuzzy
 msgid ""
-"Before installing <application>Mageia</application>, please read the license "
-"terms and conditions carefully."
+"Before installing Mageia, please read the license terms and conditions "
+"carefully."
 msgstr ""
 "Przed instalacją <application>Mageia</application>, proszę przeczytać "
 "uważnie warunki umowy licencyjnej."
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:46
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:56
+#, fuzzy
 msgid ""
-"These terms and conditions apply to the entire <application>Mageia</"
-"application> distribution and must be accepted before you can continue."
+"These terms and conditions apply to the entire Mageia distribution and must "
+"be accepted before you can continue."
 msgstr ""
 "Warunki umowy licencyjnej odnoszą się do całej dystrybucji "
 "<application>Mageia</application> i muszą być zaakceptowane przed "
 "kontynuacją instalacji."
 
-#. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:50
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/acceptLicense.xml:61
 #, fuzzy
 msgid ""
-"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
-"<guibutton>Next</guibutton>."
+"To proceed, simply select <emphasis>Accept</emphasis> and then click on "
+"<emphasis>Next</emphasis>"
 msgstr ""
 "Aby zaakceptować po prostu wybierz <guilabel>Akceptuj</guilabel> i kliknij "
 "<guibutton>Dalej</guibutton>."
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:53
+#: en/acceptLicense.xml:66
+#, fuzzy
 msgid ""
-"If you decide not to accept these conditions, then we thank you for looking. "
-"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+"If you decide not to accept these conditions, then we thank you for your "
+"interest in Mageia. Clicking <emphasis>Quit</emphasis> will reboot your "
+"computer."
 msgstr ""
 "Jeśli zdecydujesz że nie zgadzasz się na warunki licencji, dziękujemy za "
 "zainteresowanie. Kliknięcie <guibutton>Zakończ</guibutton> spowoduje ponowne "
 "uruchomienie komputera."
 
 #. type: Content of: <section><section><info><title>
-#: en/acceptLicense.xml:63
+#: en/acceptLicense.xml:76
 msgid "Release Notes"
 msgstr "Informacje o Wydaniu"
 
 #. type: Content of: <section><section><para>
-#: en/acceptLicense.xml:70
+#: en/acceptLicense.xml:83
 #, fuzzy
 msgid ""
-"Important information about this release of <application>Mageia</"
-"application> can be viewed by clicking on the <guibutton>Release Notes</"
-"guibutton> button."
+"Important information about this particular Mageia release can be viewed by "
+"clicking on the <emphasis>Release Notes</emphasis> button."
 msgstr ""
 "Aby zobaczyć co nowego w tym wydaniu <application>Mageia</application>, "
 "Kliknij <guibutton>Informacje na temat wydania</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: 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
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:2
+#: en/DrakX-cover.xml:3 en/DrakX.xml:3 en/media_selection.xml:2
 msgid "en"
 msgstr "pl"
 
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:3
-msgid "Media Selection (Configure Supplemental Installation Media)"
+#, fuzzy
+msgid "Supplemental Installation Media"
 msgstr "Wybór nośników (konfiguracja dodatkowych nośników instalacyjnych)"
 
 #.  papoteur 2013-04-13  - created 
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
+#. 2018/02/10 apb: Text and typgraphy.
+#. 2018/02/16 apb: Update dx2-add_supplemental_media.png to Mga6
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:14
+#: en/add_supplemental_media.xml:18
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
@@ -134,13 +140,13 @@ msgstr ""
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:19
+#: en/add_supplemental_media.xml:23
 #, fuzzy
 msgid ""
-"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.  "
+"This screen shows you the list of already recognised 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."
+"subsequent steps."
 msgstr ""
 "Ten ekran pokazuje listę znalezionych nośników. Możesz dodać inne nośniki "
 "instalacyjne, jak dysk cd/dvd lub zdalny serwer sieciowy. Wybór źródeł "
@@ -148,27 +154,27 @@ msgstr ""
 "następnych kroków."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:28
 msgid "For a network source, there are two steps to follow:"
 msgstr "Dla nośników sieciowych, wymagane są dwa kroki:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:28
-msgid "Choosing and activation of the network, if not already up."
+#: en/add_supplemental_media.xml:32
+#, fuzzy
+msgid "Choosing and activating the network, if not already up."
 msgstr ""
 "Wybór i aktywacja połączenia sieciowego, jeśli jeszcze nie zostało "
 "ustanowione."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:32
+#: en/add_supplemental_media.xml:36
 #, fuzzy
 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 <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."
+"Mageia, like the <emphasis>Nonfree</emphasis>, the <emphasis>Tainted</"
+"emphasis> repositories and the <emphasis>Updates</emphasis>. With the URL, "
+"you can designate a specific repository or your own NFS installation."
 msgstr ""
 "Wybór mirrora lub podanie adresu URL. Wybierając mirror masz dostęp do "
 "wszystkich repozytoriów udostępnianych przez Mageię, jak Nonfree, Tainted "
@@ -176,15 +182,15 @@ msgstr ""
 "swój własny mirror np. NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:42
+#: en/add_supplemental_media.xml:46
 #, fuzzy
 msgid ""
-"If you are updating a 64 bit installation which may contain some 32 bit "
+"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, the installer will find "
-"the needed 32-bit packages there."
+"selecting one of the Network protocols here. The 64-bit DVD ISO only "
+"contains 64-bit and <emphasis>noarch</emphasis> 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 ""
 "Jeśli aktualizujesz 64-bitową instalację która może zawierać 32-bitowe "
 "paczki, zaleca się w tym kroku dodać serwer lustrzany online poprzez "
@@ -194,36 +200,47 @@ msgstr ""
 "instalator powinien znaleźć w nim 32-bitowe paczki."
 
 #. type: Content of: <section><info><title>
-#: en/addUser.xml:3
-msgid "User and Superuser Management"
-msgstr "Zarządzanie użytkownikami"
+#: en/addUser.xml:9
+#, fuzzy
+msgid "User Management"
+msgstr "Zaawansowane Zarządzanie Użytkownikami"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
+#. 2018/02/12 apb: Text and Typography.
+#. 2018/02/19 apb: Update dx2-setRootPassword.png to Mga6.
+#. 2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
+#.   Also changed 'Advanced User Management' to 'User Management (advanced)'.
+#. 2018/02/24 apb: Changed list style.
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:9
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata fileref="
+"\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:20
+#: en/addUser.xml:36
 msgid "Set Administrator (root)  Password:"
 msgstr "Ustawienie hasła administratora (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:24
+#: en/addUser.xml:40
 #, fuzzy
 msgid ""
-"It is advisable for all <application>Mageia</application> installations to "
-"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 "
-"underneath, to check that the first entry was not mistyped."
+"It is advisable for all Mageia installations to set a <literal>superuser</"
+"literal> (Administrator) password, usually called the <emphasis>root </"
+"emphasis>password 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 underneath, to check that the first "
+"entry was not mistyped."
 msgstr ""
 "Wskazane jest, aby ustawić hasło administratora (root) w każdej instalacji "
 "<application>Magei</application>.  Gdy wpisujesz hasło zmienia się kolor "
@@ -233,28 +250,28 @@ msgstr ""
 "poniżej."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:34
+#: en/addUser.xml:49
 #, fuzzy
 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 ""
 "We wszystkich hasłach rozróżniane są duże i małe litery, najlepiej użyć "
 "hasła zawierającego litery (duże i małe), numery oraz inne znaki."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:42
+#: en/addUser.xml:57
 msgid "Enter a user"
 msgstr "Dodaj użytkownika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:45
+#: en/addUser.xml:60
 #, fuzzy
 msgid ""
-"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."
+"Add a User here. A regular user has fewer privileges than the "
+"<literal>superuser</literal> (root), but enough to use the Internet, office "
+"applications or play games and anything else the average user might use a "
+"computer for."
 msgstr ""
 "Tutaj dodajemy użytkownika. Użytkownik ma mniejsze uprawnienia od "
 "administratora (root), ale wystarczające, aby przeglądać Internet, używać "
@@ -262,66 +279,87 @@ msgstr ""
 "które wykonuje na swoim komputerze przeciętny użytkownik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:52
-msgid ""
-"<guibutton>Icon</guibutton>: if you click on this button it will change the "
-"user's icon."
+#: en/addUser.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Icon</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:69
+#, fuzzy
+msgid "Click on this button if you want to change the user's icon"
 msgstr ""
 "<guibutton>Ikona</guibutton>: użycie tego przycisku zmieni ikonę użytkownika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:57
-msgid ""
-"<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
-"box."
+#: en/addUser.xml:74
+#, fuzzy
+msgid "<emphasis role=\"bold\">Real Name</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:76
+#, fuzzy
+msgid "Insert the user's real name into this text box"
 msgstr ""
 "<guilabel>Imię i nazwisko</guilabel>: Wpisz swoje imię i nazwisko do tego "
 "pola tekstowego"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:62
+#: en/addUser.xml:80
+#, fuzzy
+msgid "<emphasis role=\"bold\">Login Name</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"<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>"
+"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 ""
 "<guilabel>Nazwa użytkownika</guilabel>: Tutaj wpisz nazwę użytkownika - "
 "będzie ona używana podczas logowania. Możesz też pozwolić, aby instalator "
 "wygenerował nazwę na podstawie imienia i nazwiska. <emphasis>Wielkość liter "
 "ma znaczenie.</emphasis>"
 
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/addUser.xml:88 en/setupBootloader.xml:87
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:67
+#: en/addUser.xml:90
 #, fuzzy
 msgid ""
-"<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\"/>)"
+"Type in the user password. There is a shield at the end of the text box that "
+"indicates the strength of the password. (See also <xref linkend="
+"\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Hasło</guilabel>: W tym polu wpisz hasło użytkownika. Pojawi się w "
 "nim ikonka tarczy, która oznacza siłę hasła (Zobacz również <xref linkend="
 "\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:73
+#: en/addUser.xml:94
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
-"check that you have not mistyped the password."
+"<emphasis role=\"bold\">Password (again):</emphasis> Retype the user "
+"password. DrakX will check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Hasło (powtórnie)</guilabel>: Wpisz powtórnie hasło użytkownika w "
 "tym polu, instalator sprawdzi czy hasła się zgadzają."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:79
+#: en/addUser.xml:101
 msgid ""
-"Any users you added while installing Mageia, will have a home directory that "
-"is both read and write protected (umask=0027)."
+"Any users 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:82
+#: en/addUser.xml:104
 msgid ""
 "You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
@@ -329,58 +367,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:108
 msgid "The access permissions can also be changed after the install."
 msgstr "Ustawienia dostępu mogą być również zmienione po instalacji."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:93
-msgid "Advanced User Management"
+#: en/addUser.xml:115
+#, fuzzy
+msgid "User Management (advanced)"
 msgstr "Zaawansowane Zarządzanie Użytkownikami"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:96
+#: en/addUser.xml:118
 #, fuzzy
 msgid ""
-"The <guibutton>Advanced</guibutton> option allows you to edit further "
-"settings for the user you are adding."
+"The <emphasis>Advanced</emphasis> option allows you to edit further settings "
+"for the user you are adding."
 msgstr ""
 "Po kliknięciu na przycisk <guibutton>Zaawansowane</guibutton> będziesz miał "
 "możliwość edycji ustawień dla użytkownika którego dodajesz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:101
+#: en/addUser.xml:123
 #, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"<emphasis>Shell</emphasis>: 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>"
+"<literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal>"
 msgstr ""
 "<guilabel>Powłoka</guilabel>: Ta lista pozwala na zmianę powłoki używanej "
 "przez użytkownika, którego dodajesz, do wyboru Bash, Dash oraz Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:107
+#: en/addUser.xml:130
 #, fuzzy
 msgid ""
-"<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."
+"<emphasis>User ID</emphasis>: Here you can set the user ID for any user you "
+"added in the previous screen. If you are unsure what the purpose of this is, "
+"then leave it blank."
 msgstr ""
 "<guilabel>User ID</guilabel>: Tutaj możesz ustawić ID dla użytkownika "
 "którego dodałeś w poprzednim ekranie. Jest to numer. Zostaw puste, chyba że "
 "wiesz, co robisz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:113
+#: en/addUser.xml:136
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
-"\">group ID</emphasis>. Again, if unsure, leave it blank."
+"<emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if "
+"unsure, leave it blank."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:3
+#: en/ask_mntpoint_s.xml:10
 msgid "Choose the mount points"
 msgstr "Wybierz punkty montowania"
 
@@ -395,16 +433,17 @@ msgstr "Wybierz punkty montowania"
 #.        write "it's type". And you're right about the redundant part, too, I removed it
 #.  And JohnR says the Americans are WRONG! :-)) 
 #.  2012-04-19  Language proofreading done 
+#. 2018/02/12 apb: Text and typography.
+#. 2019/01/04 apb: Typo & minor reword on custom mount-points.
 #. type: Content of: <section><mediaobject>
-#: en/ask_mntpoint_s.xml:27
+#: en/ask_mntpoint_s.xml:38
 #, fuzzy
 msgid ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-chooseMountpoints.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"chooseMountPoints-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-chooseMountpoints.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-chooseMountPoints-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -414,56 +453,37 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:36
+#: en/ask_mntpoint_s.xml:49
+#, fuzzy
 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 "
-"can change the mount points."
+"you don't agree with the DrakX suggestions, you can change the mount points "
+"yourself."
 msgstr ""
 "Tutaj zobaczysz partycje Linux, które zostały znalezione na Twoim "
 "komputerze. Jeśli nie zgadzasz się z sugestiami <application>instalatora "
 "DrakX</application>, możesz zmienić punkty montowania."
 
-#. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:41
-#, fuzzy
-msgid ""
-"If you change anything, make sure you still have a <emphasis role=\"bold"
-"\"><literal>/</literal></emphasis> (root) partition."
-msgstr ""
-"Jeśli cokolwiek zmienisz, upewnij się że wciąż masz partycję <literal>/</"
-"literal> (root)."
-
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:46
-#, fuzzy
-msgid ""
-"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
-"(capacity, mount point, type).</emphasis>"
-msgstr ""
-"Każda partycja jest ukazana jako: \"Urządzenie\" (\"Pojemność\", \"Punkt "
-"montowania\", \"Typ\")."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:50
+#: en/ask_mntpoint_s.xml:55
 msgid ""
-"<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>)."
+"To the left of the drop-down menus is a list of available partitions. For "
+"example: <filename>sda</filename> is a hard drive - and <filename>5</"
+"filename> is a <emphasis>partition number</emphasis>, followed by "
+"the<emphasis> (capacity, mount point, filesystem type)</emphasis> of the "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:56
+#: en/ask_mntpoint_s.xml:63
 #, fuzzy
 msgid ""
-"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."
+"If you have several partitions, you can choose various different "
+"<emphasis>mount points</emphasis> from the drop down menu, such as "
+"<filename>/</filename>, <filename>/home</filename> and <filename>/var</"
+"filename>. You can even make your own mount points, for instance <filename>/"
+"video</filename> for a partition where you want to store your films, or "
+"perhaps <filename>/Data</filename> for all your data files."
 msgstr ""
 "Jeśli masz wiele partycji, możesz wybrać wiele różnych punktów montowania z "
 "listy rozwijalnej, takich jak <literal>/</literal>, <literal>/home</literal> "
@@ -472,7 +492,7 @@ msgstr ""
 "literal> dla partycji na której chcesz przechowywać swoje filmy."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:63
+#: en/ask_mntpoint_s.xml:73
 #, fuzzy
 msgid ""
 "For any partitions that you don't need to make use of, you can leave the "
@@ -482,198 +502,258 @@ msgstr ""
 "mieć dostępu."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:79
 #, fuzzy
 msgid ""
-"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."
+"If you make any changes here, ensure you still have a <filename>/</filename> "
+"(root) partition."
+msgstr ""
+"Jeśli cokolwiek zmienisz, upewnij się że wciąż masz partycję <literal>/</"
+"literal> (root)."
+
+#. type: Content of: <section><tip><para>
+#: en/ask_mntpoint_s.xml:84
+#, fuzzy
+msgid ""
+"If you are not sure what to choose, click <emphasis>Previous</emphasis> to "
+"go back and then tick <emphasis>Custom disk partitioning</emphasis>, where "
+"you can click on a partition to see its type and size."
 msgstr ""
 "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."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:74
+#: en/ask_mntpoint_s.xml:90
+#, fuzzy
 msgid ""
-"If you are sure the mount points are correct, click on <guibutton>Next</"
-"guibutton>, and choose whether you only want to format the partition(s) "
-"DrakX suggests, or more."
+"If you are sure the mount points are correct, click on <emphasis>Next</"
+"emphasis>, and choose whether you only want to format the partition "
+"suggested by DrakX, or more."
 msgstr ""
 "Jeśli jesteś pewny że punkty montowania są dobrze ustawione, kliknij "
 "<guibutton>Dalej</guibutton>, by zdecydować które partycje sformatować."
 
 #. type: Content of: <section><info><title>
-#: en/bestTime.xml:10
-msgid "Clock settings"
+#: en/bestTime.xml:5
+#, fuzzy
+msgid "Clock Settings"
 msgstr "Ustawienia zegara"
 
 #. type: Content of: <section><mediaobject>
-#: en/bestTime.xml:14
+#: en/bestTime.xml:8
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"live-"
+"bestTime.png\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:20
+#: en/bestTime.xml:12
+#, fuzzy
 msgid ""
-"In this step, you have to select on which time your internal clock is set, "
-"either local time or UTC time."
+"Here, you can select whether your computer internal clock is set to local "
+"time or UTC time."
 msgstr ""
 "W tym kroku, musisz wybrać w jakim czasie jest ustawiony twój zegar, czas "
 "lokalny czy czas UTC."
 
 #. type: Content of: <section><para>
-#: en/bestTime.xml:23
-msgid "In advanced tab, you will find more options about clock settings."
-msgstr "W sekcji zaawansowane znajdziesz więcej opcji o ustawieniach zegara."
+#: en/bestTime.xml:14
+msgid ""
+"In the <emphasis>Advanced</emphasis> tab, you can enable automatic time "
+"synchronization and specify an NTP server."
+msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:6
 msgid "Boot Mageia as Live system"
 msgstr "Uruchom Mageia jako wersję Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:1
+#: en/bootLive.xml:10
 msgid "Booting the medium"
 msgstr "Uruchamianie medium"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:1
-msgid "From a disc"
-msgstr "Z płyty"
-
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:1
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:12
 msgid ""
-"You can boot directly from the media you used to burn your image (CD-ROM, "
-"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
-"bootloader to launch the installation automatically after rebooting the "
-"computer. If that does not happen you may need to reconfigure your BIOS or "
-"press one key that will offer you to choose the peripheral from which the "
-"computer will boot."
+"You can boot directly from a Live DVD or USB. Usually, you just need to plug "
+"the USB device in or place the DVD in the drive and restart the computer."
 msgstr ""
-"Możesz uruchomić prosto z urządznia, którego użyłeś do wypalenia obrazu (CD-"
-"ROM, DVD-ROM...). Zwykle musisz tylko włożyć płytę aby uruchomić instalację "
-"automatycznie po zresetowaniu komputera. Jeżeli to nie następuje musisz "
-"zmodyfikować ustawienia w BIOSie, lub kliknąć klawisz pozwalajcy ci na wybór "
-"urządzenia, z którego komputer uruchomi się."
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:6
+#. type: Content of: <section><section><para>
+#: en/bootLive.xml:15
 msgid ""
-"According to which hardware you have, and how it is configured, you get "
-"either one or another of the two screens below."
+"If the computer does not automatically boot from the USB or DVD you may need "
+"to reconfigure your BIOS Boot Disk priority. Alternatively, you might try "
+"accessing the boot device menu to select a device from which the computer "
+"will boot."
 msgstr ""
-"Odnosząc się do posiadanego przez ciebie sprzętu oraz tego, jak jest "
-"skonfigurowany, otrzymasz pierwszy albo drugi z ekranów poniżej."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:7
-msgid "From a USB device"
-msgstr "Z urządzenia USB"
+#. type: Content of: <section><section><tip><para>
+#: en/bootLive.xml:20
+msgid ""
+"To access the BIOS or boot menu when the computer is starting, you can try "
+"pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or <keycap>Esc</"
+"keycap> for the BIOS, or <keycap>Esc</keycap>, <keycap>F8</keycap>, "
+"<keycap>F10</keycap> or <keycap>F11</keycap> for the boot device menu. These "
+"(fairly common) keys are just a selection of possible options though."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:7
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:28
 msgid ""
-"You can boot from the USB device on which you dumped your image ISO. "
-"According to your BIOS settings, the computer boots perhaps directly on the "
-"USB device already plugged in a port. If that does not happen you may need "
-"to reconfigure your BIOS or press one key that will offer you to choose the "
-"peripheral from which the computer will boot."
+"The actual screen that you will first see when booting from the Live media "
+"will depend on whether your computer motherboard is of the Legacy (BIOS) or "
+"UEFI type."
 msgstr ""
-"Możesz uruchomić z urządzenia USB, na który wypaliłeś obraz ISO. Odnosząc "
-"się do twoich ustawień BIOS komputer może uruchomić się prosto z urządzenia "
-"USB podłączonego do portu. Jeżeli to nie następuje powinieneś zmodyfikować "
-"ustawienia w BIOS lub kliknąć klawisz pozwalający ci na wybór urządzenia, z "
-"którego komputer się uruchomi."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:35
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "W trybie BIOS/CSM/Legacy"
 
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:38
+msgid "Main Menu"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:40 en/bootLive.xml:152
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot Mageia</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:41
+msgid ""
+"This option will boot the Mageia Live system from the connected DVD/USB "
+"media (expect a very slow system compared to an installed OS)."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:42
+#, fuzzy
+msgid "Once the boot is done, you can proceed to the installation."
+msgstr ""
+"Ustawienia konfiguracyjny, które dokonałeś tutaj pozostają dla instalacji."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:45 en/bootLive.xml:57
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">+ use non-free video drivers (slower to boot)</"
+"emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:47
+msgid "Boot the Mageia Live system using non-free video drivers"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:53 en/bootLive.xml:156 en/installer.xml:65
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install Mageia</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:54 en/bootLive.xml:157
+#, fuzzy
+msgid "This option will install Mageia to a hard disk."
+msgstr ""
+"Zainstaluj Mageia: Ten wybór zainstaluje Mageia bezpośrednio na dysku "
+"twardym."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:59
+msgid "Install Mageia using non-free video drivers"
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:12
-msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#: en/bootLive.xml:65
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-bootCSM.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:12
+#: en/bootLive.xml:69
 msgid "First screen while booting in BIOS mode"
 msgstr "Pierwszy ekran podczas uruchamiania w trybie BIOS"
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:12
-msgid "In the middle menu, you have the choice between three actions:"
-msgstr "W środkowym menu, masz wybór pomiędzy trzema akcjami:"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/bootLive.xml:73
+msgid "Function Keys"
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:13
-msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
-"or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard "
-"disk."
-msgstr ""
-"Uruchom Mageia: Mageia 5 uruchomi się z podłączonego medium (CD/DVD lub "
-"urządzenia USB) bez interwencji na twardym dysku, więc spodziewaj się "
-"wolnego działania systemu. Po uruchomieniu, możesz przejść do instalacji na "
-"dysku twardym."
+#: en/bootLive.xml:75
+#, fuzzy
+msgid "<keycap>F1</keycap> <emphasis role=\"bold\">Help</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:76
 msgid ""
-"Install Mageia: This choice will directly install Mageia on a hard disk."
+"Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you "
+"can view relevant help by pressing <keycap>F1</keycap>."
 msgstr ""
-"Zainstaluj Mageia: Ten wybór zainstaluje Mageia bezpośrednio na dysku "
-"twardym."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:17
+#: en/bootLive.xml:81
+#, fuzzy
+msgid "<keycap>F2</keycap> <emphasis role=\"bold\">Language</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:82
 msgid ""
-"Boot from hard disk: This choice allows to boot from hard disk, as usual, "
-"when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
-"5)."
+"Press <keycap>F2</keycap> to have the installer use a specific language "
+"during the installation. Use the arrow keys to select the language then "
+"press <keycap>Enter</keycap>."
 msgstr ""
-"Uruchomienie z dysku twardego: Ten wybór pozwoli ci uruchomić system z dysku "
-"twardego, jak zwykle, gdy żadne media (CD/DVD lub urządzenie USB) nie są "
-"podłączone. (nie działa z mageia 5)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:19
-msgid "In the bottom menu, are the Boot Options:"
-msgstr "W dolnym menu, są Opcje Bootowania:"
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:87
+#, fuzzy
+msgid "<keycap>F3</keycap> <emphasis role=\"bold\">Video Mode</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:19
+#: en/bootLive.xml:89
+#, fuzzy
 msgid ""
-"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
-msgstr "F1 - Pomoc. Wyjaśnij opcje \"splash\", \"apm\", \"acpi\" i \"Ide\""
+"If needed, change the screen resolution by pressing <keycap>F3</keycap>. "
+"Options are: 640x480, 800x600, 1024x768."
+msgstr " Aby zmienić rozdzielczość ekranu wciśnij F3."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:20
-msgid "F2 - Language. Choose the display language of the screens."
-msgstr "F2 - Język. Wybierz język wyświetlany na ekranach."
+#: en/bootLive.xml:93
+#, fuzzy
+msgid "<keycap>F4</keycap> <emphasis role=\"bold\">Source</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:21
-msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#: en/bootLive.xml:94
+msgid ""
+"Normally, the installation is performed from the inserted installation "
+"medium. Here, you may select other sources, like FTP or NFS servers."
 msgstr ""
-"F3 - Rozdzielczość obrazu. Wybierz z pośród tekst, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:22
+#: en/bootLive.xml:95
+#, fuzzy
 msgid ""
-"F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
-"the inserted installation medium. Here, select other sources, like FTP or "
-"NFS servers. If the installation is carried out in a network with an SLP "
-"server, select one of the installation sources available on the server with "
-"this option."
+"If the installation is carried out in a network with an SLP server, then "
+"select one of the installation sources available on the server with this "
+"option."
 msgstr ""
 "F4 - CD-ROM. CD-ROM lub Inny. Normalnie instalacja odbywa się z "
 "zamontowanego medium instalacyjnego. Tutaj wybierz inne źródła, takie jak "
@@ -682,120 +762,168 @@ msgstr ""
 "opcji."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:26
+#: en/bootLive.xml:98
+#, fuzzy
+msgid "<keycap>F5</keycap> <emphasis role=\"bold\">Driver</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:99
 msgid ""
-"F5 - Driver. Yes or No. The system is aware about the presence of an "
-"optional disk with a driver update and will require its insertion during "
-"installation process."
+"If you have a driver update that you wish to use, select this option and "
+"then answer <emphasis>Yes</emphasis>. You will be prompted to insert the "
+"update disc at the appropriate time."
 msgstr ""
-"F5 - Sterownik. Tak lub Nie. System jest świadomy dostępności dysku "
-"opcjonalnego z aktualizacją sterownika i będzie wymagał jego zamontowania "
-"podczas procesu instalacji."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:28
+#: en/bootLive.xml:104
+#, fuzzy
+msgid "<keycap>F6</keycap> <emphasis role=\"bold\">Kernel Options</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:106
+msgid ""
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis>Kernel Option</emphasis> menu:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:111
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Default:</emphasis> splash quiet noiswmd resume "
+"audit=0"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:114
+msgid ""
+"<emphasis role=\"bold\">Safe Settings:</emphasis> <literal>apm=off acpi=off "
+"mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare "
+"irqpoll pci=nommconf</literal>"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:120
+#, fuzzy
 msgid ""
-"F6 - Kernel options. This is a way to specify options according to your "
-"hardware and the drivers to use."
+"<emphasis role=\"bold\">No ACPI:</emphasis> (Advanced Configuration and "
+"Power Interface): Power management features are not used."
+msgstr "- Bez ACPI - bez zarządzania energią."
+
+#. type: Content of: <section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/bootLive.xml:125
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">No Local APIC:</emphasis> (Local Advanced "
+"Programmable Interrupt Controller): CPU interrupt. Select this option if you "
+"experience system misbehaviour like a kernel panic in relation to APIC."
+msgstr "- Bez lokalnego APIC - ma związek z przerwaniami procesora."
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:131
+msgid ""
+"If you open any of the above <keycap>F6</keycap> menu items, and then click "
+"on <keycap>F1</keycap>, an info window will open to show more details for "
+"that particular item:"
 msgstr ""
-"F6 - Opcje jądra. Jest to możliwość wybrania opcji według twojego sprzętu "
-"oraz sterowniki do użycia."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:139
 msgid "In UEFI mode"
 msgstr "W trybie UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:142
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"live-bootUEFI.png\" align="
+"\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:29
-msgid "First screen while booting on UEFI system from disk"
-msgstr "Pierwszy ekran podczas uruchamiania w systemie UEFI z dysku"
+#: en/bootLive.xml:146
+#, fuzzy
+msgid "First screen while booting in UEFI mode"
+msgstr "Pierwszy ekran podczas uruchamiania w trybie BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:29
-msgid ""
-"You have only the choice to run Mageia in Live mode (first choice)  or to "
-"process the installation (second choice)."
+#: en/bootLive.xml:149
+msgid "In UEFI mode, you have just the two menu options to choose from:"
 msgstr ""
-"Masz tylko opcje do uruchomienia Magei w trybie Live (pierwszy wybór), lub "
-"proces instalacji (drugi wybór)."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:30
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/bootLive.xml:153
+#, fuzzy
 msgid ""
-"If you booted from a USB stick, you get two supplemental lines which are a "
-"duplicata of the previous lines suffixed with \"USB\". You have to choose "
-"them."
+"This option will boot the Mageia Live system from the connected Dvd/USB "
+"media (expect a very slow system compared to an installed OS). Once the boot "
+"is done, you can proceed to the installation"
 msgstr ""
-"Jeżeli uruchomiłeś z urządzenia USB, otrzymasz dwie dodatkowe linie będące "
-"duplikatem poprzednich z dopiskiem \"USB\". Musisz wybrać którąś z nich."
+"Uruchom Mageia: Mageia 5 uruchomi się z podłączonego medium (CD/DVD lub "
+"urządzenia USB) bez interwencji na twardym dysku, więc spodziewaj się "
+"wolnego działania systemu. Po uruchomieniu, możesz przejść do instalacji na "
+"dysku twardym."
 
-#. type: Content of: <section><section><para>
-#: en/bootLive.xml:32
+#. type: Content of: <section><section><note><para>
+#: en/bootLive.xml:161
 msgid ""
-"In each case, the first steps will be the same to choose language, timezone "
-"and keyboard, then the processes differ, with <link linkend=\"testing"
-"\">additional steps in Live mode</link>."
+"If you booted from a USB stick, you will see the above menu options "
+"duplicated, and in this case, you should choose from the menu pair that will "
+"be suffixed with \"USB\"."
 msgstr ""
-"W każdym przypadku, pierwsze kroki będą takie same aby wybrać język, strefę "
-"czasową oraz klawiaturę, później proces różni się, z <link linkend=\"testing"
-"\"> dodatkowych kroków w trybie Live</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:3
+#: en/chooseDesktop.xml:16
 msgid "Desktop Selection"
 msgstr "Wybór pulpitu"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:8
-#, fuzzy
-msgid ""
-"Depending on your selection here, you may be offered further screens to fine-"
-"tune your choice."
+#: en/chooseDesktop.xml:23
+msgid "Some choices made here will open other screens with related options."
 msgstr ""
-"W zależności  od wyboru którego tutaj dokonasz, możesz zobaczyć dalsze "
-"ekrany, aby dokonać dalszych ustawień instalacji."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:26
 #, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide-show during package "
-"installation. The slide show can be disabled by pressing the "
-"<guilabel>Details</guilabel> button"
+"After the selection step(s), you will see a slideshow during the "
+"installation of required packages. The slideshow can be disabled by pressing "
+"the <emphasis>Details</emphasis> button."
 msgstr ""
 "Po wyborze pulpitu, podczas instalacji pakietów zobaczysz pokaz slajdów. "
 "Może on być wyłączony poprzez kliknięcie przycisku <guilabel>Szczegóły</"
 "guilabel>"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:16
+#: en/chooseDesktop.xml:31
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/chooseDesktop.xml:21
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:38
+msgid ""
+"Choose whether you prefer to use the KDE Plasma or GNOME desktop "
+"environment. Both come with a full set of useful applications and tools."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/chooseDesktop.xml:44
 #, fuzzy
 msgid ""
-"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 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, for instance, is lighter than the previous two, sporting less eye "
-"candy and fewer packages installed by default."
+"Select <emphasis>Custom</emphasis> if you do not wish to use either (or, "
+"actually use both) of these, or if you want to modify the default software "
+"choices for these desktop environments. The LXDE desktop, for instance, is "
+"lighter than the previous two, sporting less eye candy and having fewer "
+"packages installed by default."
 msgstr ""
 "Wybierz środowisko graficzne <application>KDE</application> lub "
 "<application>Gnome</application>.  Oba z nich zawierają pełny zestaw "
@@ -811,15 +939,16 @@ msgid "Package Group Selection"
 msgstr "Wybór grup pakietów"
 
 #. Lebarhon 20170209 Updated SC
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:9
+#: en/choosePackageGroups.xml:11
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
 "\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:14
+#: en/choosePackageGroups.xml:16
 #, fuzzy
 msgid ""
 "Packages are arranged into common groups, to make choosing what you need on "
@@ -832,25 +961,25 @@ msgstr ""
 "najeżdżając na nie myszą."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:21
+#: en/choosePackageGroups.xml:23
 #, fuzzy
 msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:25
+#: en/choosePackageGroups.xml:27
 #, fuzzy
 msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:29
+#: en/choosePackageGroups.xml:31
 #, fuzzy
 msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:33
+#: en/choosePackageGroups.xml:35
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can use "
@@ -860,7 +989,7 @@ msgstr ""
 "samodzielnie dodawać lub usuwać pakiety."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:38
+#: en/choosePackageGroups.xml:40
 msgid ""
 "See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
@@ -872,8 +1001,10 @@ msgid "Choose Individual Packages"
 msgstr "Samodzielny wybór pakietów"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. 2018/02/15 apb: Text and typography.
+#. 2018/02/25 apb: add xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:9
+#: en/choosePackagesTree.xml:13
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
@@ -883,7 +1014,7 @@ msgstr ""
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:14
+#: en/choosePackagesTree.xml:18
 #, fuzzy
 msgid ""
 "Here you can add or remove any extra packages to customize your installation."
@@ -892,13 +1023,14 @@ msgstr ""
 "instalację do swoich potrzeb."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:21
+#, fuzzy
 msgid ""
-"After having made your choice, you can click on the <guibutton>floppy icon</"
-"guibutton> at the bottom of the page to save your choice of packages (saving "
-"to a USB key works, too). You can then use this file to install the same "
-"packages on another system, by pressing the same button during install and "
-"choosing to load it."
+"After having made your choice, you can click on the <emphasis>floppy</"
+"emphasis> icon at the bottom of the page to save your choice of packages "
+"(saving to a USB key works, too). You can then use this file to install the "
+"same packages on another system, by pressing the same button during install "
+"and choosing to load it."
 msgstr ""
 "Po dokonaniu wyboru, możesz kliknąć na <guibutton>ikonę dyskietki</"
 "guibutton> na dole okna, aby zachować swój wybór pakietów (zapisywanie na "
@@ -913,8 +1045,10 @@ msgstr "Konfiguracja usług"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#.  2018/02/16 apb: Minor text adjustment.
+#. 2018/02/25 apb: a) add xreflabel for this section. b) Added some bullets to the text.
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:11
+#: en/configureServices.xml:15
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
@@ -926,7 +1060,7 @@ msgstr ""
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:16
+#: en/configureServices.xml:20
 #, fuzzy
 msgid ""
 "Here you can choose which services should start when you boot your system."
@@ -934,19 +1068,15 @@ msgstr ""
 "Tutaj możesz ustawić które usługi powinny (nie) włączać się kiedy "
 "uruchamiasz system."
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:19
-msgid "Click on a triangle to expand a group to all the relevant services."
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:25
+msgid ""
+"Click on a triangle to expand a group to all the relevant services. The "
+"settings DrakX chose are usually good."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureServices.xml:22
-#, fuzzy
-msgid "The settings DrakX chose are usually good."
-msgstr "Ustawienia, które wybierze DrakX zwykle są dobre."
-
-#. type: Content of: <section><para>
-#: en/configureServices.xml:25
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureServices.xml:31
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -955,7 +1085,7 @@ msgstr ""
 "poniżej."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:28
+#: en/configureServices.xml:37
 msgid "Only change things when you know very well what you are doing."
 msgstr "Zmień to tylko i wyłącznie wtedy, kiedy wiesz co robisz."
 
@@ -966,15 +1096,17 @@ msgstr "Konfiguruj strefę czasową"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/13 apb: Minor text adjustment.
+#. 2018/02/25 apb: Added xreflabel to this section.
 #. type: Content of: <section><mediaobject>
-#: en/configureTimezoneUTC.xml:11
+#: en/configureTimezoneUTC.xml:15
 #, fuzzy
 msgid ""
 "<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>"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata format=\"png\" fileref=\"live-timeZone.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -982,18 +1114,18 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:20
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureTimezoneUTC.xml:26
 #, fuzzy
 msgid ""
-"Choose your time-zone by choosing your country or a city close to you in the "
-"same time-zone."
+"Choose your timezone by choosing your country, or a city close to you in the "
+"same timezone."
 msgstr ""
 "Wybierz swoją strefę czasową poprzez wybranie swojego kraju lub miasta w "
 "pobliżu w tej samej strefie czasowej."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:24
+#: en/configureTimezoneUTC.xml:32
 #, fuzzy
 msgid ""
 "In the next screen you can choose to set your hardware clock to local time "
@@ -1003,7 +1135,7 @@ msgstr ""
 "lokalny lub UTC."
 
 #. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:29
+#: en/configureTimezoneUTC.xml:37
 msgid ""
 "If you have more than one operating system on your computer, make sure they "
 "are all set to local time, or all to UTC/GMT."
@@ -1012,24 +1144,24 @@ msgstr ""
 "upewnij się, że wszystkie mają ustawiony czas lokalny, albo UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:13
+#: en/configureX_card_list.xml:24
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Wybierz System Graficzny (Skonfiguruj swoją Kartę Graficzną)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:18
+#: en/configureX_card_list.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
-"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:23
+#: en/configureX_card_list.xml:35
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1038,7 +1170,7 @@ msgstr ""
 "zidentyfikuje twoje urządzenie wideo poprawnie."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:26
+#: en/configureX_card_list.xml:38
 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:"
@@ -1046,168 +1178,193 @@ msgstr ""
 "Jeżeli instalator nie wykrył twojej karty graficznej poprawnie i wiesz, jaką "
 "kartę posiadasz, możesz wybrać jedną za pomocą:"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
-msgid "vendor"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_card_list.xml:41 en/configureX_monitor.xml:74
+#, fuzzy
+msgid "Vendor"
 msgstr "dostawca"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:33
-msgid "then the name of your card"
+#: en/configureX_card_list.xml:45
+#, fuzzy
+msgid "then the make of your card"
 msgstr "następnie nazwa karty"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:37
-msgid "and the type of card"
+#: en/configureX_card_list.xml:49
+#, fuzzy
+msgid "and the model of card"
 msgstr "oraz typ karty"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:41
+#: en/configureX_card_list.xml:53
 #, fuzzy
 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 "
-"<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."
+"<emphasis>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 VESA driver which provides "
+"basic capabilities."
 msgstr ""
 "Listing Xorg dostarcza więcej jak 40 zamkniętych oraz otwartych sterowników "
 "do kart graficznych. Jeżeli wciąż nie potrafisz znaleźć nazwanego sterownika "
 "dla twojej karty istnieje jeszcze opcja użycia sterownika vesa, który "
 "dostarcza podstawowe funkcje."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:47
+#. type: Content of: <section><caution><para>
+#: en/configureX_card_list.xml:61
 #, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
+"to the <emphasis>Command Line Interface</emphasis>"
 msgstr ""
 "Bądź ostrożny, ponieważ jeśli wybierzesz niekompatybilny sterownik możesz "
 "posiadać dostęp tylko do interfejsu tekstowego."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:51
+#: en/configureX_card_list.xml:65
 #, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
-"repository and in some cases only from the card manufacturers' websites."
+"may only be available in the <emphasis>Nonfree</emphasis> repository and in "
+"some cases only from the card manufacturers' websites. The "
+"<emphasis>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 ""
 "Niektórzy producenci kart graficznych udostępniają własnościowe sterowniki "
 "dla Linuksa, które mogą być umieszczone jedynie w repozytorium Nonfree, w "
 "niektórych przypadkach są one dostępne jedynie na stronie producenta."
 
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:56
-#, fuzzy
-msgid ""
-"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 ""
-"Aby je zainstalować musi być włączone repozytorium Nonfree. Jeśli nie "
-"włączono tego repozytorium wcześniej, należy je włączyć po ponownym "
-"uruchomieniu komputera."
-
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:3
+#: en/configureX_chooser.xml:11
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Konfiguracja Karty Graficznej i Monitora"
 
 #.  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
+#. 2018/02/15 apb: Some text and typography.
+#. 2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.
+#. 2018/02/23 apb: Typo.
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:10
+#: en/configureX_chooser.xml:24
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:15
+#: en/configureX_chooser.xml:30
 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> 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."
+"you chose for this install of Mageia, they are all based on a graphical user "
+"interface system called <literal>X Window System</literal>, or simply "
+"<quote>X</quote>. So in order for KDE Plasma, GNOME, LXDE or any other "
+"graphical environment to work well, the following <quote>X</quote> settings "
+"need to be correct. Choose the appropriate 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:27
+#: en/configureX_chooser.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphic Card</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:44
 msgid ""
-"<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
-"from the list if needed."
+"If you need to, you can select a specific card from this expandable list. "
+"See <xref linkend=\"configureX_card_list\"/>."
 msgstr ""
-"<emphasis><guibutton>Karta graficzna</guibutton></emphasis>: Wybierz swoją "
-"kartę graficzną z listy."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:33
+#: en/configureX_chooser.xml:49
+#, fuzzy
+msgid "<emphasis role=\"bold\">Monitor</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:52
 msgid ""
-"<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<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."
+"You can choose Plug'n Play, if applicable, or choose your monitor from the "
+"<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> list. Choose "
+"<emphasis>Custom</emphasis> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor. See <xref linkend="
+"\"configureX_monitor\"/>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:41
-msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Niepoprawna wartość odświeżania może uszkodzić monitor"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:60
+#, fuzzy
+msgid "<emphasis role=\"bold\">Resolution</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:47
+#: en/configureX_chooser.xml:63
 #, fuzzy
-msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
-"color depth of your monitor can be set here."
+msgid "The resolution and color depth of your monitor can be set here"
 msgstr ""
 "<emphasis><guibutton>Karta graficzna</guibutton></emphasis>: Wybierz swoją "
 "kartę graficzną z listy."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:52
+#: en/configureX_chooser.xml:68
+#, fuzzy
+msgid "<emphasis role=\"bold\">Test</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:71
 msgid ""
-"<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"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."
+"The test button does not always appear during install. If the option is "
+"there, and you test your settings, you should be asked whether your settings "
+"are correct. If you answer <emphasis>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:63
+#: en/configureX_chooser.xml:81
+#, fuzzy
+msgid "<emphasis role=\"bold\">Options</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_chooser.xml:84
+msgid "Here you can choose to enable or disable various options"
+msgstr ""
+
+#. type: Content of: <section><warning><para>
+#: en/configureX_chooser.xml:89
 msgid ""
-"<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
-"enable or disable various options."
+"There is a risk of damaging a monitor if you choose refresh rates that are "
+"outside the frequency range of that monitor. This applies to older CRT "
+"displays: modern monitors will reject an unsupported frequency and normally "
+"enter standby mode."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:11
+#: en/configureX_monitor.xml:22
 msgid "Choosing your Monitor"
 msgstr "Wybór monitora"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:14
+#: en/configureX_monitor.xml:25
 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:19
+#: en/configureX_monitor.xml:30
 msgid ""
 "<emphasis role=\"bold\">Selecting a monitor with different characteristics "
 "could damage your monitor or video hardware. Please don't try something "
@@ -1216,32 +1373,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:26
-#, fuzzy
+#: en/configureX_monitor.xml:38
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
-"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:31
-msgid "<emphasis>Custom</emphasis>"
-msgstr "<emphasis>Własny</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:46
+msgid "Custom"
+msgstr "Własne"
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:33
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:49
 msgid ""
-"This option allows you to set two critical parameters, the vertical refresh "
+"This option allows you to set two critical parameters: the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
 "screen is refreshed and horizontal sync is the rate at which scan lines are "
 "displayed."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:38
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:55
 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 "
@@ -1249,151 +1406,163 @@ msgid ""
 "consult your monitor documentation."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
-msgid "<emphasis>Plug 'n Play</emphasis>"
-msgstr "<emphasis>Plug 'n Play</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:64
+msgid "Plug'n Play"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:47
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:67
 msgid ""
-"This is the default option and tries to determine the monitor type from the "
-"monitor database."
+"This is the default option and automatically tries to determine the monitor "
+"type from the monitor database."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:51
-msgid "<emphasis>Vendor</emphasis>"
-msgstr "<emphasis>Dostawca</emphasis>"
-
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:53
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:77
 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:61
-msgid "the monitor manufacturers name"
-msgstr "nazwa producenta monitora"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:86
+msgid "Manufacturer"
+msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:65
-msgid "the monitor description"
-msgstr "Opis monitora"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/configureX_monitor.xml:90
+msgid "Monitor model"
+msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:69
-msgid "<emphasis>Generic</emphasis>"
+#. type: Content of: <section><variablelist><varlistentry><term>
+#: en/configureX_monitor.xml:96
+msgid "Generic"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/configureX_monitor.xml:71
+#. type: Content of: <section><variablelist><varlistentry><listitem><para>
+#: en/configureX_monitor.xml:99
 msgid ""
-"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."
+"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 VESA card driver "
+"when your video hardware cannot be determined automatically.  Once again it "
+"may be wise to be conservative in your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
-msgid "Custom disk partitioning with DiskDrake"
+#: en/diskdrake.xml:22
+#, fuzzy
+msgid "Custom Disk Partitioning with DiskDrake"
 msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:27
 #, fuzzy
 msgid ""
-"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 ""
-"Jeśli chcesz zaszyfrować swoją partycję <literal>/</literal> musisz się "
-"upewnić że posiadasz oddzielną partycję <literal>/boot</literal>. Partycja "
-"<literal>/boot</literal> nie może być zaszyfrowana, ponieważ uniemożliwiłoby "
-"to uruchomienie systemu."
-
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:29
-msgid ""
-"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 their details before you start."
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:38
 msgid ""
-"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>."
+"Modify the layout of your disk(s) here. You can remove or create partitions, "
+"change the filesystem or size of a partition and even view their details "
+"before you start."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:45
 #, fuzzy
 msgid ""
-"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."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device, like a USB key). In the screenshot above there are two available "
+"devices: <filename>sda </filename>and <filename>sdb</filename>."
 msgstr ""
-"Kliknij <guibutton>Wyczyść wszystko</guibutton>, aby usunąć wszystkie "
-"partycje znajdujące się na wybranym dysku."
+"Dla każdego wykrytego dysku lub innego urządzenia, jak USB, prezentowana "
+"jest oddzielna karta. Na przykład sda, sdb i sdc jeśli zostały wykryte trzy "
+"urządzenia."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:52
 #, fuzzy
 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>Expert mode</guibutton> provides more options such as a label "
-"(give a name to) a partition, or to choose a partition type."
+"<emphasis>Expert mode</emphasis> provides more options such as to label "
+"(name) a partition, or to choose a partition type."
 msgstr ""
 "Dla wszystkich innych działań: najpierw kliknij na wybraną partycję. "
 "Następnie możesz wybrać system plików, punkt montowania, zmienić rozmiar lub "
 "ją usunąć."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/diskdrake.xml:60
 #, fuzzy
-msgid "Continue until you have adjusted everything to your satisfaction."
+msgid ""
+"Continue until you have adjusted everything to your satisfaction, then click "
+"<emphasis>Done</emphasis> when you're ready."
 msgstr ""
 "Kontynuuj aż do momentu gdy skonfigurujesz wszystko zgodnie ze swoimi "
 "preferencjami."
 
-#. type: Content of: <section><para>
-#: en/diskdrake.xml:52
-msgid "Click <guibutton>Done</guibutton> when you're ready."
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:69
+#, fuzzy
+msgid ""
+"Take care with the <emphasis>Clear all</emphasis> option, use it only if you "
+"are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
-"Jeśli wszystko zostało już ustawione kliknij <guibutton>Gotowe</guibutton>."
+"Kliknij <guibutton>Wyczyść wszystko</guibutton>, aby usunąć wszystkie "
+"partycje znajdujące się na wybranym dysku."
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:56
+#. type: Content of: <section><warning><orderedlist><listitem><para>
+#: en/diskdrake.xml:75
+#, fuzzy
+msgid ""
+"If you wish to use encryption on your <filename>/</filename> partition you "
+"must ensure that you have a separate <filename>/boot</filename> partition. "
+"The encryption option for the <filename>/boot</filename> partition must NOT "
+"be set, otherwise your system will be unbootable."
+msgstr ""
+"Jeśli chcesz zaszyfrować swoją partycję <literal>/</literal> musisz się "
+"upewnić że posiadasz oddzielną partycję <literal>/boot</literal>. Partycja "
+"<literal>/boot</literal> nie może być zaszyfrowana, ponieważ uniemożliwiłoby "
+"to uruchomienie systemu."
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:87
 msgid ""
 "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)"
+"Partition) is present and correctly mounted on <filename>/boot/EFI</"
+"filename>. See Figure 1 below."
 msgstr ""
 
-#. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:61
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/diskdrake.xml:93
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present and of the correct type. See Figure 2 below."
+msgstr ""
+
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:101
+#, fuzzy
+msgid "EFI System Partition"
+msgstr "Użyj istniejących partycji"
+
+#. type: Content of: <section><figure><mediaobject>
+#: en/diskdrake.xml:104
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-diskdrake2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1401,20 +1570,18 @@ msgstr ""
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><note><para>
-#: en/diskdrake.xml:60
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:103 en/diskdrake.xml:117
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of: <section><note><para>
-#: 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"
+#. type: Content of: <section><figure><title>
+#: en/diskdrake.xml:115
+msgid "BIOS boot partition"
 msgstr ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:76
+#. type: Content of: <section><mediaobject>
+#: en/diskdrake.xml:118 en/doPartitionDisks.xml:200
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1428,52 +1595,59 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
-msgid "Partitioning"
+#: en/doPartitionDisks.xml:25
+#, fuzzy
+msgid "Suggested Partitioning"
 msgstr "Partycjonowanie"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:28
 #, fuzzy
 msgid ""
 "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>."
+"DrakX partitioning proposals for where to install Mageia."
 msgstr ""
 "Na tym ekranie możesz zobaczyć zawartość twoich twardych dysków oraz "
 "propozycje instalatora dotyczące instalacji <application>Magei</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:16
+#: en/doPartitionDisks.xml:32
 #, fuzzy
 msgid ""
-"The options available from those shown below will vary according to the "
-"layout and content of your particular hard drive(s)."
+"The actual options available from those shown below will vary according to "
+"the layout and content of your particular hard drive(s)."
 msgstr ""
 "Opcje dostępne na liście poniżej są zależne od podziału twojego dysku "
 "twardego oraz jego zawartości."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:21
+#: en/doPartitionDisks.xml:37
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
-msgid "Use Existing Partitions"
-msgstr "Użyj istniejących partycji"
+#. type: Content of: <section><itemizedlist><title>
+#: en/doPartitionDisks.xml:47
+#, fuzzy
+msgid "Main Options"
+msgstr "Opcje"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Existing Partitions</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:53
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1481,13 +1655,14 @@ msgstr ""
 "Jeśli dostępna jest ta opcja, oznacza to że zostały znalezione partycje "
 "linuksowe i mogą być użyte do instalacji."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
-msgid "Use Free Space"
-msgstr "Wykorzystaj wolne miejsce"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:59
+#, fuzzy
+msgid "<emphasis role=\"bold\">Use Free Space</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:43
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:62
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1495,138 +1670,124 @@ msgstr ""
 "Jeśli posiadasz nieużywane miejsce na dysku (niesformatowane), może być ono "
 "wykorzystane do instalacji Magei."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:49
-msgid "Use Free Space on a Windows Partition"
-msgstr "Wykorzystaj wolne miejsce na partycji Windows"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:68
+#, fuzzy
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may "
-"offer to use it."
-msgstr ""
-"Jeśli masz niewykorzystane miejsce na partycji Windows, instalator "
-"zaproponuje, aby je wykorzystać."
+"<emphasis role=\"bold\">Use Free Space on a Windows Partition</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:71
+#, fuzzy
 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 "
-"important files!"
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use 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!"
 msgstr ""
 "To może być użyteczne rozwiązanie, aby przygotować miejsce na instalację "
 "Magei, jest to jednak ryzykowna operacja więc powinieneś się upewnić że masz "
 "kopię zapasową ważnych plików!"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: 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 "
-"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."
-msgstr ""
-"Zauważ, że ta metoda spowoduje zmniejszenie rozmiaru partycji Windows. "
-"Partycja musi być \"czysta\", co oznacza, że Windows musi być poprawnie "
-"zamknięty za ostatnim razem gdy był używany. Musi być także "
-"zdefragmentowany, choć to nie daje pewności że wszystkie pliki zostały "
-"przesunięte poza obszar dysku, który zostanie użyty. Dlatego też bardzo "
-"wskazane jest zrobienie kopii zapasowej ważnych plików."
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:69
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:77
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "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."
+"clicking and dragging the gap between both partitions.  See the following "
+"screenshot:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:76
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:85
 #, fuzzy
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
-msgid "Erase and use Entire Disk."
-msgstr "Wymaż i wykorzystaj cały dysk"
+msgid "<emphasis role=\"bold\">Erase and use Entire Disk</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:90
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:88
 #, fuzzy
-msgid "This option will allocate the entire drive for Mageia."
+msgid "This option will allocate the entire drive for Mageia"
 msgstr "Ta opcja użyje całego dysku dla Magei."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:93
-msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
-msgstr "Zauważ! WSZYSTKIE dane z wybranego dysku zostaną wymazane. Uważaj!"
-
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#. type: Content of: <section><itemizedlist><listitem><warning><para>
+#: en/doPartitionDisks.xml:92
+#, fuzzy
 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 "
-"this option."
+"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."
 msgstr ""
 "Jeśli chcesz używać części tego dysku do czegoś innego, albo już masz na "
 "dysku dane, których nie chcesz stracić, nie używaj tej opcji."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:103
+#. type: Content of: <section><itemizedlist><listitem><important><para>
+#: en/doPartitionDisks.xml:99
+msgid ""
+"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."
+msgstr ""
+"Zauważ, że ta metoda spowoduje zmniejszenie rozmiaru partycji Windows. "
+"Partycja musi być \"czysta\", co oznacza, że Windows musi być poprawnie "
+"zamknięty za ostatnim razem gdy był używany. Musi być także "
+"zdefragmentowany, choć to nie daje pewności że wszystkie pliki zostały "
+"przesunięte poza obszar dysku, który zostanie użyty. Dlatego też bardzo "
+"wskazane jest zrobienie kopii zapasowej ważnych plików."
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:110
 #, fuzzy
-msgid "Custom disk partitioning"
-msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
+msgid "<emphasis role=\"bold\">Custom Disk Partitioning</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:113
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 "Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji."
 
-#. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:120
+#, fuzzy
+msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks2.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:129
 msgid ""
-"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:"
+"If you are not using the <emphasis>Custom disk partitioning</emphasis> "
+"option, then the installer will allocate the available space according to "
+"the following rules:"
 msgstr ""
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:135
 #, fuzzy
 msgid ""
 "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."
+"created. This will be the <filename>/</filename> (root)  partition."
 msgstr ""
 "Jeżeli całkowita dostępna przestrzeń jest mniejsza niż 50GB, to tylko jedna "
 "partycja zostanie utworzona dla /, nie ma oddzielnej partycji dla /home."
 
-#. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:141
 #, fuzzy
 msgid ""
 "If the total available space is greater than 50 GB, then three partitions "
@@ -1635,93 +1796,97 @@ msgstr ""
 "Jeżeli całkowita dostępna przestrzeń wynosi więcej niż 50GB, to zostaną "
 "utworzone trzy partycje"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:146
 #, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
-"emphasis> with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <filename>/</filename> "
+"with a maximum of 50 GB"
 msgstr ""
 "6/19 całkowitej dostępnej przestrzeni zostaje przydzielona do /, jednak "
 "maksimum wynosi 50 GB"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:134
-msgid "1/19 is allocated to swap with a maximum of 4 GB"
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:151
+#, fuzzy
+msgid "1/19 is allocated to <filename>swap</filename> with a maximum of 4 GB"
 msgstr ""
 "1/19 przestrzeni zostanie przydzielona jako swap, jednak maksimum wynosi 4 GB"
 
-#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:138
+#. type: Content of: <section><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:156
 #, fuzzy
 msgid ""
-"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
-"emphasis>"
+"the rest (at least 12/19) is allocated to <emphasis>/</"
+"emphasis><filename>home</filename><emphasis role=\"bold\">.</emphasis>"
 msgstr "Cała reszta (conajmniej 12/19) zostanie przydzielone dla /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:144
-#, fuzzy
+#: en/doPartitionDisks.xml:164
 msgid ""
-"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>."
+"This means that from 160 GB or greater available space, the installer will "
+"create three partitions:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:169
+msgid "50 GB for <filename>/</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:173
+msgid "4 GB for <filename>swap</filename>"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:177
+msgid "and the remainder for <filename>/home</filename>."
 msgstr ""
-"Oznacza to, że z 160 GB lub więcej dostępnej przestrzeni instalator utworzy "
-"trzy partycje: 50GB dla /, 4GB dla swap i całą resztę dla /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:182
 msgid ""
 "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</"
+"automatically detected - or created if it does not exist yet - and mounted "
+"on <filename>/boot/EFI</filename>. The <emphasis>Custom disk partitioning</"
 "emphasis> option is the only one that allows to check it has been correctly "
-"done"
+"done."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:158
+#: en/doPartitionDisks.xml:188
 msgid ""
-"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."
+"If you are using a Legacy (also known as BIOS) system with a GPT partitioned "
+"disk, you need to create a BIOS boot partition if it doesn't already exist. "
+"It should be about 1 MiB with no mount point. It can be created with the "
+"Installer, under <emphasis>Custom disk partitioning</emphasis>, like any "
+"other partition. Be sure to select <quote>BIOS boot partition</quote> for "
+"filesystem type."
 msgstr ""
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
-#, fuzzy
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:195
+msgid "See <xref linkend=\"diskdrake\"/> for information on how to proceed."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:210
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4.png"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:216
 #, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "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:"
+"drive."
 msgstr ""
 "Niektóre nowe dysku używają 4096 bitowych sektorów logicznych, zamiast "
 "wcześniej standardowych 512 bitowych. Z powodu braku takiego sprzętu, "
@@ -1729,20 +1894,35 @@ msgstr ""
 "z takim dyskiem. Sugerujemy wcześniejsze przygotowanie takiego dysku, za "
 "pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień:"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:189
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:221
 #, fuzzy
-msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgid ""
+"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 gparted, and to use the following "
+"settings:"
+msgstr ""
+"Niektóre nowe dysku używają 4096 bitowych sektorów logicznych, zamiast "
+"wcześniej standardowych 512 bitowych. Z powodu braku takiego sprzętu, "
+"narzędzie do partycjonowania użyte w instalatorze nie zostało przetestowane "
+"z takim dyskiem. Sugerujemy wcześniejsze przygotowanie takiego dysku, za "
+"pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień:"
+
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:228
+#, fuzzy
+msgid "<emphasis>Align to</emphasis> = MiB"
 msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:191
+#. type: Content of: <section><important><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:232
 #, fuzzy
-msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgid "<emphasis>Free space preceding (MiB)</emphasis> = 2"
 msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#. type: Content of: <section><important><para>
+#: en/doPartitionDisks.xml:236
 #, fuzzy
 msgid ""
 "Also make sure all partitions are created using an even number of megabytes."
@@ -1751,39 +1931,41 @@ msgstr ""
 "liczbę megabajtów."
 
 #. type: Content of: <article><info><title>
-#: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
+#: en/DrakLive-cover.xml:15 en/DrakLive-cover.xml:54 en/DrakLive.xml:16
 msgid "Installation from LIVE medium"
 msgstr "Instalacja z trybu Live"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
+#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:14
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakLive-cover.xml:10
-msgid "January 2015"
-msgstr "Styczeń 2015"
+#: en/DrakLive-cover.xml:23
+msgid "March 2016"
+msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakLive-cover.xml:11
+#: en/DrakLive-cover.xml:25
 msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
+#: en/DrakLive-cover.xml:30 en/DrakX-cover.xml:27
 msgid "The Official Documentation for Mageia"
 msgstr "Oficjalna Dokumentacja dla Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17
-msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#: en/DrakLive-cover.xml:33 en/DrakX-cover.xml:30
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
-#: en/DrakX.xml:12
+#: en/DrakLive-cover.xml:38 en/DrakLive.xml:25 en/DrakX-cover.xml:35
+#: en/DrakX.xml:44
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1794,8 +1976,8 @@ msgstr ""
 "org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
-#: en/DrakX.xml:15
+#: en/DrakLive-cover.xml:42 en/DrakLive.xml:29 en/DrakX-cover.xml:39
+#: en/DrakX.xml:48
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1806,8 +1988,7 @@ msgstr ""
 "www.neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
-#: en/DrakX.xml:17
+#: en/DrakLive-cover.xml:46 en/DrakX-cover.xml:43 en/DrakX.xml:52
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1817,15 +1998,15 @@ msgstr ""
 "chcesz pomóc poprawić dokumentację skontaktuj się z <link ns6:href=\"https://"
 "wiki.mageia.org/en/Documentation_team\">Zespołem Dokumentacji</link>, "
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
-#: en/DrakX.xml:6
+#. type: Content of: <section><itemizedlist><listitem><para><note>
+#: en/DrakLive-cover.xml:56 en/DrakLive.xml:19 en/DrakX-cover.xml:64
+#: en/DrakX.xml:38 en/selectKeyboard.xml:49
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
-#: en/DrakX.xml:7
+#: en/DrakLive-cover.xml:57 en/DrakLive.xml:20 en/DrakX-cover.xml:65
+#: en/DrakX.xml:39
 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 "
@@ -1835,94 +2016,101 @@ msgstr ""
 "To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz jakich "
 "wyborów dokonasz podczas instalacji."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
-#: en/DrakX.xml:10
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/DrakLive-cover.xml:60 en/DrakLive.xml:23 en/DrakX-cover.xml:68
+#: en/DrakX.xml:42 en/selectKeyboard.xml:56
 msgid "</note>"
 msgstr "</note>"
 
+#. type: Content of: <article><info><cover><para>
+#: en/DrakLive.xml:33
+#, fuzzy
+msgid ""
+"It was written by volunteers in their free time. Please contact the <link "
+"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
+"Team</link>, if you would like to help improve this manual."
+msgstr ""
+"Dokumentacja została napisana przez wolontariuszy w ich wolnym czasie. Jeśli "
+"chcesz pomóc poprawić dokumentację skontaktuj się z <link ns6:href=\"https://"
+"wiki.mageia.org/en/Documentation_team\">Zespołem Dokumentacji</link>, "
+
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
+#: en/DrakX-cover.xml:12 en/DrakX-cover.xml:61 en/DrakX.xml:35
 msgid "Installation with DrakX"
 msgstr "Instalacja za pomocą DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:9
+#: en/DrakX-cover.xml:20
 msgid "February 2014"
 msgstr "Luty 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:22
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
-#. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakX-cover.xml:16
-#, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
-
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gratulacje"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/12 apb: Text and typography.
+#. 2018/02/25 apb: Added clickable link to mageia.org
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:13
 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:18
+#, fuzzy
 msgid ""
-"You have finished installing and configuring <application>Mageia</"
-"application> and it is now safe to remove the installation medium and reboot "
-"your computer."
+"You have finished installing and configuring Mageia and it is now safe to "
+"remove the installation medium and reboot your computer."
 msgstr ""
 "Instalacja i konfiguracja <application>Magei</application>została "
 "zakończona, teraz można bezpiecznie usunąć nośnik instalacyjny i uruchomić "
 "komputer ponownie."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:22
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating "
-"systems (if there are more than one) on your computer."
+"After rebooting, you can use the bootloader screen to choose which operating "
+"system to start (if there are more than one on your computer)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:26
 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:30
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:32
+#, fuzzy
 msgid ""
-"Visit www.mageia.org if you have any questions or want to contribute to "
-"Mageia"
+"Visit <link ns4:href=\"http://www.mageia.org/en/\">www.mageia.org/en/</link> "
+"if you have any questions or want to contribute to Mageia"
 msgstr ""
 "Jeśli masz jakieś pytania, bądź chciał(a)byś dołączyć do pojektu Mageia - "
 "odwiedź www.mageia.org"
 
 #. type: Content of: <section><info><title>
-#: en/firewall.xml:3
+#: en/firewall.xml:7
 msgid "Firewall"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:6
+#: en/firewall.xml:10
 msgid ""
 "This section allows you to configure some simple firewall rules: they "
 "determine which type of message from the Internet will be accepted by the "
@@ -1931,48 +2119,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:12
+#: en/firewall.xml:16
 msgid ""
 "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."
+"accessible from the network. The <emphasis>Everything (no firewall)</"
+"emphasis> option 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
+#: en/firewall.xml:25
 msgid ""
 "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."
+"enable the CUPS server if you want printers on your machine to be accessible "
+"from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:25
+#: en/firewall.xml:29
 #, fuzzy
 msgid "<emphasis role=\"bold\">Advanced</emphasis>"
 msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:27
+#: en/firewall.xml:31
 msgid ""
-"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 "
+"The <emphasis>Advanced</emphasis> option opens a window where you can enable "
+"a series of services by typing a list of <quote>couples</quote> (blank "
 "separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:31
+#: en/firewall.xml:35
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Własny</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:34
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;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 "
@@ -1980,28 +2168,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:38
+#: en/firewall.xml:42
 msgid ""
 "- <emphasis>&lt;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:43
+#: en/firewall.xml:47
 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:46
+#: en/firewall.xml:50
 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:3
+#: en/formatPartitions.xml:10
 msgid "Formatting"
 msgstr "Formatowanie"
 
@@ -2009,15 +2197,16 @@ msgstr "Formatowanie"
 #.  NEEDS TO BE REVIEWED! 
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
+#. 2018/02/10 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:15
+#: en/formatPartitions.xml:24
 #, fuzzy
 msgid ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-formatPartitions.png\" format=\"PNG\" revision=\"1\" xml:id="
+"\"formatPartitions-im1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-formatPartitions.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"live-formatPartitions-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2027,7 +2216,7 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:24
+#: en/formatPartitions.xml:35
 #, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
@@ -2038,29 +2227,32 @@ msgstr ""
 "zachowane."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:28
-msgid "Usually at least the partitions DrakX selected, need to be formatted"
+#: en/formatPartitions.xml:39
+#, fuzzy
+msgid ""
+"Usually, at least the partitions that DrakX selected need to be formatted."
 msgstr ""
 "Zazwyczaj przynajmniej te partycje, które zaznaczył instalator, powinny być "
 "sformatowane"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:31
+#: en/formatPartitions.xml:42
+#, fuzzy
 msgid ""
-"Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
-"check for so called <emphasis>bad blocks</emphasis>"
+"Click on <emphasis>Advanced</emphasis> to choose the partitions you want to "
+"check for so-called <emphasis>bad blocks</emphasis>"
 msgstr ""
 "Kliknij na <guibutton>Zaawansowane</guibutton> aby wybrać, które partycje "
 "mają zostać sprawdzone na obecnoś tzw. <emphasis>bad bloków</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:36
+#: en/formatPartitions.xml:47
 #, fuzzy
 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, "
-"where you can choose to view details of your partitions."
+"<emphasis>Previous</emphasis>, again on <emphasis>Previous</emphasis> and "
+"then on <emphasis>Custom</emphasis> to get back to the main screen, where "
+"you can choose to view details of your partitions."
 msgstr ""
 "Jeśli nie jesteś pewien swojego wyboru, możesz kliknąć <guibutton>Wstecz</"
 "guibutton>, jeszcze raz <guibutton>Wstecz</guibutton>, a następnie "
@@ -2069,21 +2261,22 @@ msgstr ""
 "partycjach."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:43
+#: en/formatPartitions.xml:54
+#, fuzzy
 msgid ""
-"When you are confident about the selection, click on <guibutton>Next</"
-"guibutton> to continue."
+"When you are confident about the selections, click on <emphasis>Next</"
+"emphasis> to continue."
 msgstr ""
 "Jeśli jesteś zadowolony ze swojego wyboru, kliknij <guibutton>Dalej</"
 "guibutton> aby kontynuować."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:10
+#: en/installer.xml:14
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX instalator Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:13
+#: en/installer.xml:16
 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 "
@@ -2093,334 +2286,261 @@ msgstr ""
 "Linuxa, instalator Magei jest zaprojektowany tak, aby uczynić instalację lub "
 "aktualizację łatwą i przyjemną. "
 
-#. type: Content of: <section><para>
-#: 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 ""
-"Pierwszy ekran instalatora zawiera różne opcje,jednak opcja zaznaczona "
-"domyślnie rozpoczyna instalację i zazwyczaj będzie to wszystko czego "
-"potrzebujesz."
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:22
-msgid "Installation Welcome Screen"
-msgstr "Ekran powitalny instalatora"
+#: en/installer.xml:20
+msgid "The installation steps"
+msgstr "Etapy instalacji"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:25
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:23
 #, fuzzy
-msgid "Using a Mageia DVD"
-msgstr "Używanie bootloader'a Magei"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:27
 msgid ""
-"Here are the default welcome screens when using a Mageia DVD, The first one "
-"is what you will see if you have a UEFI system, the second one is for a "
-"Legacy system:"
+"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 ""
+"Proces instalacji jest podzielony na kilka etapów, możesz je śledzić po "
+"lewej stronie ekranu instalatora."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:32
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:28
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:37
 msgid ""
-"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."
+"Each step has one or more screens, which may also have <emphasis>Advanced</"
+"emphasis> sections with extra, less commonly required options."
 msgstr ""
+"Każdy etap zawiera jeden lub więcej ekranów, które mogą także mieć przycisk "
+"<guibutton>Zaawansowane</guibutton>, który umożliwia dostęp do rzadziej "
+"używanych opcji."
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:45
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/installer.xml:33
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:50
-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 ""
-"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>"
+"Most screens have <emphasis>Help</emphasis> buttons for further details "
+"about the particular step."
 msgstr ""
+"Większość ekranów posiada przycisk <guibutton>Pomoc</guibutton>, który "
+"pozwala na zapoznanie się z wyjaśnieniami dotyczącymi aktualnego etapu "
+"instalacji."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:63
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:38
+#, fuzzy
 msgid ""
-"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
-"specific language for the installation."
+"If at some point during the install you decide to abort 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."
 msgstr ""
+"Jeśli w którymś momencie instalacji zdecydujesz się ją przerwać, istnieje "
+"możliwość ponownego uruchomienia komputera, lecz należy sie nad tym poważnie "
+"zastanowić. W chwili gdy partycje zostały już sformatowane lub rozpoczęła "
+"się instalacja pakietów, twój komputer nie jest już w takim samym stanie jak "
+"wcześniej, ponowne uruchomienie w tym momencie najprawdopodobniej spowoduje, "
+"że system nie będzie zdatny do użytku. Jeśli masz pewność, że chcesz "
+"ponownie uruchomić komputer, możesz przejśc do terminala tekstowego "
+"wciskając jednocześnie klawisze<guibutton>Alt Ctrl F2</guibutton>. Następnie "
+"zrebootuj komputer za pomocą klawiszy <guibutton>Alt Ctrl Delete</guibutton>."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:67
-#, fuzzy
+#. type: Content of: <section><section><caution><para>
+#: en/installer.xml:43
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"If, in spite of this, you are very sure rebooting is what you want, go to a "
+"text terminal by pressing the keys <keycombo><keycap>Ctrl</"
+"keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo> together. After "
+"that, press <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
+"keycap><keycap>Delete</keycap></keycombo> together to reboot."
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-#, fuzzy
-msgid ""
-"Use the arrow keys to select the language then press <emphasis role=\"bold"
-"\">Enter</emphasis>."
-msgstr "Użyj strzałek aby wybrać język i naciśnij ENTER."
+#. type: Content of: <section><section><title>
+#: en/installer.xml:48
+msgid "Installation Welcome Screen"
+msgstr "Ekran powitalny instalatora"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:77
-#, fuzzy
+#. type: Content of: <section><section><para>
+#: en/installer.xml:49
 msgid ""
-"If needed, change the screen resolution by pressing <emphasis role=\"bold"
-"\">F3</emphasis> (Legacy mode only)."
-msgstr " Aby zmienić rozdzielczość ekranu wciśnij F3."
+"The particular screen that you will first see when booting from the "
+"Installation media will depend on whether your computer motherboard is of "
+"the Legacy (BIOS) or UEFI type."
+msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:81
+#. type: Content of: <section><section><para>
+#: en/installer.xml:52
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+"The welcome menu screen has various options, however the default option will "
+"start the installer, and is normally all that you will need."
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+"Pierwszy ekran instalatora zawiera różne opcje,jednak opcja zaznaczona "
+"domyślnie rozpoczyna instalację i zazwyczaj będzie to wszystko czego "
+"potrzebujesz."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:88
-msgid ""
-"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)."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:56
+msgid "Legacy (BIOS) Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:96
-#, fuzzy
-msgid "Default: It doesn't alter anything in the default options."
-msgstr "- Domyślne - nie zmienia żadnej z domyślnych opcji."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:101
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:58
 #, fuzzy
 msgid ""
-"Safe Settings: Priority is given to the safer options at the price of a "
-"performance detriment."
+"<imageobject> <imagedata fileref=\"dx-welcome.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"- Bezpieczne ustawienia - nadaje priorytet opcjom bezpiecznym kosztem "
-"wydajności."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:106
-#, fuzzy
-msgid ""
-"No ACPI: (Advanced Configuration and Power Interface): Power management "
-"features are not used."
-msgstr "- Bez ACPI - bez zarządzania energią."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/installer.xml:113
-#, fuzzy
-msgid ""
-"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 "- Bez lokalnego APIC - ma związek z przerwaniami procesora."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: 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."
+#. type: Content of: <section><section><section><itemizedlist><title>
+#: en/installer.xml:63
+msgid "Menu"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:125
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:66
 msgid ""
-"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."
+"Install Mageia to a hard disk. This is the default option, and will "
+"automatically start after a short while unless another option is selected."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:132
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:69
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+msgid "<emphasis role=\"bold\">Rescue System</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:139
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:70
 msgid ""
-"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."
+"This option allows you to either re-install the bootloader for an existing "
+"Mageia installation or you can use it to restore a Windows bootloader."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:146
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:75
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+msgid "<emphasis role=\"bold\">Memory Test</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:151
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:76
 msgid ""
-"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."
+"Test the installed RAM by performing multiple read and write operations. "
+"Reboot to end the test."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:158
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:80
 #, fuzzy
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgid "<emphasis role=\"bold\">F2: Language</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:81
+msgid "Press F2 for alternative languages."
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:164
-msgid ""
-"The help is translated in the chosen language with <emphasis role=\"bold"
-"\">F2</emphasis>."
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:86
+msgid "UEFI Systems"
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:168
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:87
 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>"
+"From this screen, you can access options by pressing <keycap>e</keycap> to "
+"enter the edit mode. To come back to this screen, press <keycap>Esc</keycap> "
+"to quit without saving or press <keycap>F10</keycap> to save and quit."
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/installer.xml:177
-msgid "The installation steps"
-msgstr "Etapy instalacji"
-
-#. type: Content of: <section><section><para>
-#: en/installer.xml:179
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:92
 #, fuzzy
 msgid ""
-"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."
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
-"Proces instalacji jest podzielony na kilka etapów, możesz je śledzić po "
-"lewej stronie ekranu instalatora."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:182
-#, fuzzy
-msgid ""
-"Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> sections with extra, less commonly required, options."
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:96
+msgid "In UEFI mode you have only two menu options to choose from:"
 msgstr ""
-"Każdy etap zawiera jeden lub więcej ekranów, które mogą także mieć przycisk "
-"<guibutton>Zaawansowane</guibutton>, który umożliwia dostęp do rzadziej "
-"używanych opcji."
 
-#. type: Content of: <section><section><para>
-#: en/installer.xml:186
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:99
 #, fuzzy
+msgid "<emphasis role=\"bold\">Install:</emphasis> Start the Install process"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons for further details "
-"about the particular step."
+"<emphasis role=\"bold\">Rescue:</emphasis> This option allows you to either "
+"re-install the bootloader for an existing Mageia installation or you can use "
+"it to restore a Windows bootloader."
 msgstr ""
-"Większość ekranów posiada przycisk <guibutton>Pomoc</guibutton>, który "
-"pozwala na zapoznanie się z wyjaśnieniami dotyczącymi aktualnego etapu "
-"instalacji."
 
-#. type: Content of: <section><section><note><para>
-#: en/installer.xml:190
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:109
 #, fuzzy
 msgid ""
-"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 "
-"rebooting is what you want, go to a text terminal by pressing the three keys "
-"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
-"<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
+"If you booted from a USB stick, you will see the above options duplicated, "
+"and in this case, you should use the set that will be suffixed with \"USB\"."
 msgstr ""
-"Jeśli w którymś momencie instalacji zdecydujesz się ją przerwać, istnieje "
-"możliwość ponownego uruchomienia komputera, lecz należy sie nad tym poważnie "
-"zastanowić. W chwili gdy partycje zostały już sformatowane lub rozpoczęła "
-"się instalacja pakietów, twój komputer nie jest już w takim samym stanie jak "
-"wcześniej, ponowne uruchomienie w tym momencie najprawdopodobniej spowoduje, "
-"że system nie będzie zdatny do użytku. Jeśli masz pewność, że chcesz "
-"ponownie uruchomić komputer, możesz przejśc do terminala tekstowego "
-"wciskając jednocześnie klawisze<guibutton>Alt Ctrl F2</guibutton>. Następnie "
-"zrebootuj komputer za pomocą klawiszy <guibutton>Alt Ctrl Delete</guibutton>."
+"Jeżeli uruchomiłeś z urządzenia USB, otrzymasz dwie dodatkowe linie będące "
+"duplikatem poprzednich z dopiskiem \"USB\". Musisz wybrać którąś z nich."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:203
+#: en/installer.xml:115
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemy z instalacją oraz możliwe rozwiązania"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:206
+#: en/installer.xml:117
 msgid "No Graphical Interface"
 msgstr "Brak graficznego interfejsu"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:210
+#: en/installer.xml:120
+#, fuzzy
 msgid ""
-"After the initial screen you did not reach the language selection screen. "
-"This can happen with some graphic cards and older systems. Try using low "
-"resolution by typing <code>vgalo</code> at the prompt."
+"After the initial screen you did not progress to the <emphasis>Language "
+"Selection</emphasis> screen. This can happen with some graphic cards and "
+"older systems. Try using low resolution by typing <command>vgalo</command> "
+"at the prompt."
 msgstr ""
 "Po ekranie powitalnym nie wyświetla się ekran wyboru języka. To może się "
 "zdarzyć dla niektórych kart graficznych lub starszych komputerów. Spróbuj "
 "użyć niskiej rozdzielczości wpisując w linii komend <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:217
+#: en/installer.xml:126
 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 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."
+"In this case it is worth trying a text-mode installation. To use this press "
+"<keycap>Esc</keycap> at the <emphasis>Welcome</emphasis> screen and confirm "
+"with <keycap>ENTER</keycap>. You will be presented with a black screen with "
+"a <prompt>boot:</prompt> prompt. Type <command>text</command> and press "
+"<keycap>ENTER</keycap> to continue with the installation in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:230
+#: en/installer.xml:138
 msgid "The Install Freezes"
 msgstr "Zawieszenie się instalacji"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:232
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
-"problem with hardware detection. In this case the automatic detection of "
-"hardware may be bypassed and dealt with later. To try this, type "
-"<code>noauto</code> at the prompt. This option may also be combined with "
-"other options as necessary."
+"problem with hardware detection. In this case the automatic hardware "
+"detection may be bypassed and dealt with later. To try this, type "
+"<command>noauto</command> at the prompt. This option may also be combined "
+"with other parameters as necessary."
 msgstr ""
 "Jeśli system zawiesi się podczas instalacji, może to oznaczać problem z "
 "detekcją sprzętu. W tym przypadku automatyczna detekcja sprzętu może zostać "
@@ -2428,18 +2548,19 @@ msgstr ""
 "łączona z innymi opcjami jeśli zajdzie taka potrzeba."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:240
+#: en/installer.xml:146
 msgid "RAM problem"
 msgstr "Problem z pamięcią RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:242
+#: en/installer.xml:147
 #, fuzzy
 msgid ""
 "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."
+"<literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where "
+"<replaceable>xxx</replaceable> is the correct amount of RAM. e.g. "
+"<literal>mem=256M</literal> would specify 256MB of RAM."
 msgstr ""
 "To są rzadkie przypadki, jednak czasem zdarza się, że system zgłasza "
 "niepoprawnie ilość dostępnej pamięci RAM. Aby określić ją manualnie wpisz "
@@ -2447,35 +2568,31 @@ msgstr ""
 "pamięci RAM wyrażoną w MB, np. <code>mem=256M</code> oznacza 256MB."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:249
+#: en/installer.xml:154
 msgid "Dynamic partitions"
 msgstr "Dynamiczne partycje"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:251
+#: en/installer.xml:155
 msgid ""
-"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>."
+"If you converted your hard disk from <literal>Basic</literal> format to "
+"<literal>Dynamic</literal> format in Microsoft Windows, then it is not "
+"possible to install Mageia on this disc. To revert to a <literal>Basic</"
+"literal> 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 ""
 
 #. type: Content of: <section><info><title>
-#: en/installUpdates.xml:3
+#: en/installUpdates.xml:16
 msgid "Updates"
 msgstr "Aktualizacje"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
-#.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:15
+#: en/installUpdates.xml:20
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"<imageobject> <imagedata format=\"png\" fileref=\"dx2-installUpdates.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
@@ -2484,62 +2601,73 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:20
+#: en/installUpdates.xml:25
+#, fuzzy
 msgid ""
-"Since this version of <application>Mageia</application> was released, some "
-"packages will have been updated or improved."
+"Since this version of Mageia was released, some packages will have been "
+"updated or improved."
 msgstr ""
 "Od czasu gdy ta wersja <application>Magei</application> została "
 "udostępniona, niektóre pakiety zostały zaktualizowane lub poprawione."
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:24
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:30
+msgid ""
+"Select <emphasis>Yes</emphasis> if you wish to download and install them"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:35
 #, fuzzy
 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 "
+"Select <emphasis>No</emphasis> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Wybierz <guilabel>tak</guilabel> jeśli chcesz je pobrać i zainstalować, "
 "wybierz <guilabel>nie</guilabel> jeśli nie chcesz tego teraz robić lub jeśli "
 "nie masz połączenia z Internetem"
 
-#. type: Content of: <section><para>
-#: en/installUpdates.xml:29
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/installUpdates.xml:40
 #, fuzzy
-msgid "Press <guibutton>Next</guibutton> to continue"
+msgid "Press <emphasis>Next</emphasis> to continue"
 msgstr "Kliknij <guibutton>Dalej</guibutton> aby kontynuować"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:1
-msgid "Login screen"
+#: en/login.xml:4
+#, fuzzy
+msgid "Login Screen"
 msgstr "Ekran logowania"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:1
+#: en/login.xml:7
+#, fuzzy
 msgid ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:1
-msgid "KDM login screen"
+#: en/login.xml:11
+#, fuzzy
+msgid "SDDM login screen"
 msgstr "Ekran logowania KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
-msgid "Finally, you will come to the login screen."
+#: en/login.xml:14
+msgid "Finally, you will come to the desktop login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:1
+#: en/login.xml:15
+#, fuzzy
 msgid ""
 "Enter your user name and user password, and in a few seconds you will find "
-"yourself with a loaded KDE or GNOME desktop, depending on which live medium "
-"you used. You can now start using your Mageia installation."
+"yourself with a loaded KDE Plasma or GNOME desktop, depending on which live "
+"medium you used. You can now start using and enjoying your Mageia "
+"installation."
 msgstr ""
 "Wprowadź twoją nazwę użytkownika oraz hasło, i w ciągu kilku sekund "
 "powinieneś znaleźć się na załadowanym pulpicie KDE lub GNOME, w zależności "
@@ -2547,34 +2675,35 @@ msgstr ""
 "instalacji Magei."
 
 #. type: Content of: <section><para>
-#: en/login.xml:3
+#: en/login.xml:16
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find further documentation in <link xmlns:ns0=\"http://www.w3."
+"org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/media_selection.xml:3
-msgid "Media Selection (Nonfree)"
-msgstr "Wybór nośników (Nonfree)"
+#: en/media_selection.xml:10
+msgid "Nonfree Media"
+msgstr ""
 
 #.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
+#. 2019.01.05 apb: Changed Ati to AMD in Nonfree para.
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:15
-#, fuzzy
+#: en/media_selection.xml:24
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
-"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:20
+#: en/media_selection.xml:30
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2587,7 +2716,7 @@ msgstr ""
 "następnych krokach."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:27
+#: en/media_selection.xml:37
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2596,12 +2725,13 @@ msgstr ""
 "zawiera ono podstawowe pakiety dystrybucji."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:32
+#: en/media_selection.xml:42
+#, fuzzy
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
 "software (hence the name - Nonfree). For example this repository includes "
-"nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
+"nVidia and AMD graphics card proprietary drivers, firmware for various WiFi "
 "cards, etc."
 msgstr ""
 "Repozytorium <emphasis>Nonfree</emphasis> zawiera pakiety wolne od opłat, "
@@ -2611,7 +2741,7 @@ msgstr ""
 "firmware dla niektórych kart WIFI, itp."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:40
+#: en/media_selection.xml:50
 #, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
@@ -2632,63 +2762,64 @@ msgid "Minimal Install"
 msgstr "Minimalna instalacja"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:11
+#: en/minimal-install.xml:17
+msgid ""
+"Minimal Installation is intended for those with specific uses in mind for "
+"Mageia, such as a server or a specialised workstation. You will probably use "
+"this option combined with the <emphasis>Individual package selection</"
+"emphasis> option to fine-tune your installation. See <xref linkend="
+"\"choosePackagesTree\"/>."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:24
 #, fuzzy
 msgid ""
-"You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
+"You can choose a <emphasis>Minimal Installation</emphasis> by de-selecting "
+"everything in the <emphasis>Package Group Selection</emphasis> screen, see "
+"<xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Możesz przeprowadzić Minimalną instalację poprzez odznaczenie wszystkich "
 "grup pakietów na ekranie Wybór grup pakietów, zobacz <xref linkend="
 "\"choosePackageGroups\"></xref>."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:28
 msgid ""
-"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
-"package selection</emphasis> option in the same screen."
+"If desired, you can additionally tick the <emphasis>Individual package "
+"selection</emphasis> option in the same screen."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:17
-msgid ""
-"Minimal Installation is intended for those with specific uses in mind for "
-"<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:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:33
 #, fuzzy
 msgid ""
-"If you choose this installation method, then the relevant screen will offer "
-"you a few useful extras to install, such as documentation and X."
+"If you choose this installation method, then the relevant screen (see "
+"screenshot below) will offer you a few useful extras to install, such as "
+"documentation and <quote>X</quote>."
 msgstr ""
 "Jeśli wybierzesz ten typ instalacji, zostanie ci zaprezentowanych kilka "
 "użytecznych opcji, jak dokumentacja czy X Window."
 
-#. type: Content of: <section><para>
-#: en/minimal-install.xml:26
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/minimal-install.xml:37
 msgid ""
-"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"If the <emphasis>With X</emphasis> option is selected, then IceWM (a "
 "lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:42
 msgid ""
-"The basic documentation is provided in the form of man and info pages.  It "
-"contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
-"manpages/man.html\">Linux Documentation Project</link> and the <link xlink:"
-"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> "
-"info pages."
+"The basic documentation is provided in the form of <quote>man</quote> and "
+"<quote>info</quote> pages. It contains the man pages from the <link xlink:"
+"href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation Project</"
+"link> and the <link xlink:href=\"http://www.gnu.org/software/coreutils/"
+"manual/\">GNU coreutils</link> info pages."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:35
+#: en/minimal-install.xml:48
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
@@ -2700,295 +2831,319 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
-msgid "Summary of miscellaneous parameters"
-msgstr ""
+#, fuzzy
+msgid "Configuration Summary"
+msgstr "Konfiguracja dźwięku"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
+#. 2018/02/09 apb: Changed title to Configuration Summary (as agreed). Also, text and typography.
+#. 2018/02/22 apb: Changed list styles.
+#. 2018/02/23 apb: Updated dx2-summaryBottom.png
+#. 2018/02/24 apb: Changed list style
+#. 2018/02/24 apb: Centre-align dx2-summaryTop.png
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:10
+#: en/misc-params.xml:19
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:15
+#: en/misc-params.xml:24
 msgid ""
 "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>."
+"settings here and change them if you want by pressing <emphasis>Configure</"
+"emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/misc-params.xml:21
+#: en/misc-params.xml:30
 msgid ""
 "As a general rule, it is recommended that you accept the default settings "
 "unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:24
+#: en/misc-params.xml:33
 msgid "there are known issues with a default setting"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:28
+#: en/misc-params.xml:37
 msgid "the default setting has already been tried and it fails"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
-#: en/misc-params.xml:32
-msgid ""
-"some other factor mentionned in the detailed sections below is an issue."
+#: en/misc-params.xml:41
+msgid "some other factor mentioned in the detailed sections below is an issue"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:40
+#: en/misc-params.xml:49
 msgid "System parameters"
 msgstr "Parametry systemu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:45
-msgid "<guilabel>Timezone</guilabel>"
-msgstr "<guilabel>Strefa czasowa</guilabel>"
+#: en/misc-params.xml:54
+#, fuzzy
+msgid "<emphasis role=\"bold\">Timezone</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:47
+#: en/misc-params.xml:56
 msgid ""
-"DrakX selects a time zone for you, depending on your preferred language. You "
+"DrakX selects a timezone 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:53
-msgid "<guilabel>Country / Region</guilabel>"
-msgstr "<guilabel>Kraj / Region</guilabel>"
+#: en/misc-params.xml:62
+#, fuzzy
+msgid "<emphasis role=\"bold\">Country / Region</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:56
+#: en/misc-params.xml:64
 msgid ""
 "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:62
-msgid "<guilabel>Bootloader</guilabel>"
-msgstr "<guilabel>System rozruchowy</guilabel>"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:64
-msgid "DrakX has made good choices for the bootloader setting."
-msgstr ""
+#: en/misc-params.xml:70
+#, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
-msgid "Do not change anything, unless you know how to configure GRUB2"
+#: en/misc-params.xml:72
+msgid "DrakX proposal for the bootloader setting"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:70
-msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
+#: en/misc-params.xml:75
+msgid ""
+"Do not change anything, unless you know how to configure GRUB2. For more "
+"information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
-msgid "<guilabel>User management</guilabel>"
-msgstr ""
+#: en/misc-params.xml:83
+#, fuzzy
+msgid "<emphasis role=\"bold\">User management</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:78
+#: en/misc-params.xml:85
 msgid ""
-"You can add extra users here. They will each get their own <literal>/home</"
-"literal> directories."
+"You can add extra users here. They will each be allocated their own "
+"<filename>/home</filename> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:84
-msgid "<guilabel>Services</guilabel>:"
-msgstr "<guilabel>Usługi</guilabel>:"
+#: en/misc-params.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Services</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:86
+#: en/misc-params.xml:93
 msgid ""
 "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:90
+#: en/misc-params.xml:97
 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:94
-msgid "For more information, see <xref linkend=\"configureServices\"/>"
+"prevent your computer from operating correctly. For more information, see "
+"<xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:101
+#: en/misc-params.xml:106
 msgid "Hardware parameters"
 msgstr "Parametry sprzętu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:106
-msgid "<guilabel>Keyboard</guilabel>:"
-msgstr "<guilabel>Klawiatura</guilabel>:"
+#: en/misc-params.xml:111
+#, fuzzy
+msgid "<emphasis role=\"bold\">Keyboard</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:108
+#: en/misc-params.xml:113
 msgid ""
 "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:113
+#: en/misc-params.xml:118
 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:119
-msgid "<guilabel>Mouse</guilabel>:"
-msgstr "<guilabel>Mysz</guilabel>:"
+#: en/misc-params.xml:124
+#, fuzzy
+msgid "<emphasis role=\"bold\">Mouse</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:126
 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:126
-msgid "<guilabel>Sound card</guilabel>:"
-msgstr "<guilabel>Karta dźwiękowa</guilabel>:"
+#: en/misc-params.xml:131
+#, fuzzy
+msgid "<emphasis role=\"bold\">Sound card</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: 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 where none of them is the default one."
+#: en/misc-params.xml:133
+msgid "The installer will use the default driver if one is available."
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:137
-msgid "<guilabel>Graphical interface</guilabel>:"
+#. type: Content of: <section><section><para>
+#: en/misc-params.xml:136 en/soundConfig.xml:46
+msgid ""
+"If there is no actual default driver for your sound card, there may be other "
+"possible alternative drivers available to choose from. If this is the case, "
+"but you think the installer has not made the most appropriate choice, you "
+"can click on <emphasis>Advanced</emphasis> to manually specify a driver."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:140
-msgid "This section allows you to configure your graphic card(s) and displays."
-msgstr ""
+#: en/misc-params.xml:144
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical interface</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:143
-msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
+#: en/misc-params.xml:146
+msgid ""
+"This section allows you to configure your graphics card(s) and displays. For "
+"more information, see <xref linkend=\"configureX_chooser\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:149
+#: en/misc-params.xml:155
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:157
+#: en/misc-params.xml:163
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
-msgid "<guilabel>Network</guilabel>:"
-msgstr "<guilabel>Sieć</guilabel>:"
+#: en/misc-params.xml:169
+#, fuzzy
+msgid "<emphasis role=\"bold\">Network</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:165
+#: en/misc-params.xml:171
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"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 "
+"drivers it is better to do that after reboot, using the Mageia Control "
+"Center, if you have not yet enabled the <emphasis>Nonfree</emphasis> media "
 "repositories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:172
+#: en/misc-params.xml:178
 msgid ""
 "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:179
-msgid "<guilabel>Proxies</guilabel>:"
-msgstr ""
+#: en/misc-params.xml:185
+#, fuzzy
+msgid "<emphasis role=\"bold\">Proxies</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:181
+#: en/misc-params.xml:187
 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 "
+"Internet.  This section allows you to configure your computer to utilize a "
 "proxy service."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:186
+#: en/misc-params.xml:192
 msgid ""
-"You may need to consult your systems administrator to get the parameters you "
-"need to enter here."
+"You may need to consult your systems administrator to obtain the parameters "
+"you need to enter here."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:195
+#: en/misc-params.xml:201
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:200
-msgid "<guilabel>Security Level</guilabel>:"
-msgstr "<guilabel>Poziom Bezpieczeństwa</guilabel>:"
+#: en/misc-params.xml:206
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Level</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:203
+#: en/misc-params.xml:208
 msgid ""
-"Here you set the Security level for your computer, in most cases the default "
-"setting (Standard) is adequate for general use."
+"The Security level for your computer, in most cases the default setting "
+"(Standard)  is adequate for general use. Select the option which best suits "
+"your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:207
-msgid "Check the option which best suits your usage."
-msgstr ""
+#: en/misc-params.xml:215
+#, fuzzy
+msgid "<emphasis role=\"bold\">Firewall</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
-msgid "<guilabel>Firewall</guilabel>:"
-msgstr "<guilabel>Firewall</guilabel>:"
+#: en/misc-params.xml:217
+msgid ""
+"The firewall allows you to manage which network connections are allowed on "
+"your computer. The safe and secure default is to allow ZERO inbound "
+"connections. This does not stop you connecting outbound and using your "
+"computer normally."
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:214
+#: en/misc-params.xml:223
 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."
+"Please be aware that the Internet is a high risk network where there are "
+"continuous attempts to probe and attack systems. Even seemingly <quote>safe</"
+"quote> connections such as ICMP (for ping) have been used as covert data "
+"channels for exfiltrating data by malicious persons."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: 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 "
-"information, see <xref linkend=\"firewall\"/>."
+#: en/misc-params.xml:229
+msgid "For more information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:224
-msgid "Bear in mind that allowing everything (no firewall) may be very risky."
+#: en/misc-params.xml:232
+msgid ""
+"Bear in mind that allowing <emphasis>everything</emphasis> (no firewall) may "
+"be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2997,29 +3152,43 @@ msgid "Reboot"
 msgstr "Uruchom ponownie"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:6
+#: en/reboot.xml:7
 msgid ""
 "Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer, click on <emphasis "
-"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
-"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+"computer, remove the live DVD/USB stick and restart the computer."
+msgstr ""
+
+#. type: Content of: <section><important><simpara>
+#: en/reboot.xml:9
+msgid ""
+"Ensure that you follow these shut-down and restart instruction steps in the "
+"<emphasis role=\"bold\">same</emphasis> order."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:11
-msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+#: en/reboot.xml:12
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><para>
-#: en/reboot.xml:15
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:16
+msgid "When you are ready, press <emphasis>Finish</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><simpara>
+#: en/reboot.xml:17
 msgid ""
 "When you restart, you will see a succession of download progress bars. These "
-"indicate that the software media lists are being downloaded (see Software "
-"management)."
+"indicate that the software media lists are being downloaded (see "
+"<emphasis>Software Management</emphasis>)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/reboot.xml:17
+#: en/reboot.xml:19
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
 "reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
@@ -3041,46 +3210,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:3
+#: en/securityLevel.xml:10
 msgid "Security Level"
 msgstr "Poziom bezpieczeństwa"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
+#. 2018/02/12 apb: Minor wording.
 #. type: Content of: <section><mediaobject>
-#: en/securityLevel.xml:11
+#: en/securityLevel.xml:20
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
-"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-securityLevel.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"securityLevel-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
-"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:16
+#: en/securityLevel.xml:26
 #, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
 msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:19
+#: en/securityLevel.xml:29
+msgid ""
+"<emphasis>Standard</emphasis> is the default, and recommended setting for "
+"the average user."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:32
 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."
+"<emphasis>Secure</emphasis> 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
+#: en/securityLevel.xml:36
 #, fuzzy
 msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
 msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:26
+#: en/securityLevel.xml:38
 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 "
@@ -3088,14 +3263,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:31
+#: en/securityLevel.xml:43
 msgid ""
-"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
-"where &lt;user> is the login name of the user to receive these messages."
+"A good, and easy-to-implement, choice is to enter &lt;user&gt;@localhost - "
+"where &lt;user&gt; is the login name of the user to receive these messages."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/securityLevel.xml:36
+#: en/securityLevel.xml:48
 msgid ""
 "The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
 "messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
@@ -3103,329 +3278,366 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:41
+#: en/securityLevel.xml:53
 msgid ""
-"After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
+"It will always be possible to adjust your security settings post-install in "
+"the <emphasis>Security</emphasis> section of the Mageia Control Center."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:6
+#: en/SelectAndUseISOs2.xml:15
 msgid "Select and use ISOs"
 msgstr "Wybierz i użyj obrazu ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:18
 msgid "Introduction"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:10
+#: en/SelectAndUseISOs2.xml:19
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:12
-msgid "There are two families of media:"
+#: en/SelectAndUseISOs2.xml:21
+msgid "There are three types of installation media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:15
+#: en/SelectAndUseISOs2.xml:24
 msgid ""
-"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"
+"<emphasis role=\"bold\">Classical installer:</emphasis> 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:21
+#: en/SelectAndUseISOs2.xml:31
+msgid ""
+"<emphasis role=\"bold\">LIVE media:</emphasis> This option allows you to try "
+"out Mageia without having to actually install it, or make any changes to "
+"your computer. However, the Live media also includes an Installer, which can "
+"be started when booting the media, or after booting into the Live operating "
+"system itself."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/SelectAndUseISOs2.xml:37
+msgid ""
+"The Live Installer is simpler compared to the Classical Installer - but you "
+"have fewer configuration options."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><important><para>
+#: en/SelectAndUseISOs2.xml:41
 msgid ""
-"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"
+"Live ISOs can only be used to create <quote>clean</quote> installations, "
+"they cannot be used to upgrade previously installed Mageia releases."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
+msgid ""
+"<emphasis role=\"bold\">Net Install</emphasis>: These are minimal ISO's "
+"containing no more than that which is needed to start the DrakX installer "
+"and find <literal>DrakX-installer-stage2</literal> 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 Internet."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:53
+msgid ""
+"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><para>
-#: en/SelectAndUseISOs2.xml:27
-msgid "Details are given in the next sections."
+#: en/SelectAndUseISOs2.xml:58
+msgid "More details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:30
+#: en/SelectAndUseISOs2.xml:61
 msgid "Media"
 msgstr "Nośnik"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:32
+#: en/SelectAndUseISOs2.xml:63
 msgid "Definition"
 msgstr "Definicja"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:64
 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 (DVD, USB "
-"stick, ...) the ISO file is copied to."
+"install and/or update Mageia and, by extension, any physical medium (DVD, "
+"USB stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:36
+#: en/SelectAndUseISOs2.xml:67
 msgid ""
 "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:39
+#: en/SelectAndUseISOs2.xml:70
 msgid "Classical installation media"
 msgstr "Klasyczne medium instalacji"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
-#: en/SelectAndUseISOs2.xml:141
+#: en/SelectAndUseISOs2.xml:72 en/SelectAndUseISOs2.xml:104
+#: en/SelectAndUseISOs2.xml:171
 msgid "Common features"
 msgstr "Powszechne możliwości"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:44
-msgid "These ISOs use the Classical installer called drakx."
+#: en/SelectAndUseISOs2.xml:75
+msgid "These ISOs use the Classical installer called DrakX"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:47
+#: en/SelectAndUseISOs2.xml:78
 msgid ""
 "They are used for performing clean installs or to upgrade a previously "
-"installed version of Mageia."
+"installed version of Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
-#: en/SelectAndUseISOs2.xml:158
+#: en/SelectAndUseISOs2.xml:82 en/SelectAndUseISOs2.xml:118
+#: en/SelectAndUseISOs2.xml:174
 #, fuzzy
-msgid "Different media for 32 and 64 bit architectures."
+msgid "Different media for 32 and 64-bit architectures"
 msgstr "Różne media dla 32 i 64 bitowych architektur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:54
+#: en/SelectAndUseISOs2.xml:85
 msgid ""
-"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
-"Hardware Detection Tool."
+"Some tools are available in the Installer <quote>Welcome</quote> screen: "
+"<emphasis>Rescue System, Memory Test, </emphasis>and <emphasis>Hardware "
+"Detection Tool</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:58
-msgid "Each DVD contains many available desktop environments and languages."
+#: en/SelectAndUseISOs2.xml:91
+msgid "Each DVD contains many available desktop environments and languages"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:95
+#, fuzzy
 msgid ""
-"You'll be given the choice during the installation to add non free software."
+"You'll be given the choice during the installation to add non-free software"
 msgstr "Dostaniesz wybór podczas instalacji aby dodać niewolne oprogramowanie."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:102
 msgid "Live media"
 msgstr "Nośniki live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:74
+#: en/SelectAndUseISOs2.xml:107
 msgid ""
 "Can be used to preview the Mageia operating system without having to install "
-"it. Can also be used to install Mageia if you wish."
+"it"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:79
-msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
+#: en/SelectAndUseISOs2.xml:111
+msgid "The Live media also includes an Installer."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:86
-msgid ""
-"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade previously installed Mageia "
-"releases.</emphasis>"
+#: en/SelectAndUseISOs2.xml:114
+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:91
-msgid "They contain non free software."
+#: en/SelectAndUseISOs2.xml:121
+#, fuzzy
+msgid "They contain non-free software"
 msgstr "Zawierają one niewolne oprogramowanie."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:96
+#: en/SelectAndUseISOs2.xml:126
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:99
-msgid "Plasma desktop environment only."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:129
+#, fuzzy
+msgid "Plasma desktop environment only"
+msgstr "Tylko środowisko graficzne GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
-#: en/SelectAndUseISOs2.xml:130
+#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:160
 #, fuzzy
-msgid "All available languages are present."
+msgid "All available languages are present"
 msgstr "Wszystkie języki są obecne."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:105
-msgid "64 bit architecture only."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:135 en/SelectAndUseISOs2.xml:149
+#, fuzzy
+msgid "64-bit architecture only"
+msgstr "Różne media dla 32 i 64 bitowych architektur."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:110
+#: en/SelectAndUseISOs2.xml:140
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:113
-msgid "GNOME desktop environment only."
+#: en/SelectAndUseISOs2.xml:143
+#, fuzzy
+msgid "GNOME desktop environment only"
 msgstr "Tylko środowisko graficzne GNOME."
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:119
-msgid "64 bit architecture only"
-msgstr ""
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:124
+#: en/SelectAndUseISOs2.xml:154
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:127
-msgid "Xfce desktop environment only."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:157
+#, fuzzy
+msgid "Xfce desktop environment only"
+msgstr "Tylko środowisko graficzne GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:133
+#: en/SelectAndUseISOs2.xml:163
 #, fuzzy
-msgid "32 or 64 bit architectures."
+msgid "32 or 64-bit architectures"
 msgstr "Różne media dla 32 i 64 bitowych architektur."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:139
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid "Net install media"
 msgstr "Klasyczne medium instalacji"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:144
-msgid ""
-"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 Internet."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:152
-msgid ""
-"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:161
+#: en/SelectAndUseISOs2.xml:177
 #, fuzzy
-msgid "First steps are English language only."
+msgid "First steps are English language only"
 msgstr "Tylko język angielski."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:166
+#: en/SelectAndUseISOs2.xml:182
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:169
+#: en/SelectAndUseISOs2.xml:185
 #, fuzzy
 msgid ""
-"Contains only free software, for those people who prefer not to use non-free "
-"software."
+"Contains only free software, for those who prefer to not use non-free "
+"software"
 msgstr ""
 "Zawiera tylko wolne oprogramowanie, dla ludzi odmawiającyh z wykorzystania "
 "niewolnego oprogramowania."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:175
+#: en/SelectAndUseISOs2.xml:191
 msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:194
 msgid ""
-"Contains non-free software (mostly drivers, codecs...) for people who need "
-"it."
+"Contains non-free software (mostly drivers, codecs...) for those who need it"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:186
+#: en/SelectAndUseISOs2.xml:202
 msgid "Downloading and Checking Media"
 msgstr "Pobieranie i Sprawdzanie Mediów"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
+#: en/SelectAndUseISOs2.xml:204
 msgid "Downloading"
 msgstr "Pobieranie"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:189
+#: en/SelectAndUseISOs2.xml:205
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
 "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."
+"the mirror in use and an option to switch to an alternative if the bandwidth "
+"is too low."
 msgstr ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:191
-msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:209
+msgid ""
+"If http is chosen you will also see some information regarding checksums."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:195
+#: en/SelectAndUseISOs2.xml:212
+msgid ""
+"<literal>md5sum</literal>, <literal>sha1sum</literal> and "
+"<literal>sha512sum</literal> (the most secure) are tools to check the ISO "
+"integrity. Copy one of the checksums (string of alphanumeric characters) for "
+"use in the next section."
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/SelectAndUseISOs2.xml:217
+#, fuzzy
 msgid ""
-"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:"
+"<imageobject> <imagedata align=\"center\" fileref=\"Checking.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:222
+msgid "In the meantime, a window to download the actual ISO will open:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:199
-msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:225
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Download.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:203
-msgid "Select the Save File option, then, click OK."
+#: en/SelectAndUseISOs2.xml:229
+msgid ""
+"Click on <emphasis>Save File</emphasis>, then click <emphasis>OK</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
+#: en/SelectAndUseISOs2.xml:233
 #, fuzzy
 msgid "Checking the integrity of the downloaded media"
 msgstr "Sprawdzanie integralności pobranych mediów"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:208
+#: en/SelectAndUseISOs2.xml:235
 msgid ""
 "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."
+"match, and if that 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:214
+#: en/SelectAndUseISOs2.xml:241
 #, fuzzy
 msgid ""
 "To generate the checksum for your downloaded ISO, open a console, (no need "
@@ -3433,194 +3645,227 @@ msgid ""
 msgstr "Otwórz konsolę, root nie wymagany i:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:218
+#: en/SelectAndUseISOs2.xml:245
 #, fuzzy
 msgid ""
-"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
-"userinput>."
+"To use the md5sum, type: <command>md5sum path/to/the/image/file.iso</command>"
 msgstr ""
 "Wpisz polecenie: # <userinput>dd if=ścieżka/do/obrazu/ISO.iso of=/dev/sdX "
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:222
+#: en/SelectAndUseISOs2.xml:249
+#, fuzzy
+msgid ""
+"To use the sha1sum, type: <command>sha1sum path/to/the/image/file.iso</"
+"command>"
+msgstr ""
+"Wpisz polecenie: # <userinput>dd if=ścieżka/do/obrazu/ISO.iso of=/dev/sdX "
+"bs=1M</userinput>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:254
+#, fuzzy
 msgid ""
-"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
-"userinput>"
+"To use the sha512sum, type: <command>sha512sum path/to/the/image/file.iso</"
+"command>"
 msgstr ""
+"Wpisz polecenie: # <userinput>dd if=ścieżka/do/obrazu/ISO.iso of=/dev/sdX "
+"bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:226
+#: en/SelectAndUseISOs2.xml:258
 msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:228
-msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:260
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Md5sum.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:265
 msgid ""
-"and compare the result (you may have to wait for a while) with the checksum "
-"provided by Mageia."
+"then compare the result (you may have to wait for a while) with the ISO "
+"checksum provided by Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:237
+#: en/SelectAndUseISOs2.xml:270
 msgid "Burn or dump the ISO"
 msgstr "Wypal lub zrzuć obraz ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:238
+#: en/SelectAndUseISOs2.xml:271
 msgid ""
-"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."
+"The verified ISO can now be burned to a CD/DVD or <quote>dumped</quote> 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:242
+#: en/SelectAndUseISOs2.xml:275
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Wypalenie obrazu ISO na CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:243
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
-"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. See "
-"<link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the "
-"Mageia wiki</link> for more information."
+"Whichever software you use, ensure that the option to burn an<emphasis> "
+"image</emphasis> is used. Burn <emphasis>data</emphasis> or <emphasis>files</"
+"emphasis> is NOT correct. See the <link ns4:href=\"https://wiki.mageia.org/"
+"en/Writing_CD_and_DVD_images\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:282
 msgid "Dump the ISO to a USB stick"
 msgstr "Zrzuć obraz ISO na pamięci USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:283
 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."
+"All Mageia ISOs are hybrids, which means you can dump them to a USB stick "
+"and then use that to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:286
 msgid ""
-"\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any existing data will be lost and the partition capacity "
-"will be reduced to the image size."
+"Dumping an image onto a flash device destroys any previous file-system on "
+"the device and all existing data will be lost."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:256
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:290
+msgid ""
+"Also, the only partition on the flash device will then just be the Mageia "
+"ISO partition."
+msgstr ""
+
+#. type: Content of: <section><section><section><note><para>
+#: en/SelectAndUseISOs2.xml:292
 msgid ""
-"To recover the original capacity, you must redo partitioning and re-format "
-"the USB stick."
+"So, if an ISO of about 4GB is written to an 8GB USB stick, the stick will "
+"then only show up as 4GB. This is because the remaining 4GB is no longer "
+"formatted - hence not currently available for use. To recover the original "
+"capacity, you must reformat and repartition the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:259
+#: en/SelectAndUseISOs2.xml:299
 msgid "Using a graphical tool within Mageia"
 msgstr "Używanie graficznych narzędzi w Magei"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#: en/SelectAndUseISOs2.xml:300
 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:263
+#: en/SelectAndUseISOs2.xml:303
 msgid "Using a graphical tool within Windows"
 msgstr "Używanie graficznych narzędzi w Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:304
 msgid "You could try:"
 msgstr "Powinieneś spróbować:"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:267
+#: en/SelectAndUseISOs2.xml:307
 msgid ""
 "<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
-"\"ISO image\" option;"
+"\"ISO image\" option"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:271
+#: en/SelectAndUseISOs2.xml:311
 msgid ""
 "<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:277
-msgid "Using Command line within a GNU/Linux system"
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "Using the Command line within a GNU/Linux system"
 msgstr "Użycie linii poleceń w systemie GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:279
+#: en/SelectAndUseISOs2.xml:319
 msgid ""
 "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:285
+#: en/SelectAndUseISOs2.xml:325
 msgid "Open a console"
 msgstr "Otwórz konsolę"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:288
+#: en/SelectAndUseISOs2.xml:328
 msgid ""
-"Become a root (Administrator) user with the command <userinput>su -</"
-"userinput> (don't forget the final '-' )"
+"Become a <emphasis>root</emphasis> (Administrator) user with the command "
+"<command>su -</command> (don't forget the <command>-</command> )"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
-msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:332
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Root.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:297
+#: en/SelectAndUseISOs2.xml:338
 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)"
+"Plug in your USB stick - but 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:302
-msgid "Enter the command <userinput>fdisk -l</userinput>"
+#: en/SelectAndUseISOs2.xml:343
+#, fuzzy
+msgid "Enter the command <command>fdisk -l</command>"
 msgstr "Wpisz polecenie <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
-msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+#: en/SelectAndUseISOs2.xml:345
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata align=\"center\" fileref=\"Fdisk.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:310
+#: en/SelectAndUseISOs2.xml:351
 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."
+"Find the device name for your USB stick (by its size), for example "
+"<filename>/dev/sdb</filename> in the screenshot above, is an 8GB USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:312
+#: en/SelectAndUseISOs2.xml:354
 msgid ""
-"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 that its size is 2GB:"
+"Alternatively, you can find the device name with the command <command>dmesg</"
+"command>. Towards the end of the following example, you can see the device "
+"name starting with <filename>sd</filename>, and in this case, <filename>sdd</"
+"filename> is the actual device. You can also see that its size is 2GB:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3644,52 +3889,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:317
+#: en/SelectAndUseISOs2.xml:360
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:337
+#: en/SelectAndUseISOs2.xml:380
 #, fuzzy
 msgid ""
-"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
-"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
+"Enter the command: <command>dd if=path/to/the/ISO/file of=/dev/"
+"sd<replaceable>X</replaceable> bs=1M</command>"
 msgstr ""
 "Wpisz polecenie: # <userinput>dd if=ścieżka/do/obrazu/ISO.iso of=/dev/sdX "
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:340
+#: en/SelectAndUseISOs2.xml:382
 #, fuzzy
-msgid "Where X=your device name eg: /dev/sdd"
+msgid ""
+"Where <replaceable>X</replaceable>=your device name eg: <filename>/dev/sdd</"
+"filename>"
 msgstr "Gdzie X=twoje urządzenie nazwane np. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:341
+#: en/SelectAndUseISOs2.xml:384
 #, fuzzy
 msgid ""
-"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
-"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+"Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/"
+"sdd bs=1M</literal>"
 msgstr ""
 "Przykład: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:388
 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"
+"It might be 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:349
-msgid "Enter the command: # <userinput>sync</userinput>"
+#: en/SelectAndUseISOs2.xml:392
+#, fuzzy
+msgid "Enter the command: <command>sync</command>"
 msgstr "Wpisz polecenie: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:395
 msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
@@ -3699,50 +3948,51 @@ msgid "Select your Country / Region"
 msgstr "Wybierz twój Kraj / Region"
 
 #.  Lebarhon 2016 12 16 updated for Mageia 6
+#. 2018/02/13 apb: Minor wording + typography.
+#. 2018/02/25 apb: a) add xreflabel to this section. b) make some text bulleted.
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:9
+#: en/selectCountry.xml:13
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
 "\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:14
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:20
 msgid ""
-"Select your country or region.  This is important for all kinds of settings, "
+"Select your country or region. This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
-"can lead to not being able to use a Wireless network."
+"can lead to being unable to use a Wireless network."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectCountry.xml:27
 #, fuzzy
 msgid ""
-"If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> option and choose your country / region there."
+"If your country isn't in the list, click the <emphasis>Other Countries</"
+"emphasis> option and choose your country / region there."
 msgstr ""
 "Jeśli twoja klawiatura nie znajduje się na pokazanej liście, kliknij na "
 "<guibutton>More</guibutton>, aby zobaczyć pełną listę i wybrać z niej swoją "
 "klawiaturę."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:34
 msgid ""
-"If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"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."
+"If your country is only in the <emphasis>Other Countries</emphasis> list, "
+"after clicking <emphasis>OK</emphasis> it may seem that a country from the "
+"main list was chosen. Despite this, DrakX will actually apply your choice."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:33
+#: en/selectCountry.xml:42
 msgid "Input method"
 msgstr "Metoda wejścia"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:36
+#: en/selectCountry.xml:45
 msgid ""
-"In the <guilabel>Other Countries</guilabel> screen you can also select an "
+"In the <emphasis>Other Countries</emphasis> 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. "
@@ -3751,63 +4001,68 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:45
+#: en/selectCountry.xml:54
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"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."
+"post-install via <menuchoice> <guimenu>Configure your Computer</guimenu> "
+"<guimenuitem>System</guimenuitem> </menuchoice>, or by running "
+"<command>localedrake</command> as <emphasis>root</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:14
+#: en/selectInstallClass.xml:29
 msgid "Install or Upgrade"
 msgstr "Instalacja czy uaktualnienie"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:18
+#: en/selectInstallClass.xml:33
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
-"selectInstallClass.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass."
+"png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:25
-msgid "Install"
-msgstr "Zainstaluj"
+#: en/selectInstallClass.xml:41
+#, fuzzy
+msgid "<emphasis role=\"bold\">Install</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:27
+#: en/selectInstallClass.xml:43
 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."
+"Use this option to perform a fresh installation of Mageia. This will format "
+"the <literal>root</literal> partition (<filename>/</filename>), but can "
+"preserve a pre-existing <filename>/home</filename> partition (a dedicated /"
+"home partition, rather than being incorporated within the root (/) partition "
+"itself)."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:33
-msgid "Upgrade"
-msgstr "Uaktualnienie"
+#: en/selectInstallClass.xml:50
+#, fuzzy
+msgid "<emphasis role=\"bold\">Upgrade</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:35
-msgid ""
-"This can be used to upgrade an existing installation of <application>Mageia</"
-"application>."
+#: en/selectInstallClass.xml:52
+#, fuzzy
+msgid "Use this option to upgrade an existing installation of Mageia."
 msgstr ""
+"Użyj tej opcji dla świeżej instalacji <application>Mageia</application>."
 
-#. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:39
+#. type: Content of: <section><important><para>
+#: en/selectInstallClass.xml:58
 #, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
-"supported</emphasis> when this installer's version was released, has been "
+"supported</emphasis> when this Installer's version was released, has been "
 "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."
+"its <quote>End Of Life</quote> then it is better to do a <quote>clean</"
+"quote> install instead, while preserving your <filename>/home</filename> "
+"partition."
 msgstr ""
 "Tylko uaktualnienie z poprzedniej wersji Magei, która była <emphasis>nadal "
 "wspierana</emphasis>, w momencie ukazania się wersji którą chcesz "
@@ -3815,37 +4070,15 @@ msgstr ""
 "starszą wersję Magei, zalecamy przeprowadzenie świeżej instalacji bez "
 "formatowania partycji <literal>/home</literal>."
 
-#. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:50
-#, fuzzy
-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, 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 ""
-"Jeśli podczas instalacji zdecydujesz się ją przerwać, jest taka możliwość, "
-"należy to jednak dobrze przemyśleć. Gdy są już sformatowane partycje lub gdy "
-"zaczęły już się instalować pakiety, twój komputer nie jest już w takim samym "
-"stanie jak przed instalacją, ponowne uruchomienie go w tej chwili może "
-"spowodować, że system będzie nieużywalny. Jeśli jesteś pewien, że przerwanie "
-"instalacji to dobry pomysł, przejdź do terminala za pomocą <guilabel>Alt "
-"Ctrl F2</guilabel>. Następnie wciśnij <guilabel>Alt Ctrl Delete</guilabel>, "
-"aby zrestartować komputer."
-
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:62
+#: en/selectInstallClass.xml:67
 #, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"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."
+"can return from the <emphasis>Install or Upgrade</emphasis> screen to the "
+"language choice screen by pressing <keycombo> <keycap>Ctrl</keycap> "
+"<keycap>Alt</keycap> <keycap>Home</keycap> </keycombo>. Do<emphasis role="
+"\"bold\"> NOT</emphasis> do this later in the install."
 msgstr ""
 "Jeśli zorientujesz się, że zapomniałeś wybrać dodatkowy język, możesz cofnąć "
 "się  z ekranu \"Instalacja/Uaktualnienie do ekranu wyboru języka za pomocą "
@@ -3853,36 +4086,41 @@ msgstr ""
 "podczas dalszych etapów instalacji."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboardLive.xml:3
-msgid "Select keyboard"
+#: en/selectKeyboardLive.xml:14
+#, fuzzy
+msgid "Select Keyboard"
 msgstr "Wybierz klawiaturę"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboardLive.xml:7
+#: en/selectKeyboardLive.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-selectKeyboard.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"selectKeyboardLive-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/selectKeyboardLive.xml:24
+msgid "Here you can set the keyboard layout you wish to use with Mageia​​."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectKeyboardLive.xml:12
+#: en/selectKeyboardLive.xml:27
 msgid ""
-"You will be required to set the keyboard layout you wish to use in Mageia​​. "
-"The default one is selected according to your language and timezone "
-"previously selected."
+"A suggested keyboard layout (highlighted), has been chosen for you based "
+"upon your previously selected language and timezone choices."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:7
+#: en/selectKeyboard.xml:20
 msgid "Keyboard"
 msgstr "Klawiatura"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:10
+#: en/selectKeyboard.xml:23
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -3892,17 +4130,17 @@ msgstr ""
 "klawiatury US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:15
+#: en/selectKeyboard.xml:28
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/"
 "> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:35
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3919,28 +4157,28 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:31
+#: en/selectKeyboard.xml:45
 #, fuzzy
 msgid ""
-"If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a fuller list, and select your keyboard there."
+"If your keyboard isn't in the list shown, click on <emphasis>More</emphasis> "
+"to get a fuller list, and select your keyboard there."
 msgstr ""
 "Jeśli twoja klawiatura nie znajduje się na pokazanej liście, kliknij na "
 "<guibutton>More</guibutton>, aby zobaczyć pełną listę i wybrać z niej swoją "
 "klawiaturę."
 
-#. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:36
+#. type: Content of: <section><itemizedlist><listitem><para><note><para>
+#: en/selectKeyboard.xml:50
 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 and "
-"continue the installation: the keyboard chosen from the full list will be "
-"applied."
+"After choosing a keyboard from the <emphasis>More</emphasis> dialogue, "
+"you'll return to the first keyboard choice dialogue and it will seem as "
+"though 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:46
+#: en/selectKeyboard.xml:60
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialogue screen asking how you would prefer to switch between the "
@@ -3948,39 +4186,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:34
 msgid "Please choose a language to use"
 msgstr "Wybór języka"
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:39
+#, fuzzy
 msgid ""
 "Select your preferred language, by first expanding the list for your "
-"continent. <application>Mageia</application> will use this selection during "
-"the installation and for your installed system."
+"continent. Mageia will use this selection during the installation and for "
+"your installed system."
 msgstr ""
 "Wybierz preferowany język, najpierw rozwijając listę dla swojego kontynentu. "
 "<application>Mageia</application> będzie używać wybranego języka zarówno "
 "podczas instalacji jak i w zainstalowanym systemie."
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:23
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:45
 #, fuzzy
 msgid ""
-"Select your preferred language.  <application>Mageia</application> 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."
 msgstr ""
 "Wybierz preferowany język, najpierw rozwijając listę dla swojego kontynentu. "
 "<application>Mageia</application> będzie używać wybranego języka zarówno "
 "podczas instalacji jak i w zainstalowanym systemie."
 
-#. type: Content of: <section><para>
-#: en/selectLanguage.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/selectLanguage.xml:50
 #, fuzzy
 msgid ""
 "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 "
+"installed on your system, then you should use the <emphasis>Multiple "
+"languages</emphasis> option to add them now. It will be difficult to add "
 "extra language support after installation."
 msgstr ""
 "Jeśli potrzebujesz mieć kilka języków zainstalowanych w systemie, dla siebie "
@@ -3988,69 +4227,69 @@ msgstr ""
 "guibutton> aby je teraz dodać.  "
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:58
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-language.png"
+"\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:43
+#. type: Content of: <section><important><para>
+#: en/selectLanguage.xml:68
 #, fuzzy
 msgid ""
 "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."
+"preferred language from the main list of languages. It will also be marked "
+"as chosen in the <emphasis>Multiple languages</emphasis> screen."
 msgstr ""
 "Nawet jeśli chcesz zainstalować więcej niż jeden język, musisz najpierw "
 "wybrać jeden z nich jako domyślny w głównym oknie wyboru języka. Będzie on "
 "również zaznaczony jako domyślny w oknie wyboru wielu języków."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:76
+#, fuzzy
 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."
+"it is advisable to install the required language for your keyboard as well"
 msgstr ""
 "Jeśli język twojej klawiatury nie jest taki sam jak język, który wybierasz "
 "jako domyślny, należy zainstalować także język odpowiedni do twojej "
 "klawiatury."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:56
-msgid "Mageia uses UTF-8 (Unicode) support by default."
-msgstr "Mageia używa wsparcia UTF-8 (Unicode) domyślnie."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:58
+#: en/selectLanguage.xml:82
 #, fuzzy
 msgid ""
-"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."
+"Mageia uses UTF-8 (Unicode) support by default. This may be disabled in the "
+"<emphasis>Multiple languages</emphasis> screen if you know that it is "
+"inappropriate for your language. Disabling UTF-8 applies to all installed "
+"languages."
 msgstr ""
 "Jeśli wiesz, że to kodowanie nie jest odpowiednie dla twojego języka, możesz "
 "wyłączyć wsparcie dla UTF-8 w oknie \"więcej języków\". Będzie to dotyczyć "
 "wszystkich zainstalowanych języków."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:64
+#: en/selectLanguage.xml:89
+#, fuzzy
 msgid ""
-"You can change the language of your system after installation in the Mageia "
-"Control Center -> System -> Manage localization for your system."
+"You can change the language for your system post-installation in the "
+"<menuchoice> <guimenu>Mageia Control Center</guimenu> <guimenuitem>System</"
+"guimenuitem> <guimenuitem>localization for your system</guimenuitem> </"
+"menuchoice>."
 msgstr ""
 "Po instalacji możesz zmienic domyslny język uzywany w systemie za pomocą "
 "Centrum Sterowania Mageia -> System -> Zarządzanie lokalizacją systemu"
 
 #. type: Content of: <section><info><title>
-#: en/selectMouse.xml:4
+#: en/selectMouse.xml:10
 msgid "Select mouse"
 msgstr "Wybierz mysz"
 
@@ -4058,17 +4297,19 @@ msgstr "Wybierz mysz"
 #.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
 #.  marja 2012-04-24 adding screenshot 
+#. 2018/02/15 apb: Text and typography.
 #. type: Content of: <section><mediaobject>
-#: en/selectMouse.xml:16
+#: en/selectMouse.xml:24
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectMouse.png\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:23
+#: en/selectMouse.xml:29
 msgid ""
 "If you are not happy with how your mouse responds, you can select a "
 "different one here."
@@ -4077,21 +4318,22 @@ msgstr ""
 "tutaj."
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:25
+#: en/selectMouse.xml:32
 msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
-"guilabel> is a good choice."
+"Usually, <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Any PS/2 and "
+"USB mice</guimenuitem> </menuchoice> is a good choice."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectMouse.xml:27
+#: en/selectMouse.xml:38
 msgid ""
-"Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
-"configure the buttons that do not work on a mouse with six or more buttons."
+"Select <menuchoice> <guimenu>Universal</guimenu> <guimenuitem>Force edev</"
+"guimenuitem> </menuchoice> to configure the buttons that do not work on a "
+"mouse with six or more buttons."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Dodaj lub zmodyfikuj wpis Boot Menu"
 
@@ -4111,142 +4353,238 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
+#: en/setupBootloader.xml:10
+#, fuzzy
+msgid "Bootloader"
 msgstr "Podstawowe opcje programu rozruchowego"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:10
-msgid "Bootloader interface"
+#: en/setupBootloader.xml:13
+msgid "Grub2"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:11
-msgid "By default, Mageia uses exclusively:"
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:15
+msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:14
+#: en/setupBootloader.xml:17
 msgid ""
-"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) will be used exclusively as the "
+"bootloader for a Legacy/MBR or Legacy/GPT system."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:18
-msgid "GRUB2-efi for a UEFI system."
+#: en/setupBootloader.xml:21
+msgid ""
+"By default, a new bootloader will be written into either the MBR (Master "
+"Boot Record) of your first hard drive or in the BIOS boot partition."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:22
+#. type: Content of: <section><section><itemizedlist><title>
+#: en/setupBootloader.xml:27
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:29
+msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:33
+msgid ""
+"By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
+"System Partition)."
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:35
+msgid ""
+"If there are already UEFI-based operating systems installed on your computer "
+"(Windows 8 for example), the Mageia installer will detect the existing ESP "
+"created by Windows and add grub2-efi to it. If no ESP exists, then one will "
+"be created. Although it is possible to have several ESPs, only one is "
+"required, whatever the number of operating systems you have."
+msgstr ""
+
+#. type: Content of: <section><section><info><title>
+#: en/setupBootloader.xml:46
 #, fuzzy
-msgid "The Mageia graphical menus are nice :)"
-msgstr "Graficzne menu Magei są niezłe:"
+msgid "Bootloader Setup"
+msgstr "Podstawowe opcje programu rozruchowego"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:25
-msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
-msgstr ""
+#: en/setupBootloader.xml:49
+msgid "Bootloader main options"
+msgstr "Podstawowe opcje programu rozruchowego"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
-"setupBootloader.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader.png\" xml:id=\"setupBootloader-"
+"im1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:62
 #, fuzzy
+msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:63
 msgid ""
-"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
-"really know what you are doing."
-msgstr "Nie modyfikuj \"Boot Device\", chyba że masz pojęcie, co robisz."
+"This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
+"systems will not see this option here."
+msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:38
-msgid "GRUB2-efi on UEFI systems"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:67
+#, fuzzy
+msgid "<emphasis role=\"bold\">Boot device</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:68
+#, fuzzy
+msgid "Don't change this unless you really know what you are doing"
+msgstr "Zmień to tylko i wyłącznie wtedy, kiedy wiesz co robisz."
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:72
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:74
+msgid ""
+"This text box lets you set a delay, in seconds, before the default operating "
+"system is started up."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:39
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:78
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:79
 msgid ""
-"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."
+"This allows you to set a password for the bootloader. This means a username "
+"and password will be required when booting in order to select a booting "
+"entry or change settings. This is optional, and most people are not likely "
+"to have a need for it. The username is <literal>root</literal> and the "
+"password is the one chosen hereafter."
 msgstr ""
 
-#. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:42
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:88
+msgid "Choose a password for the bootloader (optional)"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:91
+#, fuzzy
+msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:92
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
-"imageobject>"
+"Retype the password and DrakX will check that it matches with the one set "
+"above"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<guilabel>Hasło (powtórnie)</guilabel>: Wpisz powtórnie hasło użytkownika w "
+"tym polu, instalator sprawdzi czy hasła się zgadzają."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#, fuzzy
+msgid "<emphasis>Advanced</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:99
+#, fuzzy
+msgid "<emphasis>Enable ACPI</emphasis>"
+msgstr "<emphasis>Własny</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:100
 msgid ""
-"If Mageia is the only system installed on your computer, the installer "
-"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 required (and advised), whatever the number of "
-"operating systems you have."
+"ACPI (Advanced Configuration and Power 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><title>
-#: en/setupBootloader.xml:61
-msgid "Using a Mageia bootloader"
-msgstr "Używanie bootloader'a Magei"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:108
+#, fuzzy
+msgid "<emphasis>Enable SMP</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:62
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:109
 msgid ""
-"By default, and according to your system, Mageia writes one of the following:"
+"This option enables/disables symmetric multiprocessing for multi-core "
+"processors"
 msgstr ""
 
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:66
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:113
+#, fuzzy
+msgid "<emphasis>Enable APIC</emphasis>"
+msgstr "<emphasis>Własny</emphasis>"
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:114
 msgid ""
-"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
-"hard drive or in the BIOS boot partition."
+"Enabling 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><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:70
-msgid "a GRUB2-efi bootloader into the ESP"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
+#, fuzzy
+msgid "<emphasis>Enable Local APIC</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:73
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:121
 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 untick the <emphasis role="
-"\"bold\">Probe Foreign OS</emphasis> option."
+"Here you can set Local APIC, which manages all external interrupts for a "
+"specific processor in an SMP system"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:78
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:127
+#, fuzzy
+msgid "Bootloader Configuration"
+msgstr "Konfiguracja dźwięku"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:129
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4254,183 +4592,149 @@ msgstr ""
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:87
-msgid "Using an existing bootloader"
-msgstr "Użyj istniejącego bootloader'a."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:139
+#, fuzzy
+msgid "<emphasis role=\"bold\">Default</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:88
-msgid ""
-"The exact procedure for adding your Mageia system to an existing bootloader "
-"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."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:140
+msgid "The operating system to started up by default"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:95
-msgid "Using chain loading"
-msgstr ""
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:143
+#, fuzzy
+msgid "<emphasis role=\"bold\">Append</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:96
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:144
 msgid ""
-"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 tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"This option lets you pass information to the kernel or tell the kernel to "
+"give you more information as it boots"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:101
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:148
 #, fuzzy
-msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:108
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:149
 msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking "
-"<guibutton>OK</guibutton>."
+"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, "
+"then untick the Probe Foreign OS option."
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:111
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:156
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-setupBootloader4.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:117
-msgid "Options"
-msgstr "Opcje"
-
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:119
-msgid "First page"
-msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
-msgid ""
-"<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><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:166
+#, fuzzy
+msgid "<emphasis>Video mode</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:122
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:167
 msgid ""
-"<guilabel>Security</guilabel>: This allows you to set a password for the "
-"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:125
-msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
+"This sets the screen size and colour depth 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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:172
 #, fuzzy
-msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
-"check that it matches with the one above."
-msgstr ""
-"<guilabel>Hasło (powtórnie)</guilabel>: Wpisz powtórnie hasło użytkownika w "
-"tym polu, instalator sprawdzi czy hasła się zgadzają."
+msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: 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:127
-msgid ""
-"<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"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:133
+#: en/setupBootloader.xml:173
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
-"multiprocessing for multi core processors."
+"Select this option if you don't want a bootable Mageia, but would rather "
+"chain-load it from another OS. You will get a warning that the bootloader is "
+"missing. Click<emphasis> Ok</emphasis> if you are sure you understand the "
+"implications, and wish to proceed."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:135
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:181
+#, fuzzy
 msgid ""
-"<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."
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:138
-msgid ""
-"<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><title>
+#: en/setupBootloader.xml:188
+#, fuzzy
+msgid "Other Options"
+msgstr "Opcje"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:143
-msgid "Next page"
-msgstr ""
-
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:146
-msgid "<guilabel>Default:</guilabel> Operating system started up by default"
-msgstr ""
+#: en/setupBootloader.xml:190
+msgid "Using an existing bootloader"
+msgstr "Użyj istniejącego bootloader'a."
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:150
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:191
 msgid ""
-"<guilabel>Append:</guilabel> This option lets you pass the kernel "
-"information or tell the kernel to give you more information as it boots."
+"The exact procedure for adding Mageia to an existing bootloader is beyond "
+"the scope of this documentation. However in most cases it will involve "
+"running the relevant bootloader installation program, which should detect "
+"Mageia and automatically add an entry for it in the bootloader menu. See the "
+"documentation for the relevant operating system."
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:155
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:199
+#, fuzzy
+msgid "Installing Without a Bootloader"
+msgstr "Używanie bootloader'a Magei"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:200
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
-"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"While you can opt to install Mageia without a bootloader (see section 2.1 "
+"Advanced), this is not recommended unless you absolutely know what you are "
+"doing, as without some form of bootloader your operating system will be "
+"unable to start."
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:159
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:207
 msgid ""
-"<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"to be used by the boot menu. If you click the down triangle you will be "
-"offered other size and colour depth options."
+"To do this you need to manually edit <filename>/boot/grub2/custom.cfg</"
+"filename> or use the software <application>grub-customizer</application> "
+"tool instead (available in the Mageia repositories)."
 msgstr ""
 
-#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. type: Content of: <section><section><section><note><para>
+#: en/setupBootloader.xml:212
 msgid ""
-"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
-"linkend=\"setupChainLoading\">Using the chain loading</link>"
+"For more information, see: <link ns4: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/setupSCSI.xml:3
+#: en/setupSCSI.xml:10
 msgid "Setup SCSI"
 msgstr "Wykrywanie SCSI"
 
@@ -4442,18 +4746,20 @@ msgstr "Wykrywanie SCSI"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
+#. 2018/02/15 apb: Text and typography.
+#. 2018/0217 apb: Merge 2nd/3rd paras and reword.
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:22
+#: en/setupSCSI.xml:33
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
-"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:27
+#: en/setupSCSI.xml:39
 #, fuzzy
 msgid ""
 "DrakX will normally detect hard disks correctly. However, with some older "
@@ -4465,82 +4771,60 @@ msgstr ""
 "odpowiedniego sterownika i w efekcie nie rozpoznać dysku."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:44
 #, fuzzy
 msgid ""
-"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
-"you have."
+"If your device is not recognised, you will need to manually tell DrakX which "
+"SCSI drive(s) you have. DrakX should then be able to configure the drive(s) "
+"correctly."
 msgstr ""
 "Jeśli zaistnieje taka sytuacja,  zostaniesz poproszony, aby ręcznie wskazać, "
 "który dysk SCSI posiadasz."
 
-#. type: Content of: <section><para>
-#: en/setupSCSI.xml:35
-msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "DrakX powinien być wtedy w stanie odpowiednio skonfigurować  dysk(i)."
-
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:3
+#: en/soundConfig.xml:10
 msgid "Sound Configuration"
 msgstr "Konfiguracja dźwięku"
 
 #.  Lebarhon 20170209 updated SC
+#. 2018/02/13 apb: Text and typography.
+#. 2018/02/17 apb: Centre-align PNG
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:9
-msgid ""
-"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
-"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/soundConfig.xml:14
+#: en/soundConfig.xml:20
+#, fuzzy
 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 one exists."
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-soundConfig.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"soundConfig-im1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:18
+#: en/soundConfig.xml:26
 msgid ""
-"The default driver should work without problems. However, if after install "
-"you do encounter problems, then run <command>draksound</command> or start "
-"this tool via MCC (Mageia Control Center), by choosing the "
-"<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
-"Configuration</guilabel> at the top right of the screen."
+"This screen shows the details of the sound card driver chosen for you by the "
+"installer, and this driver should work without problems."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:24
+#: en/soundConfig.xml:29
 msgid ""
-"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."
+"However, if you encounter any issues post-install, then run "
+"<command>draksound</command> or start this tool via <menuchoice> "
+"<guimenu>Mageia Control Center</guimenu> <guimenuitem>Hardware</guimenuitem> "
+"<guimenuitem>Sound Configuration</guimenuitem> </menuchoice>. Then, in the "
+"<literal>draksound</literal> or <emphasis>Sound Configuration</emphasis> "
+"screen, click on <emphasis>Troubleshooting</emphasis> to find useful advice "
+"about how to solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:30
+#: en/soundConfig.xml:43
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#. type: Content of: <section><section><para>
-#: en/soundConfig.xml:33
-msgid ""
-"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:38
-msgid ""
-"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:3
+#: en/takeOverHdConfirm.xml:10
 msgid "Confirm hard disk to be formatted"
 msgstr "Formatowanie twardego dysku"
 
@@ -4550,126 +4834,143 @@ msgstr "Formatowanie twardego dysku"
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
+#. 2018/02/15 apb: Text and typography
+#. 2018/02/20 apb: Change the 2 paras to itemized listitems.
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:18
+#: en/takeOverHdConfirm.xml:29
 #, fuzzy
 msgid ""
-"<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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-"
+"takeOverHdConfirm.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:27
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:42
 #, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
+"Click on <emphasis>Previous</emphasis> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Kliknij <guibutton>Wstecz</guibutton> jeśli nie jesteś pewien swojego wyboru."
 
-#. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:31
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/takeOverHdConfirm.xml:48
 #, fuzzy
 msgid ""
-"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."
+"Click on <emphasis>Next</emphasis> to proceed if you are sure that it is OK "
+"to erase <emphasis role=\"bold\">every</emphasis> partition, <emphasis role="
+"\"bold\">every</emphasis> operating system and <emphasis role=\"bold\">all "
+"data</emphasis> that might be on that hard disk."
 msgstr ""
 "Kliknij <guibutton>Dalej</guibutton> jeśli jesteś pewien że chcesz wymazać "
 "każdą partycję, każdy system operacyjny oraz wszystkie dane z twardego dysku."
 
 #. type: Content of: <section><info><title>
-#: en/testing.xml:9
+#: en/testing.xml:3
 msgid "Testing Mageia as Live system"
 msgstr "Testowanie Magei w systemie Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/testing.xml:14
+#: en/testing.xml:8
 msgid "Live mode"
 msgstr "Tryb Live"
 
+#. type: Content of: <section><section><para>
+#: en/testing.xml:11
+msgid ""
+"This is the screen you will see if you selected the <emphasis role=\"bold"
+"\">Boot Mageia </emphasis>option from the Live media menu."
+msgstr ""
+
 #. type: Content of: <section><section><mediaobject>
-#: en/testing.xml:18
+#: en/testing.xml:14
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/testing.xml:23
-msgid ""
-"You get this screen if you selected \"Boot Mageia\". If not, you get the "
-"\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
-msgstr ""
-
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:28
+#: en/testing.xml:21
 msgid "Testing hardware"
 msgstr "Testowanie sprzętu"
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:31
+#: en/testing.xml:24
 msgid ""
-"One of the Live mode goals is to test if the hardware is correctly managed "
-"by Mageia. You can check if all devices have a driver in the Hardware "
-"section of the Mageia Control Center. You can test the most current devices:"
+"One of the aims of using the Live mode is to test that your hardware is "
+"correctly managed by Mageia. You can check if all devices have a driver in "
+"the Hardware section of the Mageia Control Center:"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:38
+#: en/testing.xml:31
 msgid "network interface: configure it with net_applet"
 msgstr "interfejs sieciowy: skonfiguruj za pomocą net_applet"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:42
-msgid "graphical card: if you see the previous screen, it's already OK."
+#: en/testing.xml:35
+#, fuzzy
+msgid "graphics card: if you see the previous screen, it's already OK."
 msgstr "karta graficzna: jeżeli widzisz poprzedni ekran, wszystko jest OK"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:47
+#: en/testing.xml:40
 msgid "webcam:"
 msgstr "kamera internetowa:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:51
+#: en/testing.xml:44
 msgid "sound: a jingle has already been played"
 msgstr "dźwięk: dżingiel został już odtworzony"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:55
-msgid "printer: configure it and print a test page"
+#: en/testing.xml:48
+#, fuzzy
+msgid "printer: configure your printer/s and print a test page"
 msgstr "drukarka: skonfiguruj ją oraz wydrukuj stronę testową"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/testing.xml:59
+#: en/testing.xml:52
 msgid "scanner: scan a document from ..."
 msgstr "skaner: skanuj dokument z..."
 
 #. type: Content of: <section><section><section><para>
-#: en/testing.xml:63
+#: en/testing.xml:56
 msgid ""
-"If all is OK for you, you can process to the installation. If not, you can "
-"leave with the quit button."
+"If everything is satisfactory, you can proceed with the installation. If "
+"not, you can use the <emphasis>Quit</emphasis> button to exit."
 msgstr ""
 
-#. type: Content of: <section><section><section><remark>
-#: en/testing.xml:66
-msgid "The configuration settings you made here are kept for the installation."
+#. type: Content of: <section><section><section><note><para>
+#: en/testing.xml:61
+#, fuzzy
+msgid ""
+"The configuration settings you apply here are carried over if you decide to "
+"proceed with the installation."
 msgstr ""
 "Ustawienia konfiguracyjny, które dokonałeś tutaj pozostają dla instalacji."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/testing.xml:72
+#: en/testing.xml:68
 msgid "Launch installation"
 msgstr "Uruchom instalację"
 
+#. type: Content of: <section><section><section><para>
+#: en/testing.xml:71
+msgid ""
+"To launch the installation of the Live DVD to a hard disk or SSD drive, "
+"simply click the <emphasis>Install on Hard Disk</emphasis> icon on the Live "
+"desktop. You will then see this screen, followed by the <link linkend="
+"\"doPartitionDisks\">Partitioning</link> step."
+msgstr ""
+
 #. type: Content of: <section><section><section><mediaobject>
-#: en/testing.xml:76
+#: en/testing.xml:77
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
@@ -4677,22 +4978,13 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/testing.xml:81
-msgid ""
-"To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
-"SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
-"link> step\" as for the direct installation."
-msgstr ""
-
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:3
+#: en/uninstall-Mageia.xml:10
 msgid "Uninstalling Mageia"
 msgstr "Usuwanie Magei"
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:18
 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 "
@@ -4700,34 +4992,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:14
+#: en/uninstall-Mageia.xml:23
 msgid ""
-"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."
+"After backing up your data, reboot your Mageia installation DVD and select "
+"<emphasis>Rescue system</emphasis>, then <emphasis>Restore Windows boot "
+"loader</emphasis>. At the next boot, you will only have Windows, with no "
+"option to choose your Mageia operating system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:19
+#: en/uninstall-Mageia.xml:28
 msgid ""
-"In Windows to recover the space used by Mageia partitions: click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> 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."
+"In Windows, to recover the space used by Mageia partitions: click on "
+"<menuchoice> <guimenu>Start</guimenu> <guimenuitem>Control Panel</"
+"guimenuitem> <guimenuitem>Administrative Tools</guimenuitem> "
+"<guimenuitem>Computer Management</guimenuitem> <guimenuitem>Storage</"
+"guimenuitem> <guimenuitem>Disk Management</guimenuitem> </menuchoice>. You "
+"will recognise a Mageia partition because they are labeled <literal>Unknown</"
+"literal>, and also by their size and place on the disk. Right-click on each "
+"of these partitions and select <emphasis>Delete</emphasis> to free up the "
+"space."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:46
 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."
+"(FAT32 or NTFS). It will then get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/uninstall-Mageia.xml:30
+#: en/uninstall-Mageia.xml:49
 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 "
@@ -4737,30 +5032,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/unused.xml:9
+#: en/unused.xml:3
 msgid "Keep or delete unused material"
 msgstr "Zostaw lub usuń nieużywany materiał"
 
+#. 2018/03/03 apb: Adjusted text and updated SC's to Mga6.
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:13
+#: en/unused.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"unused-im1\" fileref=\"live-"
+"unused.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:19
+#: en/unused.xml:14
 msgid ""
 "In this step, the installer looks for unused locales packages and unused "
-"hardware packages. Then it proposes you to delete them. It is a good idea to "
-"accept, except if you prepare an installation which has to run on different "
-"hardware."
+"hardware packages and you are then given an opportunity to delete them."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:18
+msgid ""
+"If you do not foresee a case where your installation may need to run on "
+"different hardware, or that you might need additional localization files "
+"then you might wish to accept this proposal."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/unused.xml:22
+msgid ""
+"Clicking <emphasis>Advanced</emphasis> will list the unused hardware and "
+"localization files that will be removed if you proceed."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/unused.xml:25
+#: en/unused.xml:26
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
@@ -4769,12 +5079,506 @@ msgstr ""
 "> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/unused.xml:30
+#: en/unused.xml:31
 msgid ""
-"The next step is the copying of files on hard disk. This takes some minutes. "
-"At the end, you get a blank screen for some time, it's normal."
+"The next step is the copying of files to hard disk. This process should just "
+"take a little while to complete. When it is finising you will briefly get a "
+"blank screen - this is normal."
 msgstr ""
 
+#~ msgid "User and Superuser Management"
+#~ msgstr "Zarządzanie użytkownikami"
+
+#, fuzzy
+#~ msgid ""
+#~ "Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+#~ "(capacity, mount point, type).</emphasis>"
+#~ msgstr ""
+#~ "Każda partycja jest ukazana jako: \"Urządzenie\" (\"Pojemność\", \"Punkt "
+#~ "montowania\", \"Typ\")."
+
+#~ msgid "In advanced tab, you will find more options about clock settings."
+#~ msgstr ""
+#~ "W sekcji zaawansowane znajdziesz więcej opcji o ustawieniach zegara."
+
+#~ msgid "From a disc"
+#~ msgstr "Z płyty"
+
+#~ msgid ""
+#~ "You can boot directly from the media you used to burn your image (CD-ROM, "
+#~ "DVD-ROM...). You usually just need to insert it in your CD/DVD drive for "
+#~ "the bootloader to launch the installation automatically after rebooting "
+#~ "the computer. If that does not happen you may need to reconfigure your "
+#~ "BIOS or press one key that will offer you to choose the peripheral from "
+#~ "which the computer will boot."
+#~ msgstr ""
+#~ "Możesz uruchomić prosto z urządznia, którego użyłeś do wypalenia obrazu "
+#~ "(CD-ROM, DVD-ROM...). Zwykle musisz tylko włożyć płytę aby uruchomić "
+#~ "instalację automatycznie po zresetowaniu komputera. Jeżeli to nie "
+#~ "następuje musisz zmodyfikować ustawienia w BIOSie, lub kliknąć klawisz "
+#~ "pozwalajcy ci na wybór urządzenia, z którego komputer uruchomi się."
+
+#~ msgid ""
+#~ "According to which hardware you have, and how it is configured, you get "
+#~ "either one or another of the two screens below."
+#~ msgstr ""
+#~ "Odnosząc się do posiadanego przez ciebie sprzętu oraz tego, jak jest "
+#~ "skonfigurowany, otrzymasz pierwszy albo drugi z ekranów poniżej."
+
+#~ msgid "From a USB device"
+#~ msgstr "Z urządzenia USB"
+
+#~ msgid ""
+#~ "You can boot from the USB device on which you dumped your image ISO. "
+#~ "According to your BIOS settings, the computer boots perhaps directly on "
+#~ "the USB device already plugged in a port. If that does not happen you may "
+#~ "need to reconfigure your BIOS or press one key that will offer you to "
+#~ "choose the peripheral from which the computer will boot."
+#~ msgstr ""
+#~ "Możesz uruchomić z urządzenia USB, na który wypaliłeś obraz ISO. Odnosząc "
+#~ "się do twoich ustawień BIOS komputer może uruchomić się prosto z "
+#~ "urządzenia USB podłączonego do portu. Jeżeli to nie następuje powinieneś "
+#~ "zmodyfikować ustawienia w BIOS lub kliknąć klawisz pozwalający ci na "
+#~ "wybór urządzenia, z którego komputer się uruchomi."
+
+#~ msgid ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
+#~ msgid "In the middle menu, you have the choice between three actions:"
+#~ msgstr "W środkowym menu, masz wybór pomiędzy trzema akcjami:"
+
+#~ msgid ""
+#~ "Boot from hard disk: This choice allows to boot from hard disk, as usual, "
+#~ "when no media (CD/DVD or USB stick) is connected. (not working with "
+#~ "Mageia 5)."
+#~ msgstr ""
+#~ "Uruchomienie z dysku twardego: Ten wybór pozwoli ci uruchomić system z "
+#~ "dysku twardego, jak zwykle, gdy żadne media (CD/DVD lub urządzenie USB) "
+#~ "nie są podłączone. (nie działa z mageia 5)."
+
+#~ msgid "In the bottom menu, are the Boot Options:"
+#~ msgstr "W dolnym menu, są Opcje Bootowania:"
+
+#~ msgid ""
+#~ "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+#~ msgstr "F1 - Pomoc. Wyjaśnij opcje \"splash\", \"apm\", \"acpi\" i \"Ide\""
+
+#~ msgid "F2 - Language. Choose the display language of the screens."
+#~ msgstr "F2 - Język. Wybierz język wyświetlany na ekranach."
+
+#~ msgid ""
+#~ "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+#~ msgstr ""
+#~ "F3 - Rozdzielczość obrazu. Wybierz z pośród tekst, 640x400, 800x600, "
+#~ "1024x728"
+
+#~ msgid ""
+#~ "F5 - Driver. Yes or No. The system is aware about the presence of an "
+#~ "optional disk with a driver update and will require its insertion during "
+#~ "installation process."
+#~ msgstr ""
+#~ "F5 - Sterownik. Tak lub Nie. System jest świadomy dostępności dysku "
+#~ "opcjonalnego z aktualizacją sterownika i będzie wymagał jego zamontowania "
+#~ "podczas procesu instalacji."
+
+#~ msgid ""
+#~ "F6 - Kernel options. This is a way to specify options according to your "
+#~ "hardware and the drivers to use."
+#~ msgstr ""
+#~ "F6 - Opcje jądra. Jest to możliwość wybrania opcji według twojego sprzętu "
+#~ "oraz sterowniki do użycia."
+
+#~ msgid "First screen while booting on UEFI system from disk"
+#~ msgstr "Pierwszy ekran podczas uruchamiania w systemie UEFI z dysku"
+
+#~ msgid ""
+#~ "You have only the choice to run Mageia in Live mode (first choice)  or to "
+#~ "process the installation (second choice)."
+#~ msgstr ""
+#~ "Masz tylko opcje do uruchomienia Magei w trybie Live (pierwszy wybór), "
+#~ "lub proces instalacji (drugi wybór)."
+
+#~ msgid ""
+#~ "In each case, the first steps will be the same to choose language, "
+#~ "timezone and keyboard, then the processes differ, with <link linkend="
+#~ "\"testing\">additional steps in Live mode</link>."
+#~ msgstr ""
+#~ "W każdym przypadku, pierwsze kroki będą takie same aby wybrać język, "
+#~ "strefę czasową oraz klawiaturę, później proces różni się, z <link linkend="
+#~ "\"testing\"> dodatkowych kroków w trybie Live</link>."
+
+#, fuzzy
+#~ msgid ""
+#~ "Depending on your selection here, you may be offered further screens to "
+#~ "fine-tune your choice."
+#~ msgstr ""
+#~ "W zależności  od wyboru którego tutaj dokonasz, możesz zobaczyć dalsze "
+#~ "ekrany, aby dokonać dalszych ustawień instalacji."
+
+#, fuzzy
+#~ msgid "The settings DrakX chose are usually good."
+#~ msgstr "Ustawienia, które wybierze DrakX zwykle są dobre."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-"
+#~ "im1\" align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision="
+#~ "\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "Aby je zainstalować musi być włączone repozytorium Nonfree. Jeśli nie "
+#~ "włączono tego repozytorium wcześniej, należy je włączyć po ponownym "
+#~ "uruchomieniu komputera."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+#~ "fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#~ msgid ""
+#~ "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your "
+#~ "card from the list if needed."
+#~ msgstr ""
+#~ "<emphasis><guibutton>Karta graficzna</guibutton></emphasis>: Wybierz "
+#~ "swoją kartę graficzną z listy."
+
+#~ msgid "Incorrect refresh rates may damage your monitor"
+#~ msgstr "Niepoprawna wartość odświeżania może uszkodzić monitor"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+#~ "fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#~ msgid "<emphasis>Plug 'n Play</emphasis>"
+#~ msgstr "<emphasis>Plug 'n Play</emphasis>"
+
+#~ msgid "the monitor manufacturers name"
+#~ msgstr "nazwa producenta monitora"
+
+#~ msgid "the monitor description"
+#~ msgstr "Opis monitora"
+
+#~ msgid "Click <guibutton>Done</guibutton> when you're ready."
+#~ msgstr ""
+#~ "Jeśli wszystko zostało już ustawione kliknij <guibutton>Gotowe</"
+#~ "guibutton>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#~ msgid "Use Free Space"
+#~ msgstr "Wykorzystaj wolne miejsce"
+
+#~ msgid "Use Free Space on a Windows Partition"
+#~ msgstr "Wykorzystaj wolne miejsce na partycji Windows"
+
+#~ msgid ""
+#~ "If you have unused space on an existing Windows partition, the installer "
+#~ "may offer to use it."
+#~ msgstr ""
+#~ "Jeśli masz niewykorzystane miejsce na partycji Windows, instalator "
+#~ "zaproponuje, aby je wykorzystać."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#~ msgid "Erase and use Entire Disk."
+#~ msgstr "Wymaż i wykorzystaj cały dysk"
+
+#~ msgid ""
+#~ "Note! This will erase ALL data on the selected hard drive. Take care!"
+#~ msgstr "Zauważ! WSZYSTKIE dane z wybranego dysku zostaną wymazane. Uważaj!"
+
+#, fuzzy
+#~ msgid "Custom disk partitioning"
+#~ msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
+
+#, fuzzy
+#~ msgid ""
+#~ "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 ""
+#~ "Oznacza to, że z 160 GB lub więcej dostępnej przestrzeni instalator "
+#~ "utworzy trzy partycje: 50GB dla /, 4GB dla swap i całą resztę dla /home."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition="
+#~ "\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#~ msgid "January 2015"
+#~ msgstr "Styczeń 2015"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "Using a Mageia DVD"
+#~ msgstr "Używanie bootloader'a Magei"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use the arrow keys to select the language then press <emphasis role=\"bold"
+#~ "\">Enter</emphasis>."
+#~ msgstr "Użyj strzałek aby wybrać język i naciśnij ENTER."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid "Default: It doesn't alter anything in the default options."
+#~ msgstr "- Domyślne - nie zmienia żadnej z domyślnych opcji."
+
+#, fuzzy
+#~ msgid ""
+#~ "Safe Settings: Priority is given to the safer options at the price of a "
+#~ "performance detriment."
+#~ msgstr ""
+#~ "- Bezpieczne ustawienia - nadaje priorytet opcjom bezpiecznym kosztem "
+#~ "wydajności."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid "Media Selection (Nonfree)"
+#~ msgstr "Wybór nośników (Nonfree)"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" "
+#~ "align=\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#~ msgid "<guilabel>Timezone</guilabel>"
+#~ msgstr "<guilabel>Strefa czasowa</guilabel>"
+
+#~ msgid "<guilabel>Country / Region</guilabel>"
+#~ msgstr "<guilabel>Kraj / Region</guilabel>"
+
+#~ msgid "<guilabel>Bootloader</guilabel>"
+#~ msgstr "<guilabel>System rozruchowy</guilabel>"
+
+#~ msgid "<guilabel>Services</guilabel>:"
+#~ msgstr "<guilabel>Usługi</guilabel>:"
+
+#~ msgid "<guilabel>Keyboard</guilabel>:"
+#~ msgstr "<guilabel>Klawiatura</guilabel>:"
+
+#~ msgid "<guilabel>Mouse</guilabel>:"
+#~ msgstr "<guilabel>Mysz</guilabel>:"
+
+#~ msgid "<guilabel>Sound card</guilabel>:"
+#~ msgstr "<guilabel>Karta dźwiękowa</guilabel>:"
+
+#~ msgid "<guilabel>Network</guilabel>:"
+#~ msgstr "<guilabel>Sieć</guilabel>:"
+
+#~ msgid "<guilabel>Security Level</guilabel>:"
+#~ msgstr "<guilabel>Poziom Bezpieczeństwa</guilabel>:"
+
+#~ msgid "<guilabel>Firewall</guilabel>:"
+#~ msgstr "<guilabel>Firewall</guilabel>:"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" "
+#~ "align=\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref="
+#~ "\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#~ msgid "Install"
+#~ msgstr "Zainstaluj"
+
+#~ msgid "Upgrade"
+#~ msgstr "Uaktualnienie"
+
+#, fuzzy
+#~ 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, 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 ""
+#~ "Jeśli podczas instalacji zdecydujesz się ją przerwać, jest taka "
+#~ "możliwość, należy to jednak dobrze przemyśleć. Gdy są już sformatowane "
+#~ "partycje lub gdy zaczęły już się instalować pakiety, twój komputer nie "
+#~ "jest już w takim samym stanie jak przed instalacją, ponowne uruchomienie "
+#~ "go w tej chwili może spowodować, że system będzie nieużywalny. Jeśli "
+#~ "jesteś pewien, że przerwanie instalacji to dobry pomysł, przejdź do "
+#~ "terminala za pomocą <guilabel>Alt Ctrl F2</guilabel>. Następnie wciśnij "
+#~ "<guilabel>Alt Ctrl Delete</guilabel>, aby zrestartować komputer."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Mageia uses UTF-8 (Unicode) support by default."
+#~ msgstr "Mageia używa wsparcia UTF-8 (Unicode) domyślnie."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+#~ "format=\"PNG\" > </imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid "The Mageia graphical menus are nice :)"
+#~ msgstr "Graficzne menu Magei są niezłe:"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref="
+#~ "\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless "
+#~ "you really know what you are doing."
+#~ msgstr "Nie modyfikuj \"Boot Device\", chyba że masz pojęcie, co robisz."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+#~ "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+
+#~ msgid "DrakX should then be able to configure the drive(s) correctly."
+#~ msgstr ""
+#~ "DrakX powinien być wtedy w stanie odpowiednio skonfigurować  dysk(i)."
+
+#, fuzzy
+#~ msgid ""
+#~ "<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 ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
 #~ msgid "Additionally, you can disable or enable a guest account."
 #~ msgstr "Dodatkowo, możesz włączyć lub wyłączyć konto gościa"
 
@@ -4846,23 +5650,6 @@ msgstr ""
 #~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
 #~ "</imagedata> </imageobject>"
 
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
-#~ "\"configureX_monitor-im1\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
-#~ "\"configureX_monitor-im1\"/> </imageobject>"
-
-#~ 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 ""
-#~ "Dla każdego wykrytego dysku lub innego urządzenia, jak USB, prezentowana "
-#~ "jest oddzielna karta. Na przykład sda, sdb i sdc jeśli zostały wykryte "
-#~ "trzy urządzenia."
-
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
@@ -4936,15 +5723,6 @@ msgstr ""
 #~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
-#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
-#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
 #~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
 #~ "imagedata> </imageobject>"
@@ -4982,12 +5760,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #~ msgid ""
-#~ "Use this option for a fresh <application>Mageia</application> "
-#~ "installation."
-#~ msgstr ""
-#~ "Użyj tej opcji dla świeżej instalacji <application>Mageia</application>."
-
-#~ 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."
@@ -5020,9 +5792,6 @@ msgstr ""
 #~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
 #~ "> </imageobject>"
 
-#~ msgid "Custom"
-#~ msgstr "Własne"
-
 #~ msgid "DVD"
 #~ msgstr "DVD"