Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line

Add drakx structure on the SVN
------------------------------------------------------------------------
r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned advertising
------------------------------------------------------------------------
r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line

Import Clean perl-install
------------------------------------------------------------------------
r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line

Add cleaned files
------------------------------------------------------------------------
r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned kernel
------------------------------------------------------------------------
r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned tools
------------------------------------------------------------------------
r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line

Import stage1
------------------------------------------------------------------------
r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line

Import images
------------------------------------------------------------------------
r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines

readd missing file

------------------------------------------------------------------------
r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line

Import rescue
------------------------------------------------------------------------
r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines

import cleaned rescue for Mageia

------------------------------------------------------------------------
r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line

import (cleaned) doc
------------------------------------------------------------------------

1 files changed, 52 insertions, 57 deletions

diff --git a/perl-install/install/help/po/nn.po b/perl-install/install/help/po/nn.po
index b5f06b4de..e4e5ac362 100644
--- a/perl-install/install/help/po/nn.po
+++ b/perl-install/install/help/po/nn.po
@@ -17,15 +17,15 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../help.pm:14
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandriva Linux distribution. If you agree with all the\n"
+"covers the entire Mageia distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "Du bør lesa vilkåra i lisensavtala nøye før du eventuelt held fram.\n"
-"Avtala dekkjer heile Mandriva Linux-distribusjonen. Kryss av for\n"
+"Avtala dekkjer heile Mageia-distribusjonen. Kryss av for\n"
 "«%s» berre viss du er einig i alle vilkåra. Elles vil «%s»-knappen\n"
 "starta maskina på nytt."
 
@@ -202,15 +202,15 @@ msgstr ""
 " nest lågaste SCSI-ID, og så vidare."
 
 #: ../help.pm:88
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mageia installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandriva Linux-distribusjonen ligg fordelt på fleire plater. Viss ein pakke "
+"Mageia-distribusjonen ligg fordelt på fleire plater. Viss ein pakke "
 "ligg på ei anna plate, vert du automatisk bedt om å setja ho i. Berre trykk «%"
 "s» om du ikkje har denne plata. Dei aktuelle pakkane vert då ikkje "
 "installerte."
@@ -219,12 +219,11 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandriva Linux, and to make "
-"it\n"
+"There are thousands of packages available for Mageia, and to make it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandriva Linux sorts package groups in four categories. You can mix and\n"
+"Mageia sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -275,7 +274,7 @@ msgid ""
 "megabytes."
 msgstr ""
 "Det må no velja kva program du ønskjer å installera på maskina. Det finst\n"
-"tusenvis av programpakkar for Mandriva Linux, og desse er her ordna i "
+"tusenvis av programpakkar for Mageia, og desse er her ordna i "
 "grupper.\n"
 "\n"
 "Pakkane er grupperte i fire kategoriar, men du kan velja program frå alle\n"
@@ -339,7 +338,7 @@ msgid "Truly minimal install"
 msgstr "Heilt minimal installasjon"
 
 #: ../help.pm:152
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you choose to install packages individually, the installer will present\n"
 "a tree containing all packages classified by groups and subgroups. While\n"
@@ -352,10 +351,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandriva Linux will automatically start any installed\n"
+"installed. By default Mageia will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandriva Linux was\n"
+"security holes were discovered after this version of Mageia was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -505,11 +504,11 @@ msgstr ""
 "kan du velja tenaren som passar best for deg."
 
 #: ../help.pm:234
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mageia rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -566,7 +565,7 @@ msgstr ""
 "X er hjarta i det grafiske grensesnittet til GNU/Linux, og alle dei "
 "grafiske\n"
 "skrivebordsmiljøa (KDE, GNOME, AfterStep, WindowsMaker, med fleire)\n"
-"som følgjer med Mandriva Linux avheng av X.\n"
+"som følgjer med Mageia avheng av X.\n"
 "\n"
 "Du vil sjå ei liste over forskjellige innstillingar til det grafiske "
 "oppsettet:\n"
