aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/fr.po27
-rw-r--r--docs/installer/fr/setupBootloaderAddEntry.xml52
-rw-r--r--docs/installer/uk.po140
3 files changed, 110 insertions, 109 deletions
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index f7893825..e92fe89b 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2014-09-30 20:36+0300\n"
-"PO-Revision-Date: 2014-08-06 04:10+0000\n"
+"PO-Revision-Date: 2014-09-30 18:52+0000\n"
"Last-Translator: Eric Barbero <dune06@free.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
"fr/)\n"
@@ -3585,14 +3585,13 @@ msgstr "Ajouter ou Modifier une Entrée de Menu de Démarrage"
#. type: Content of: <section><mediaobject>
#: en/setupBootloaderAddEntry.xml:8
-#, fuzzy
msgid ""
"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
"\"bootloaderConfiguration-im1\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" format=\"PNG\" revision=\"1\" xml:id="
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
"\"bootloaderConfiguration-im1\"/> </imageobject>"
#. type: Content of: <section><para>
@@ -3615,17 +3614,22 @@ msgid ""
"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
"instead."
msgstr ""
+"Si vous avez choisi <code>Grub 2</code> comme chargeur de démarrage, vous ne "
+"pouvez pas utliser cet outil pour modifier les entrées à cette étape, "
+"appuyez sur 'Suivant'. Vous devez modifier manuellement le fichier <code>/"
+"boot/grub2/custom.cfg</code> ou utiliser <code>grub-customizer</code> à la "
+"place."
#. type: Content of: <section><mediaobject>
#: en/setupBootloaderAddEntry.xml:25
-#, fuzzy
msgid ""
"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
"png\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
+"png\"/> </imageobject>"
#. type: Content of: <section><para>
#: en/setupBootloaderAddEntry.xml:30
@@ -3999,12 +4003,3 @@ msgstr ""
"Cliquer sur <guibutton>Suivant</guibutton> en cas de certitude avec la "
"volonté d'effacer toutes les partitions, tous les systèmes d'exploitation et "
"toutes les données présents sur ce disque dur."
-
-#~ msgid ""
-#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-#~ "setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
-#~ "\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-#~ "setupBootloaderAddEntry.png\" format=\"PNG\" revision=\"1\" xml:id="
-#~ "\"setupBootloaderAddEntry-im1\"/> </imageobject>"
diff --git a/docs/installer/fr/setupBootloaderAddEntry.xml b/docs/installer/fr/setupBootloaderAddEntry.xml
index 8c93cd74..620d996c 100644
--- a/docs/installer/fr/setupBootloaderAddEntry.xml
+++ b/docs/installer/fr/setupBootloaderAddEntry.xml
@@ -1,38 +1,44 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="fr">
+ <info>
+ <title xml:id="setupBootloaderAddEntry-ti1">Ajouter ou Modifier une Entrée de Menu de Démarrage</title>
+ </info>
-
-
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="setupBootloaderAddEntry"><info><title xml:id="setupBootloaderAddEntry-ti1">Ajouter ou Modifier une Entrée de Menu de Démarrage</title></info>
-
-
-
- <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-bootloaderConfiguration.png" format="PNG" revision="1"
+ <mediaobject>
+<imageobject> <imagedata revision="1"
+fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
-
-
-
+
<para>Vous pouvez ajouter une entrée ou en modifier une après l'avoir
sélectionnée, en pressant le bouton correspondant dans l'écran de
<emphasis>Configuration du démarrage</emphasis> et en éditant les entrées de
la fenêtre qui s'ouvre à ce moment.</para>
-
- <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-setupBootloaderAddEntry.png" format="PNG" revision="1"
-xml:id="setupBootloaderAddEntry-im1"/> </imageobject></mediaobject>
-
+ <note>
+ <para>Si vous avez choisi <code>Grub 2</code> comme chargeur de démarrage, vous ne
+pouvez pas utliser cet outil pour modifier les entrées à cette étape,
+appuyez sur 'Suivant'. Vous devez modifier manuellement le fichier
+<code>/boot/grub2/custom.cfg</code> ou utiliser <code>grub-customizer</code>
+à la place.</para>
+ </note>
+
+ <mediaobject>
+<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
+align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+</imageobject></mediaobject>
+
<para>Le changement du nom d'une entrée et l'activation de la case à cocher pour
définir l'entrée par défaut sont des actions qui ne comportent pas de
risques.</para>
+
<para>Vous pouvez ajouter votre propre version du numéro d'une entrée ou la
renommer complètement.</para>
+
<para>L'entrée par défaut est celle qui est choisie lorsque aucun choix n'est fait
pendant la phase de démarrage du système.</para>
-<warning><para>L'édition des autres paramètres peut rendre votre système sans possibilité
-de démarrage. Soyez sûr de vos actions lorsque vous apportez des
-modifications dans ce domaine.</para></warning>
- </section>
+ <warning>
+ <para>L'édition des autres paramètres peut rendre votre système sans possibilité
+de démarrage. Soyez sûr de vos actions lorsque vous apportez des
+modifications dans ce domaine.</para>
+ </warning>
+</section> \ No newline at end of file
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index d3a70e2b..cc8e0839 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -100,9 +100,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: <section><mediaobject>
#: en/add_supplemental_media.xml:18
msgid ""
@@ -158,19 +158,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: <section><mediaobject>
#: en/addUser.xml:27
msgid ""
@@ -421,17 +421,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: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
msgid ""
@@ -697,8 +697,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: <section><mediaobject>
#: en/configureServices.xml:21
msgid ""
@@ -751,8 +751,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: <section><mediaobject>
#: en/configureTimezoneUTC.xml:20
msgid ""
@@ -1498,9 +1498,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: <section><mediaobject>
#: en/exitInstall.xml:14
@@ -1561,10 +1561,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: <section><mediaobject>
#: en/formatPartitions.xml:18
msgid ""
@@ -2070,10 +2070,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: <section><mediaobject>
#: en/installUpdates.xml:13
msgid ""
@@ -2117,9 +2117,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: <section><mediaobject>
#: en/media_selection.xml:12
@@ -2242,18 +2242,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: <section><mediaobject>
#: en/misc-params.xml:33
@@ -2602,8 +2602,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: <section><mediaobject>
#: en/securityLevel.xml:19
msgid ""
@@ -3234,8 +3234,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: <section><mediaobject>
#: en/selectCountry.xml:21
msgid ""
@@ -3577,10 +3577,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: <section><mediaobject>
#: en/selectMouse.xml:16
msgid ""
@@ -3656,9 +3656,9 @@ msgstr ""
"Якщо вами було вибрано завантажувач <code>Grub 2</code>, ви не зможете "
"скористатися цим інструментом для редагування записів на наступному кроці, "
"після натискання кнопки «Далі». Вам слід скористатися іншим графічним "
-"інструментом для редагування, зокрема <code>kcm-grub2</code>, <code>"
-"grub-customizer</code>, або внести зміни до <code>/boot/grub2/custom.cfg<"
-"/code> вручну."
+"інструментом для редагування, зокрема <code>kcm-grub2</code>, <code>grub-"
+"customizer</code>, або внести зміни до <code>/boot/grub2/custom.cfg</code> "
+"вручну."
#. type: Content of: <section><mediaobject>
#: en/setupBootloaderAddEntry.xml:25
@@ -3712,7 +3712,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: <section><mediaobject>
#: en/setupBootloader.xml:11
@@ -3884,14 +3884,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: <section><mediaobject>
#: en/setupSCSI.xml:26
msgid ""
@@ -3933,7 +3933,7 @@ msgstr ""
msgid "Sound Configuration"
msgstr "Налаштування звуку"
-#. Started by marja on 2013-12-07
+#. Started by marja on 2013-12-07
#. type: Content of: <section><mediaobject>
#: en/soundConfig.xml:17
msgid ""
@@ -4012,12 +4012,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: <section><mediaobject>
#: en/takeOverHdConfirm.xml:19
msgid ""
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 10:09:56 +0000