po: sync with the code

1 files changed, 235 insertions, 244 deletions

diff --git a/po/nn.po b/po/nn.po
index db4bbb3f..9404243f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2010-02-07 16:45+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -49,7 +49,7 @@ msgstr "Det finst nye oppdateringar for systemet ditt."
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Ein ny versjon av Mandriva Linux er no ute."
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Eit ekstra pakkemedium er tilgjengeleg for distribusjonen din."
@@ -75,13 +75,13 @@ msgstr "urpmi-databasen er låst."
 msgid "Release not supported (too old release, or development release)"
 msgstr "Utgåva di er ikkje støtta (anten for gammal eller utviklingsutgåve)."
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "Fann ingen medium. Du må leggja til medium gjennom «Mediehandtering»."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,42 +97,42 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Feil ved oppdatering av medie"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringane"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Legg til ekstra pakkemedium"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Sjå etter oppdateringar"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Set opp nettverket"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Oppgrader systemet"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -142,74 +142,71 @@ msgstr ""
 "Grunnleggjande vedlikehald for denne distribusjonen er ikkje støtta. Sidan "
 "du abonnerer på utvida vedlikehald, får du likevel oppdateringar fram til %s."
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Køyrer drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Ny versjon av Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Ein ny versjon av Mandriva Linux er no ute."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Meir informasjon om denne nye versjonen"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Ønskjer du å oppgradera til «%s»?"
 
-#: ../mdkapplet:433 ../mdkapplet:526 ../mdkapplet:966 ../mdkapplet:992
+#: ../mdkapplet:471 ../mdkapplet:568 ../mdkapplet:1025 ../mdkapplet:1055
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Spør ikkje igjen"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Last ned alle pakkane først"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Åtvaring: Du treng då mykje ledig diskplass.)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Lagra pakkane i mappa:"
 
-#: ../mdkapplet:446 ../mdkapplet:531 ../mdkapplet:598 ../mdkapplet:967
-#: ../mdkapplet:993 ../mdkapplet-enterprise-update-helper:89
-#: ../mdkapplet-extended-maintenance-helper:131
-#: ../mdkapplet-restricted-helper:95
+#: ../mdkapplet:485 ../mdkapplet:573 ../mdkapplet:650 ../mdkapplet:1026
+#: ../mdkapplet:1056 ../mdkapplet-extended-maintenance-helper:129
+#: ../mdkapplet_gui.pm:197
 #, c-format
 msgid "Next"
 msgstr "Neste"
 
-#: ../mdkapplet:446 ../mdkapplet:531 ../mdkapplet:598 ../mdkapplet:967
-#: ../mdkapplet:993 ../mdkapplet-enterprise-update-helper:89
-#: ../mdkapplet-extended-maintenance-helper:131
-#: ../mdkapplet-restricted-helper:95 ../mdkapplet-upgrade-helper:131
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet:485 ../mdkapplet:573 ../mdkapplet:650 ../mdkapplet:1026
+#: ../mdkapplet:1056 ../mdkapplet-extended-maintenance-helper:129
+#: ../mdkapplet_gui.pm:197
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -218,22 +215,22 @@ msgstr ""
 "Vedlikehaldsplanen for denne utgåva av Mandriva Linux er no over. Du vil "
 "ikkje få nokon nye oppdateringar framover."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "For å halda systemet sikkert, kan du:"
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr "Du bør skaffa utvida vedlikehald."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -242,17 +239,23 @@ msgstr ""
 "Du bør anten skaffa utvida vedlikehald, eller oppgradera til ein ny versjon "
 "av %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Du bør oppgradera til ein ny versjon av %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Distribusjonen er ikkje lenger støtta"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Utvida vedlikehald"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -261,7 +264,7 @@ msgstr ""
 "Kjøp ei vedlikehaldsutviding for denne versjonen (%s) for å få oppdateringar "
 "fram til %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -270,17 +273,17 @@ msgstr ""
 "Denne oppgraderinga krev eit raskt Internett-samband (kabelmodus, xDSL, …), "
 "og kan ta fleire timar å fullføra."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Estimert nedlastingsdata: %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Du bør lukka alle andre program som køyrer før du held fram."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -289,96 +292,94 @@ msgstr ""
 "Du bør kopla den berbare maskina til straumuttaket, og om mogleg bruka "
 "kabeltilkopling i staden for trådlaust samband."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Køyrer MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Granskar nye oppdateringar …\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er oppdatert\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerer nettverk: Ser avslått ut.\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright © %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online gjev deg tilgang til vevtenestene til Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Heimeside"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:844
