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, 62 insertions, 67 deletions

diff --git a/perl-install/install/help/po/is.po b/perl-install/install/help/po/is.po
index 5707eeda9..4b9edde1c 100644
--- a/perl-install/install/help/po/is.po
+++ b/perl-install/install/help/po/is.po
@@ -1,6 +1,6 @@
 # translation of DrakX.po to
 # translation of DrakX.po to Icelandic
-# Translation file for Mandriva Linux graphic install, DrakX
+# Translation file for Mageia graphic install, DrakX
 # Copyright (C) 1999,2003, 2005, 2006 Free Software Foundation, Inc.
 # Copyright (C) 1999 Mandriva
 # Jóhann Þorvarðarson <johann.torvardarson@lais.is>, 1999-2000.
@@ -23,15 +23,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 ""
 "Áður en þú heldur áfram, ættir þú að lesa vandlega leyfisskilmálana. Þeir\n"
-"taka yfir alla Mandriva Linux dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"
+"taka yfir alla Mageia dreifinguna. Ef þú er samþykk(ur) öllum þeim\n"
 "skilmálum sem þar standa, krossaðu þá við í \"%s\" reitinn, ef ekki\n"
 "smelltu þá á \"%s\" hnappinn sem mun endurræsa tölvuna þína."
 
@@ -198,15 +198,15 @@ msgstr ""
 "\"næst-lægsta SCSI ID\", o.s.frv."
 
 #: ../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 uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"
+"Mageia uppsetningunni er dreift á nokkra geisladiska. Ef valinn\n"
 "pakki er á öðrum geisladiski, þá mun DrakX spýta út núverandi diski\n"
 "og biðja þig um að setja inn rétta diskinn. Ef þú hefur ekki rétta diskinn "
 "við\n"
@@ -217,12 +217,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"
@@ -274,10 +273,10 @@ msgid ""
 msgstr ""
 "Nú er tími til að skilgreina hvaða forrit þú vilt að séu sett upp á kerfinu "
 "þínu.\n"
-"Það eru þúsundir pakka til fyrir Mandriva Linux, og til að einfalda\n"
+"Það eru þúsundir pakka til fyrir Mageia, og til að einfalda\n"
 "umsjón pakkanna hafa þeir verið flokkaðir í hópa af svipuðum forritum.\n"
 "\n"
-"Mandriva Linux skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"
+"Mageia skiptir pökkunum í fjóra flokka. Þú getur blandað saman\n"
 "pökkum úr mismunandi flokkum svo að ``Vinnustöðvar'' uppsetning\n"
 "getur innihaldið forrit úr ``Miðlara'' flokknum.\n"
 "\n"
@@ -343,7 +342,7 @@ msgid "Truly minimal install"
 msgstr "Alger lágmarksuppsetning"
 
 #: ../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"
@@ -356,10 +355,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"
@@ -390,7 +389,7 @@ msgstr ""
 "!! Ef miðlara-pakki hefur verið valinn, annað hvort af því að þú valdir "
 "stakan\n"
 "pakka eða hann var hluti af hóp, verður þú beðinn um að staðfesta að\n"
-"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mandriva Linux ræsa "
+"þú viljir fá þessa miðlara uppsetta. Sjálfgefið mun Mageia ræsa "
 "allar\n"
 "uppsettar þjónustur og miðlara við kerfisræsingu. Jafnvel þó að þeir séu\n"
 "öruggir og engar þekktar villur þegar kerfinu var dreift þá er möguleiki að\n"
@@ -521,11 +520,11 @@ msgstr ""
 " miðlara sem best hentar þínum þörfum."
 
 #: ../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"
@@ -581,7 +580,7 @@ msgid ""
 msgstr ""
 "X (sem stendur fyrir X-glugga-kerfið) er grunnur myndræna viðmótsins\n"
 "á GNU/Linux. Á því eru byggð öll gluggakerfin (KDE, GNOME, AfterStep,\n"
-"WindowMaker, o.s.frv. ) sem fylgja Mandriva Linux.\n"
+"WindowMaker, o.s.frv. ) sem fylgja Mageia.\n"
 "\n"
 "Þú sérð lista af mismunandi breytum til að stilla bestu myndgæði.\n"
 "\n"
@@ -694,14 +693,14 @@ msgstr ""
 "grafíska skjákortið/upplausnina/skjáinn... rétt."
 
 #: ../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"
