sync with code

1 files changed, 164 insertions, 158 deletions

diff --git a/perl-install/install/share/po/is.po b/perl-install/install/share/po/is.po
index 39a18bf4b..a52309d80 100644
--- a/perl-install/install/share/po/is.po
+++ b/perl-install/install/share/po/is.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 05:35+0200\n"
+"POT-Creation-Date: 2009-09-10 12:21+0200\n"
 "PO-Revision-Date: 2009-03-30 14:04+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -20,6 +20,31 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../advertising/IM_flash.pl:1
+#, c-format
+msgid "Your desktop on a USB key"
+msgstr "Vinnustöðin þín á USB lykli"
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr "Mandriva uppsetningin með 100%% frjálsum, opnum hugbúnaði"
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr "Kannaðu Linux með Mandriva One"
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr "Full Mandriva Linux vinnustöð, með þjónustu"
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr "Mandriva: dreifingar við allra hæfi"
+
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -140,49 +165,18 @@ msgstr ""
 msgid "Looking at packages already installed..."
 msgstr "Athuga þegar uppsetta pakka..."
 
-#: any.pm:368
+#: any.pm:369
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Leita að pökkum til að uppfæra..."
 
-#: any.pm:387
+#: any.pm:388
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjarlægi pakka áður en uppfærsla hefst..."
 
-#: any.pm:408
-#, c-format
-msgid ""
-"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
-"choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
-"settings. \n"
-"To upgrade with KDE 3.5 and your personal settings preserved, \n"
-"please reboot your system and upgrade using the Mandriva update applet."
-msgstr ""
-"Þú hefur ákveðið að uppfæra kerfið þitt í %s. KDE 3.5 hefur fundist á\n"
-"kerfinu þínu. Þetta uppsetningarforrit getur ekki varðveitt KDE 3.5 "
-"uppsetningu.\n"
-"Ef þú velur að halda áfram, þá verður KDE 4 sett upp í stað KDE 3 og "
-"persónulegar\n"
-"stillingar tapast.\n"
-"Til að uppfæra með KDE 3.5, og varðveita persónulegar stillingar, "
-"endurræstu\n"
-"þá tölvuna þína og notaðu Mandriva bakka-uppfærsluforritið."
-
-#: any.pm:413 steps_interactive.pm:1103
-#, c-format
-msgid "Reboot"
-msgstr "Endurræsa"
-
-#: any.pm:413
-#, c-format
-msgid "Proceed"
-msgstr "Halda áfram"
-
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:602
+#: any.pm:594
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,91 +189,86 @@ msgstr ""
 "\n"
 "Viltu í alvöru fjarlægja þessa pakka?\n"
 
-#: any.pm:821
+#: any.pm:813
 #, c-format
 msgid "Error reading file %s"
 msgstr "Villa við lestur úr skránni %s"
 
-#: any.pm:1028
+#: any.pm:1020
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Eftirfarandi diskar voru endurnefndir:"
 
-#: any.pm:1030
+#: any.pm:1022
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (áður nefnt %s)"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1106 steps_interactive.pm:932
+#: any.pm:1098 steps_interactive.pm:936
 #, c-format
 msgid "Network"
 msgstr "Net"
 
-#: any.pm:1110
+#: any.pm:1102
 #, c-format
 msgid "Please choose a media"
 msgstr "Veldu miðil"
 
-#: any.pm:1126
+#: any.pm:1118
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Skráin er þegar til. Skrifa yfir hana?"
 
-#: any.pm:1130
+#: any.pm:1122
 #, c-format
 msgid "Permission denied"
 msgstr "Aðgangi hafnað"
 
-#: any.pm:1178
+#: any.pm:1170
 #, c-format
 msgid "Bad NFS name"
 msgstr "Rangt NFS nafn"
 
-#: any.pm:1199
+#: any.pm:1191
 #, c-format
 msgid "Bad media %s"
 msgstr "Gallaður miðill %s"
 
-#: any.pm:1242
+#: any.pm:1234
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Get ekki tekið skjámyndir fyrr en disksneiðar hafa verið skilgreindar"
 
-#: any.pm:1250
+#: any.pm:1242
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjámyndir verða tiltækar eftir uppsetningu í %s"
 
