Update from Calenco

1 files changed, 110 insertions, 34 deletions

diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index 97057928..afd73bd6 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-04-28 08:48+0400\n"
-"PO-Revision-Date: 2013-04-28 08:51+0300\n"
+"POT-Creation-Date: 2013-05-06 09:50+0400\n"
+"PO-Revision-Date: 2013-05-06 09:51+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -707,20 +707,18 @@ msgstr ""
 "МБ оперативної пам’яті."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:22
+#: en/selectInstallClass.xml:23
 msgid "Install or Upgrade"
 msgstr "Встановлення або оновлення"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:26
+#: en/selectInstallClass.xml:27
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectinstallClass.png\" align="
-"\"center\" width=\"100%\" format=\"PNG\" depth=\"600\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" width=\"100%\" format=\"PNG\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectinstallClass.png\" align="
-"\"center\" width=\"100%\" format=\"PNG\" depth=\"600\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" width=\"100%\" format=\"PNG\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:34
@@ -870,8 +868,21 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Налаштування ваших служб"
 
+#.  2012-12-25 marja - moved this section out of misc-params.xml
+#.  2013-05-05 marja - added screenshot
+#. type: Content of: <section><mediaobject>
+#: en/configureServices.xml:21
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"configureServices-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"configureServices-im1\"></imagedata> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/configureServices.xml:19
+#: en/configureServices.xml:27
 msgid ""
 "Here you can set which services should (not) start when you boot your system."
 msgstr ""
@@ -879,7 +890,7 @@ msgstr ""
 "а які ні, під час завантаження вашої системи."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:22
+#: en/configureServices.xml:30
 msgid ""
 "There are four groups, click on the triangle before a group to expand it and "
 "see all services in it."
@@ -888,12 +899,12 @@ msgstr ""
 "натисніть кнопку з зображенням трикутника перед пунктом групи."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:26
+#: en/configureServices.xml:34
 msgid "The setting DrakX chose are usually good."
 msgstr "Зазвичай, потреби у зміні налаштувань, вибраних DrakX, немає."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:29
+#: en/configureServices.xml:37
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -902,7 +913,7 @@ msgstr ""
 "інформаційній панелі під списком."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:33
+#: en/configureServices.xml:41
 msgid "Only change things when you know very well what you are doing."
 msgstr "Вносьте зміни, лише якщо вам добре відомі наслідки ваших дій."
 
@@ -1016,8 +1027,23 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Підтвердження форматування жорсткого диска"
 
+#.  Made by marja on 2012 04 03
+#.  test comment - johnr
+#.  2012-04-24 marja - replaced "if you are not sure you selected the correct
+#.     hard disk." with "if you are not sure about your choice", because I'm sure I
+#.     saw this help screen when I had only one HD
+#.  2013-05-05 marja added screenshot
+#. type: Content of: <section><mediaobject>
+#: en/takeOverHdConfirm.xml:19
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
+"\" align=\"center\" width=\"800\" depth=\"600\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG"
+"\" align=\"center\" width=\"800\" depth=\"600\"></imagedata> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:18
+#: en/takeOverHdConfirm.xml:24
 msgid ""
 "Click on <guibutton>Previous</guibutton> if you are not sure about your "
 "choice."
@@ -1026,7 +1052,7 @@ msgstr ""
 "зробленого вибору."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:21
+#: en/takeOverHdConfirm.xml:27
 msgid ""
 "Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
 "partition, every operating system and all data on that hard disk."
@@ -1993,8 +2019,21 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Налаштування часового поясу"
 
+#.  2012-12-25 marja - moved this part out of misc-params.xml
+#.  2013-05-05 marja - added screenshot
+#. type: Content of: <section><mediaobject>
+#: en/configureTimezoneUTC.xml:20
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"configureTimezoneUTC-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"configureTimezoneUTC-im1\"></imagedata> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:19
+#: en/configureTimezoneUTC.xml:26
 msgid ""
 "Choose your time zone by choosing your country or a city close to you in the "
 "same time zone."
@@ -2004,7 +2043,7 @@ msgstr ""
 "тому самому часовому поясі."
 
 #. type: Content of: <section><para>