@@ -679,14 +678,14 @@ msgstr ""
 "eller du før ikkje har klart å setja opp det grafiske oppsettet."
 
 #: ../help.pm:319
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"You now need to decide where you want to install the Mandriva Linux\n"
+"You now need to decide where you want to install the Mageia\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandriva Linux system.\n"
+"Mageia system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -713,7 +712,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mageia and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -722,8 +721,7 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandriva Linux system, "
-"choose\n"
+"your hard drive and replace them with your new Mageia system, choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -743,7 +741,7 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"No må du velja kor du vil installera Mandriva Linux på harddisken din. Viss\n"
+"No må du velja kor du vil installera Mageia på harddisken din. Viss\n"
 "harddisken er tom, eller viss eit anna operativsystem brukar heile disken,\n"
 "må du først partisjonera han. Å partisjonera vil seia å dela opp disken,\n"
 "slik at for eksempel kvart operativsystem får sin eigen del.\n"
@@ -771,7 +769,7 @@ msgstr ""
 "\n"
 "– «%s»: Om Microsoft Windows er installert og tar opp all plass på harddisken "
 "din,\n"
-"må du frigjera noko plass til Mandriva Linux. Du kan anten sletta Windows-\n"
+"må du frigjera noko plass til Mageia. Du kan anten sletta Windows-\n"
 "partisjonen din (sjå «Slett heile disken»-valet), eller endra storleiken på "
 "Windows-\n"
 "partisjonen (både FAT- og NTFS-filsystema er støtta). Du vil ikkje mista "
@@ -779,7 +777,7 @@ msgstr ""
 "data ved endra storleiken på partisjonen, så lenge du har defragmentert han\n"
 "på førehand. Men du bør uansett ta reservekopi av alle dataa. Du bør velja "
 "dette\n"
-"valet om du ønskjer å bruka både Mandriva Linux og Microsoft Windows på "
+"valet om du ønskjer å bruka både Mageia og Microsoft Windows på "
 "same\n"
 "maskina.\n"
 "\n"
@@ -790,7 +788,7 @@ msgstr ""
 "programvare.\n"
 "\n"
 "– «%s»: Vel dette om du ønskjer å sletta alle data og alle partisjonar på\n"
-"harddisken din, og installera Mandriva Linux over desse. Ver forsiktig, då "
+"harddisken din, og installera Mageia over desse. Ver forsiktig, då "
 "du ikkje\n"
 "kan angra denne handlinga.\n"
 "\n"
@@ -859,7 +857,7 @@ msgid ""
 "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
 "/dev/fd0\"."
 msgstr ""
-"Sånn! Installasjonen er no ferdig, og Mandriva Linux er klar til bruk. "
+"Sånn! Installasjonen er no ferdig, og Mageia er klar til bruk. "
 "Berre\n"
 "trykk «%s» for å starta maskina på nytt. Ikkje gløym å fjerna installasjons\n"
 "mediet (CD-ROM-en eller disketten) først. Når maskina er starta opp att,\n"
@@ -876,7 +874,7 @@ msgstr ""
 "    – «%s»: Heilautomatisk installering. Harddisken vert heilt tømt, og alle\n"
 "gamle data går tapt.\n"
 "\n"
-"   Denne funksjonen er veldig nyttig når du skal installera Mandriva Linux "
+"   Denne funksjonen er veldig nyttig når du skal installera Mageia "
 "på\n"
 " fleire like maskiner. Sjå avsnittet om automatisk installering på "
 "nettstaden vår for\n"
@@ -915,7 +913,7 @@ msgid "Save packages selection"
 msgstr ""
 
 #: ../help.pm:408
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
 "reformat some of them and erase any data they contain. To do so, please\n"
@@ -934,7 +932,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandriva Linux operating system installation.\n"
+"Mageia operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -953,15 +951,15 @@ msgstr ""
 "\n"
 "Trykk «%s» når du er klar til å formatera partisjonane.\n"
 "\n"