+#: ../mdkapplet:896
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Karl Ove Hufthammer <karl@huftis.org>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: ../mdkapplet:875 ../mdkapplet:883 ../mdkapplet:885
-#: ../mdkapplet-enterprise-update-helper:150
-#: ../mdkapplet-extended-maintenance-helper:196
-#: ../mdkapplet-restricted-helper:156
+#: ../mdkapplet:927 ../mdkapplet:932 ../mdkapplet:940 ../mdkapplet:942
+#: ../mdkapplet-extended-maintenance-helper:196 ../mdkapplet_gui.pm:229
 #, c-format
 msgid "More Information"
 msgstr "Meir informasjon"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Legg til medium"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Om …"
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Oppdateringsoppsett"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Køyr ved oppstart"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nytt medium tilgjengeleg"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -386,185 +387,131 @@ msgid ""
 msgstr ""
 "Du brukar distribusjonen «%s», og har derfor tilgang til meir programvare."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Vil du leggja til dette nye programvarelageret?"
 
 # skip-rule: server
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr "Mandriva Enterprise Server"
 
-#: ../mdkapplet-config:43 ../mdkapplet-enterprise-update-helper:61
-#: ../mdkapplet-enterprise-update-helper:74
-#: ../mdkapplet-enterprise-update-helper:140
-#: ../mdkapplet-enterprise-update-helper:145
-#: ../mdkapplet-extended-maintenance-helper:76
+#: ../mdkapplet-add-media-helper:68 ../mdkapplet-config:43
+#: ../mdkapplet-extended-maintenance-helper:77
 #: ../mdkapplet-extended-maintenance-helper:186
-#: ../mdkapplet-restricted-helper:68 ../mdkapplet-restricted-helper:80
-#: ../mdkapplet-restricted-helper:146 ../mdkapplet-restricted-helper:151
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Legg til nytt pakkemedium"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Her kan du setja opp oppdateringsprogrammet"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Oppdateringsfrekvens (timar)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Pause før første sjekk (minutt)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Sjå etter ei ny utgåve av «%s»"
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Sjå etter «%s»-medium som manglar"
-
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Restricted"
-msgstr "Avgrensa"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Bedrift"
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:120
 #, c-format
 msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 "Skriv inn e-postadressa og passord til kontoen din for å leggja til det nye "
 "pakkemediet."
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Meir informasjon om brukarkontoen din"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "E-postadresse"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Passord"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Gløymt passord"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-add-media-helper:134 ../mdkapplet-add-media-helper:162
+#: ../mdkapplet-extended-maintenance-helper:86
 #: ../mdkapplet-extended-maintenance-helper:141
 #: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:103 ../mdkapplet-restricted-helper:122
-#: ../mdkapplet-restricted-helper:164 ../mdkapplet-upgrade-helper:82
-#: ../mdkapplet-upgrade-helper:125 ../mdkapplet-upgrade-helper:177
-#: ../mdkapplet-upgrade-helper:214
+#: ../mdkapplet-extended-maintenance-helper:204 ../mdkapplet_gui.pm:209
 #, c-format
 msgid "Error"
 msgstr "Feil"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Passord- og e-postfelta kan ikkje stå tomme."
-
-#: ../mdkapplet-enterprise-update-helper:121
+#: ../mdkapplet-add-media-helper:135
 #: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
 #, c-format
 msgid "An error occurred"
 msgstr "Det oppstod ein feil"
 
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "Mandriva-kontoen din har ikkje eit nedlastingsabonnement for %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Klarte ikkje leggja til nytt medium."
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "La til mediet «%s»."
+
+#: ../mdkapplet-add-media-helper:172
 #: ../mdkapplet-extended-maintenance-helper:178
 #: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
 #, c-format
 msgid "Successfully added media %s."
 msgstr "La til mediet «%s»."
 
-#: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-add-media-helper:174
 #: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Mandriva-kontoen din har ikkje eit nedlastingsabonnement for %s."
+msgid "Here you can configure the updates applet"
+msgstr "Her kan du setja opp oppdateringsprogrammet"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Lukk"
+msgid "Update frequency (hours)"
+msgstr "Oppdateringsfrekvens (timar)"
 
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:80
 #, c-format
-msgid "An error occurred while adding medium"
-msgstr "Klarte ikkje leggja til nytt medium."
+msgid "First check delay (minutes)"
+msgstr "Pause før første sjekk (minutt)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Feil ved henting av distribusjonslista:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Sjå etter ei ny utgåve av «%s»"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Utvida vedlikehald"
+msgid "Check for missing \"%s\" media"
+msgstr "Sjå etter «%s»-medium som manglar"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Avgrensa"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Bedrift"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Feil ved henting av distribusjonslista:"
 
 #. -PO: Here '%s' will be a localized date (eg: "2009/11/28" in english but "28/11/2009" for brazil or "28 Nov. "2009" for french:
-#: ../mdkapplet-extended-maintenance-helper:107
+#: ../mdkapplet-extended-maintenance-helper:104
 #, c-format
 msgid ""
 "Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva tilbyr 12 månader med generelle oppdateringar (fram til %s), samt 18 "