-#: en/configureTimezoneUTC.xml:23
+#: en/configureTimezoneUTC.xml:30
 msgid ""
 "In next screen you can choose to set your hardware clock to local time or to "
 "GMT, also known as UTC."
@@ -2014,7 +2053,7 @@ msgstr ""
 "також відомого як Всесвітній час."
 
 #. type: Content of: <section><note><para>
-#: en/configureTimezoneUTC.xml:28
+#: en/configureTimezoneUTC.xml:35
 msgid ""
 "If you have more than one operating system on your computer, make sure they "
 "are all set to local time, or all to UTC/GMT."
@@ -3154,7 +3193,7 @@ msgid "Minimal Install"
 msgstr "Мінімальне встановлення"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:8
+#: en/minimal-install.xml:9
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
 "Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
@@ -3165,7 +3204,7 @@ msgstr ""
 "\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:9
+#: en/minimal-install.xml:10
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
 "their <application>Mageia</application>, such as a server or a specialised "
@@ -3179,28 +3218,52 @@ msgstr ""
 "linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:13
+#: en/minimal-install.xml:14
 msgid ""
-"If you choose this installation class, then the next screen will offer you a "
-"few useful extras to install, such as documentation and X."
+"If you choose this installation class, then the related screen will offer "
+"you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Якщо ви виберете цей варіант встановлення, на наступній сторінці програми "
 "вам буде запропоновано встановити корисні доповнення системи, зокрема "
 "документацію та графічний сервер."
 
+#. type: Content of: <section><mediaobject>
+#: en/minimal-install.xml:19
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"minimal-"
+"install-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"minimal-"
+"install-im1\"></imagedata> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/securityLevel.xml:12
 msgid "Security Level"
 msgstr "Рівень безпеки"
 
+#.  2012-12-25 marja - moved this part out of misc-params.xml"
+#.  2013-05-05 marja - added screenshot
+#. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:19
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"securityLevel-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"securityLevel-im1\"></imagedata> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:17
+#: en/securityLevel.xml:24
 msgid "You can adjust your security level here."
 msgstr ""
 "За допомогою цієї сторінки ви можете змінити рівень захисту вашої системи."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:20
+#: en/securityLevel.xml:27
 msgid ""
 "Leave the default settings as they are, if you don't know what to choose."
 msgstr ""
@@ -3208,7 +3271,7 @@ msgstr ""
 "параметрів."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:23
+#: en/securityLevel.xml:30
 msgid ""
 "After install, it will always be possible to adjust your security settings "
 "in the <guilabel>Security</guilabel> part of the Mageia Control Center."
@@ -3221,8 +3284,21 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Вибір країни і регіону"
 
+#.  2012-12-25 marja - moved this section out of misc-params
+#.  2013-05-05 marja - added screenshot
+#. type: Content of: <section><mediaobject>
+#: en/selectCountry.xml:21
+msgid ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"selectCountry-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"width=\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id="
+"\"selectCountry-im1\"></imagedata> </imageobject>"
+
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:19
+#: en/selectCountry.xml:27
 msgid ""
 "Select your country or region. This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
@@ -3234,7 +3310,7 @@ msgstr ""
 "використання бездротового зв’язку."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:24
+#: en/selectCountry.xml:32
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
 "guilabel> button and choose your country / region there."
@@ -3243,7 +3319,7 @@ msgstr ""
 "guilabel> і виберіть країну або регіон за допомогою вікна, яке буде відкрито."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:29
+#: en/selectCountry.xml:37
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
 "after clicking <guibutton>OK</guibutton> it may seem a country from the "
@@ -3255,12 +3331,12 @@ msgstr ""
 "це, DrakX вже врахував ваш правильний вибір."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:38
+#: en/selectCountry.xml:46
 msgid "Input method"
 msgstr "Спосіб введення"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:41
+#: en/selectCountry.xml:49
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
@@ -3283,7 +3359,7 @@ msgstr ""
 "сховища пакунків HTTP/FTP."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:53
+#: en/selectCountry.xml:61
 msgid ""
 "If you missed the input method setup during installation, you can access it "
 "after you boot your installed system via \"Configure your Computer\" -&gt; "