@@ -728,7 +727,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"
@@ -737,8 +736,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"
@@ -758,11 +756,11 @@ 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 ""
-"Nú verður þú að ákveða hvar þú vilt setja upp Mandriva Linux\n"
+"Nú verður þú að ákveða hvar þú vilt setja upp Mageia\n"
 "stýrikerfið á diskinn þinn. Ef diskurinn þinn er tómur eða núverandi\n"
 "stýrikerfi er að nota allt plássið á disknum, þá verður þú að\n"
 "Endursníða diskinn. Að sníða diskinn þýðir að skipta disknum\n"
-"í hluta sem þörf er á til að setja upp Mandriva Linux kerfið.\n"
+"í hluta sem þörf er á til að setja upp Mageia kerfið.\n"
 "\n"
 "Af því að skipting disks í sneiðar er venjulega óafturkræf aðgerð\n"
 "og getur leitt til að þú tapir gögnum, þá getur þetta verið erfið og\n"
@@ -799,7 +797,7 @@ msgstr ""
 "til að geyma gögn og setja upp hugbúnað.\n"
 "\n"
 " * \"%s\". Ef þú vilt eyða öllum gögnum og disksneiðum sem nú eru\n"
-"á disknum og skipta þeim út með nýju Mandriva Linux stýrikerfi, veldu\n"
+"á disknum og skipta þeim út með nýju Mageia stýrikerfi, veldu\n"
 "þennan valkost. Farðu varlega, því þú getur ekki afturkallað þessar\n"
 "breytingar eftir að þú hefur staðfest þær.\n"
 "\n"
@@ -929,7 +927,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"
@@ -948,7 +946,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."
@@ -969,16 +967,16 @@ msgstr ""
 "\n"
 "Smelltu á \"%s\" þegar þú ert tilbúinn, og vilt forsníða disksneiðarnar.\n"
 "\n"
-"Smelltu á \"%s\" ef þú vilt velja aðra disksneið fyrir nýja Mandriva Linux\n"
+"Smelltu á \"%s\" ef þú vilt velja aðra disksneið fyrir nýja Mageia\n"
 "stýrikerfið þitt.\n"
 "\n"
 "Smelltu á \"%s\" ef þú vilt velja disksneiðar sem verða skoðaðar\n"
 "sérstaklega m.t.t. galla á diskblokkum."
 
 #: ../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"
@@ -990,7 +988,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Þegar þú setur upp Mandriva Linux er líklegt að sumir pakkar hafi verið\n"
+"Þegar þú setur upp Mageia er líklegt að sumir pakkar hafi verið\n"
 "uppfærðir frá upphaflegri útgáfu. Villur hafa verið lagfærðar, og\n"
 "öryggisvandamál leyst. Til að nýta ykkur þessar uppfærslur, þá getið\n"
 "þið sótt þær nú um Internetið. Krossaðu við \"%s\" ef þú hefur nú\n"
@@ -1002,7 +1000,7 @@ msgstr ""
 "til að sækja og setja upp valda pakka, eða \"%s\" til að hætta við."
 
 #: ../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"
@@ -1011,7 +1009,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"
@@ -1024,7 +1022,7 @@ msgstr ""
 "vél og gögnum verður óþjálli.\n"
 "\n"
 "Ef þú veist ekki hvað á að velja, notaðu þá sjálfgefið öryggisstig. Þú\n"
-"getur breytt því seinna með draksec tólinu, sem er hluti af Mandriva Linux\n"
+"getur breytt því seinna með draksec tólinu, sem er hluti af Mageia\n"
 "stjórnborðinu.\n"
 "\n"
 "Fylltu út í svæðið \"%s\" með netfangi þess aðila sem er ábyrgur fyrir\n"
@@ -1036,10 +1034,10 @@ msgid "Security Administrator"
 msgstr "Öryggisfulltrúi"
 
 #: ../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"
@@ -1109,7 +1107,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"Hér þarft þú að ákveða hvaða disksneið þú vilt nota fyrir Mandriva Linux\n"
+"Hér þarft þú að ákveða hvaða disksneið þú vilt nota fyrir Mageia\n"
 "stýrikerfið. Ef disksneiðar hafa þegar verið skilgreindar, annað hvort\n"
 "frá fyrri uppsetningu á GNU/Linux, eða af öðru forriti til að stilla\n"
 "disksneiðar, þá getur þú notað þær. Annars verður þú að skilgreina\n"
@@ -1217,11 +1215,11 @@ msgid "Toggle between normal/expert mode"
 msgstr "Víxla milli venjulegs/sérfræðings-hams"
 
 #: ../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"
