From 03e952c4f721142af7580feb9624df1faa69e62f Mon Sep 17 00:00:00 2001 From: Yuri Chornoivan Date: Sun, 12 May 2013 12:46:32 +0000 Subject: Update from Calenco --- docs/installer/en/DrakX.xml | 10 ++-- docs/installer/help.pot | 2 +- docs/installer/ru/DrakX.xml | 14 +++-- docs/installer/uk.po | 134 ++++++++++++++++++++++---------------------- docs/installer/uk/DrakX.xml | 14 +++-- 5 files changed, 94 insertions(+), 80 deletions(-) (limited to 'docs') diff --git a/docs/installer/en/DrakX.xml b/docs/installer/en/DrakX.xml index ee6d908a..c6d0dd32 100644 --- a/docs/installer/en/DrakX.xml +++ b/docs/installer/en/DrakX.xml @@ -22,6 +22,8 @@ + + @@ -39,14 +41,14 @@ - + + + diff --git a/docs/installer/help.pot b/docs/installer/help.pot index 95c336cf..6623fcf6 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-06 09:50+0400\n" +"POT-Creation-Date: 2013-05-12 15:42+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/docs/installer/ru/DrakX.xml b/docs/installer/ru/DrakX.xml index baf78bf8..591e4036 100644 --- a/docs/installer/ru/DrakX.xml +++ b/docs/installer/ru/DrakX.xml @@ -2,6 +2,8 @@
+ + @@ -32,6 +34,8 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команды + + @@ -49,13 +53,15 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команды - + + + + - + diff --git a/docs/installer/uk.po b/docs/installer/uk.po index afd73bd6..705710cd 100644 --- a/docs/installer/uk.po +++ b/docs/installer/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" -"POT-Creation-Date: 2013-05-06 09:50+0400\n" +"POT-Creation-Date: 2013-05-12 15:42+0400\n" "PO-Revision-Date: 2013-05-06 09:51+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -95,19 +95,19 @@ msgstr "" msgid "User and Superuser Management" msgstr "Керування обліковими записами користувача і адміністратора" -#. Started by marja,using Led43's text, on 2012 03 27 -#. NEEDS TO BE REVIEWED! -#. SimonNZG 2012-04-03 has taken a look but needs to come back +#. Started by marja,using Led43's text, on 2012 03 27 +#. NEEDS TO BE REVIEWED! +#. SimonNZG 2012-04-03 has taken a look but needs to come back #. removed para xml:id's, finished the page using Led43's text in the wiki, but -#. changed his text about the Advanced User Managment screen (the only thing -#. about guest account there, is the box you can tick or untick to enable or +#. changed his text about the Advanced User Managment screen (the only thing +#. about guest account there, is the box you can tick or untick to enable or #. disable it, the rest is about the normal user you're adding in the previous #. screen), marja, 20120409 #. barjac 2012-04-13 moved explanation of xguest lower down. I don't understand -#. "rbash" in the xguest warning - is that correct? -#. JohnR 2012-04-19 Language proofreading -#. marja 2012-04-24 Added screenshot -#. marja 2013-04-26 added new note +#. "rbash" in the xguest warning - is that correct? +#. JohnR 2012-04-19 Language proofreading +#. marja 2012-04-24 Added screenshot +#. marja 2013-04-26 added new note #. type: Content of:
#: en/addUser.xml:27 msgid "" @@ -358,17 +358,17 @@ msgstr "" msgid "Choose the mount points" msgstr "Виберіть точки монтування" -#. Made by marja on 2012 03 28 -#. NEEDS TO BE REVIEWED! -#. SimonNZG 2012-04-03 has taken a look but needs to come back -#. removed para xml:id's, marja, 20120409 +#. Made by marja on 2012 03 28 +#. NEEDS TO BE REVIEWED! +#. SimonNZG 2012-04-03 has taken a look but needs to come back +#. removed para xml:id's, marja, 20120409 #. barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE" -#. with "a", as I can't imagine having more than one root partition ;) -#. Lebarhon : I put [] where it seems having mistakes +#. with "a", as I can't imagine having more than one root partition ;) +#. Lebarhon : I put [] where it seems having mistakes #. Marja: you're right, in English English it is "its type", however, the Americans #. 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 +#. And JohnR says the Americans are WRONG! :-)) +#. 2012-04-19 Language proofreading done #. type: Content of:
#: en/ask_mntpoint_s.xml:27 msgid "" @@ -868,8 +868,8 @@ msgstr "" msgid "Configure your Services" msgstr "Налаштування ваших служб" -#. 2012-12-25 marja - moved this section out of misc-params.xml -#. 2013-05-05 marja - added screenshot +#. 2012-12-25 marja - moved this section out of misc-params.xml +#. 2013-05-05 marja - added screenshot #. type: Content of:
#: en/configureServices.xml:21 msgid "" @@ -1027,12 +1027,12 @@ msgstr "" msgid "Confirm hard disk to be formatted" msgstr "Підтвердження форматування жорсткого диска" -#. Made by marja on 2012 04 03 -#. test comment - johnr +#. 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 +#. saw this help screen when I had only one HD +#. 2013-05-05 marja added screenshot #. type: Content of:
#: en/takeOverHdConfirm.xml:19 msgid "" @@ -1499,9 +1499,9 @@ msgstr "" msgid "Congratulations" msgstr "Вітаємо" -#. Started by marja on 2012 03 29 -#. NEEDS TO BE WRITTEN AND THEN REVIEWED! -#. marja - 2012-04-24 added screenshot and text +#. Started by marja on 2012 03 29 +#. NEEDS TO BE WRITTEN AND THEN REVIEWED! +#. marja - 2012-04-24 added screenshot and text #. same day, added "s" to "sytems" #. type: Content of:
#: en/exitInstall.xml:14 @@ -1562,10 +1562,10 @@ msgstr "" msgid "Formatting" msgstr "Форматування" -#. Made by marja on 2012 03 29 -#. NEEDS TO BE REVIEWED! -#. marja 2012-04-24 added screenshot -#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1 +#. Made by marja on 2012 03 29 +#. NEEDS TO BE REVIEWED! +#. marja 2012-04-24 added screenshot +#. marja 2012-04-24 added emphasis tags in formatPartitions-pa1 #. type: Content of:
#: en/formatPartitions.xml:18 msgid "" @@ -1630,10 +1630,10 @@ msgstr "" msgid "Updates" msgstr "Поновлення" -#. Made by marja on 2012 03 30 -#. NEEDS TO BE REVIEWED! +#. 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 +#. marja, 2012-04-24 added screenshot #. type: Content of:
#: en/installUpdates.xml:13 msgid "" @@ -1677,18 +1677,18 @@ msgstr "" msgid "Summary of miscellaneous parameters" msgstr "Резюме щодо інших параметрів" -#. Started by marja on 2012 03 31 -#. NEEDS TO BE WRITTEN AND REVIEWED! -#. marja - 2012 04 15 added some text, not much, unfortunately :( -#. marja 2012-04-24 added screenshots +#. Started by marja on 2012 03 31 +#. NEEDS TO BE WRITTEN AND REVIEWED! +#. marja - 2012 04 15 added some text, not much, unfortunately :( +#. marja 2012-04-24 added screenshots #. JohnR 2012-04-25 Added text as requested by Psec :-) -#. marja 2012-04-24 added 2 links to other help pages -#. marja 2012-04-24 added some text in the drakxid-configureServices and -#. the drakxid-miscellaneous section -#. marja 2012-04-24 corrected "Magaia" in the last paragraph -#. marja 2012-04-24 corrected para xml:id number in the last paragraph -#. 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. -#. 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" +#. marja 2012-04-24 added 2 links to other help pages +#. marja 2012-04-24 added some text in the drakxid-configureServices and +#. the drakxid-miscellaneous section +#. marja 2012-04-24 corrected "Magaia" in the last paragraph +#. marja 2012-04-24 corrected para xml:id number in the last paragraph +#. 2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. +#. 2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" #. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files #. type: Content of:
#: en/misc-params.xml:33 @@ -2019,8 +2019,8 @@ msgstr "" msgid "Configure your Timezone" msgstr "Налаштування часового поясу" -#. 2012-12-25 marja - moved this part out of misc-params.xml -#. 2013-05-05 marja - added screenshot +#. 2012-12-25 marja - moved this part out of misc-params.xml +#. 2013-05-05 marja - added screenshot #. type: Content of:
#: en/configureTimezoneUTC.xml:20 msgid "" @@ -2105,14 +2105,14 @@ msgstr "" msgid "Setup SCSI" msgstr "Налаштування SCSI" -#. Made by marja on 2012 04 02 -#. NEEDS TO BE REVIEWED! -#. JohnR - edited 2012-03-03 -#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) -#. barjac has re-reviewed and made some minor tweaks. Revisions incremented. -#. marja 2012-04-24 added screenshot +#. Made by marja on 2012 04 02 +#. NEEDS TO BE REVIEWED! +#. JohnR - edited 2012-03-03 +#. SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) +#. barjac has re-reviewed and made some minor tweaks. Revisions incremented. +#. 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 +#. Mdv doc instead of on our setupSCSI file #. type: Content of:
#: en/setupSCSI.xml:26 msgid "" @@ -2175,10 +2175,10 @@ msgstr "" msgid "Select mouse" msgstr "Вибір драйвера миші" -#. Made by marja on 2012 04 11 -#. NEEDS TO BE REVIEWED! +#. Made by marja on 2012 04 11 +#. 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 +#. marja 2012-04-24 adding screenshot #. type: Content of:
#: en/selectMouse.xml:16 msgid "" @@ -2531,7 +2531,7 @@ msgstr "" msgid "Bootloader main options" msgstr "Основні параметри завантажувача" -#. 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence. +#. 2012-08-12 Copied this page, setupBootloader.xml, from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence. #. 2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist #. type: Content of:
#: en/setupBootloader.xml:11 @@ -3243,8 +3243,8 @@ msgstr "" msgid "Security Level" msgstr "Рівень безпеки" -#. 2012-12-25 marja - moved this part out of misc-params.xml" -#. 2013-05-05 marja - added screenshot +#. 2012-12-25 marja - moved this part out of misc-params.xml" +#. 2013-05-05 marja - added screenshot #. type: Content of:
#: en/securityLevel.xml:19 msgid "" @@ -3284,8 +3284,8 @@ msgstr "" msgid "Select your Country / Region" msgstr "Вибір країни і регіону" -#. 2012-12-25 marja - moved this section out of misc-params -#. 2013-05-05 marja - added screenshot +#. 2012-12-25 marja - moved this section out of misc-params +#. 2013-05-05 marja - added screenshot #. type: Content of:
#: en/selectCountry.xml:21 msgid "" @@ -3375,9 +3375,9 @@ msgstr "" msgid "Media Selection (Nonfree)" msgstr "Вибір носія (з пакунками, які не є вільними)" -#. papoteur 2013-04-11 - created +#. 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-16 s/in/during/ as suggested by Tristan Campbell #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong) #. type: Content of:
#: en/media_selection.xml:12 @@ -3450,9 +3450,9 @@ msgid "Media Selection (Configure Supplemental Installation Media)" msgstr "" "Вибір носія (налаштовування додаткових носіїв пакунків для встановлення)" -#. 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 +#. 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 #. type: Content of:
#: en/add_supplemental_media.xml:18 msgid "" diff --git a/docs/installer/uk/DrakX.xml b/docs/installer/uk/DrakX.xml index c2afceee..b568b973 100644 --- a/docs/installer/uk/DrakX.xml +++ b/docs/installer/uk/DrakX.xml @@ -2,6 +2,8 @@
+ + @@ -32,6 +34,8 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команди + + @@ -49,13 +53,15 @@ ns6:href="https://wiki.mageia.org/en/Documentation_team">команди - + + + + - + -- cgit v1.2.1