aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installer
diff options
context:
space:
mode:
authorYuri Chornoivan <yurchor@ukr.net>2015-02-25 19:43:06 +0200
committerYuri Chornoivan <yurchor@ukr.net>2015-02-25 19:43:06 +0200
commitc69cf3f4a68559bd7c2026ae9bc0c75c6651a9f3 (patch)
treecfd5897affced4ddc616224d270d60b110b197e5 /docs/installer
parenta1e543276e4df809a72b00e126acf86944790a62 (diff)
downloadtools-c69cf3f4a68559bd7c2026ae9bc0c75c6651a9f3.tar
tools-c69cf3f4a68559bd7c2026ae9bc0c75c6651a9f3.tar.gz
tools-c69cf3f4a68559bd7c2026ae9bc0c75c6651a9f3.tar.bz2
tools-c69cf3f4a68559bd7c2026ae9bc0c75c6651a9f3.tar.xz
tools-c69cf3f4a68559bd7c2026ae9bc0c75c6651a9f3.zip
Update French translation
Diffstat (limited to 'docs/installer')
-rw-r--r--docs/installer/eu.po317
-rw-r--r--docs/installer/fr.po33
-rw-r--r--docs/installer/fr/SelectAndUseISOs2.xml24
-rw-r--r--docs/installer/fr/installer.xml5
4 files changed, 151 insertions, 228 deletions
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index 821756c2..df6b0e37 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.po
@@ -14,10 +14,10 @@ msgstr ""
"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
"eu/)\n"
+"Language: eu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.6.9\n"
@@ -102,11 +102,9 @@ msgstr "eu"
msgid "Media Selection (Configure Supplemental Installation Media)"
msgstr "Baliabide Aukeraketa (Konfiguratu Instalazio Baliabide Osagarriak)"
-#. 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 ""
@@ -160,24 +158,19 @@ msgstr ""
msgid "User and Superuser Management"
msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
-#. 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
-#. 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
+#. 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
+#. 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
#. type: Content of: <section><mediaobject>
#: en/addUser.xml:27
msgid ""
@@ -418,20 +411,17 @@ msgstr ""
msgid "Choose the mount points"
msgstr "Aukeratu muntatze-puntuak"
-#. 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
-#. 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
+#. 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
+#. 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
#. type: Content of: <section><mediaobject>
#: en/ask_mntpoint_s.xml:27
msgid ""
@@ -587,8 +577,7 @@ msgstr ""
msgid "Package Group Selection"
msgstr "Pakete-taldearen hautapena"
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
#. type: Content of: <section><mediaobject>
#: en/choosePackageGroups.xml:10
msgid ""
@@ -649,8 +638,7 @@ msgstr ""
msgid "Choose Individual Packages"
msgstr "Aukeratu Banakako Paketeak"
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
#. type: Content of: <section><mediaobject>
#: en/choosePackagesTree.xml:11
msgid ""
@@ -687,8 +675,8 @@ msgstr ""
msgid "Configure your Services"
msgstr "Konfiguratu zure Serbitzuak"
-#. 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 ""
@@ -741,8 +729,8 @@ msgstr "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
msgid "Configure your Timezone"
msgstr "Konfiguratu zure Denbora-Eremua"
-#. 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 ""
@@ -888,9 +876,7 @@ msgstr ""
msgid "Graphic Card and Monitor Configuration"
msgstr "Txartel Grafikoa eta Pantaila Konfigurazioa"
-#. 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
+#. 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
#. type: Content of: <section><mediaobject>
#: en/configureX_chooser.xml:11
msgid ""
@@ -1389,8 +1375,7 @@ msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
msgid "February 2014"
msgstr "2014ko Otsaila"
-#. type: Content of:
-#. <book><info><cover><info><revhistory><revision><revremark>
+#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:29
msgid "Mageia 4"
msgstr "Mageia 4"
@@ -1464,10 +1449,10 @@ msgstr ""
msgid "Congratulations"
msgstr "Zorionak"
-#. 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"
+#. 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
msgid ""
@@ -1527,10 +1512,10 @@ msgstr ""
msgid "Formatting"
msgstr "Formateatzen"
-#. 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 ""
@@ -2020,15 +2005,10 @@ msgstr ""
msgid "Updates"
msgstr "Eguneraketak"
-#. 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
+#. 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:13
msgid ""
@@ -2070,12 +2050,10 @@ msgstr "Ondoren, sakatu <guibutton>Hurrengoa</guibutton> jarraitzeko"
msgid "Media Selection (Nonfree)"
msgstr "Baliabide Aukeraketa (Nonfree)"
-#. 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)
+#. 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)
#. type: Content of: <section><mediaobject>
#: en/media_selection.xml:12
msgid ""
@@ -2192,21 +2170,19 @@ msgstr ""
msgid "Summary of miscellaneous parameters"
msgstr "Hainbat parametroen laburpena"
-#. 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"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry,
-#. configureServices and SecurityLevel out to separate files
+#. 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
msgid ""
@@ -2539,8 +2515,8 @@ msgstr ""
msgid "Security Level"
msgstr "Segurtasun-maila"
-#. 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 ""
@@ -2618,15 +2594,13 @@ msgstr "Instalazioa Klasiko baliabidea"
msgid "Common features"
msgstr "Ezaugarri komunak"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:29
msgid "These ISOs use the traditional installer called drakx."
msgstr ""
"ISO hauek DrakX deituriko Instalatzaile tradizionalak erabilitzen dituzte."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:34
msgid ""
"They are able to make a clean install or an update from previous releases."
@@ -2639,14 +2613,12 @@ msgstr ""
msgid "DVD"
msgstr "DVD"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:45
msgid "Different media for architecture 32 or 64 bits."
msgstr "Baliabide ezberdinak 32 edo 64 biteko arkitekturentzat."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:49
msgid ""
"Some tools are available in the Welcome screen: Rescue System, Memory Test, "
@@ -2655,14 +2627,12 @@ msgstr ""
"Tresna batzuk Ongi etorri pantailan eskuragarri daude: Berreskuratze "
"Sistema, Memoria Testa, Hardware hautemate tresna."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:54
msgid "Each DVD contains many available desktop environments and languages."
msgstr "DVD bakoitzak mahaigaineko ingurune eta hizkuntza asko dauka."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:59
msgid ""
"You'll be given the choice during the installation to add non free software."
@@ -2673,8 +2643,7 @@ msgstr "Instalazioa zehar software ez librea gehitzeko aukera izango duzue."
msgid "DVD dual arch"
msgstr "arkitektura bikoitzeko DVDa"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:70
msgid ""
"Both architectures are present on the same medium, the choice is made "
@@ -2683,14 +2652,12 @@ msgstr ""
"Arkitektura biak baliabide berean agertzen dira, aukera automatikoki egiten "
"da atzemandako CPU-aren arabera."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:75
msgid "Uses Xfce desktop only."
msgstr "Xfce mahaigaina soilik erabiltzen du."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:79
msgid ""
"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
@@ -2699,8 +2666,7 @@ msgstr ""
"Hizkuntza guztiak ez daude eskuragarri. (be, bg, ca, de, en, es, fr, it, mk, "
"pl, pt, ru, sv, uk) EGIAZTAPENAREN ZAIN!"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:84
msgid "It contains non free software."
msgstr "Software ez librea dauka."
@@ -2710,8 +2676,7 @@ msgstr "Software ez librea dauka."
msgid "Live media"
msgstr "Live baliabidea"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:98
msgid ""
"Can be used to preview the distribution without installing it on a HDD, and "
@@ -2720,21 +2685,18 @@ msgstr ""
"Distribuzioa aurreikusteko HDD baten instalatu gabe, eta aukeran Mageia zure "
"HDD-an instalatzeko erabil daiteke."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:103
msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
msgstr "ISO bakoitzak mahaigain ingurune bakarra (KDE edo GNOME) dauka."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:172
#: en/SelectAndUseISOs2.xml:190 en/SelectAndUseISOs2.xml:220
msgid "Different media for 32 or 64 bit architectures."
msgstr "32 edo 64 biteko arkitektura media ezberdinak."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:112
msgid ""
"<emphasis role=\"bold\">Live ISOs can only be used to create clean "
@@ -2745,8 +2707,7 @@ msgstr ""
"erabiliko dira, ezin dira aurreko bertsioetatik eguneratzeko erabili.</"
"emphasis>"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:118
msgid "They contain non free software."
msgstr "Software ez librea dute."
@@ -2756,21 +2717,18 @@ msgstr "Software ez librea dute."
msgid "Live CD KDE"
msgstr "KDE-ren Live CDa"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:128 en/SelectAndUseISOs2.xml:164
msgid "KDE desktop environment only."
msgstr "KDE mahaigaineko ingurunea soilik."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:150
#: en/SelectAndUseISOs2.xml:224
msgid "English language only."
msgstr "Ingelera hizkuntza soilik"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:154
msgid "32 bit only."
msgstr "32 bit soilik."
@@ -2780,8 +2738,7 @@ msgstr "32 bit soilik."
msgid "Live CD GNOME"
msgstr "GNOME-ren Live CD-a"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:146 en/SelectAndUseISOs2.xml:182
msgid "GNOME desktop environment only."
msgstr "GNOME mahaigaineko ingurunea soilik."
@@ -2791,8 +2748,7 @@ msgstr "GNOME mahaigaineko ingurunea soilik."
msgid "Live DVD KDE"
msgstr "KDE-ren Live DVD-a"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:168 en/SelectAndUseISOs2.xml:186
msgid "All languages are present."
msgstr "Hizkuntza guztiak presente daude."
@@ -2807,8 +2763,7 @@ msgstr "GNOME-ren Live DVD-a"
msgid "Boot-only CD media"
msgstr "Abioko CD baliabidea soilik"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:204
msgid ""
"Each one is a small image that contains no more than that which is needed to "
@@ -2822,8 +2777,7 @@ msgstr ""
"PC disko gogorrean egon daiteke, tokiko drive baten, sare lokalean zein "
"Interneten."
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:213
msgid ""
"These media are very light (less than 100 MB) and are convenient when "
@@ -2839,8 +2793,7 @@ msgstr ""
msgid "boot.iso"
msgstr "boot.iso"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:234
msgid ""
"Contains only free software, for those people who refuse to use non-free "
@@ -2854,8 +2807,7 @@ msgstr ""
msgid "boot-nonfree.iso"
msgstr "boot-nonfree.iso"
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:245
msgid ""
"Contains non-free software (mostly drivers, codecs...) for people who need "
@@ -3059,14 +3011,12 @@ msgstr ""
msgid "You can also use the dd tool in a console:"
msgstr "dd kontsola tresna bezala ere erabil dezakezu:"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:352
msgid "Open a console"
msgstr "Kontsola bat ireki"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:356
msgid ""
"Become root with the command <userinput>su -</userinput> (don't forget the "
@@ -3074,8 +3024,7 @@ msgid ""
msgstr ""
"Bihurtu root komando <userinput> su - </userinput> (ez ahaztu finalean '-')"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
#: en/SelectAndUseISOs2.xml:360
msgid ""
"<imageobject> <imagedata contentwidth=\"650\" fileref=\"../Root.png\"/> </"
@@ -3084,8 +3033,7 @@ msgstr ""
"<imageobject> <imagedata contentwidth=\"650\" fileref=\"../Root.png\"/> </"
"imageobject>"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:367
msgid ""
"Plug your USB stick (do not mount it, this also means do not open any "
@@ -3094,14 +3042,12 @@ msgstr ""
"Entxufatu zure USBa (ez muntatu, hau ere esan dezake edozein aplikazio edo "
"fitxategi kudeatzaile ez ireki hori eskuratu eta irakurri, ezin)"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:373
msgid "Enter the command <userinput>fdisk -l</userinput>"
msgstr "Idatzi <userinput>fdisk-l</userinput> komandoa"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
#: en/SelectAndUseISOs2.xml:376
msgid ""
"<imageobject> <imagedata fileref=\"../Fdisk.png\" contentwidth=\"650\"/> </"
@@ -3110,8 +3056,7 @@ msgstr ""
"<imageobject> <imagedata fileref=\"../Fdisk.png\" contentwidth=\"650\"/> </"
"imageobject>"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:383
msgid ""
"Find the device name for your USB stick (by its size), for example /dev/sdb "
@@ -3120,8 +3065,7 @@ msgstr ""
"Aurkitu zure USB gailuaren izena (bere tamainaren arabera), adibidez /dev/"
"sdb goiko irudian, 8Go USB-makila."
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:389
msgid ""
"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
@@ -3130,14 +3074,12 @@ msgstr ""
"Agindua sartu: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX bs=1M</"
"userinput>"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:392
msgid "Where X=your device name eg: /dev/sdc"
msgstr "Non X=zure dispositiboaren izena adibidez: /dev/sdc"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:394
msgid ""
"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
@@ -3146,14 +3088,12 @@ msgstr ""
"Adibidez: # <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><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:400
msgid "Enter the command: # <userinput>sync</userinput>"
msgstr "Agindua sartu: # <userinput>sync</userinput>"
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:404
msgid "Unplug your USB stick, it is done"
msgstr "Deskonektatu zure USB, eginda dago"
@@ -3210,8 +3150,8 @@ msgstr ""
msgid "Select your Country / Region"
msgstr "Aukeratu zure Herrialdea / Eskualdea"
-#. 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 ""
@@ -3545,11 +3485,10 @@ msgstr ""
msgid "Select mouse"
msgstr "Aukeratu sagua"
-#. 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
+#. 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
#. type: Content of: <section><mediaobject>
#: en/selectMouse.xml:16
msgid ""
@@ -3679,11 +3618,8 @@ msgstr ""
msgid "Bootloader main options"
msgstr "Abio zamatzailearen aukera nagusiak"
-#. 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
+#. 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
msgid ""
@@ -3848,16 +3784,14 @@ msgstr ""
msgid "Setup SCSI"
msgstr "SCSI konfiguratu"
-#. 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
+#. 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
#. type: Content of: <section><mediaobject>
#: en/setupSCSI.xml:26
msgid ""
@@ -3898,7 +3832,7 @@ msgstr ""
msgid "Sound Configuration"
msgstr "Soinu Konfiguraketa"
-#. Started by marja on 2013-12-07
+#. Started by marja on 2013-12-07
#. type: Content of: <section><mediaobject>
#: en/soundConfig.xml:17
msgid ""
@@ -3976,13 +3910,12 @@ msgstr ""
msgid "Confirm hard disk to be formatted"
msgstr "Baieztatzeko formateatu beharreko disko gogorra"
-#. 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
+#. 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 ""
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index d7b87463..94e069f6 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -19,8 +19,8 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2015-02-24 19:21+0200\n"
-"PO-Revision-Date: 2015-01-18 21:01+0000\n"
-"Last-Translator: Lebarhon <lebarhon@free.fr>\n"
+"PO-Revision-Date: 2015-02-25 17:31+0000\n"
+"Last-Translator: Eric Barbero <dune06@free.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
"fr/)\n"
"Language: fr\n"
@@ -2973,12 +2973,11 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/SelectAndUseISOs2.xml:303
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"../Md5sum.png\" contentwidth=\"650\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"Md5sum.png\" contentwidth=\"650\"/> </"
+"<imageobject> <imagedata fileref=\"../Md5sum.png\" contentwidth=\"650\"/> </"
"imageobject>"
#. type: Content of: <section><section><title>
@@ -3003,18 +3002,17 @@ msgstr "Graver l'image ISO sur un CD/DVD"
#. type: Content of: <section><section><section><para>
#: en/SelectAndUseISOs2.xml:322
-#, fuzzy
msgid ""
"Use whatever burner you wish but ensure the burning device is set correctly "
"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
"not correct. There is more information in <link ns4:href=\"https://wiki."
"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
msgstr ""
-"Utilisez le logiciel de gravure que vous voulez mais assurez-vous que le "
-"graveur est bien paramétré pour <emphasis role=\"bold\">graver une image</"
-"emphasis>, car graver des données ou des fichiers n'est pas correct. Pour "
-"plus d'information, voir <link ns4:href=\"https://wiki.mageia.org/en/"
-"Writing_CD_and_DVD_images\">le wiki Mageia</link>."
+"Utilisez le logiciel de gravure de votre choix mais assurez-vous que le "
+"périphérique de gravure est bien paramétré pour <emphasis role=\"bold"
+"\">graver une image</emphasis>, car graver des données ou des fichiers est "
+"erroné. Plus d'information est disponible dans <link ns4:href=\"https://wiki."
+"mageia.org/en/Writing_CD_and_DVD_images\">le wiki Mageia</link>."
#. type: Content of: <section><section><section><title>
#: en/SelectAndUseISOs2.xml:329
@@ -3084,11 +3082,12 @@ msgstr ""
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
#: en/SelectAndUseISOs2.xml:360
-#, fuzzy
msgid ""
"<imageobject> <imagedata contentwidth=\"650\" fileref=\"../Root.png\"/> </"
"imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata contentwidth=\"650\" fileref=\"../Root.png\"/> </"
+"imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
#: en/SelectAndUseISOs2.xml:367
@@ -3107,12 +3106,11 @@ msgstr "Saisissez la commande <userinput>fdisk -l</userinput>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
#: en/SelectAndUseISOs2.xml:376
-#, fuzzy
msgid ""
"<imageobject> <imagedata fileref=\"../Fdisk.png\" contentwidth=\"650\"/> </"
"imageobject>"
msgstr ""
-"<imageobject> <imagedata fileref=\"Fdisk.png\" contentwidth=\"650\"/> </"
+"<imageobject> <imagedata fileref=\"../Fdisk.png\" contentwidth=\"650\"/> </"
"imageobject>"
#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
@@ -4104,10 +4102,3 @@ msgstr ""
"tels que gparted, disponible pour Windows et Linux. Comme toujours, lorsque "
"vous modifiez des partitions, soyez très prudent et assurez-vous que toutes "
"vos données importantes ont été sauvegardées."
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"Root.png\" contentwidth=\"650\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"Root.png\" contentwidth=\"650\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/fr/SelectAndUseISOs2.xml b/docs/installer/fr/SelectAndUseISOs2.xml
index 0572c1d4..76fa20b1 100644
--- a/docs/installer/fr/SelectAndUseISOs2.xml
+++ b/docs/installer/fr/SelectAndUseISOs2.xml
@@ -1,4 +1,5 @@
<?xml version='1.0' encoding='utf-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" xml:id="Select-and-use-ISOs" version="5.0" xml:lang="fr">
+
<info>
<!-- Made by Lebarhon 2014 03 26 -->
@@ -95,8 +96,7 @@ ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk) peuvent être sélectionnées !<
<itemizedlist>
<listitem>
<para>Peut être utilisé pour tester la distribution Mageia sans l'installer sur le
-disque dur, puis éventuellement l'installer par la suite.
- </para>
+disque dur, puis éventuellement l'installer par la suite.</para>
</listitem>
<listitem>
@@ -292,7 +292,7 @@ chemin/vers/le/fichier/image.iso</userinput>.</para>
certain temps) avec le nombre fourni par Mageia. Exemple :</para>
<mediaobject>
-<imageobject> <imagedata fileref="Md5sum.png" contentwidth="650"/>
+<imageobject> <imagedata fileref="../Md5sum.png" contentwidth="650"/>
</imageobject></mediaobject>
<para/>
@@ -309,10 +309,10 @@ un moyen de démarrage.</para>
<section>
<title>Graver l'image ISO sur un CD/DVD</title>
- <para>Utilisez le logiciel de gravure que vous voulez mais assurez-vous que le
-graveur est bien paramétré pour <emphasis role="bold">graver une
-image</emphasis>, car graver des données ou des fichiers n'est pas correct.
-Pour plus d'information, voir <link
+ <para>Utilisez le logiciel de gravure de votre choix mais assurez-vous que le
+périphérique de gravure est bien paramétré pour <emphasis role="bold">graver
+une image</emphasis>, car graver des données ou des fichiers est
+erroné. Plus d'information est disponible dans <link
ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">le wiki
Mageia</link>.</para>
</section>
@@ -350,7 +350,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
oublier le '-' final)</para>
<mediaobject>
-<imageobject> <imagedata fileref="Root.png" contentwidth="650"/>
+<imageobject> <imagedata contentwidth="650" fileref="../Root.png"/>
</imageobject></mediaobject>
</listitem>
@@ -364,7 +364,7 @@ ou la lire).</para>
<para>Saisissez la commande <userinput>fdisk -l</userinput></para>
<mediaobject>
-<imageobject> <imagedata fileref="Fdisk.png" contentwidth="650"/>
+<imageobject> <imagedata fileref="../Fdisk.png" contentwidth="650"/>
</imageobject></mediaobject>
</listitem>
@@ -379,7 +379,8 @@ USB de 8 Go.</para>
bs=1M</userinput></para>
<para>Où X=le nom de votre périphérique, par exemple : /dev/sdc</para>
- <para> Exemple : # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
+
+ <para>Exemple : # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
of=/dev/sdb bs=1M</userinput></para>
</listitem>
@@ -418,5 +419,4 @@ ns4:href="http://www.mageia.org/fr/doc/">la documentation Mageia</link>.</para>
ns4:href="https://wiki.mageia.org/en/Category:Documentation">le wiki de
Mageia</link>.</para>
</section>
-
-</section>
+</section> \ No newline at end of file
diff --git a/docs/installer/fr/installer.xml b/docs/installer/fr/installer.xml
index 4ac63fda..9cf2f18f 100644
--- a/docs/installer/fr/installer.xml
+++ b/docs/installer/fr/installer.xml
@@ -193,7 +193,6 @@ F2</guibutton>. Ensuite appuyer simultanément sur les trois touches
</note>
</section>
- <section xml:id="installationOptions">
<section xml:id="installationProblems">
<info>
<title xml:id="installationProblems-ti1">Problèmes d'installation et solutions possibles</title>
@@ -259,5 +258,5 @@ consultez la documentation Microsoft : <link
ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
</section>
</section>
- </section>
-</section> \ No newline at end of file
+</section>
+