Update from Calenco

1 files changed, 93 insertions, 30 deletions

diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index 6c5e3733..95c336cf 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2013-05-05 11:18+0000\n"
+"POT-Creation-Date: 2013-05-06 09:50+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -531,16 +531,15 @@ msgid ""
 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 ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
@@ -649,34 +648,45 @@ 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 ""
+
 #. 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 ""
 
 #. 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:26
+#: en/configureServices.xml:34
 msgid "The setting DrakX chose are usually good."
 msgstr ""
 
 #. 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."
 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 ""
 
@@ -763,15 +773,29 @@ 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 ""
+
 #. 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."
 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."
@@ -1525,22 +1549,33 @@ 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 ""
+
 #. 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."
 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."
 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."
@@ -2433,7 +2468,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 "
@@ -2441,7 +2476,7 @@ msgid ""
 msgstr ""
 
 #. 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 "
@@ -2450,10 +2485,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:13
+#: en/minimal-install.xml:14
+msgid ""
+"If you choose this installation class, then the related screen will offer "
+"you a few useful extras to install, such as documentation and X."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/minimal-install.xml:19
 msgid ""
-"If you choose this installation class, then the next screen will offer you a "
-"few useful extras to install, such as documentation and X."
+"<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 ""
 
 #. type: Content of: <section><info><title>
@@ -2461,18 +2504,28 @@ msgstr ""
 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 ""
+
 #. 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 ""
 
 #. 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."
@@ -2483,8 +2536,18 @@ 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 ""
+
 #. 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 "
@@ -2492,14 +2555,14 @@ msgid ""
 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."
 msgstr ""
 
 #. 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 "
@@ -2508,12 +2571,12 @@ msgid ""
 msgstr ""
 
 #. 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 "
@@ -2526,7 +2589,7 @@ msgid ""
 msgstr ""
 
 #. 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; "