-#: gtk.pm:130
+#: gtk.pm:131
 #, c-format
 msgid "Installation"
 msgstr "Set inn"
 
-#: gtk.pm:134 share/meta-task/compssUsers.pl:44
+#: gtk.pm:135 share/meta-task/compssUsers.pl:44
 #, c-format
 msgid "Configuration"
 msgstr "Stillingar"
 
-#: http.pm:53
-#, c-format
-msgid "retrieval of [%s] failed"
-msgstr ""
-
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -310,17 +299,17 @@ msgstr "Keyri niður netið"
 msgid "Please wait, retrieving file"
 msgstr "Bíðið, sæki skrá"
 
-#: media.pm:718
+#: media.pm:716
 #, c-format
 msgid "unable to add medium"
 msgstr ""
 
-#: media.pm:758
+#: media.pm:756
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Afrita nokkra pakka á diska til notkunar síðar"
 
-#: media.pm:811
+#: media.pm:809
 #, c-format
 msgid "Copying in progress"
 msgstr "Afritun í gangi"
@@ -364,12 +353,12 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Villa kom upp:"
 
-#: pkgs.pm:780
+#: pkgs.pm:792
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d Innsetningarfærslur brugðust"
 
-#: pkgs.pm:781
+#: pkgs.pm:793
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Innsetning pakka tókst ekki:"
@@ -800,17 +789,17 @@ msgstr "Hér er forsýn af '%s' skjáborðinu."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Smelltu á myndir til að sjá stærri forsýn"
 
-#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Val á pakkahóp"
 
-#: steps_gtk.pm:336 steps_interactive.pm:619
+#: steps_gtk.pm:336 steps_interactive.pm:623
 #, c-format
 msgid "Individual package selection"
 msgstr "Val á einstökum pökkum"
 
-#: steps_gtk.pm:360 steps_interactive.pm:543
+#: steps_gtk.pm:360 steps_interactive.pm:544
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Heildarstærð: %d / %d MB"
@@ -927,59 +916,59 @@ msgstr "Lágmarks uppsetning"
 msgid "Software Management"
 msgstr "Hugbúnaðarumsýsla"
 
-#: steps_gtk.pm:517 steps_interactive.pm:428
+#: steps_gtk.pm:517 steps_interactive.pm:429
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Veldu pakkana sem þú vilt setja inn"
 
-#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Set inn"
 
-#: steps_gtk.pm:563
+#: steps_gtk.pm:564
 #, c-format
 msgid "No details"
 msgstr "Engar upplýsingar"
 
-#: steps_gtk.pm:578
+#: steps_gtk.pm:583
 #, c-format
 msgid "Time remaining:"
 msgstr "Tími eftir:"
 
-#: steps_gtk.pm:579
+#: steps_gtk.pm:584
 #, c-format
 msgid "(estimating...)"
 msgstr "(áætla...)"
 
-#: steps_gtk.pm:605
+#: steps_gtk.pm:614
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakki"
 msgstr[1] "%d pakkar"
 
-#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
+#: steps_gtk.pm:668 steps_interactive.pm:801 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Yfirlit"
 
-#: steps_gtk.pm:670
+#: steps_gtk.pm:687
 #, c-format
 msgid "Configure"
 msgstr "Stilla"
 
-#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
+#: steps_gtk.pm:704 steps_interactive.pm:797 steps_interactive.pm:948
 #, c-format
 msgid "not configured"
 msgstr "ekki stillt"
 
-#: steps_gtk.pm:721
+#: steps_gtk.pm:738
 #, c-format
 msgid "Media Selection"
 msgstr "Val á miðlum"
 
-#: steps_gtk.pm:730 steps_interactive.pm:329
+#: steps_gtk.pm:747 steps_interactive.pm:330
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -988,7 +977,7 @@ msgstr ""
 "Eftirfarandi uppsetningar-miðlar hafa fundist.\n"
 "Ef þú vilt sleppa einhverjum af þeim, þá getur þú af-valið þá núna."
 
-#: steps_gtk.pm:746 steps_interactive.pm:335
+#: steps_gtk.pm:763 steps_interactive.pm:336
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1001,7 +990,7 @@ msgstr ""
 "Síðan mun uppsetning halda áfram frá disknum og pakkarnir verða til staðar "
 "þegar kerfið er að fullu uppsett."
 