@@ -1251,7 +1249,7 @@ msgid ""
 msgstr ""
 "Fleiri en ein Microsoft disksneið hefur fundist á disknum.\n"
 "Vinsamlega veldu hverri þeirra þú vilt breyta stærðinni á til að geta sett\n"
-"upp nýja Mandriva Linux stýrikerfið.\n"
+"upp nýja Mageia stýrikerfið.\n"
 "\n"
 "Hver sneið á listanum inniheldur \"Linux nafn\", \"Windows nafn\" \"Diskrýmd"
 "\".\n"
@@ -1292,13 +1290,13 @@ msgstr ""
 "smelltu þá á \"%s\" hnappinn til að sjá heildalista landa."
 
 #: ../help.pm:572
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "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"
@@ -1307,20 +1305,19 @@ 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 ""
 "Þetta skref er aðeins virkjað ef GNU/Linux disksneið hefur fundist á\n"
 "tölvunni þinni.\n"
 "\n"
 "DrakX þarf nú að vita hvort þú vilt setja upp nýtt kerfi eða hvort þú\n"
-"vilt uppfæra uppsett Mandriva Linux kerfi:\n"
+"vilt uppfæra uppsett Mageia kerfi:\n"
 "\n"
 " * \"%s\". Þetta þurkar að mestu út gamla kerfið. En þó fer það\n"
 "svolítið eftir diskssneiðum sem þú hefur sett upp, þá getur þú\n"
@@ -1329,13 +1326,13 @@ msgstr ""
 "skráakerfinu, þá ættir þú að velja þennan valkost.\n"
 "\n"
 " * \"%s\". Þessi uppsetning leyfir þér að uppfæra pakkana sem nú\n"
-"eru uppsettir á Mandriva Linux kerfinu þínu. Disksneiðum og gögnum\n"
+"eru uppsettir á Mageia kerfinu þínu. Disksneiðum og gögnum\n"
 "verður ekki breytt. Flest uppsetningarþrep eru enn aðgengileg\n"
 "og eru svipuð venjulegri uppfærslu.\n"
 "\n"
-"Að nota ``Uppfærslu'' aðgerðina ætti að virka vel á Mandriva Linux\n"
+"Að nota ``Uppfærslu'' aðgerðina ætti að virka vel á Mageia\n"
 "kerfum sem eru að keyra útgáfu \"8.1\" eða nýrri. Ekki er mælt með\n"
-"uppfærslu á eldri útgáfum en Mandriva Linux \"8.1\"."
+"uppfærslu á eldri útgáfum en Mageia \"8.1\"."
 
 #: ../help.pm:594
 #, c-format
@@ -1375,7 +1372,7 @@ msgstr ""
 "sem víxlar til og frá latneska lyklaborðinu."
 
 #: ../help.pm:612
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -1391,8 +1388,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"
@@ -1596,10 +1592,10 @@ msgstr ""
 "það aðeins ef þú veist hvað þú ert að gera."
 
 #: ../help.pm:745
-#, c-format
+#, fuzzy, 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"
@@ -1620,11 +1616,11 @@ 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 ""
 "Nú er komið að því að setja upp prentkerfi fyrir tölvuna þína. Önnur\n"
-"stýrikerfis bjóða þér kannski upp á eitt, en Mandriva Linux býður tvö.\n"
+"stýrikerfis bjóða þér kannski upp á eitt, en Mageia býður tvö.\n"
 "Hvort þeirra hefur sína kosti\n"
 "\n"
 " * \"%s\" -- sem er skammstöfun fyrir ``prenta ekki biðröð'' \n"
@@ -1646,7 +1642,7 @@ msgstr ""
 "prentaraval og stjórnun á prentara.\n"
 "\n"
 "Hvað sem þú velur núna, þá getur þú breytt prentkerfinu með því að\n"
-"keyra PrinterDrake frá Mandriva Linux stjórnborðinu og smella á \"%s\"\n"
+"keyra PrinterDrake frá Mageia stjórnborðinu og smella á \"%s\"\n"
 "hnappinn."
 
 #: ../help.pm:768
@@ -1752,8 +1748,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"
@@ -1770,7 +1765,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"
@@ -1853,14 +1848,14 @@ msgid "Graphical Interface"
 msgstr "Myndrænt viðmót"
 
 #: ../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 ""
 "Veldu diskinn sem þú vilt hreinsa allt af til að setja upp nýja\n"
-"Mandriva Linux disksneið.  Varúð, öllum gögnum á disknum verður\n"
+"Mageia disksneið.  Varúð, öllum gögnum á disknum verður\n"
 "eytt, og það er ekki hægt að sækja þau aftur!"
 
 #: ../help.pm:866