diff options
| -rw-r--r-- | docs/docs/stable/installer/nb.po | 12 | ||||
| -rw-r--r-- | docs/docs/stable/installer/nb/DrakX-cover.xml | 14 | ||||
| -rw-r--r-- | docs/docs/stable/installer/nb/DrakX.xml | 8 | ||||
| -rw-r--r-- | docs/docs/stable/installer/nb/configureX_chooser.xml | 10 |
4 files changed, 25 insertions, 19 deletions
diff --git a/docs/docs/stable/installer/nb.po b/docs/docs/stable/installer/nb.po index 9294078e..c9f42619 100644 --- a/docs/docs/stable/installer/nb.po +++ b/docs/docs/stable/installer/nb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Mageia\n" "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n" "POT-Creation-Date: 2019-01-13 16:48+0200\n" -"PO-Revision-Date: 2019-01-11 11:07+0000\n" +"PO-Revision-Date: 2019-01-13 20:51+0000\n" "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/" "language/nb/)\n" @@ -1101,7 +1101,6 @@ msgstr "" #. type: Content of: <section><para> #: en/configureX_chooser.xml:32 -#, fuzzy msgid "" "No matter which graphical environment (also known as desktop environment) " "you chose for this install of Mageia, they are all based on a graphical user " @@ -1124,6 +1123,8 @@ msgid "" "Choose the appropriate settings manually if you think the details are " "incorrect, or if none are shown." msgstr "" +"Velg de aktuelle innstillingene manuelt, dersom du tror at detaljene er " +"feil, eller hvis ingen vises." #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureX_chooser.xml:44 @@ -1146,7 +1147,6 @@ msgstr "<emphasis role=\"bold\">Skjerm</emphasis>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureX_chooser.xml:55 -#, fuzzy msgid "" "You can choose Plug 'n Play, if applicable, or choose your monitor from the " "<emphasis>Vendor</emphasis> or <emphasis>Generic</emphasis> lists. Choose " @@ -1167,7 +1167,6 @@ msgstr "<emphasis role=\"bold\">Oppløsning</emphasis>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureX_chooser.xml:66 -#, fuzzy msgid "The resolution and color depth of your monitor can be set here." msgstr "Oppløsningen og fargedybden på skjermen din kan stilles inn her." @@ -1178,7 +1177,6 @@ msgstr "<emphasis role=\"bold\">Test</emphasis>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureX_chooser.xml:74 -#, fuzzy msgid "" "The test button does not always appear during install. If the option is " "there, and you test your settings, you should be asked to confirm that your " @@ -1203,7 +1201,6 @@ msgstr "<emphasis role=\"bold\">Alternativer</emphasis>" #. type: Content of: <section><itemizedlist><listitem><para> #: en/configureX_chooser.xml:88 -#, fuzzy msgid "Here you can choose to enable or disable various options." msgstr "Her kan du velge å aktivere eller deaktivere ulike alternativer." @@ -2181,9 +2178,8 @@ msgstr "" #. type: Content of: <section><info><title> #: en/graphicalConfiguration.xml:13 -#, fuzzy msgid "Graphical Configuration" -msgstr "Grafikk kort og Skjerm konfigurasjon" +msgstr "Grafisk konfigurasjon" #. type: Content of: <section><info><title> #: en/installer.xml:32 diff --git a/docs/docs/stable/installer/nb/DrakX-cover.xml b/docs/docs/stable/installer/nb/DrakX-cover.xml index 75fdcb3c..a65e7bf4 100644 --- a/docs/docs/stable/installer/nb/DrakX-cover.xml +++ b/docs/docs/stable/installer/nb/DrakX-cover.xml @@ -4,6 +4,7 @@ <book version="5.0" xml:lang="nb" xml:id="Quick-Startup" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:ns62="http://docbook.org/ns/transclusion" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xhtml" @@ -53,20 +54,21 @@ Team</link>, hvis du vil hjelpe til med å forbedre denne manualen.</para> + + <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before--> <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed --> <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva --> <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml --> <!--2013-12-08 add soundConfig.xml --> +<!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. --> <title>Installasjon med DrakX</title> - <para> - <note> + <para><note> <para>Ingen vil se alle installasjonsskjermbildene du ser i denne manualen. Hvilke skjermbilder du kommer til å se er avhengig av din maskinvare og de valg du gjør under installasjonen.</para> - </note> - </para> + </note></para> @@ -128,13 +130,15 @@ gjør under installasjonen.</para> </xi:include> --> <xi:include href="addUser.xml"/> - <xi:include href="configureX_chooser.xml"/> + <xi:include href="graphicalConfiguration.xml"/> <!-- <xi:include href="configureX_card_list.xml"/> + <xi:include href="configureX_chooser.xml"/> + <xi:include href="configureX_monitor.xml"/> --> <xi:include href="setupBootloader.xml"/> diff --git a/docs/docs/stable/installer/nb/DrakX.xml b/docs/docs/stable/installer/nb/DrakX.xml index 1a64d159..78329f17 100644 --- a/docs/docs/stable/installer/nb/DrakX.xml +++ b/docs/docs/stable/installer/nb/DrakX.xml @@ -30,6 +30,7 @@ + <!-- <xi:include href="drakx-intro.xml"/> --> <info> @@ -45,6 +46,7 @@ <!--2018/02/27 apb: a) Created this section to merge doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdrake.xml and formatPartitions.xml b) renamed doPartitionDisks.xml as suggestedPartitioning.xml c) These XML's now exist as xi:includes within the newly created partitionig.xml --> <!--2018/02/27 apb: Merged configureTimezoneUTC.xml and selectCountry.xml within newly created Locale.xml. b) Disabled configureTimezoneUTC.xml and selectCountry.xml Includes and inserted Locale include.--> +<!--2019/01/12 apb: add graphicalConfiguration.xml to hold the configureX xml's.--> <title>Installasjon med DrakX</title> <cover> @@ -126,12 +128,14 @@ Team</link>, hvis du vil hjelpe til med å forbedre denne manualen.</para> </xi:include> --> <xi:include href="addUser.xml"/> - <xi:include href="configureX_chooser.xml"/> + <xi:include href="graphicalConfiguration.xml"/> - <!-- <xi:include href="configureX_card_list.xml"/> + <!-- <xi:include href="configureX_chooser.xml"/> + + <xi:include href="configureX_card_list.xml"/> <xi:include href="configureX_monitor.xml"/> --> <xi:include href="setupBootloader.xml"/> diff --git a/docs/docs/stable/installer/nb/configureX_chooser.xml b/docs/docs/stable/installer/nb/configureX_chooser.xml index a26f6937..a4269038 100644 --- a/docs/docs/stable/installer/nb/configureX_chooser.xml +++ b/docs/docs/stable/installer/nb/configureX_chooser.xml @@ -19,11 +19,14 @@ + + <mediaobject> <!-- 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--> <!--2018/02/15 apb: Some text and typography.--> <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.--> <!--2018/02/23 apb: Typo.--> +<!--2019/01/06 apb: Slight reword, split 1st para in two.--> <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png" format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject> @@ -35,6 +38,9 @@ grafisk miljø skal fungere godt, er følgende <quote>X </quote> innstillingene må være korrekte. Velg de riktige innstillingene, hvis ingen vises, eller hvis du tror at detaljene er feil.</para> + <para>Velg de aktuelle innstillingene manuelt, dersom du tror at detaljene er +feil, eller hvis ingen vises.</para> + <itemizedlist> <listitem> <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Skjerm kort</emphasis></para> @@ -84,8 +90,4 @@ ligger utenfor frekvensområdet for denne skjermen. Dette gjelder for eldre CRT-skjermer: Moderne skjermer avviser en ikke-støttet frekvens og går normalt inn i ventemodus.</para> </warning> - - <xi:include href="configureX_card_list.xml"/> - - <xi:include href="configureX_monitor.xml"/> </section> |