-#: steps_gtk.pm:748 steps_interactive.pm:337
+#: steps_gtk.pm:765 steps_interactive.pm:338
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Afrita alla geisladiska"
@@ -1021,49 +1010,49 @@ msgstr "Veldu lyklaborðs-uppsetningu"
 msgid "Here is the full list of available keyboards:"
 msgstr "Hér er tæmandi listi af tiltækum lyklaborðum:"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:144
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Innsetning/Uppfærsla"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:148
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er þetta innsetning eða uppfærsla?"
 
-#: steps_interactive.pm:149
+#: steps_interactive.pm:150
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Innsetning"
 
-#: steps_interactive.pm:151
+#: steps_interactive.pm:152
 #, c-format
 msgid "Upgrade %s"
 msgstr "Uppfæra %s"
 
-#: steps_interactive.pm:169
+#: steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Dulritunar-lykill fyrir %s"
 
-#: steps_interactive.pm:202
+#: steps_interactive.pm:203
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Hætta við innsetningu, endurræsa kerfi"
 
-#: steps_interactive.pm:203
+#: steps_interactive.pm:204
 #, c-format
 msgid "New Installation"
 msgstr "Ný Uppsetning"
 
-#: steps_interactive.pm:204
+#: steps_interactive.pm:205
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Uppfæra fyrri uppsetningu (ekki mælt með)"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:209
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1082,17 +1071,17 @@ msgstr ""
 "Aðvörun : þú ættir að afrita öll persónuleg gögn áður en þú velur \"Ný "
 "Uppsetning\"."
 
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
 #, c-format
 msgid "Configuring IDE"
 msgstr "Uppsetning IDE"
 
-#: steps_interactive.pm:287
+#: steps_interactive.pm:288
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1101,7 +1090,7 @@ msgstr ""
 "Ekki pláss fyrir 1MB ræsigeira! Uppsetning mun halda áfram, en til að ræsa "
 "kerfið þitt verður þú að búa til ræsi-disksneið með DiskDrake"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:293
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1111,7 +1100,7 @@ msgstr ""
 "Þú þarft að búa til PPC PReP for-ræsingu! Uppsetningin mun halda áfram, en "
 "til að ræsa kerfið, þarft þú að búa til ræsi-disksneið með DiskDrake"
 
-#: steps_interactive.pm:368
+#: steps_interactive.pm:369
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1125,12 +1114,12 @@ msgstr ""
 "Ef þú hefur ekki diskinn, ýttu þá að \"Hætta við\" til að sleppa uppsetningu "
 "frá þessum diski."
 
-#: steps_interactive.pm:385
+#: steps_interactive.pm:386
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Leita að tiltækum pökkum..."
 
-#: steps_interactive.pm:393
+#: steps_interactive.pm:394
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1139,7 +1128,7 @@ msgstr ""
 "Það er ekki nóg laust pláss fyrir innsetningu eða uppfærslu á kerfinu þínu (%"
 "dMB > %dMB)"
 
-#: steps_interactive.pm:440
+#: steps_interactive.pm:441
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1148,52 +1137,52 @@ msgstr ""
 "Veldu hvort eigi að sækja eða vista pakkaval.\n"
 "Sniðið er það sama og á auto_install skrám."
 
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
 #, c-format
 msgid "Load"
 msgstr "Sækja"
 
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
 #, c-format
 msgid "Save"
 msgstr "Vista"
 
-#: steps_interactive.pm:450
+#: steps_interactive.pm:451
 #, c-format
 msgid "Bad file"
 msgstr "Gölluð skrá"
 
-#: steps_interactive.pm:466
+#: steps_interactive.pm:467
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:467
+#: steps_interactive.pm:468
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:471
 #, c-format
 msgid "Desktop Selection"
 msgstr "Val á Skjáborði"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:472
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Þú getur valið vinnustöðvar-umhverfi (skjáborð)."
 
-#: steps_interactive.pm:557
+#: steps_interactive.pm:558
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valin stærð er stærri en tiltækt pláss"
 
-#: steps_interactive.pm:572
+#: steps_interactive.pm:574
 #, c-format
 msgid "Type of install"
 msgstr "Tegund uppsetningar"
 