-"Trykk «%s» om du vil velja ein annan partisjon for Mandriva Linux-systemet.\n"
+"Trykk «%s» om du vil velja ein annan partisjon for Mageia-systemet.\n"
 "\n"
 "Trykk «%s» om du ønskjer å velja partisjonar å gjennomsøkja etter fysiske "
 "feil."
 
 #: ../help.pm:437
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"By the time you install Mandriva Linux, it's likely that some packages will\n"
+"By the time you install Mageia, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -973,7 +971,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Det har no truleg komme fleire oppdateringar til pakkane i Mandriva Linux\n"
+"Det har no truleg komme fleire oppdateringar til pakkane i Mageia\n"
 "sidan denne utgåva vart produsert. Det kan for eksempel vera feil som er\n"
 "fiksa, eller tryggleikshol som er tetta. Du kan lasta ned desse "
 "oppdateringane\n"
@@ -989,7 +987,7 @@ msgstr ""
 "vel «%s» for å avbryta."
 
 #: ../help.pm:450
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, DrakX will allow you to choose the security level you desire\n"
 "for your machine. As a rule of thumb, the security level should be set\n"
@@ -998,7 +996,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandriva Linux\n"
+"to change it later with the draksec tool, which is part of Mageia\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -1022,10 +1020,10 @@ msgid "Security Administrator"
 msgstr "Tryggleiksansvarleg"
 
 #: ../help.pm:464
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandriva Linux system. If partitions have already been\n"
+"installation of your Mageia system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -1095,7 +1093,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"No må du velja kva partisjonar du vil installera Mandriva Linux på. Om du "
+"No må du velja kva partisjonar du vil installera Mageia på. Om du "
 "allereie har ferdige partisjonar, frå tidlegare installasjonar av GNU/Linux "
 "eller av partisjoneringsverktøy, kan du bruka desse. Elles må du laga nye "
 "partisjonar.\n"
@@ -1197,11 +1195,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "Byt mellom normal- og ekspertmodus"
 
 #: ../help.pm:536
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandriva Linux operating system.\n"
+"Mageia operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -1231,7 +1229,7 @@ msgid ""
 msgstr ""
 "Oppdaga meir enn éin Microsoft-partisjon på harddisken.\n"
 "Vel kven av dei du vil endra storleiken på for å installera det nye\n"
-"Mandriva Linux-operativsystemet.\n"
+"Mageia-operativsystemet.\n"
 "Kvar partisjon vert vist slik: Linux-namn, Windows-namn, storleik.\n"
 "Linuxnamnet er skriven slik: harddisktype, harddisknummer, partisjonsnummer "
 "(for eksempel «hda1»).\n"
@@ -1272,7 +1270,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandriva Linux system:\n"
+"upgrade of an existing Mageia system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -1281,14 +1279,13 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandriva Linux system. Your current "
-"partitioning\n"
+"currently installed on your Mageia system. Your current partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mageia systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandriva Linux version \"8.1\" is not recommended."
+"to Mageia version \"8.1\" is not recommended."
 msgstr ""
 
 #: ../help.pm:594
@@ -1345,8 +1342,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandriva Linux's use of UTF-8 "
-"will\n"
+"still under development. For that reason, Mageia's use of UTF-8 will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -1464,7 +1460,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
+"operating systems may offer you one, but Mageia offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -1485,7 +1481,7 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandriva Linux\n"
+"system you may change it by running PrinterDrake from the Mageia\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 
@@ -1577,8 +1573,7 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandriva Linux Control Center after the installation has finished to "
-"benefit\n"
+"Mageia Control Center after the installation has finished to benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -1595,7 +1590,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandriva Linux Control Center.\n"
+"Mageia Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -1618,13 +1613,13 @@ msgid "Graphical Interface"
 msgstr "Grafisk grensesnitt"
 
 #: ../help.pm:861
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
+"Mageia partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Vel harddisken du ønskjer å sletta for å installera den nye Mandriva Linux-\n"
+"Vel harddisken du ønskjer å sletta for å installera den nye Mageia-\n"
 "partisjonen. Alle data på denne stasjonen vil då gå tapt for all framtid."
 
 #: ../help.pm:866