-"månader med grunnoppdateringar (fram til %s)."
+"Mandriva tilbyr 12 månader med generelle oppdateringar (fram til %s), samt "
+"18 månader med grunnoppdateringar (fram til %s)."
 
-#: ../mdkapplet-extended-maintenance-helper:110
+#: ../mdkapplet-extended-maintenance-helper:107
 #, c-format
 msgid ""
 "Extended maintenance is now available to get 18 months of additional updates "
@@ -573,131 +520,127 @@ msgstr ""
 "Utvida vedlikehald er no tilgjengeleg, og gjev 18 månader meir med "
 "oppdateringar (fram til %s)."
 
-#: ../mdkapplet-extended-maintenance-helper:112
+#: ../mdkapplet-extended-maintenance-helper:109
 #, c-format
 msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-"Du kan starta eit abonnement på utvida vedlikehald <b>nett no</b>:"
+msgstr "Du kan starta eit abonnement på utvida vedlikehald <b>nett no</b>:"
 
 #: ../mdkapplet-extended-maintenance-helper:112
 #, c-format
 msgid "Lifetime policy"
 msgstr "Oppdateringsperiodar"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Abonnement"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
 "have subscribed online"
 msgstr ""
-"Etter at du har starta abonnementet, kan du skriva inn e-postadressa og passord ditt her for å leggja til det nye pakkemediet."
+"Etter at du har starta abonnementet, kan du skriva inn e-postadressa og "
+"passord ditt her for å leggja til det nye pakkemediet."
 
-#: ../mdkapplet-extended-maintenance-helper:192
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "Mandriva-kontoen din har ikkje eit abonnement på utvida vedlikehald."
+msgid "More information on your user account"
+msgstr "Meir informasjon om brukarkontoen din"
 
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "Mandriva-kontoen din har ikkje eit nedlastingsabonnement for PowePack."
+msgid "Your email"
+msgstr "E-postadresse"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
-"Systemet ditt har ikkje nok ledig plass att på «%s» for ei oppgradering (%d "
-"MB < %d MB)"
+msgid "Your password"
+msgstr "Passord"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation failed"
-msgstr "Feil ved installering"
+msgid "Forgotten password"
+msgstr "Gløymt passord"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Du finn installasjonsloggar i «%s»"
+msgid "Password and email cannot be empty."
+msgstr "Passord- og e-postfelta kan ikkje stå tomme."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Prøv på nytt"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Mandriva-kontoen din har ikkje eit abonnement på utvida vedlikehald."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulerer"
+msgid "Close"
+msgstr "Lukk"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Oppgraderinga til Mandriva %s er no fullført."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Du må starta maskina på nytt."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
-#, c-format
-msgid "Reboot"
-msgstr "Start på nytt"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Abonnement"
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:257
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Continue to use your new Powerpack account information to upgrade, or Cancel "
+"and upgrade to the Free Edition."
 msgstr ""
-"Pakkedatabasen er låst. Lukk alle andre program\n"
-"som brukar pakkedatabasen (har du eit anna\n"
-"mediehandsamingsprogram oppe, eller held du på\n"
-"å installera andre pakkar no?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Klarte ikkje leggja til nytt medium"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Flash"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Free"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Mini"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, c-format
 msgid "Mandriva One"
 msgstr "Mandriva One"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva PowerPack"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Oppgradering av distribusjon"
@@ -750,6 +693,54 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Mandriva-kontoen din har ikkje eit nedlastingsabonnement for PowePack."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Systemet ditt har ikkje nok ledig plass att på «%s» for ei oppgradering (%"
+#~ "d MB < %d MB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Feil ved installering"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Du finn installasjonsloggar i «%s»"
+
+#~ msgid "Retry"
+#~ msgstr "Prøv på nytt"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulerer"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Oppgraderinga til Mandriva %s er no fullført."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Du må starta maskina på nytt."
+
+#~ msgid "Reboot"
+#~ msgstr "Start på nytt"
+
+#~ msgid ""
+#~ "Packages database is locked. Please close other applications\n"
+#~ "working with packages database (do you have another media\n"
+#~ "manager on another desktop, or are you currently installing\n"
+#~ "packages as well?)."
+#~ msgstr ""
+#~ "Pakkedatabasen er låst. Lukk alle andre program\n"
+#~ "som brukar pakkedatabasen (har du eit anna\n"
+#~ "mediehandsamingsprogram oppe, eller held du på\n"
+#~ "å installera andre pakkar no?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Klarte ikkje leggja til nytt medium"
+
+#~ msgid ""
 #~ "This Mandriva Linux system maintenance has ended. It means it will not "
 #~ "receive any new software update."
 #~ msgstr ""