-#: steps_interactive.pm:573
+#: steps_interactive.pm:575
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1202,82 +1191,87 @@ msgstr ""
 "Þú hefur ekki valið neina pakkahópa.\n"
 "Veldu lágmarksuppsetningu sem þú vilt:"
 
-#: steps_interactive.pm:578
+#: steps_interactive.pm:580
 #, c-format
 msgid "With X"
 msgstr "Með X"
 
-#: steps_interactive.pm:579
+#: steps_interactive.pm:581
+#, fuzzy, c-format
+msgid "Install suggested packages"
+msgstr "Set inn pakka %s"
+
+#: steps_interactive.pm:582
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Með grunn-handbókum (mælt með!)"
 
-#: steps_interactive.pm:580
+#: steps_interactive.pm:583
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Alger lágmarksuppsetning (ekkert urpmi)"
 
-#: steps_interactive.pm:634
+#: steps_interactive.pm:638
 #, c-format
 msgid "Preparing installation"
 msgstr "Undirbý innsetningu"
 
-#: steps_interactive.pm:642
+#: steps_interactive.pm:646
 #, c-format
 msgid "Installing package %s"
 msgstr "Set inn pakka %s"
 
-#: steps_interactive.pm:666
+#: steps_interactive.pm:670
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Það kom upp villa við að raða pökkum:"
 
-#: steps_interactive.pm:666
+#: steps_interactive.pm:670
 #, c-format
 msgid "Go on anyway?"
 msgstr "Viltu samt halda áfram?"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:674
 #, c-format
 msgid "Retry"
 msgstr "Reyna aftur"
 
-#: steps_interactive.pm:671
+#: steps_interactive.pm:675
 #, c-format
 msgid "Skip this package"
 msgstr "Sleppa þessum pakka"
 
-#: steps_interactive.pm:672
+#: steps_interactive.pm:676
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Sleppa ölum pökkum af miðli \"%s\""
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:677
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Fara til baka í val á miðlum og pökkum"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:680
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Það kom upp villa við innsetningu pakka %s."
 
-#: steps_interactive.pm:695
+#: steps_interactive.pm:699
 #, c-format
 msgid "Post-install configuration"
 msgstr "Lokastillingar"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:706
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Staðfestu að Uppfærslu-miðill sé í drifi %s"
 
-#: steps_interactive.pm:730 steps_list.pm:47
+#: steps_interactive.pm:734 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uppfærslur"
 
-#: steps_interactive.pm:731
+#: steps_interactive.pm:735
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1297,28 +1291,28 @@ msgstr ""
 "\n"
 "Viltu sækja uppfærslurnar?"
 
-#: steps_interactive.pm:839
+#: steps_interactive.pm:843
 #, c-format
 msgid "%s on %s"
 msgstr "%s á %s"
 
-#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
-#: steps_interactive.pm:909 steps_interactive.pm:924
+#: steps_interactive.pm:876 steps_interactive.pm:883 steps_interactive.pm:896
+#: steps_interactive.pm:913 steps_interactive.pm:928
 #, c-format
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: steps_interactive.pm:893 steps_interactive.pm:910
+#: steps_interactive.pm:897 steps_interactive.pm:914
 #, c-format
 msgid "Sound card"
 msgstr "Hljóðkort"
 
-#: steps_interactive.pm:913
+#: steps_interactive.pm:917
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Er kannski ISA hljóðkort í vélinni?"
 
-#: steps_interactive.pm:915
+#: steps_interactive.pm:919
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1327,68 +1321,68 @@ msgstr ""
 "Keyrðu \"alsaconf\" eða \"sndconfig\" eftir uppsetningu til að stilla "
 "hljóðkortið þitt"
 
-#: steps_interactive.pm:917
+#: steps_interactive.pm:921
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Ekkert hljóðkort fannst. Reyndu að keyra \"harddrake\" eftir uppsetningu"
 
-#: steps_interactive.pm:925
+#: steps_interactive.pm:929
 #, c-format
 msgid "Graphical interface"
 msgstr "Myndrænt viðmót"
 
-#: steps_interactive.pm:931 steps_interactive.pm:942
+#: steps_interactive.pm:935 steps_interactive.pm:946
 #, c-format
 msgid "Network & Internet"
 msgstr "Staðarnet og Internet"
 
-#: steps_interactive.pm:943
+#: steps_interactive.pm:947
 #, c-format
 msgid "Proxies"
 msgstr "Sel"
 
-#: steps_interactive.pm:944
+#: steps_interactive.pm:948
 #, c-format
 msgid "configured"
 msgstr "stillt"
 
-#: steps_interactive.pm:954
+#: steps_interactive.pm:958
 #, c-format
 msgid "Security Level"
 msgstr "Öryggisþrep"
 
-#: steps_interactive.pm:973
+#: steps_interactive.pm:977
 #, c-format
 msgid "Firewall"
 msgstr "Eldveggur"
 
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
 #, c-format
 msgid "activated"
 msgstr "virkt"
 
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
 #, c-format
 msgid "disabled"
 msgstr "óvirkt"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:995
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Þú hefur ekki sett upp X, ertu viss um að þú viljir þetta?"
 
-#: steps_interactive.pm:1019
+#: steps_interactive.pm:1023
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Set upp ræsistjórann..."
 
-#: steps_interactive.pm:1020
+#: steps_interactive.pm:1024
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Verið þolinmóð þetta getur tekið nokkra stund..."
 
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1035
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1401,7 +1395,7 @@ msgstr ""
 "verður að nota BootX eða aðrar leiðir til að ræsa vélina. kjarna-viðfangið "
 "fyrir rótarsneiðina er: root=%s"
 
-#: steps_interactive.pm:1045
+#: steps_interactive.pm:1049
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1410,17 +1404,17 @@ msgstr ""
 "Í þessu öryggisþrepi er aðgangur að Windows disksneiðum takmarkaður við "
 "kerfisstjóra."
 
-#: steps_interactive.pm:1077
+#: steps_interactive.pm:1081
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Settu tóman diskling í drif %s"
 
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1083
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Bý til diskling fyrir sjálfvirka uppsetningu..."
 
-#: steps_interactive.pm:1090
+#: steps_interactive.pm:1094
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1431,11 +1425,16 @@ msgstr ""
 "\n"
 "Viltu virkilega hætta núna?"
 
-#: steps_interactive.pm:1100
+#: steps_interactive.pm:1104
 #, c-format
 msgid "Congratulations"
 msgstr "Til hamingju"
 
+#: steps_interactive.pm:1107
+#, c-format
+msgid "Reboot"
+msgstr "Endurræsa"
+
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
@@ -1575,20 +1574,27 @@ msgid ""
 "Exit"
 msgstr "Hætta"
 
-#~ msgid "Your desktop on a USB key"
-#~ msgstr "Vinnustöðin þín á USB lykli"
-
-#~ msgid "The 100%% open source Mandriva Linux distribution"
-#~ msgstr "Mandriva uppsetningin með 100%% frjálsum, opnum hugbúnaði"
-
-#~ msgid "Explore Linux easily with Mandriva One"
-#~ msgstr "Kannaðu Linux með Mandriva One"
-
-#~ msgid "A full Mandriva Linux desktop, with support"
-#~ msgstr "Full Mandriva Linux vinnustöð, með þjónustu"
-
-#~ msgid "Mandriva: distributions for everybody's needs"
-#~ msgstr "Mandriva: dreifingar við allra hæfi"
+#~ msgid ""
+#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
+#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
+#~ "you choose to proceed, \n"
+#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
+#~ "configuration settings. \n"
+#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
+#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ msgstr ""
+#~ "Þú hefur ákveðið að uppfæra kerfið þitt í %s. KDE 3.5 hefur fundist á\n"
+#~ "kerfinu þínu. Þetta uppsetningarforrit getur ekki varðveitt KDE 3.5 "
+#~ "uppsetningu.\n"
+#~ "Ef þú velur að halda áfram, þá verður KDE 4 sett upp í stað KDE 3 og "
+#~ "persónulegar\n"
+#~ "stillingar tapast.\n"
+#~ "Til að uppfæra með KDE 3.5, og varðveita persónulegar stillingar, "
+#~ "endurræstu\n"
+#~ "þá tölvuna þína og notaðu Mandriva bakka-uppfærsluforritið."
+
+#~ msgid "Proceed"
+#~ msgstr "Halda áfram"
 
 #~ msgid "Downloading file %s..."
 #~ msgstr "Sæki skrá %s..."