Update Basque translation

correcting one sentence
author: Egoitz Rodriguez <egoitzro@gmail.com> 2014-10-12 20:44:07 +0200
committer: Pascal Terjan <pterjan@gmail.com> 2014-10-20 21:47:27 +0000
commit: f9667a459d78178b4042d56738ff6344f9d50e16 (patch)
tree: 22a68962ffa2942b9e6f5f87e41ad27f6ea22cdc /rescue
parent: 03f4e1dd9e90eba3e5c83c5a4fb939e91b711e94 (diff)
download: drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar
drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar.gz
drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar.bz2
drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar.xz
drakx-f9667a459d78178b4042d56738ff6344f9d50e16.zip
0 files changed, 0 insertions, 0 deletions
diff --git a/po/af.po b/po/af.po
index f060eca4..52cd0f8a 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-02-27 21:12+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -75,13 +75,13 @@ msgstr "RPM-databasisnavraag het misluk\n"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,42 +97,42 @@ msgstr ""
 "\n"
 "Herbegin net %s daarna."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Aktiveer"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installeer updaterings"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigureer die Netwerk"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -140,420 +140,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Volgende"
 
-#: ../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 "Kanselleer"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux Online Span"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Aanlyn Webwerf"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Omtrent.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Konfigurasie"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Eindig"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, fuzzy, c-format
 msgid "New medium available"
 msgstr "Nie Beskikbaar"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Fout"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "'n Fout het voorgekom"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "'n Fout het voorgekom"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "OK"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Verkeerde wagwoord"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Verkeerde wagwoord"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Fout"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "'n Fout het voorgekom"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Maak toe"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "'n Fout het voorgekom"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -563,113 +510,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Masjiennaam:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Verkeerde wagwoord"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Installasie het gefaal!"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Verkeerde wagwoord"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Konfigurasie"
+msgid "Close"
+msgstr "Maak toe"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Herlaai"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Masjiennaam:"
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Linux Online Span"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Linux Online Span"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -721,6 +670,15 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Installasie het gefaal!"
+
+#~ msgid "Congratulations"
+#~ msgstr "Konfigurasie"
+
+#~ msgid "Reboot"
+#~ msgstr "Herlaai"
+
 #~ msgid "Yes"
 #~ msgstr "Ja"
 
diff --git a/po/am.po b/po/am.po
index b055a7d8..2fe66184 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -71,13 +71,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -88,42 +88,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "ያስችላል"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -131,420 +131,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "የሚቀጥለው"
 
-#: ../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 "ተወው"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "ውጣ"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "ስህተት"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "ስህተት ተፈጥሯል"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "ስህተት ተፈጥሯል"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "እሺ"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "ሚስጢራዊ ቃል"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Forgotten password"
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "ስህተት"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "ስህተት ተፈጥሯል"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Successfully added media %s."
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "እሺ"
-
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "ዝጋ"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "ስህተት ተፈጥሯል"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -554,113 +501,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "ሚስጢራዊ ቃል"
+
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
+msgid "Forgotten password"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "%s አልተገኘም"
-
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "እንኳን ደስ ያለዎ!"
+msgid "Close"
+msgstr "ዝጋ"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
 #, c-format
-msgid "Reboot"
-msgstr "እንደገና ጀምር"
+msgid "Get Powerpack subscription!"
+msgstr ""
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
+msgid "Cancel, upgrade to Free Edition"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, c-format
 msgid "Mandriva Mini"
 msgstr ""
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -706,6 +655,16 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installation failed"
+#~ msgstr "%s አልተገኘም"
+
+#~ msgid "Congratulations"
+#~ msgstr "እንኳን ደስ ያለዎ!"
+
+#~ msgid "Reboot"
+#~ msgstr "እንደገና ጀምር"
+
 #~ msgid "Yes"
 #~ msgstr "አዎ"
 
diff --git a/po/ar.po b/po/ar.po
index 0f898e7b..3b4d3a74 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2009-11-26 16:15+0100\n"
 "Last-Translator: Yaser Ammar <linux.uae@gawab.com>\n"
 "Language-Team:  Arabic <doc@arabeyes.org>\n"
@@ -55,7 +55,7 @@ msgstr "هناك تحديثات متوفّرة لنظامك"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "يتوفر إصدار جديد من توزيعة لينكس ماندريفا"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "يتوفر وسيط إضافي للحزم لتوزيعتك."
@@ -81,13 +81,13 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "هذه الإصدارة غير مدعومة (إما بسبب أنها قديمة جداً، أو أنها إصدارة تطويريّة)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "لا توجد وسائط، تجب إضافة بعض الوسائط عبر 'مدير وسائط البرامج'."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "البرامج لتمكين واحد على الأقل (أشر عليها في عمود %s).\n"
 "ثم أعد تشغيل %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "مُفعَّل"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "خطأ في تحديث الوسيط"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "ثبّت التّحديثات"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "أضف وسيط حزم إضافي"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "التمس تحديثات"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "اضبط الشّبكة"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "ترقية النظام"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -145,120 +145,123 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "يُقدح drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "إصدار جديد من توزيعة لينكس ماندريفا"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "أُطلق إصدار جديد من توزيعة لينكس ماندريفا."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "معلومات إضافية حول هذا الإصدار الجديد"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "هل تريد الترقية إلى التوزيعة '%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 "لا تسألني في المرة القادمة"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "التالي"
 
-#: ../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 "ألغِ"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "هل تريد الترقية إلى التوزيعة '%s' ؟"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -267,17 +270,17 @@ msgstr ""
 "هذه الترقية تتطلب اتصالا شبكيا عريض النطاق (اتصال الكبل، دي إس إل، ...) وقد "
 "يستغرق عدة ساعات ليكتمل"
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "المقدار التقريبي للبيانات التي ستنزل هو %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "ينبغي أن تغلق كل التطبيقات الأخرى العاملة قبل المتابعة"
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -286,48 +289,48 @@ msgstr ""
 "ينبغي أن توصل حاسوبك المحمول بتيار الكهرباء المتناوبة (AC)، ويفضل استخدام "
 "الاتصال السلكي (ethernet) بدل اللاسلكي (wifi) إن أمكن."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "محدّث ماندريفا (MandrivaUpdate) يُقدح\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "حساب التّحديثات الجديدة...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "النّظام محدّث\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "فحص الشّبكة: تبدو معطّلة\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "حقوق النشر (C) %s لماندريفا"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "ماندريفا أونلاين تقدم وصولا إلى خدمات ماندريفا على الشبكة"
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "موقع ماندريفا على الإنترنت"
 
 #. -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 ""
@@ -337,237 +340,181 @@ msgstr ""
 "Ossama M. Khayat <okhayat@yahoo.com>, 2004, 2005.\n"
 "Yaser Ammar <linux.uae@gawab.com>2009\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../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 "معلومات إضافية"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "أضف وسائط"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "عَن..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "ضبط التحديثات"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "اقدحه دومًا عند البدء"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "اخرج"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "يتوفر وسط جديد"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr "أنت تستخدم توزيعة '%s' ولذلك يحق لك الوصول إلى برامج إضافية."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "هل تريد تثبيت مستودع البرامج الإضافي هذا؟"
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 "إضافة وسيط حزم إضافي"
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
-msgstr "بإمكانك هنا ضبط بريمج التحديثات"
-
-#: ../mdkapplet-config:71
-#, fuzzy, c-format
-msgid "Update frequency (hours)"
-msgstr "تكرار التحديث (بالثواني)"
-
-#: ../mdkapplet-config:80
-#, fuzzy, c-format
-msgid "First check delay (minutes)"
-msgstr "زمن أول فحص"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr ""
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-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 "فضلاً اكتب مُعرِّف حسابك لإضافة وسيط حزم إضافي"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "معلومات إضافية عن حسابك"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "بريدك الإلكتروني"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "كلمة سرك"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "نسيت كلمة السر"
-
-#: ../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 "خطأ"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "كلمة السر والبريد الإلكتروني لا يمكن تركهما خاليين."
-
-#: ../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 "حدث خطأ"
 
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-add-media-helper:141
+#, fuzzy, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "حدث خطأ أثناء إضافة الوسيط"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "نجحت إضافة الوسائط %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 "نجحت إضافة الوسائط %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 "موافق"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
+#, c-format
+msgid "Here you can configure the updates applet"
+msgstr "بإمكانك هنا ضبط بريمج التحديثات"
+
+#: ../mdkapplet-config:71
 #, fuzzy, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
+msgid "Update frequency (hours)"
+msgstr "تكرار التحديث (بالثواني)"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:80
+#, fuzzy, c-format
+msgid "First check delay (minutes)"
+msgstr "زمن أول فحص"
+
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Close"
-msgstr "أغلق"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "An error occurred while adding medium"
-msgstr "حدث خطأ أثناء إضافة الوسيط"
+msgid "Check for missing \"%s\" media"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
+msgid "Enterprise"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -577,116 +524,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "موقع ماندريفا على الإنترنت"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
 "have subscribed online"
 msgstr "فضلاً اكتب مُعرِّف حسابك لإضافة وسيط حزم إضافي"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
+msgid "More information on your user account"
+msgstr "معلومات إضافية عن حسابك"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr "لا توجد مساحة كافية بنظامك في %s للترقية (%dMB < %dMB)"
+msgid "Your email"
+msgstr "بريدك الإلكتروني"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "فشل التّثبيت"
+msgid "Your password"
+msgstr "كلمة سرك"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "بإمكانك أن تجد سجلات التثبيت في '%s'"
+msgid "Forgotten password"
+msgstr "نسيت كلمة السر"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "أعد المحاولة"
+msgid "Password and email cannot be empty."
+msgstr "كلمة السر والبريد الإلكتروني لا يمكن تركهما خاليين."
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "تهانينا"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "نجحت الترقية إلى إصدار ماندريفا %s"
+msgid "Close"
+msgstr "أغلق"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "يجب أن تعيد النظام"
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "أعد الحاسوب"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
+
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "موقع ماندريفا على الإنترنت"
 
-#: ../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 ""
-"قاعدة بيانات الحزم مقفلة. من فضلك أغلق التّطبيقات الأخرى\n"
-"المستعملة لقاعدة بيانات الحزم (هل لديك مدير وسائط آخر على سطح\n"
-" مكتب آخر مثلاً، أو هل تثبّت حزمًا حاليًا كذلك؟)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "فشل عند إضافة الوسيط"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr "ماندريفا بَور باك"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "ترقية التوزيعة"
@@ -737,6 +683,50 @@ msgstr "  --debug\t\t\t- سجل ما يحدث\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "لا يمكن تحديث الحزم من وسيط التحديث.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr "لا توجد مساحة كافية بنظامك في %s للترقية (%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "فشل التّثبيت"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "بإمكانك أن تجد سجلات التثبيت في '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "أعد المحاولة"
+
+#~ msgid "Congratulations"
+#~ msgstr "تهانينا"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "نجحت الترقية إلى إصدار ماندريفا %s"
+
+#~ msgid "You must restart your system."
+#~ msgstr "يجب أن تعيد النظام"
+
+#~ msgid "Reboot"
+#~ msgstr "أعد الحاسوب"
+
+#~ 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 ""
+#~ "قاعدة بيانات الحزم مقفلة. من فضلك أغلق التّطبيقات الأخرى\n"
+#~ "المستعملة لقاعدة بيانات الحزم (هل لديك مدير وسائط آخر على سطح\n"
+#~ " مكتب آخر مثلاً، أو هل تثبّت حزمًا حاليًا كذلك؟)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "فشل عند إضافة الوسيط"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/ast.po b/po/ast.po
index 5abd3529..140d2a53 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline_es\n"
 "Report-Msgid-Bugs-To: \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-01-28 18:05+0100\n"
 "Last-Translator: marquinos <marquinos@mandriva.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -49,7 +49,7 @@ msgstr "Hai nuevos anovamientos disponibles pal sistema"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Foi llanzáu una nueva versión de Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Una mediu adicional de paquetes ta disponible pa la distribución"
@@ -74,7 +74,7 @@ msgstr "base de datos d'urpmi bloquiada"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión nun sofitada (mui antigua o versión en desendolcu)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -82,7 +82,7 @@ msgstr ""
 "Nun alcontráu dengún mediu. Tienes d'amestar un col \"Alministrador de "
 "preseos de software\"."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -100,42 +100,42 @@ msgstr ""
 "\n"
 "Dempués, vuelve a entamar \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Activada"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Fallu anovando'l sofitu"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalar anovamientos"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Amestar mediu de programes adicionales"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar anovamientos"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar rede"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Anovar el sistema"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -146,74 +146,71 @@ msgstr ""
 "soscrición al caltenimientu estendíu, el sistema caltendráse anováu fasta'l %"
 "s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Llanzando drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nueva versión de Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Restolar"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Una nueva versión de Mandriva Linux ta disponible"
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Más información tocante a esta nueva versión"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "¿Quies anovar a la distribución '%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 "Nun volver a entrugar"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Baxar tolos paquetes de secute"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Avitu: Necesites abondo espaciu llibre)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Onde baxar los paquetes:"
 
-#: ../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 "Siguiente"
 
-#: ../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 "Encaboxar"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -222,22 +219,22 @@ msgstr ""
 "Finó'l caltenimientu del sistema Mandriva Linux. Esto significa que nun "
 "recibirás nengún anovamientu nuevu de software."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Pa caltener el to sistema seguru, puedes:"
 
-#: ../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 "Deberíes obtener caltenimientu estendíu."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -246,17 +243,23 @@ msgstr ""
 "Deberíes obtener un caltenimientu estendíu o anovar a una versión más nueva "
 "de la distribución %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Deberíes anovar a una versión más nueva de la distribución %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "La to distribución nun ye sofitada más"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, fuzzy, c-format
+msgid "Extended Maintenance"
+msgstr "Deberíes obtener caltenimientu estendíu."
+
+#: ../mdkapplet:544
 #, fuzzy, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -265,7 +268,7 @@ msgstr ""
 "Mercar una estensión de caltenimientu pa esta versión (%s) y caltenelo "
 "furrulando."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -274,18 +277,18 @@ msgstr ""
 "Esti anovamientu necesita una conexón de banda ancha alta (cable, xDSL, ...) "
 "y puede tardar abondes hores en finar."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "La baxada estimada será de %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Tienes de finar toles demás aplicaciones n'execución enantes de siguir."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -294,96 +297,94 @@ msgstr ""
 "Recomendamos que coneutes el portátil a la corriente y si ye posible escueyi "
 "una rede cableada envés d'inalámbrica, si puedes."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Llanzando MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calculando anovamientos nuevos...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema ta al día\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificando rede: paez tar desactivada\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 (C) %s by Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandiva Online da accesu a los servicios web de Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Web Online"
 
 #. -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 "Softastur <alministradores@softastur.org>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Avisu"
 
-#: ../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 "Más Información"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Amestar preseos"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Tocante a..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuración d'anovamientos"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Llanzar siempres al aniciu"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Colar"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nuevu mediu disponible"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -392,28 +393,77 @@ msgstr ""
 "Uses la distribución '%s', entós tienes accesu privilexiáu pa programes "
 "adicionales."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "¿Quies amestar esti repositoriu de programes adicionales?"
 
-#: ../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 "Amestando un mediu de programes adicionales"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Por favor da la ID de la cuenta p'amestar esti mediu nuevu."
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Fallu"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Hebo un fallu"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "La to cuenta de Mandriva nun tien soscripción pa baxar %s "
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Fallu al amestar sofitu"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Preséu %s amestáu."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Preséu %s amestáu."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "Aceutar"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -449,130 +499,27 @@ msgstr "Restrinxíu"
 msgid "Enterprise"
 msgstr "Empresa"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Por favor da la ID de la cuenta p'amestar esti mediu nuevu."
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Más información na to cuenta d'usuariu"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "El to corréu"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "La to contraseña"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Escaecí la contraseña"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Fallu"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Contraseña y corréu nun pueden tar ermos."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Hebo un fallu"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Preséu %s amestáu."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Aceutar"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "La to cuenta de Mandriva nun tien soscripción pa baxar %s "
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Zarrar"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fallu al amestar sofitu"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, fuzzy, c-format
-msgid "Extended Maintenance"
-msgstr "Deberíes obtener caltenimientu estendíu."
-
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:112
+#: ../mdkapplet-extended-maintenance-helper:109
 #, fuzzy, c-format
 msgid "You can subscribe <b>right now</b> to get extended maintenance:"
 msgstr "Deberíes obtener caltenimientu estendíu."
@@ -582,117 +529,115 @@ msgstr "Deberíes obtener caltenimientu estendíu."
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Descripción de la máquina:"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
 "have subscribed online"
 msgstr "Por favor da la ID de la cuenta p'amestar esti mediu nuevu."
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "La to cuenta de Mandriva nun tien soscripción pa baxar %s "
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "La cuenta de Mandriva nun tien soscripción pa baxar el Powerpack "
+msgid "More information on your user account"
+msgstr "Más información na to cuenta d'usuariu"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr "El sistema ta ensin espaciu suficiente en %s p'anovar (%dMB < %dMB)"
+msgid "Your email"
+msgstr "El to corréu"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "Falló la instalación"
+msgid "Your password"
+msgstr "La to contraseña"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Los rexistros d'instalación atopense en '%s' "
+msgid "Forgotten password"
+msgstr "Escaecí la contraseña"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "Reintentalo"
+msgid "Password and email cannot be empty."
+msgstr "Contraseña y corréu nun pueden tar ermos."
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "Felicidaes"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "La to cuenta de Mandriva nun tien soscripción pa baxar %s "
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Anovamientu pa Mandriva %s fináu con ésitu."
+msgid "Close"
+msgstr "Zarrar"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "Tienes que reaniciar el sistema."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "Reaniciar"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Descripción de la máquina:"
+
+#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"La base de datos de paquetes ta bloquiada. Por favor, zarra otres\n"
-"aplicaciones que trabayen con ella (¿tienes dalgún otru\n"
-"alministrador de medios n'otru escritoriu, o tas instalando\n"
-"paquetes n'esti intre?)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fallu al amestar mediu"
+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 "Anovamientu de la Distribución"
@@ -744,6 +689,51 @@ msgstr "  --debug\t\t\t- facer un rexistru de lo que se faiga\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "La cuenta de Mandriva nun tien soscripción pa baxar el Powerpack "
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr "El sistema ta ensin espaciu suficiente en %s p'anovar (%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Falló la instalación"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Los rexistros d'instalación atopense en '%s' "
+
+#~ msgid "Retry"
+#~ msgstr "Reintentalo"
+
+#~ msgid "Congratulations"
+#~ msgstr "Felicidaes"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Anovamientu pa Mandriva %s fináu con ésitu."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Tienes que reaniciar el sistema."
+
+#~ msgid "Reboot"
+#~ msgstr "Reaniciar"
+
+#~ 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 ""
+#~ "La base de datos de paquetes ta bloquiada. Por favor, zarra otres\n"
+#~ "aplicaciones que trabayen con ella (¿tienes dalgún otru\n"
+#~ "alministrador de medios n'otru escritoriu, o tas instalando\n"
+#~ "paquetes n'esti intre?)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fallu al amestar mediu"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/az.po b/po/az.po
index 69742df1..589c7608 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-09-12 19:12+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -52,7 +52,7 @@ msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -78,13 +78,13 @@ msgstr "urpmi databeyzi qıfıllıdır"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,42 +101,42 @@ msgstr ""
 "\n"
 "Daha sonra, %s'i yenidən başladın."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Fəal"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Yeniləmələri qur"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Yeniləmələri Yoxla"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Şəbəkəni Quraşdır"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -144,420 +144,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect başladılır\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Sonrakı"
 
-#: ../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 "Ləğv et"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate başladılır\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Yeniləmələr hesablanır...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem yenidir\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Şəbəkə Yoxlanır: deyəsən qeyri-fəaldır\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Onlayn Veb Saytı"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Haqqında..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Qurğuları Göndər"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Həmişə başlanğıcda işə sal"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Çıx"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Xəta"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Bir xəta oldu"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Medium əlavə etmə xətası"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Oldu"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Səhv parol"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Səhv parol"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Xəta"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Bir xəta oldu"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Oldu"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Bağla"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Medium əlavə etmə xətası"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -567,116 +514,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Kompüter adı:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Səhv parol"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Qurulum bacarılmadı"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Səhv parol"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Təbriklər"
+msgid "Close"
+msgstr "Bağla"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Yenidən başlat"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Kompüter adı:"
 
-#: ../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 ""
-"Paket mə'lumat bazası qıfıllıdır. Xahiş edirik paket mə'lumat bazasını\n"
-"işlədən digər proqramları bağlayın (hazırda açıq olan başqa bir\n"
-"mediya idarəçisi varsa bağlayın, ya da hazırda paket qurmağı dayandırın)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Medium əlavə etmə xətası"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -727,6 +673,28 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Installation failed"
+#~ msgstr "Qurulum bacarılmadı"
+
+#~ msgid "Congratulations"
+#~ msgstr "Təbriklər"
+
+#~ msgid "Reboot"
+#~ msgstr "Yenidən başlat"
+
+#~ 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 ""
+#~ "Paket mə'lumat bazası qıfıllıdır. Xahiş edirik paket mə'lumat bazasını\n"
+#~ "işlədən digər proqramları bağlayın (hazırda açıq olan başqa bir\n"
+#~ "mediya idarəçisi varsa bağlayın, ya da hazırda paket qurmağı dayandırın)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Medium əlavə etmə xətası"
+
 #~ msgid "Yes"
 #~ msgstr "Bəli"
 
diff --git a/po/be.po b/po/be.po
index 6644126b..af9b6061 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -71,13 +71,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -88,42 +88,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -131,420 +131,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Далей"
 
-#: ../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 "Адмена"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Увага!"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Выхад"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr ""
-
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "First check delay (minutes)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../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_gui.pm:209
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "Error"
+msgstr "Памылка"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "An error occurred"
 msgstr ""
 
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Restricted"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
 #, c-format
-msgid "Enterprise"
+msgid "An error occurred while adding medium"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Your email"
-msgstr ""
+msgid "Ok"
+msgstr "Ок"
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your password"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Forgotten password"
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Памылка"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
+#: ../mdkapplet-config:89
 #, c-format
-msgid "An error occurred"
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Successfully added media %s."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Зачыніць"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:101
 #, c-format
-msgid "An error occurred while adding medium"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -554,113 +501,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../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)"
+msgid "Your password"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Усталяванне SILO"
-
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Forgotten password"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Congratulations"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
+#, c-format
+msgid "Close"
+msgstr "Зачыніць"
+
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
 #, c-format
-msgid "Reboot"
-msgstr "Перазагрузка"
+msgid "Get Powerpack subscription!"
+msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, c-format
 msgid "Mandriva Flash"
 msgstr ""
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, c-format
 msgid "Mandriva Free"
 msgstr ""
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, c-format
 msgid "Mandriva Mini"
 msgstr ""
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, c-format
 msgid "Mandriva One"
 msgstr ""
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr ""
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -706,6 +655,13 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Installation failed"
+#~ msgstr "Усталяванне SILO"
+
+#~ msgid "Reboot"
+#~ msgstr "Перазагрузка"
+
 #~ msgid "Yes"
 #~ msgstr "Так"
 
diff --git a/po/bg.po b/po/bg.po
index 3cfdd324..1f411933 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-10-21 19:34+0300\n"
 "Last-Translator: Dimitar Terziev <mitak@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Налични са актуализации за вашата сист�
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -80,13 +80,13 @@ msgstr "базата данни на urpmi е заключена"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версията не се подържа (много стара, или в процес на разработка)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,42 +103,42 @@ msgstr ""
 "\n"
 "След това рестартирайте %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Да разреша"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Инсталиране на актуализации"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Проверка за актуализации"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигуриране на мрежа"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -146,420 +146,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Стартиране на drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Следващ"
 
-#: ../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 "Отказ"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Стартиране на MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Събиране на нови актуализации...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системата е обновена\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка на мрежата: изглежда забранена\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Относно..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Прочитане на конфигурацията\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Зареждане при стартиране"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Изход"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Грешка"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Появи се грешка"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Грешка при добавяне на източник"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Грешна парола"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Грешна парола"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Появи се грешка"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Затваряне"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Грешка при добавяне на източник"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -569,116 +516,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Име на машината:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Грешна парола"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Инсталацията провалена"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Грешна парола"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Поздравления"
+msgid "Close"
+msgstr "Затваряне"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Престартира"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Име на машината:"
 
-#: ../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 ""
-"Базата с пакети е заключена. Затворете всички програми, които\n"
-"изполават базата с пакеите (проверете дали не сте стартирали менажера на "
-"пакети повече от веднъж?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Грешка при добавяне на източник"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -730,6 +676,28 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не е възможна актуализацията на пакетите от източника.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Инсталацията провалена"
+
+#~ msgid "Congratulations"
+#~ msgstr "Поздравления"
+
+#~ msgid "Reboot"
+#~ msgstr "Престартира"
+
+#~ 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 ""
+#~ "Базата с пакети е заключена. Затворете всички програми, които\n"
+#~ "изполават базата с пакеите (проверете дали не сте стартирали менажера на "
+#~ "пакети повече от веднъж?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Грешка при добавяне на източник"
+
 #~ msgid "Yes"
 #~ msgstr "Да"
 
diff --git a/po/bn.po b/po/bn.po
index 18d4241c..3a40764b 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-02-03 20:01+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -53,7 +53,7 @@ msgstr "আপনার সিস্টেমের জন্য নতুন �
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -79,13 +79,13 @@ msgstr "urpmi ডাটাবেস লক করা আছে"
 msgid "Release not supported (too old release, or development release)"
 msgstr "সংস্করণটির সমর্থন নেই (খুব পুরানো, অথবা ডেভেলপমেন্ট সংস্করণ)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,42 +103,42 @@ msgstr ""
 "এর পরে %s পুনরায় চালু করুন।"
 
 #  আছে কি
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "সক্রিয়"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "আপডেট গুলো ইনস্টল করো"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "আপডেট পরীক্ষা করো"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "নেটওয়ার্ক কনফিগার করো"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -146,420 +146,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "পরবর্তী"
 
-#: ../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 "বাতিল"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "নতুন আপডেট পরীক্ষা করা হচ্ছে...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "সিস্টেম আপ-টু-ডেট আছে\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "নেটওয়ার্ক পরীক্ষা করা হচ্ছে: সম্ভবত নিষ্ক্রিয় করা আছে\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "অনলাইন ওয়েবসাইট"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "পরিচিতি..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "কনফিগারেশন প্রেরণ করুন"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "সবসময় স্টার্টআপে আরম্ভ করো"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "প্রস্থান"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "ত্রুটি"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "ঠিক আছে"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "ভূল পাসওয়ার্ড"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "ভূল পাসওয়ার্ড"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "ত্রুটি"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "ঠিক আছে"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "বন্ধ"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -569,117 +516,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "মেশিনের নাম:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "ভূল পাসওয়ার্ড"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "ইনস্টলেশন ব্যর্থ হয়েছে"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "ভূল পাসওয়ার্ড"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "পুনরায় চেষ্টা করো"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "অভিন্দন"
+msgid "Close"
+msgstr "বন্ধ"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "রিবুট"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "মেশিনের নাম:"
 
-#: ../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 ""
-"প্যাকেজ সংক্রান্ত ডাটাবেসটি লক করা আছে। যে অ্যাপ্লিকেশনগুলো\n"
-"বর্তমানে প্যাকেজ ডাটাবেস ব্যবহার করছে সেগুলোকে বন্ধ করুন (অন্য \n"
-"কোন ডেস্কটপে কি আরেকটি মিডিয়া ম্যানজার চলছে, অথবা আপনি কি\n"
-"বর্তমানে প্যাকেজ ইনস্টল করছেন?)।"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -730,6 +675,32 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source মাধ্যম থেকে প্যাকেজ আপডেট করা যায় নি।\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "ইনস্টলেশন ব্যর্থ হয়েছে"
+
+#~ msgid "Retry"
+#~ msgstr "পুনরায় চেষ্টা করো"
+
+#~ msgid "Congratulations"
+#~ msgstr "অভিন্দন"
+
+#~ msgid "Reboot"
+#~ msgstr "রিবুট"
+
+#~ 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 ""
+#~ "প্যাকেজ সংক্রান্ত ডাটাবেসটি লক করা আছে। যে অ্যাপ্লিকেশনগুলো\n"
+#~ "বর্তমানে প্যাকেজ ডাটাবেস ব্যবহার করছে সেগুলোকে বন্ধ করুন (অন্য \n"
+#~ "কোন ডেস্কটপে কি আরেকটি মিডিয়া ম্যানজার চলছে, অথবা আপনি কি\n"
+#~ "বর্তমানে প্যাকেজ ইনস্টল করছেন?)।"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
+
 #~ msgid "Yes"
 #~ msgstr "হ্যাঁ"
 
diff --git a/po/br.po b/po/br.po
index 154c8207..bb7cbb69 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \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-01-27 00:02+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: brezhoneg <LL@li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -73,13 +73,13 @@ msgstr "krouilhet eo stlennvon urpmi"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -90,42 +90,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Bevaatet "
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Fazi en ur bremañaat ar medium"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Bremañaat"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Kefluniañ ar rouedad"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Bremañaat ar reizhiad"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -133,422 +133,369 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "O loc'hañ drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Furchal"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "A heul"
 
-#: ../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 "Nullañ"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "O loc'hañ MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Bremañaet eo ar reiziad\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../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 (C) %s gant Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Lec'hienn gwiad Online"
 
 #. -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 ""
 "Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Thierry Vignaud <tvignaud@mandriva.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Ho evezh"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "A-brepoz ..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Kefluniadur an nevezioù"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Loc'hañ atav pa loc'her ar reizhiad"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Medium nevez zo dibres"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Fazi"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Ur fazi zo bet"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
 #, c-format
-msgid "Restricted"
-msgstr ""
+msgid "An error occurred while adding medium"
+msgstr "Fazi en ur ouzhpennañ ar medium"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Mat eo"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Ho tremenger"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Kollet eo an tremenger"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Fazi"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Ur fazi zo bet"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Mat eo"
-
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Close"
-msgstr "Serriñ"
+msgid "Check for missing \"%s\" media"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:95
 #, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fazi en ur ouzhpennañ ar medium"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -558,113 +505,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Deskrivadur an ostiz :"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../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 ""
+msgid "Your password"
+msgstr "Ho tremenger"
 
-#: ../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 "Sac'het eo ar staliadur"
+msgid "Forgotten password"
+msgstr "Kollet eo an tremenger"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Adklask"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Gourc'hemennoù"
+msgid "Close"
+msgstr "Serriñ"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Adlañsañ"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Deskrivadur an ostiz :"
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fazi en ur grouiñ ar medium"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../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 ""
@@ -716,6 +665,21 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Installation failed"
+#~ msgstr "Sac'het eo ar staliadur"
+
+#~ msgid "Retry"
+#~ msgstr "Adklask"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gourc'hemennoù"
+
+#~ msgid "Reboot"
+#~ msgstr "Adlañsañ"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fazi en ur grouiñ ar medium"
+
 #~ msgid "Yes"
 #~ msgstr "Ya"
 
diff --git a/po/bs.po b/po/bs.po
index 11b9f4f0..0277825d 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2006-09-13 20:38+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -57,7 +57,7 @@ msgstr "Nove ispravke su dostupne za vaš sistem"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -83,13 +83,13 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Izdanje nije podržano (prestaro izdanje ili je riječ o izdanju u razvoju)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,42 +105,42 @@ msgstr ""
 "\n"
 "Zatim, restartujte %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Uključeno"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "Ažuriram medije...\n"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj ispravke"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri da li ima ispravki"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -148,420 +148,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Dalje"
 
-#: ../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 "Odustani"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Pokrećem MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Izračunavam nove ispravke...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je up-to-date\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mrežu: čini se da je isključena\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 "Autorska prava (C) %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online vam omogućuje pristup Mandriva web uslugama."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online web stranica"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Čitam konfiguraciju\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Uvijek pokreni na početku"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Greška"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Došlo je do greške"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Neuspjeh u dodavanju medija"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "U redu"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Pogrešna šifra"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Pogrešna šifra"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Došlo je do greške"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "U redu"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Neuspjeh u dodavanju medija"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -571,116 +518,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Opis računara:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Pogrešna šifra"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Pogrešna šifra"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Pokušaj ponovo"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Čestitam"
+msgid "Close"
+msgstr "Zatvori"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Restartuj"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Opis računara:"
 
-#: ../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 ""
-"Baza paketa je zaključana. Molim zatvorite druge programe\n"
-"koji rade sa bazom paketa (imate li neki drugi menadžer medija\n"
-"na drugom desktopu ili trenutno instalirate neke druge pakete?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Neuspjeh u dodavanju medija"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -731,6 +677,31 @@ msgstr "  --debug\t\t\t- ispisuje sve što se radi\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Instalacija nije uspjela"
+
+#~ msgid "Retry"
+#~ msgstr "Pokušaj ponovo"
+
+#~ msgid "Congratulations"
+#~ msgstr "Čestitam"
+
+#~ msgid "Reboot"
+#~ msgstr "Restartuj"
+
+#~ 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 ""
+#~ "Baza paketa je zaključana. Molim zatvorite druge programe\n"
+#~ "koji rade sa bazom paketa (imate li neki drugi menadžer medija\n"
+#~ "na drugom desktopu ili trenutno instalirate neke druge pakete?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Neuspjeh u dodavanju medija"
+
 #~ msgid "Yes"
 #~ msgstr "Da"
 
diff --git a/po/ca.po b/po/ca.po
index abc6db18..70d1a474 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-09-20 00:10+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -54,7 +54,7 @@ msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -79,13 +79,13 @@ msgstr "la base de dades de l'urpmi està bloquejada"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "Després reinicieu la %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instal·la actualitzacions"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la xarxa"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -145,420 +145,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "S'està executant drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Següent"
 
-#: ../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 "Cancel·la"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "L'equip Mandriva Linux Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "S'està executant MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "S'estan computant les noves actualitzacions...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema està actualitzat\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "S'està comprovant la xarxa: sembla estar desactivada\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Advertència"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Quant a..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Envia la configuració"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executa sempre al inici"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, fuzzy, c-format
 msgid "New medium available"
 msgstr "No disponible"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Error"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "S'ha produït un error"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Fallada al afegir una font"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "D'acord"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Contrasenya incorrecta"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Contrasenya incorrecta"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Error"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "S'ha produït un error"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "D'acord"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Tanca"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fallada al afegir una font"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -568,117 +515,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Nom de màquina:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Contrasenya incorrecta"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "La instal·lació ha fallat"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Contrasenya incorrecta"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Felicitats"
+msgid "Close"
+msgstr "Tanca"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Reinicia"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Nom de màquina:"
 
-#: ../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 ""
-"La base de dades de paquets està bloquejada- Si us plau tanqueu\n"
-"les altres aplicacions que estiguin treballant amb la base de dades\n"
-"de paquets (teniu un altre gestor de paquets o esteu instal·lant\n"
-"algun paquet?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fallada al afegir una font"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "L'equip Mandriva Linux Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "L'equip Mandriva Linux Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -730,6 +675,29 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "La instal·lació ha fallat"
+
+#~ msgid "Congratulations"
+#~ msgstr "Felicitats"
+
+#~ msgid "Reboot"
+#~ msgstr "Reinicia"
+
+#~ 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 ""
+#~ "La base de dades de paquets està bloquejada- Si us plau tanqueu\n"
+#~ "les altres aplicacions que estiguin treballant amb la base de dades\n"
+#~ "de paquets (teniu un altre gestor de paquets o esteu instal·lant\n"
+#~ "algun paquet?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fallada al afegir una font"
+
 #~ msgid "Yes"
 #~ msgstr "Sí"
 
diff --git a/po/cs.po b/po/cs.po
index 21e5d73c..28c11bb9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \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-05-13 22:32+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -56,7 +56,7 @@ msgstr "Pro váš systém jsou k dispozici nové aktualizace"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Byla vydána nová verze distribuce Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Pro vaši distribuci je k dispozici dodatečný zdroj balíčků."
@@ -81,7 +81,7 @@ msgstr "databáze urpmi je zamknutá"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Verze není podporována (příliš stará nebo vývojová verze)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -89,7 +89,7 @@ msgstr ""
 "Nebyl nalezen žádný zdroj softwaru. Je třeba přidat alespoň jeden zdroj "
 "pomocí Správce zdrojů softwaru."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,42 +105,42 @@ msgstr ""
 "\n"
 "Poté znovu spusťte „%s”."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Povolen"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Chyba při aktualizaci zdroje"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalovat aktualizace"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Přidat dodatečný zdroj balíčků"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Zkontrolovat aktualizace"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavit síť"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Povýšit systém"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -150,74 +150,71 @@ msgstr ""
 "Základní podpora této distribuce vypršela. Díky vašemu objednání rozšířené "
 "podpory bude váš systém udržován aktuální do %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spouští se drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nová verze distribuce Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Prohlížet"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Byla vydána nová verze distribuce Mandriva Linux."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Více informací o této nové verzi"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Chcete povýšit systém na distribuci „%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 "Příště se už neptat"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Stáhnout všechny balíčky najednou"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Varování: Budete potřebovat hodně volného místa)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Kam stáhnout balíčky:"
 
-#: ../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 "Další"
 
-#: ../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 "Zrušit"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -226,22 +223,22 @@ msgstr ""
 "Podpora tohoto systému Mandriva Linux skončila. To znamená, že již nebudou k "
 "dispozici žádné nové aktualizace softwaru."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Pokud chcete udržet svůj systém bezpečný, můžete:"
 
-#: ../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 "Měli byste pořídit rozšířenou podporu."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -250,17 +247,23 @@ msgstr ""
 "Buď byste měli pořídit rozšířenou podporu nebo povýšit na novější verzi "
 "distribuce %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Měli byste povýšit na novější verzi distribuce %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Vaše distribuce již není nadále podporována"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Rozšířená podpora"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -269,7 +272,7 @@ msgstr ""
 "Pořiďte si rozšířenou podporu pro tuto verzi (%s) a zachovejte svůj systém v "
 "provozu do %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -278,18 +281,18 @@ msgstr ""
 "Toto povýšení vyžaduje širokopásmové síťové připojení (kabelové, xDSL, …) a "
 "celkem může trvat několik hodin."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Odhadovaná velikost stažených dat bude %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Před pokračováním by měly být ukončeny všechny ostatní běžící aplikace."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -298,99 +301,97 @@ msgstr ""
 "Váš přenosný počítač by měl být v režimu napájení ze sítě a pokud je "
 "dostupné, mělo by být upřednostněno pevné síťové připojení před bezdrátovým."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Spouští se MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Vyhledávám nové aktualizace…\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systém je aktuální\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontroluji síť: zdá se nedostupná\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 by Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 "Mandriva Online umožňuje přístup k webovým službám společnosti Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online webové stránky"
 
 #. -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 ""
 "Michal Bukovjan <bukm@centrum.cz>\n"
 "Vlastimil Ott <vlastimil@e-ott.info>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Varování"
 
-#: ../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 "Více informací"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Přidat zdroj"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "O aplikaci…"
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Nastavení aktualizací"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Vždy spustit při startu"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Konec"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Dostupný nový zdroj"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -399,28 +400,77 @@ msgstr ""
 "Používáte distribuci „%s” a máte tudíž privilegovaný přístup k dalšímu "
 "software."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Chcete nainstalovat tento dodatečný zdroj software?"
 
-#: ../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 "Přidávám dodatečný zdroj balíčků"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Pro přidání dodatečného zdroje balíčků prosím vyplňte ID vašeho účtu"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Chyba"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Vyskytla se chyba"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "Váš účet Mandriva nemá aktivní předplacené stažení verze %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Během přidávání zdroje nastala chyba"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Zdroj %s byl úspěšně přidán."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Zdroj %s byl úspěšně přidán."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -456,116 +506,13 @@ msgstr "Omezený"
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Pro přidání dodatečného zdroje balíčků prosím vyplňte ID vašeho účtu"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Více informací o vašem uživatelském účtu"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Váš email"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Vaše heslo"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Zapomenuté heslo"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Chyba"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Heslo a email nesmí být prázdné."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Vyskytla se chyba"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Zdroj %s byl úspěšně přidán."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Váš účet Mandriva nemá aktivní předplacené stažení verze %s."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Zavřít"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Během přidávání zdroje nastala chyba"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Selhalo získávání seznamu distribucí:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Rozšířená podpora"
-
 #. -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 "
@@ -574,7 +521,7 @@ msgstr ""
 "Společnost Mandriva poskytuje u distribucí 12 měsíců aktualizací pro "
 "desktopy (do %s) a 18 měsíců základních aktualizací (až do %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 "
@@ -583,7 +530,7 @@ msgstr ""
 "Nyní je k dispozici rozšířená podpora, která zahrnuje 18 měsíců dodatečných "
 "aktualizací (do %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 "Pořídit rozšířenou podporu můžete <b>právě teď</b>:"
@@ -593,12 +540,12 @@ msgstr "Pořídit rozšířenou podporu můžete <b>právě teď</b>:"
 msgid "Lifetime policy"
 msgstr "Politika životnosti"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Online předplatné"
 
-#: ../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 "
@@ -607,106 +554,103 @@ msgstr ""
 "Poté, co jste se zaregistrovali online, vyplňte prosím ID vašeho účtu a "
 "přidejte dodatečný zdroj balíčků"
 
-#: ../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 "Váš účet Mandriva nemá aktivní předplacenou rozšířenou podporu."
+msgid "More information on your user account"
+msgstr "Více informací o vašem uživatelském účtu"
 
-#: ../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 "Váš účet Mandriva nemá aktivní předplacené stažení verze Powerpack."
+msgid "Your email"
+msgstr "Váš email"
 
-#: ../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 ""
-"Váš systém nemá na povýšení dostatek volného prostoru na %s (%dMB < %dMB)"
+msgid "Your password"
+msgstr "Vaše heslo"
 
-#: ../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 "Instalace selhala"
+msgid "Forgotten password"
+msgstr "Zapomenuté heslo"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Záznamy z instalace lze nalézt v „%s”"
+msgid "Password and email cannot be empty."
+msgstr "Heslo a email nesmí být prázdné."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Zkusit znovu"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Váš účet Mandriva nemá aktivní předplacenou rozšířenou podporu."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulujeme"
+msgid "Close"
+msgstr "Zavřít"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Povýšení na verzi Mandriva %s bylo úspěšné."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Váš systém musí být restartován."
+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 "Restartovat"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Online předplatné"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Databáze balíčků je zamčená. Ukončete prosím jiné aplikace,\n"
-"které s databází balíčků pracují (Možná máte správce\n"
-"zdrojů softwaru spuštěný na jiné ploše nebo právě \n"
-"instalujete balíčky?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Nepodařilo se přidat médium"
+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 "Povýšení distribuce"
@@ -758,6 +702,52 @@ msgstr "  --debug\t\t\t- zaznamenávat co se děje\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "Váš účet Mandriva nemá aktivní předplacené stažení verze Powerpack."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Váš systém nemá na povýšení dostatek volného prostoru na %s (%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Instalace selhala"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Záznamy z instalace lze nalézt v „%s”"
+
+#~ msgid "Retry"
+#~ msgstr "Zkusit znovu"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulujeme"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Povýšení na verzi Mandriva %s bylo úspěšné."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Váš systém musí být restartován."
+
+#~ msgid "Reboot"
+#~ msgstr "Restartovat"
+
+#~ 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 ""
+#~ "Databáze balíčků je zamčená. Ukončete prosím jiné aplikace,\n"
+#~ "které s databází balíčků pracují (Možná máte správce\n"
+#~ "zdrojů softwaru spuštěný na jiné ploše nebo právě \n"
+#~ "instalujete balíčky?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Nepodařilo se přidat médium"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/cy.po b/po/cy.po
index c5eff28f..4e1b7e1e 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2009-10-01 16:32+0100\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Meddal.com\n"
@@ -53,7 +53,7 @@ msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Mae cyfrwng pecynnau ychwanegol ar gael ar gyfer eich dosbarthiad."
@@ -79,7 +79,7 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Nid yw'r rhyddhad yn cael ei gynnal (mae'n rhy hen neu'n rhyddhad datblygu)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -87,7 +87,7 @@ msgstr ""
 "Heb ganfod cyfrwng. Rhaid ychwanegu cyfrwng drwy'r \"Rheolwr Cyfrwng "
 "Meddalwedd\""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,42 +104,42 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Gwall wrth diweddaru cyfrwng"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Ychwanegu cyfrwng pecynnau ychwanegol"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Gwirio Diweddariad"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Diweddaru'r system"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -147,96 +147,93 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Fersiwn newydd o ddosbarthiad Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Mwy o wybodaeth am y fersiwn newydd"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Hoffech chi ddiweddaru i ddosbarthiad '%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 "Peidio gofyn y tro nesaf"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Nesaf"
 
-#: ../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 "Diddymu"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, fuzzy, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -245,24 +242,30 @@ msgstr ""
 "Nid yw'r dosbarthiad yn cael ei gynnal bellach. Ni fydd diweddariadau "
 "pellach. Dylech ddiweddaru i fersiwn mwy diweddar o ddosbarthiad %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Hoffech chi ddiweddaru i ddosbarthiad '%s'??"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -271,17 +274,17 @@ msgstr ""
 "Mae'r diweddariad yn gofyn am gysylltiad rhwydwaith band llydan cyflym "
 "(cebl, xDSL,...) a gall gymryd rhai oriau i'w gwblhau."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Amcan o'r data i'w lwytho i lawr yw %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Dylech gau pob rhaglen sy'n rhedeg cyn parhau."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -290,96 +293,94 @@ msgstr ""
 "Dylech osod eich gliniadur ar gyflenwad trydan ac mae ethernet yn well na'r "
 "diwifr, os yn bosib."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Cychwyn MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\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 "Hawlfraint (C) %s  Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online yw gwasanaethau gwe Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Gwefan Ar-lein"
 
 #. -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 "-:Rhoslyn Prys <post@meddal.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../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 "Rhagor o Wybodaeth"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Ychwanegu cyfrwng"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Ynghylch..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Ffurfweddiad Diweddaru"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Cyfrwng newydd ar gael"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -388,187 +389,133 @@ msgstr ""
 "Rydych yn defnyddio dosbarthiad '%s' ac o ganlyniad mae gennych fynediad "
 "breintiedig i feddalwedd ychwanegol."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Hoffech chi osod y storfa o feddalwedd ychwanegol?"
 
-#: ../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 "Ychwanegu cyfrwng pecynnau ychwanegol"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Yma mae modd ffurfweddu'r rhaglennig diweddaru"
-
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Update frequency (hours)"
-msgstr "Amlder diweddaru (awr)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Oedi gwiriad cyntaf (munud)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr ""
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-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 "Rhwoch enw eich cyfrif yn ogystal a'r cyfrwng pecyn ychwnegol"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Rhagor o wybodaeth am eich cyfrif defnyddiwr"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Eich e-bost"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Eich cyfrinair"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Cyfrinair wedi ei anghofio"
-
-#: ../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 "Gwall"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Nid oes modd i'r cyfrinair a'r e-bost fod yn wag"
-
-#: ../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 "Digwyddodd gwall"
 
-#: ../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 "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho %s i lawr."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Digwyddodd gwall wrth ychwanegu cyfrwng"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Wedi ychwanegu cyfrwng %s yn llwyddiannus."
+
+#: ../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 "Wedi ychwanegu cyfrwng %s yn llwyddiannus."
 
-#: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-add-media-helper:174
 #: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho %s i lawr."
+msgid "Here you can configure the updates applet"
+msgstr "Yma mae modd ffurfweddu'r rhaglennig diweddaru"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Cau"
+msgid "Update frequency (hours)"
+msgstr "Amlder diweddaru (awr)"
 
-#: ../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 "Digwyddodd gwall wrth ychwanegu cyfrwng"
+msgid "First check delay (minutes)"
+msgstr "Oedi gwiriad cyntaf (munud)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
+msgid "Check for missing \"%s\" media"
+msgstr ""
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr ""
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -578,118 +525,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Disgrifiad y peiriant:"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
 "have subscribed online"
 msgstr "Rhwoch enw eich cyfrif yn ogystal a'r cyfrwng pecyn ychwnegol"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho %s i lawr."
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr ""
-"Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho PowerPack i lawr."
+msgid "More information on your user account"
+msgstr "Rhagor o wybodaeth am eich cyfrif defnyddiwr"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr "Nid oes digon o le ar %s ar gyfer y diweddariad (%dMB < %dMB)"
+msgid "Your email"
+msgstr "Eich e-bost"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
+msgid "Your password"
+msgstr "Eich cyfrinair"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Mae cofnodion gosod i'w gweld yn '%s'"
+msgid "Forgotten password"
+msgstr "Cyfrinair wedi ei anghofio"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "Ail geisiwch."
+msgid "Password and email cannot be empty."
+msgstr "Nid oes modd i'r cyfrinair a'r e-bost fod yn wag"
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "Llongyfarchiadau"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho %s i lawr."
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Mae diweddaru i Mandriva %s wedi bod yn llwyddiant."
+msgid "Close"
+msgstr "Cau"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "Rhaid ailgychwyn eich system."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "Ail gychwyn"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Disgrifiad y peiriant:"
+
+#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Mae cronfa ddata'r pecynnau wedi cau. Crëwch raglenni eraill\n"
-"sy'n gweithio ar y gronfa ddata (oes gennych chi reolwr cyfrwng\n"
-"arall ar fwrdd gwaith arall, neu a ydych yn gosod pecynnau\n"
-" eraill hefyd?"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Methu ychwanegu cyfrwng"
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Linux"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Linux"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../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 "Diweddaru'r Dosbarthiad"
@@ -741,6 +685,53 @@ msgstr "  --debug\t\t\t- cofnodi'r hyn sydd wedi ei wneud\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho PowerPack i "
+#~ "lawr."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr "Nid oes digon o le ar %s ar gyfer y diweddariad (%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Methodd y gosod"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Mae cofnodion gosod i'w gweld yn '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Ail geisiwch."
+
+#~ msgid "Congratulations"
+#~ msgstr "Llongyfarchiadau"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Mae diweddaru i Mandriva %s wedi bod yn llwyddiant."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Rhaid ailgychwyn eich system."
+
+#~ msgid "Reboot"
+#~ msgstr "Ail gychwyn"
+
+#~ 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 ""
+#~ "Mae cronfa ddata'r pecynnau wedi cau. Crëwch raglenni eraill\n"
+#~ "sy'n gweithio ar y gronfa ddata (oes gennych chi reolwr cyfrwng\n"
+#~ "arall ar fwrdd gwaith arall, neu a ydych yn gosod pecynnau\n"
+#~ " eraill hefyd?"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Methu ychwanegu cyfrwng"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/da.po b/po/da.po
index ffe5027a..660c7d13 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2009-12-30 20:57+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -54,7 +54,7 @@ msgstr "Nye opdateringer er tilgængelige for dit system"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "En ny version af Mandriva Linux distributionen er blevet udgivet"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Et nyt pakkemedie er tilgængelig til din distribution."
@@ -80,7 +80,7 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Udgivelse ikke understøttet (for gammel udgivelse, eller udviklingsudgivelse)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -88,7 +88,7 @@ msgstr ""
 "Intet medie fundet. Du skal tilføje et medie via 'Administration af "
 "programmedier'."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,42 +104,42 @@ msgstr ""
 "\n"
 "Derefter skal '%s' genstartes."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Fejl ved opdatering af medie"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installér opdateringer"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Tilføj nyt pakkemedie"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Tjek for opdateringer"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurér netværk"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Opgradér systemet"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -147,96 +147,93 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Begynder på drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Ny version af Mandriva Linux distributionen"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Gennemsé"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "En ny version af Mandriva Linux distributionen er blevet udgivet."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Mere info om denne nye version"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Ønsker du at opgradere til '%s' distributionen?"
 
-#: ../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ørg ikke næste gang"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Hent alle pakker på en gang"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "Aldvarsel: du vil få brug for en masse fri plads"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Hvor skal pakker hentes til: "
 
-#: ../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 "Næste"
 
-#: ../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 "Annullér"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, fuzzy, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -246,24 +243,30 @@ msgstr ""
 "flere opdateringer. Du bør opgradere til en nyere version af %s "
 "distributionen."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Ønsker du at opgradere til '%s' distributionen?"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -272,17 +275,17 @@ msgstr ""
 "Denne opgradering kræver en hurtig netværksforbindelse (kabel, xDSL, ...)  "
 "og kan tage en del timer at gøre færdig."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Beregnet hentningstid for data vil være %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Du bør lukke alle andre kørende programmer før du fortsætter."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -291,96 +294,94 @@ msgstr ""
 "Du bør tilsutte din bærbare til lysnettet, og foretrække en "
 "ethernetforbindelse fremfor wifi, om muligt."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Start MandrivaUpdate op\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Beregner nye opdateringer...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er opdateret\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tjekker netværk: ser ud til at være deaktiveret\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 "Ophavsret © %s ved Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online giver adgang til Mandrivas webtjenester."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite på nettet"
 
 #. -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 "Keld Simonsen,<keld@dkuug.dk>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../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 "Mere information"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Tilføj medie"
 
-#: ../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 "Konfigurering af opdateringer"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Start altid op ved opstart"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nyt medie tilgængeligt"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -389,187 +390,133 @@ msgstr ""
 "Du bruger distributionen '%s' og har derfor priviligeret adgang til "
 "yderligere programmel."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Ønsker du at installere dette ekstra programmel-repositorie?"
 
-#: ../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 "Tilføjer et ekstra pakkemedie"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Her kan du konfigurere updates-appletten"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Opdateringsfrekvens (timer)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Forsinkelse på første check (minutter)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Tjek for nyere udgaver af %s"
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Tjek for manglende medie med %s"
-
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Restricted"
-msgstr "Begrænset"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Virksomhed"
+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 "Udfyld venligst din konto-ID for at tilføje et ekstra pakkemedie"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Mere information om din brugerkonto"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Din epost"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Din adgangskode"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Glemt adgangskode"
-
-#: ../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 "Fejl"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Adgangskode og epost kan ikke være 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 "En fejl indtraf"
 
-#: ../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 "Din Mandriva-konto har ikke aktiveret %s download abonnement."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Der skete en fejl ved tilføjelse af medie"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Tilføjede medie %s uden problemer."
+
+#: ../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 "Tilføjede medie %s uden problemer."
 
-#: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-add-media-helper:174
 #: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
 #, c-format
 msgid "Ok"
 msgstr "O.k."
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Din Mandriva-konto har ikke aktiveret %s download abonnement."
+msgid "Here you can configure the updates applet"
+msgstr "Her kan du konfigurere updates-appletten"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Luk"
+msgid "Update frequency (hours)"
+msgstr "Opdateringsfrekvens (timer)"
 
-#: ../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 "Der skete en fejl ved tilføjelse af medie"
+msgid "First check delay (minutes)"
+msgstr "Forsinkelse på første check (minutter)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
+msgid "Check for newer \"%s\" releases"
+msgstr "Tjek for nyere udgaver af %s"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
+msgid "Check for missing \"%s\" media"
+msgstr "Tjek for manglende medie med %s"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Begrænset"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Virksomhed"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -579,118 +526,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "WebSite på nettet"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
 "have subscribed online"
 msgstr "Udfyld venligst din konto-ID for at tilføje et ekstra pakkemedie"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "Din Mandriva-konto har ikke aktiveret %s download abonnement."
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "Din Mandriva-konto har ikke aktiveret Powerpack download abonnement."
+msgid "More information on your user account"
+msgstr "Mere information om din brugerkonto"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
-"Dit system har ikke nok plads tilbage på %s til opgradering (%d MB < %d MB)"
+msgid "Your email"
+msgstr "Din epost"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "Installation mislykkedes"
+msgid "Your password"
+msgstr "Din adgangskode"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Installationslogger kan findes i '%s'"
+msgid "Forgotten password"
+msgstr "Glemt adgangskode"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "Prøv igen"
+msgid "Password and email cannot be empty."
+msgstr "Adgangskode og epost kan ikke være tomme."
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "Tillykke"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Din Mandriva-konto har ikke aktiveret %s download abonnement."
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Opgradering til Mandriva %s udgave skete uden problemer."
+msgid "Close"
+msgstr "Luk"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "Du skal genstarte dit system."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "Genstart"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
+
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "WebSite på nettet"
 
-#: ../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 ""
-"Pakke-databasen er låst. Luk andre programmer som\n"
-"arbejder på pakke-databasen (har du en anden medie-administrator\n"
-"på en anden maskine, eller er du også i øjeblikket i færd med at installere\n"
-"pakker?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fejl ved tilføjelse af medie"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../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 "Opgradering af distribution"
@@ -741,6 +685,55 @@ msgstr "  --debug\t\t\t- log der laves\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kan ikke opdatere pakker fra update_source-medium.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Din Mandriva-konto har ikke aktiveret Powerpack download abonnement."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Dit system har ikke nok plads tilbage på %s til opgradering (%d MB < %d "
+#~ "MB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Installation mislykkedes"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Installationslogger kan findes i '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Prøv igen"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tillykke"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Opgradering til Mandriva %s udgave skete uden problemer."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Du skal genstarte dit system."
+
+#~ msgid "Reboot"
+#~ msgstr "Genstart"
+
+#~ 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 ""
+#~ "Pakke-databasen er låst. Luk andre programmer som\n"
+#~ "arbejder på pakke-databasen (har du en anden medie-administrator\n"
+#~ "på en anden maskine, eller er du også i øjeblikket i færd med at "
+#~ "installere\n"
+#~ "pakker?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fejl ved tilføjelse af medie"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/de.po b/po/de.po
index c5302842..e45c0491 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \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-04-28 08:22+0200\n"
 "Last-Translator: Oliver Burger <oliver@mandrivauser.de>\n"
 "Language-Team: German <cooker-i18n@mandrivalinux.org>\n"
@@ -60,7 +60,7 @@ msgstr "Neue Aktualisierungen für Ihr System verfügbar"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Eine neue Version von Mandriva Linux ist erschienen"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Eine weitere Paketquelle ist für Ihre Distribution verfügbar"
@@ -86,7 +86,7 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Version wird nicht unterstützt (zu alte Version, oder Entwicklungsversion)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -94,7 +94,7 @@ msgstr ""
 "Kein Medium gefunden. Sie müssen einige Medien mit dem 'Software Medien "
 "Manager' hinzufügen"
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -111,42 +111,42 @@ msgstr ""
 "\n"
 "Starten Sie anschließend erneut \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Fehler beim Aktualisieren des Mediums"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Aktualisieren"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Weitere Paketquelle hinzufügen"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Überprüfe Updates"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Netzwerk konfigurieren"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Das System aktualisieren"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, fuzzy, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -157,74 +157,71 @@ msgstr ""
 "Registrieung für erweiterte Wartung, Ihr System wird bis zum %s aktuell "
 "gehalten"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starte drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Neue Version der Mandriva Linux Distribution"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, fuzzy, c-format
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Eine neue Version von Mandriva Linux ist erschienen."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Mehr Informationen über diese neue Version"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Wollen Sie auf '%s'-Distribution aktualisieren?"
 
-#: ../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 "Das nächste mal nicht mehr Nachfragen"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Alle Pakete auf einmal herunterladen"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Warnung: Es wird viel Speicherplatz benötigt)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Wo man Pakete herunterladen kann:"
 
-#: ../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 "Weiter"
 
-#: ../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 "Abbrechen"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -233,22 +230,22 @@ msgstr ""
 "Die Wartungsdauer für diese Mandriva-Ausgabe ist beendet. Für dieses System "
 "werden keine Aktualisierungen mehr geliefert."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Um Ih System sicher zu erhalten, können Sie:"
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, fuzzy, c-format
 msgid "You should get extended maintenance."
 msgstr "Sie sollte sich für die erweiterte Wartung registrieren."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, fuzzy, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -257,17 +254,23 @@ msgstr ""
 "Sie sollten sich entweder für erweiterte Wartung registrieren oder auf eine "
 "neuere Version der %s Distribution wechseln."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Sie sollten auf eine neuere Version der %s Distribution aktualisieren."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ihre Distribution wird nicht länger unterstützt"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Erweiterte Wartung"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -276,7 +279,7 @@ msgstr ""
 "Kaufen Sie eine Wartungserweiterung für  diese Version (%s) und nutzen Sie "
 "sie weiter bis zum %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -286,17 +289,17 @@ msgstr ""
 "(Kabel, xDSL,...)  und kann mehrere Stunden benötigen, um vollständig zu "
 "sein."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Die geschätzten Download-Daten werden %s groß sein"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Sie sollten alle anderen Programme beenden, bevor sie fortfahren."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -305,99 +308,97 @@ msgstr ""
 "Sie sollten Ihr Notebook an das Stromnetz anschließen und eine Ethernet-"
 "Verbindung vor einer WLAN-Verbindung bevorzugen, wenn dies möglich ist."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Starte MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Berechne neue Updates...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System ist aktuell\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Überprüfe Netzwerk: Scheint abgeschaltet\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 (C) %s by Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 "Durch Mandriva Online erhalten Sie Zugriff auf Internetangebote von Mandriva"
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online Webseite"
 
 #. -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 ""
 "_: Nicolas Bauer & rastafarii@mandrivauser.de\n"
 "_: Oliver Burger & oliver@mandrivauser.de\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../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 "Mehr Informationen"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Quellen hinzufügen"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Über..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Konfiguration der Aktualisierungen"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Immer beim Start ausführen"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Neue Paketquelle verfügbar"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -406,175 +407,121 @@ msgstr ""
 "Sie nutzen die '%s' Distribution und haben deshalb Zugang zu zusätzlicher "
 "Software."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Wollen Sie diese zusätzliche Softwarequelle einrichten?"
 
-#: ../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 "Füge eine weitere Paketquelle hinzu"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Hier können Sie das Aktualisierungs-Applet einrichten"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Aktualisierungs-Frequenz (Stunden)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Wartezeit vor der ersten Überprüfung (Minuten)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Nach neueren \"%s\" Versionen suchen"
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Nach fehlenden \"%s\" Quellen suchen"
-
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Restricted"
-msgstr "Beschränkt"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
+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 ""
 "Bitte geben Sie Ihre Zugangsdaten ein, um eine zusätzliche Paketquelle "
 "hinzuzufügen"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Mehr Informationen über Ihr Benutzerkonto"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Ihre Emailadresse"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Ihr Passwort"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Vergessenes Passwort"
-
-#: ../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 "Fehler"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Passwort und Mailadresse können nicht leer sein."
-
-#: ../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 "Ein Fehler ist aufgetreten"
 
-#: ../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 "In Ihrem Mandriva Account ist kein %s Download-Abonnement aktiviert."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Fehler beim Hinzufügen eines Mediums"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Medium %s wurde erfolgreich hinzugefügt."
+
+#: ../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 "Medium %s wurde erfolgreich hinzugefügt."
 
-#: ../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 "In Ihrem Mandriva Account ist kein %s Download-Abonnement aktiviert."
+msgid "Here you can configure the updates applet"
+msgstr "Hier können Sie das Aktualisierungs-Applet einrichten"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Schließen"
+msgid "Update frequency (hours)"
+msgstr "Aktualisierungs-Frequenz (Stunden)"
 
-#: ../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 "Fehler beim Hinzufügen eines Mediums"
+msgid "First check delay (minutes)"
+msgstr "Wartezeit vor der ersten Überprüfung (Minuten)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Holen der Distributionslisten fehlgeschlagen:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Nach neueren \"%s\" Versionen suchen"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Erweiterte Wartung"
+msgid "Check for missing \"%s\" media"
+msgstr "Nach fehlenden \"%s\" Quellen suchen"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Beschränkt"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Holen der Distributionslisten fehlgeschlagen:"
 
 #. -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 "
@@ -583,7 +530,7 @@ msgstr ""
 "Mandriva bietet 12 Monate Desktop-Aktualisierungen (bis zum %s) und 18 "
 "Monate Basis-Aktualisierungen (bis zum %s) für seine Distributionen."
 
-#: ../mdkapplet-extended-maintenance-helper:110
+#: ../mdkapplet-extended-maintenance-helper:107
 #, fuzzy, c-format
 msgid ""
 "Extended maintenance is now available to get 18 months of additional updates "
@@ -592,7 +539,7 @@ msgstr ""
 "Erweiterte Wartung ist nun verfügbar, um 18 Monate zusätzliche "
 "Aktualisierungen (bis zum %s) zu erhalten."
 
-#: ../mdkapplet-extended-maintenance-helper:112
+#: ../mdkapplet-extended-maintenance-helper:109
 #, fuzzy, c-format
 msgid "You can subscribe <b>right now</b> to get extended maintenance:"
 msgstr ""
@@ -604,12 +551,12 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr "Lebenszeit-Richtlinie"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Online Registrierung"
 
-#: ../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 "
@@ -618,107 +565,103 @@ msgstr ""
 "Bitte geben Sie Ihre Zugangsdaten ein, um eine zusätzliche Paketquelle "
 "hinzuzufügen"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "In Ihrem Mandriva Account ist kein Wartungs-Registrierung aktiviert."
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr ""
-"In Ihrem Mandriva Account ist kein Powerpack Download-Abonnement aktiviert."
+msgid "More information on your user account"
+msgstr "Mehr Informationen über Ihr Benutzerkonto"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
-"Auf Ihrem System befindet sich nicht genug freier Speicherplatz in %s für "
-"die Aktualisierung (%dMB < %dMB)"
+msgid "Your email"
+msgstr "Ihre Emailadresse"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "Die Installation schlug fehl!"
+msgid "Your password"
+msgstr "Ihr Passwort"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Die Installations-Logs befinden sich in '%s'"
+msgid "Forgotten password"
+msgstr "Vergessenes Passwort"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "Wiederholen"
+msgid "Password and email cannot be empty."
+msgstr "Passwort und Mailadresse können nicht leer sein."
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "Herzlichen Glückwunsch"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "In Ihrem Mandriva Account ist kein Wartungs-Registrierung aktiviert."
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Eine Aktualisierung auf die Mandriva-Version %s war erfolgreich."
+msgid "Close"
+msgstr "Schließen"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "Sie müssen Ihr System neustarten."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "Neustart"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
+
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Online Registrierung"
 
-#: ../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 ""
-"Die Paketdatenbank ist gesperrt. Bitte schließen Sie andere Anwendungen,die "
-"mit der Paketdatenbank arbeiten (haben Sie einen anderen Paket-Manager auf "
-"einem anderen Desktop laufen oder fügen Sie gerade Pakete hinzu?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fehler beim Hinzufügen des Mediums"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../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 "Distributionsaktualisierung"
@@ -770,6 +713,55 @@ msgstr " --debug\t\t\t- protokolliere was gemacht wird\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Aktualisieren der Pakete vom Update-Medium nicht möglich.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "In Ihrem Mandriva Account ist kein Powerpack Download-Abonnement "
+#~ "aktiviert."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Auf Ihrem System befindet sich nicht genug freier Speicherplatz in %s für "
+#~ "die Aktualisierung (%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Die Installation schlug fehl!"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Die Installations-Logs befinden sich in '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Wiederholen"
+
+#~ msgid "Congratulations"
+#~ msgstr "Herzlichen Glückwunsch"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Eine Aktualisierung auf die Mandriva-Version %s war erfolgreich."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Sie müssen Ihr System neustarten."
+
+#~ msgid "Reboot"
+#~ msgstr "Neustart"
+
+#~ 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 ""
+#~ "Die Paketdatenbank ist gesperrt. Bitte schließen Sie andere Anwendungen,"
+#~ "die mit der Paketdatenbank arbeiten (haben Sie einen anderen Paket-"
+#~ "Manager auf einem anderen Desktop laufen oder fügen Sie gerade Pakete "
+#~ "hinzu?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fehler beim Hinzufügen des Mediums"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/el.po b/po/el.po
index 94ec0bde..ec270b4e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-el\n"
 "Report-Msgid-Bugs-To: \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-03 19:29+0100\n"
 "Last-Translator: Glentadakis Dimitrios\n"
 "Language-Team: Greek <translators_team@mandrivalinux.gr>\n"
@@ -59,7 +59,7 @@ msgstr "Υπάρχουν νέες ενημερώσεις για το σύστη�
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Μια νέα έκδοση της διανομής Mandriva Linux είναι διαθέσιμη"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Ένα πρόσθετο μέσο πακέτων είναι διαθέσιμο για την διανομή σας."
@@ -86,7 +86,7 @@ msgstr "η βάση δεδομένων urpmi είναι κλειδωμένη"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Η έκδοση δεν υποστηρίζεται ( πολύ παλιά έκδοση ή έκδοση σε ανάπτυξη)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -94,7 +94,7 @@ msgstr ""
 "Δε βρέθηκε κάποιο μέσο. Πρέπει να προσθέσεις κάποια μέσα, χρησιμοποιώντας το "
 "«Διαχειριστή Μέσων Λογισμικού»."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -111,42 +111,42 @@ msgstr ""
 "\n"
 "Έπειτα, εκκινήστε ξανά το «%s»."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Σφάλμα στην ενημέρωση των μέσων"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Εγκατάσταση ενημερώσεων"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Προσθήκη νέου μέσου πακέτων"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Έλεγχος ενημερώσεων"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Ρύθμιση δικτύου"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Αναβάθμιση του συστήματος"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -157,74 +157,71 @@ msgstr ""
 "εγγραφή σας στην εκτεταμένη υποστήριξη, το σύστημά σας θα ενημερώνεται μέχρι "
 "τις %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Εκτέλεση drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Νέα έκδοση της διανομής Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Περιήγηση"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Μια νέα έκδοση της διανομής Mandriva Linux είναι διαθέσιμη."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Περισσότερες πληροφορίες για την νέα έκδοση"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Θέλετε να κάνετε αναβάθμιση στην νέα διανομή «%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 "Μη με ρωτήσεις την επόμενη φορά"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Άμεση λήψη όλων των πακέτων"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Προσοχή: Θα χρειαστείτε αρκετό ελεύθερο χώρο)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Προορισμός λήψης των πακέτων:"
 
-#: ../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 "Επόμενο"
 
-#: ../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 "Άκυρο"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -233,22 +230,22 @@ msgstr ""
 "Η συντήρηση αυτού του συστήματος Mandriva Linux έχει σταματήσει. Σημαίνει "
 "πως δεν θα λαμβάνεται νέες ενημερώσεις πλέον."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Για να διατηρηθεί το σύστημα σας ασφαλές, μπορείτε να:"
 
-#: ../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 "Θα πρέπει να αποκτήσετε εκτεταμένη συντήρηση."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -257,17 +254,23 @@ msgstr ""
 "Θα πρέπει είτε να αποκτήσετε εκτεταμένη συντήρηση ή να αναβαθμίσετε σε μια "
 "νεότερη έκδοση της διανομής %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Θα πρέπει να αναβαθμίσετε σε μια νεότερη έκδοση της διανομής %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Η διανομή σας δεν υποστηρίζεται πλέον"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Εκτεταμένη συντήρηση"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -276,7 +279,7 @@ msgstr ""
 "Αγοράστε μια επέκταση συντήρησης για τη συγκεκριμένη έκδοση (%s) και "
 "συνεχίστε την λειτουργία της μέχρι το %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -285,18 +288,18 @@ msgstr ""
 "Η αναβάθμιση απαιτεί υψηλό εύρος σύνδεσης (cable, xDSL, ...) και μπορεί να "
 "χρειαστεί μερικές ώρες για να ολοκληρωθεί."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Το εκτιμώμενο μέγεθος των δεδομένων προς λήψη είναι %s "
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Θα πρέπει να κλείσετε όλες τις άλλες εκτελούμενες εφαρμογές πριν συνεχίσετε."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -305,99 +308,97 @@ msgstr ""
 "Θα πρέπει να συνδέσετε τον φορητό σας υπολογιστή στον φορτιστή AC και να "
 "προτιμήσετε ethernet σύνδεση αντί για wifi, αν είναι διαθέσιμη."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr " Εκτέλεση μικροεφαρμογής MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Επεξεργασία νέων αναβαθμίσεων...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Το σύστημα είναι ενημερωμένο\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Έλεγχος δικτύου: φαίνεται απενεργοποιημένο\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 (C)%s by mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 "Η Mandriva Online παρέχει πρόσβαση στις διαδικτυακές υπηρεσίες της Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online Δικτυακός τόπος"
 
 #. -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 ""
 "Nikos Papadopoulos <231036448@freemail.gr>\n"
 "Glentadakis Dimitrios <dglent@gmail.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../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 "Περισσότερες πληροφορίες"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Προσθήκη μέσου"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Σχετικά..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Ρύθμιση Ενημερώσεων"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Να εκτελείται πάντοτε στην εκκίνηση"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Νέο μέσο διαθέσιμο"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -406,176 +407,122 @@ msgstr ""
 "Χρησιμοποιείτε την διανομή «%s» και και επωφελείστε επομένως από μια "
 "προνομιούχο πρόσβαση σε πρόσθετα πακέτα."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Θέλετε να εγκαταστήσετε αυτό το νέο αποθετήριο λογισμικού ;"
 
-#: ../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 "Προσθήκη ενός νέου μέσου πακέτων"
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Εδώ μπορείτε να ρυθμίσετε την εφαρμογή ενημερώσεων"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Συχνότητα ενημερώσεων (ώρες)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Χρονική αναμονή πρώτης ενημέρωσης (λεπτά)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Έλεγχος για νέες εκδόσεις «%s»"
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Έλεγχος αν λείπουν τα μέσα «%s»"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Με περιορισμούς"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
+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 ""
 "Παρακαλώ συμπληρώστε τα στοιχεία του λογαριασμού σας για να προσθέσετε ένα "
 "νέο μέσο πακέτων."
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Περισσότερες πληροφορίες για τον λογαριασμό σας"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Το ηλ.ταχυδρομείο σας"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Ο κωδικός σας"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Έχω ξεχάσει τον κωδικό πρόσβασης"
-
-#: ../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 "Σφάλμα"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Θα πρέπει να συμπληρώσετε τον κωδικό και το ηλ.ταχυδρομείο σας."
-
-#: ../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 "Προκλήθηκε σφάλμα"
 
-#: ../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 δεν έχει συνδρομή στην υπηρεσία λήψης του %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Παρουσιάστηκε σφάλμα κατά την προσθήκη του μέσου"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Η προσθήκη του μέσου %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 "Η προσθήκη του μέσου %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 "Εντάξει"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr ""
-"Ο λογαριασμός σας Mandriva δεν έχει συνδρομή στην υπηρεσία λήψης του %s."
+msgid "Here you can configure the updates applet"
+msgstr "Εδώ μπορείτε να ρυθμίσετε την εφαρμογή ενημερώσεων"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Κλείσιμο"
+msgid "Update frequency (hours)"
+msgstr "Συχνότητα ενημερώσεων (ώρες)"
 
-#: ../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 "Παρουσιάστηκε σφάλμα κατά την προσθήκη του μέσου"
+msgid "First check delay (minutes)"
+msgstr "Χρονική αναμονή πρώτης ενημέρωσης (λεπτά)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Η ανάκτηση της λίστας των διανομών απέτυχε:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Έλεγχος για νέες εκδόσεις «%s»"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Εκτεταμένη συντήρηση"
+msgid "Check for missing \"%s\" media"
+msgstr "Έλεγχος αν λείπουν τα μέσα «%s»"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Με περιορισμούς"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Enterprise"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Η ανάκτηση της λίστας των διανομών απέτυχε:"
 
 #. -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 "
@@ -584,7 +531,7 @@ msgstr ""
 "Η Mandriva παρέχει 12 μήνες ενημερώσεις για την επιφάνεια εργασίας (μέχρι "
 "τις %s) και 18 μήνες βασικές ενημερώσεις (μέχρι τις %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 "
@@ -593,7 +540,7 @@ msgstr ""
 "Η εκτεταμένη συντήρηση είναι πλέον διαθέσιμη για να αποκτήσετε 18 μήνες "
 "πρόσθετες ενημερώσεις (μέχρι τις %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 ""
@@ -605,12 +552,12 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr "Πολιτική χρόνου ζωής"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Εγγραφή στο διαδίκτυο"
 
-#: ../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 "
@@ -619,112 +566,105 @@ msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία του λογαριασμού σας για να προσθέσετε ένα "
 "νέο μέσο πακέτων αφού ολοκληρώσετε την εγγραφή σας στο διαδίκτυο"
 
-#: ../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 δεν έχει συνδρομή στην υπηρεσία εκτεταμένης "
-"συντήρησης."
+msgid "More information on your user account"
+msgstr "Περισσότερες πληροφορίες για τον λογαριασμό σας"
 
-#: ../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 δεν έχει συνδρομή στην υπηρεσία λήψης του "
-"Powerpack."
+msgid "Your email"
+msgstr "Το ηλ.ταχυδρομείο σας"
 
-#: ../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 ""
-"Το σύστημά σας δεν έχει αρκετό διαθέσιμο χώρο στο %s για την αναβάθμιση (%"
-"dMB < %dMB)"
+msgid "Your password"
+msgstr "Ο κωδικός σας"
 
-#: ../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 "Η εγκατάσταση απέτυχε"
+msgid "Forgotten password"
+msgstr "Έχω ξεχάσει τον κωδικό πρόσβασης"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Τα αρχεία καταγραφής της εγκατάστασης μπορείτε να τα βρείτε στο «%s»"
+msgid "Password and email cannot be empty."
+msgstr "Θα πρέπει να συμπληρώσετε τον κωδικό και το ηλ.ταχυδρομείο σας."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Νέα προσπάθεια"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"Ο λογαριασμός σας Mandriva δεν έχει συνδρομή στην υπηρεσία εκτεταμένης "
+"συντήρησης."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Συγχαρητήρια"
+msgid "Close"
+msgstr "Κλείσιμο"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Η αναβάθμιση σε Mandriva %s ολοκληρώθηκε με επιτυχία."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Πρέπει να επανεκκινήστε το σύστημά σας."
+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 "Επανεκκίνηση"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Εγγραφή στο διαδίκτυο"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Η βάση δεδομένων των πακέτων είναι κλειδωμένη. Παρακαλώ κλείστε άλλες "
-"εφαρμογές\n"
-" που εργάζονται με τη βάση δεδομένων των πακέτων (έχετε άλλο διαχειριστή\n"
-"μέσων σε άλλη επιφάνεια εργασίας, ή κάνετε επί του παρόντος εγκατάσταση "
-"πακέτων ;)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Αποτυχία κατά την προσθήκη μέσου"
+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 "Αναβάθμιση διανομής"
@@ -777,6 +717,56 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Αδύνατη η ενημέρωση των πακέτων από το μέσο update_source.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Ο λογαριασμός σας Mandriva δεν έχει συνδρομή στην υπηρεσία λήψης του "
+#~ "Powerpack."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Το σύστημά σας δεν έχει αρκετό διαθέσιμο χώρο στο %s για την αναβάθμιση (%"
+#~ "dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Η εγκατάσταση απέτυχε"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Τα αρχεία καταγραφής της εγκατάστασης μπορείτε να τα βρείτε στο «%s»"
+
+#~ msgid "Retry"
+#~ msgstr "Νέα προσπάθεια"
+
+#~ msgid "Congratulations"
+#~ msgstr "Συγχαρητήρια"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Η αναβάθμιση σε Mandriva %s ολοκληρώθηκε με επιτυχία."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Πρέπει να επανεκκινήστε το σύστημά σας."
+
+#~ msgid "Reboot"
+#~ msgstr "Επανεκκίνηση"
+
+#~ 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 ""
+#~ "Η βάση δεδομένων των πακέτων είναι κλειδωμένη. Παρακαλώ κλείστε άλλες "
+#~ "εφαρμογές\n"
+#~ " που εργάζονται με τη βάση δεδομένων των πακέτων (έχετε άλλο διαχειριστή\n"
+#~ "μέσων σε άλλη επιφάνεια εργασίας, ή κάνετε επί του παρόντος εγκατάσταση "
+#~ "πακέτων ;)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Αποτυχία κατά την προσθήκη μέσου"
+
+#~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
diff --git a/po/eo.po b/po/eo.po
index d6541c1c..d00ac358 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-01-13 10:13+0100\n"
 "Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
 "Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -52,7 +52,7 @@ msgstr "Novaj ĝisdatigojn estas haveblajn por via sistemo"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -78,13 +78,13 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Sistemversiono ne konvenas (tro malnova versiono, aŭ disvolva versiono)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,42 +101,42 @@ msgstr ""
 "\n"
 "Poste, restartigu (%s)."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Ĉu enŝaltita"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalu ĝisdatigojn"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Serĉu ĝisdatigojn"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Konfiguru la reton"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -144,420 +144,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanĉu drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 "Ne demandu min venontfoje"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Sekvanta"
 
-#: ../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 "Nuligu"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lanĉu MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Kalkulu novajn ĝisdatigojn...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemo estas ĝisdata\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrolante Reton: ĝi ŝajnas haltita\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Kopirajto (C) %s ĉe Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "TTT-a retejo"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Averto"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Pri..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Legas konfiguradon\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Ĉiam startu post sistemstartado"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Eliru"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Eraro"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Eraro okazis"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Paneo ĉe aldono de portilo"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Jeso"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Malĝusta pasvorto"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Malĝusta pasvorto"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Eraro"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Eraro okazis"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Jeso"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Fermu"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Paneo ĉe aldono de portilo"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -567,116 +514,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Maŝinnomo:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Malĝusta pasvorto"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalado malsukcesis"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Malĝusta pasvorto"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Reprovu"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulojn"
+msgid "Close"
+msgstr "Fermu"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Restarto"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Maŝinnomo:"
 
-#: ../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 ""
-"La pakaĵo-datumbazo estas blokita. Bonvole fermi aliajn aplikaĵojn\n"
-"kiuj laboras kun la pakaĵ-datumbao (ĉu vi havas alian portil-\n"
-"mastrumilon sur alia labortablo, aŭ ĉu vi momente instalas pakaĵojn?)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Paneo ĉe aldono de portilo"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -728,6 +674,31 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Instalado malsukcesis"
+
+#~ msgid "Retry"
+#~ msgstr "Reprovu"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulojn"
+
+#~ msgid "Reboot"
+#~ msgstr "Restarto"
+
+#~ 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 ""
+#~ "La pakaĵo-datumbazo estas blokita. Bonvole fermi aliajn aplikaĵojn\n"
+#~ "kiuj laboras kun la pakaĵ-datumbao (ĉu vi havas alian portil-\n"
+#~ "mastrumilon sur alia labortablo, aŭ ĉu vi momente instalas pakaĵojn?)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Paneo ĉe aldono de portilo"
+
 #~ msgid "Yes"
 #~ msgstr "Jes"
 
diff --git a/po/es.po b/po/es.po
index fcedacc4..438a4b06 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline_es\n"
 "Report-Msgid-Bugs-To: \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-04-24 19:58-0300\n"
 "Last-Translator: Diego Bello Carreño <dbello@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -58,7 +58,7 @@ msgstr "Hay nuevas actualizaciones disponibles para su sistema"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Ha sido publicada una nueva versión de Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Un soporte adicional de programas está disponible para su distribución"
@@ -83,7 +83,7 @@ msgstr "base de datos de urpmi bloqueada"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión no soportada (muy antigua o versión de desarrollo)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -91,7 +91,7 @@ msgstr ""
 "No se encontró ningún soporte. Debe añadir uno con el \"Administrador de "
 "soportes de software\"."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,42 +109,42 @@ msgstr ""
 "\n"
 "Luego, reinicie \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Error actualizando el soporte"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizaciones"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Añadir soporte con Programas Adicionales"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar actualizaciones"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar red"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Actualizar el sistema"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -155,74 +155,71 @@ msgstr ""
 "suscripción para ampliar el mantenimiento su sistema seguirá estando "
 "actualizado hasta %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanzando drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nueva versión de Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Examinar"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Una nueva versión de Mandriva Linux está disponible"
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Más información acerca de esta nueva versión"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "¿Desea actualizar a distribución '%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 "No volver a preguntar"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Descargar todos los paquetes de una vez"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Advertencia: Necesitará una gran cantidad de espacio libre)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Dónde descargar paquetes:"
 
-#: ../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 "Siguiente"
 
-#: ../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 "Cancelar"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -231,22 +228,22 @@ msgstr ""
 "El mantenimiento de esta versión de Mandriva Linux ha finalizado. No se "
 "entregarán mas actualizaciones para este sistema."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Para mantener su sistema seguro, usted puede:"
 
-#: ../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 "Debería obtener una ampliación del mantenimiento."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -255,17 +252,23 @@ msgstr ""
 "Debería obtener una ampliación del mantenimiento o actualizar a una versión "
 "más reciente de la distribución %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Debería actualizar a una nueva versión de la distribución %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Su distribución ya no es soportada"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Mantenimiento ampliado"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -274,7 +277,7 @@ msgstr ""
 "Compre una ampliación de mantenimiento para esta versión (%s) y manténgala "
 "operativa hasta %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -283,18 +286,18 @@ msgstr ""
 "Esta actualización necesita una conexión de banda ancha (cable, xDSL, ...) y "
 "puede requerir muchas horas para completarse."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "La descarga estimada será de %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Debe terminar todas las demás aplicaciones en ejecución antes de proseguir."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -303,96 +306,94 @@ msgstr ""
 "Recomendamos que conecte su portátil a la red eléctrica y si es posible  "
 "utilice una conexión por cable en lugar inalámbrica o wifi."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lanzando MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calculando nuevas actualizaciones...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema está actualizado\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificando red: parece estar deshabilitada\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 por Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandiva Online da acceso a los servicios web de Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Sitio web en línea"
 
 #. -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 "Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../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 "Más Información"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Añadir soportes"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Acerca..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuración de Actualizaciones"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lanzar siempre al arrancar"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nuevo soporte disponible"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -401,175 +402,121 @@ msgstr ""
 "Usted utiliza la distribución '%s', y por tanto tiene acceso privilegiado "
 "para programas adicionales."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "¿Desea añadir este soporte para acceder programas adicionales?"
 
-#: ../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 "Añadiendo un soporte de programas adicionales"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Aquí se puede configurar el notificador de actualizaciones"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Frecuencia de verificaciones (horas)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Demora de la primera verificación (minutos)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Verificar si existen nuevas versiones de \"%s\""
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Verificar el medio \"%s\" que falta"
-
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Restricted"
-msgstr "Restringido"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Empresarial"
+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 ""
 "Por favor introduzca el nombre de usuario de su cuenta para añadir este "
 "nuevo  soporte."
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Más información en su cuenta de usuario"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Su correo electrónico"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Su contraseña"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "No recuerdo mi contraseña"
-
-#: ../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 "Error"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "La contraseña y correo no pueden estar en blanco."
-
-#: ../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 "Ha ocurrido un error"
 
-#: ../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 "Su cuenta de Mandriva no tiene suscripción para descarga %s "
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Ha ocurrido un error al añadir el soporte"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Soporte %s añadido satisfactoriamente."
+
+#: ../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 "Soporte %s añadido satisfactoriamente."
 
-#: ../mdkapplet-enterprise-update-helper:133
+#: ../mdkapplet-add-media-helper:174
 #: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Su cuenta de Mandriva no tiene suscripción para descarga %s "
+msgid "Here you can configure the updates applet"
+msgstr "Aquí se puede configurar el notificador de actualizaciones"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Cerrar"
+msgid "Update frequency (hours)"
+msgstr "Frecuencia de verificaciones (horas)"
 
-#: ../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 "Ha ocurrido un error al añadir el soporte"
+msgid "First check delay (minutes)"
+msgstr "Demora de la primera verificación (minutos)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Error al obtener lista de distribuciones:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Verificar si existen nuevas versiones de \"%s\""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Mantenimiento ampliado"
+msgid "Check for missing \"%s\" media"
+msgstr "Verificar el medio \"%s\" que falta"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Restringido"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Empresarial"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Error al obtener lista de distribuciones:"
 
 #. -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 "
@@ -578,7 +525,7 @@ msgstr ""
 "Mandriva provee 12 meses de actualizaciones de escritorio (hasta %s) y 18 "
 "meses de actualizaciones base (hasta el %s) para las distribuciones."
 
-#: ../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 "
@@ -587,7 +534,7 @@ msgstr ""
 "La ampliación de mantenimiento está ahora disponible para tener 18 meses de "
 "actualizaciones adicionales (hasta %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 ""
@@ -599,12 +546,12 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr "Política de tiempo de vida"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Suscripción en línea"
 
-#: ../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 "
@@ -613,108 +560,105 @@ msgstr ""
 "Por favor ingrese el nombre de usuario de su cuenta para añadir un medio de "
 "paquetes adicional una vez que se ha suscrito en línea"
 
-#: ../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 ""
-"Su cuenta de Mandriva no tiene una suscripción de Ampliación de "
-"Mantenimiento habilitada."
+msgid "More information on your user account"
+msgstr "Más información en su cuenta de usuario"
 
-#: ../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 "Su cuenta de Mandriva no tiene suscripción para descarga Powerpack "
+msgid "Your email"
+msgstr "Su correo electrónico"
 
-#: ../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 ""
-"Su sistema no tiene espacio suficiente en %s para actualizar (%dMB < %dMB)"
+msgid "Your password"
+msgstr "Su contraseña"
 
-#: ../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 "Falló la instalación"
+msgid "Forgotten password"
+msgstr "No recuerdo mi contraseña"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Los registros de instalación los encontrará en '%s' "
+msgid "Password and email cannot be empty."
+msgstr "La contraseña y correo no pueden estar en blanco."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Reintentar"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"Su cuenta de Mandriva no tiene una suscripción de Ampliación de "
+"Mantenimiento habilitada."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Felicitaciones"
+msgid "Close"
+msgstr "Cerrar"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "La actualización a Mandriva %s ha sido exitosa."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Debe reiniciar su sistema."
+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 "Reiniciar"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Suscripción en línea"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"La base de datos de paquetes está bloqueada. Por favor, cierre otras\n"
-"aplicaciones que trabajen con la misma (¿tiene algún otro\n"
-"administrador de soportes en otro escritorio, o está instalando\n"
-"paquetes en este instante?)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fallo al añadir soporte"
+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 "Actualización de Distribución"
@@ -766,6 +710,52 @@ msgstr "  --debug\t\t\t- hacer un registro de lo que se hace\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "Su cuenta de Mandriva no tiene suscripción para descarga Powerpack "
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Su sistema no tiene espacio suficiente en %s para actualizar (%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Falló la instalación"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Los registros de instalación los encontrará en '%s' "
+
+#~ msgid "Retry"
+#~ msgstr "Reintentar"
+
+#~ msgid "Congratulations"
+#~ msgstr "Felicitaciones"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "La actualización a Mandriva %s ha sido exitosa."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Debe reiniciar su sistema."
+
+#~ msgid "Reboot"
+#~ msgstr "Reiniciar"
+
+#~ 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 ""
+#~ "La base de datos de paquetes está bloqueada. Por favor, cierre otras\n"
+#~ "aplicaciones que trabajen con la misma (¿tiene algún otro\n"
+#~ "administrador de soportes en otro escritorio, o está instalando\n"
+#~ "paquetes en este instante?)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fallo al añadir soporte"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/et.po b/po/et.po
index e7d19f72..a17b7e7c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \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-03 20:33+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Teie süsteemile on uuendusi"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Ilmunud on Mandriva Linuxi distributsiooni uus versioon"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Teie distributsioonile on saadaval täiendav andmekandja."
@@ -77,7 +77,7 @@ msgstr "urpmi andmebaas on lukus"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Väljalase pole toetatud (liiga vana või arendusversioon)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -85,7 +85,7 @@ msgstr ""
 "Andmekandjat ei leitud. Andmekandja tuleb lisada tarkvaraallikate halduri "
 "abil."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "Seejärel käivitage \"%s\" uuesti."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Viga andmekandja uuendamisel"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Uuenduste paigaldamine"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Täiendava andmekandja lisamine"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Uuenduste kontrollimine"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Uuenda süsteemi"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -147,74 +147,71 @@ msgstr ""
 "Selle distributsiooni põhihooldusperiood on läbi. Kuna olete tellinud "
 "hooldusperioodi pikendamise, hoitakse Teie süsteemi uuendatuna kuni %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnecti käivitamine\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Mandriva Linuxi distributsiooni uus versioon"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Sirvi"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Ilmunud on Mandriva Linuxi distributsiooni uus versioon."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Rohkem teavet uue versiooni kohta"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Kas soovite uuendada ja paigaldada '%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 "Rohkem ei küsita"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Kõigi pakettide korraga allalaadimine"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Hoiatus: see vajab päris palju vaba ruumi)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Pakettide allalaadimise koht:"
 
-#: ../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 "Edasi"
 
-#: ../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 "Loobu"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -223,22 +220,22 @@ msgstr ""
 "Selle Mandriva Linuxi süsteemi hooldusperiood on läbi. See tähendab, et te "
 "ei saa enam tarkvara uuendusi."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Hoidmaks süsteemi turvalisena, võite"
 
-#: ../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 "Te võite hooldusperioodi pikendada."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -247,17 +244,23 @@ msgstr ""
 "Te võite hooldusperioodi pikendada või siis uuendada %si distributsiooni "
 "uuema versiooni peale."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Te võite uuendada %si distributsiooni uuema versiooni peale.?"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Teie distributsioon ei ole enam toetatud"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Hooldusperioodi pikendamine"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -266,7 +269,7 @@ msgstr ""
 "Osta selle versiooni hooldusperioodi pikendamise (%s) ja hoida oma süsteemi "
 "töös kuni %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -275,17 +278,17 @@ msgstr ""
 "See uuendus nõuab suure läbilaskevõimega võrguühendust (kaabel, xDSL...) ja "
 "võib vajada lõpetamiseks mitu tundi."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Tõmmatavaid andmeid on hinnanguliselt %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Enne jätkamist tuleks sulgeda kõik teised töötavad rakendused."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -294,96 +297,94 @@ msgstr ""
 "Sülearvuti oleks mõttekas panna seinatoitele ning võimaluse korral tasuks "
 "WiFi-le eelistada Ethernet-ühendust."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate'i käivitamine\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Uuenduste kontrollimine...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Midagi pole uuendada\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Võrgu kontroll: paistab, et võrk ei tööta\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 "Autoriõigus (C) %s: Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online võimaldab kasutada Mandriva veebiteenuseid."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Veebilehekülg"
 
 #. -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 "Marek Laane <bald@smail.ee>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../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 "Rohkem teavet"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Lisa andmekandjad"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Info..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Uuendamise seadistamine"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käivitatakse alati käivitumisel"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Saadaval on uus andmekandja"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -392,28 +393,77 @@ msgstr ""
 "Te kasutate distributsiooni '%s' ja saate seepärast võimaluse paigaldada "
 "lisatarkvara."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Kas soovite lisada täiendava andmekandja?"
 
-#: ../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 "Täiendava andmekandja lisamine"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Palun sisestage täiendava andmekandja lisamiseks oma konto ID"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Viga"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Tekkis viga"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "Teie Mandriva kontol ei ole %s allalaadimine tellitud."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Tekkis viga andmekandja lisamisel"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Andmekandja %s lisati edukalt."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Andmekandja %s lisati edukalt."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -449,116 +499,13 @@ msgstr "Piiratud"
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Palun sisestage täiendava andmekandja lisamiseks oma konto ID"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Rohkem teavet Teie kasutajakonto kohta"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Teie e-posti aadress"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Teie parool"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Olen parooli unustanud"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Viga"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Parool ja e-posti aadress tuleb kindlasti anda."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Tekkis viga"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Andmekandja %s lisati edukalt."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Olgu"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Teie Mandriva kontol ei ole %s allalaadimine tellitud."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Sulge"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Tekkis viga andmekandja lisamisel"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Distributsiooni nimekirja hankimine nurjus:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Hooldusperioodi pikendamine"
-
 #. -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 "
@@ -567,7 +514,7 @@ msgstr ""
 "Mandriva pakub uuendusi töölauale 12 kuud (kuni %s) ja baassüsteemile 18 "
 "kuud (kuni %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 "
@@ -576,7 +523,7 @@ msgstr ""
 "Nüüd on olemas võimalus ka hankida hooldusperioodi pikendamine 18 kuu võrra "
 "(kuni %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 "Te võite hooldusperioodi pikendamise <b>otsekohe tellida</b>:"
@@ -586,12 +533,12 @@ msgstr "Te võite hooldusperioodi pikendamise <b>otsekohe tellida</b>:"
 msgid "Lifetime policy"
 msgstr "Hooldusperioodi reeglid"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Internetitellimus"
 
-#: ../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 "
@@ -600,106 +547,103 @@ msgstr ""
 "Palun sisestage oma konto ID täiendava andmekandja lisamiseks, kui olete "
 "otsustanud internetitellimuse kasuks"
 
-#: ../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 "Teie Mandriva kontol ei ole hooldusperioodi pikendamine tellitud."
+msgid "More information on your user account"
+msgstr "Rohkem teavet Teie kasutajakonto kohta"
 
-#: ../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 "Teie Mandriva kontol ei ole Powerpacki allalaadimine tellitud."
+msgid "Your email"
+msgstr "Teie e-posti aadress"
 
-#: ../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 ""
-"Teie süsteemis ei ole asukohas %s uuendamiseks piisavalt ruumi (%dMB < %dMB)"
+msgid "Your password"
+msgstr "Teie parool"
 
-#: ../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 "Paigaldamine nurjus"
+msgid "Forgotten password"
+msgstr "Olen parooli unustanud"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Paigaldamislogid leiab asukohast '%s'"
+msgid "Password and email cannot be empty."
+msgstr "Parool ja e-posti aadress tuleb kindlasti anda."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Proovi uuesti"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Teie Mandriva kontol ei ole hooldusperioodi pikendamine tellitud."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Õnnitlused!"
+msgid "Close"
+msgstr "Sulge"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Uuendamine ja Mandriva väljalaske %s paigaldamine õnnestus."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Nüüd tuleb süsteem uuesti käivitada."
+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 "Taaskäivitus"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Internetitellimus"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Tarkvarapakettide andmebaas on lukus. Palun sulgege kõik muud\n"
-"rakendused, mis seda kasutavad. (On Teil avatud mõni muu\n"
-"andmekandjatega tegelev rakendus mõnel muul töölaual või\n"
-"paigaldate parajasti mingeid tarkvarapakette?)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Viga andmekandja lisamisel"
+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 "Distributsiooni uuendamine"
@@ -752,6 +696,53 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "Teie Mandriva kontol ei ole Powerpacki allalaadimine tellitud."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Teie süsteemis ei ole asukohas %s uuendamiseks piisavalt ruumi (%dMB < %"
+#~ "dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Paigaldamine nurjus"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Paigaldamislogid leiab asukohast '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Proovi uuesti"
+
+#~ msgid "Congratulations"
+#~ msgstr "Õnnitlused!"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Uuendamine ja Mandriva väljalaske %s paigaldamine õnnestus."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Nüüd tuleb süsteem uuesti käivitada."
+
+#~ msgid "Reboot"
+#~ msgstr "Taaskäivitus"
+
+#~ 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 ""
+#~ "Tarkvarapakettide andmebaas on lukus. Palun sulgege kõik muud\n"
+#~ "rakendused, mis seda kasutavad. (On Teil avatud mõni muu\n"
+#~ "andmekandjatega tegelev rakendus mõnel muul töölaual või\n"
+#~ "paigaldate parajasti mingeid tarkvarapakette?)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Viga andmekandja lisamisel"
+
+#~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
diff --git a/po/eu.po b/po/eu.po
index dba72f38..f47f0429 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \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-04-06 22:50+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Basque <>\n"
@@ -53,7 +53,7 @@ msgstr "Zure sistemarentzako eguneraketa berriak eskuragarri daude"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Mandriva Linux banaketaren bertsio berri bat kaleratu da"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Zure banaketaren pakete euskarri berri osagarri bat eskuragarri dago."
@@ -79,7 +79,7 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Bertsio hau ez dago sostengaturik (bertsio zaharregia, edo garapen bertsioa)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -87,7 +87,7 @@ msgstr ""
 "Ez da euskarririk aurkitu. Euskarriren bat erantsi behar duzu 'Software "
 "Euskarri Kudeatzailea' bitartez."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,42 +104,42 @@ msgstr ""
 "\n"
 "Ondoren, \"%s\" berrabiarazi."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Akatsa euskarri eguneratzerakoan"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalatu eguneratzeak"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Erantsi pakete euskarri osagarria"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Egiaztatu eguneratzeak"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Konfiguratu sarea"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Sistema bertsio berritu"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -149,74 +149,71 @@ msgstr ""
 "Banaketa honentzako oinarrizko mantenua amaitu da. Mantenu  hedatuan duzun "
 "harpidetzari esker, zure sistema %s arte eguneratuko da."
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconect abiarazten\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Mandriva Linux banaketaren bertsio berria"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Arakatu"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux banaketaren bertsio berri bat kaleratu da."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Bertsio berri honi buruzko informazio gehiago"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "'%s' banaketara bertsio berritu nahi duzu?"
 
-#: ../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 "Ez galdetu berriz"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Jaitsi pakete guztiak batera"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Oharra: leku aske haundi xamarra beharko duzu)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Paketeak nora jaitsi:"
 
-#: ../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 "Hurrengoa"
 
-#: ../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 "Utzi"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -225,22 +222,22 @@ msgstr ""
 "Mandriva Linux bertsio honentzako mantenua amaitu da. Ez dira sistema "
 "honentzako eguneraketa gehiago hornituko."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Zure sistema seguru mantentzeko, egin dezakezu:"
 
-#: ../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 "Mantenu hedatua hartu beharko zenuke."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -249,17 +246,23 @@ msgstr ""
 "Mantenu hedatua hartu edo %s banaketaren bertsio berriago batera berritu "
 "beharko zenuke."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "%s banaketaren bertsio berriago batera berritu beharko zenuke."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Zure banaketak ez du aurrerantzean euskarririk izango"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Mantenu hedatua"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -268,7 +271,7 @@ msgstr ""
 "Erosi bertsio honentzako (%s) mantenuaren luzapen bat eta jarraitu "
 "erabiltzen %s arte."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -277,19 +280,19 @@ msgstr ""
 "Bertsio berritze honek banda zabalera haundiko sare lotura (kablea, "
 "xDSL, ...)  behar du eta osatzeko orduak beharko ditu."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Jaitsi behar den datu kopurua %s izango dela kalkulatu da"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Jarraitu aurretik martxan dauden gainontzeko aplikazio guztiak itxi beharko "
 "zenituzke."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -298,96 +301,94 @@ msgstr ""
 "Magalekoa sare elektrikora konektatu beharko zenuke eta wifi loturaren "
 "gainetik ethernet hobetsi, eskuragarri badago."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate abiarazten\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Eguneraketa berriak kalkulatzen...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema eguneratzera doa\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sare egiaztaketa: desgaituta dagoela dirudi\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 (C) %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online-k Mandriva web zerbitzuetara sarbidea ematen du."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Lerroko Webgunea"
 
 #. -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 "Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../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 "Informazio gehiago"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Euskarria erantsi"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Honi buruz..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Eguneraketen ezarpena"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Jaurti beti hasterakoan"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Irten"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Euskarri berria eskuragarri"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -396,28 +397,77 @@ msgstr ""
 "'%s' banaketa erabiltzen duzu, ondorioz software osagarrira sarbide "
 "pribilegioa daukazu."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Pakete gordetegi osagarri hau erantsi nahi duzu?"
 
-#: ../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 "Pakete euskarri berri bat eransten"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Mesedez bete zure kontu ID, pakete euskarri osagarri bat eransteko"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Errorea"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Akats bat gertatu da"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "Zure Mandriva kontuak ez dauka %s jaisteko harpidetza gaituta."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Akatsa gertatu da euskarria eransterakoan"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "%s euskarria erantsi da."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "%s euskarria erantsi da."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "Ados"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -453,116 +503,13 @@ msgstr "Mugatuta"
 msgid "Enterprise"
 msgstr "Enpresa"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Mesedez bete zure kontu ID, pakete euskarri osagarri bat eransteko"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Zure erabiltzaile kontuaren gaineko informazio gehiago"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Zure post@"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Zure pasahitza"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Ahaztutako pasahitza"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Errorea"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Pasahitza eta post@ ezin dira hutsik utzi."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Akats bat gertatu da"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "%s euskarria erantsi da."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Ados"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Zure Mandriva kontuak ez dauka %s jaisteko harpidetza gaituta."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Itxi"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Akatsa gertatu da euskarria eransterakoan"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Akatsa banaketen zerrenda eskuratzerakoan:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Mantenu hedatua"
-
 #. -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 "
@@ -571,7 +518,7 @@ msgstr ""
 "Mandrivak banaketetan 12 hilabetez mahaigainaren eguneraketak hornitzen ditu "
 "(%s arte) eta 18 hilabez oinarriaren eguneraketak (%s arte)."
 
-#: ../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 "
@@ -580,7 +527,7 @@ msgstr ""
 "Mantenu hedatua eskuragarri dago orain 18 hilabetez eguneraketa gehigarriak "
 "jasotzeko (%s arte)."
 
-#: ../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 "Izen eman dezakezu <b>oraintxe bertan</b> mantenu hedatua jasotzeko:"
@@ -591,12 +538,12 @@ msgstr "Izen eman dezakezu <b>oraintxe bertan</b> mantenu hedatua jasotzeko:"
 msgid "Lifetime policy"
 msgstr "Biziarteko politika"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Lerroko harpidetza"
 
-#: ../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 "
@@ -605,107 +552,103 @@ msgstr ""
 "Mesedez bete zure kontu ID pakete euskarri osagarri bat eransteko lerroan "
 "izen eman duzunean"
 
-#: ../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 "Zure Mandriva kontuak ez dauka Mantenu Hedapen harpidetza gaituta."
+msgid "More information on your user account"
+msgstr "Zure erabiltzaile kontuaren gaineko informazio gehiago"
 
-#: ../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 "Zure Mandriva kontuak ez dauka Powerpack jaisteko harpidetza gaituta."
+msgid "Your email"
+msgstr "Zure post@"
 
-#: ../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 ""
-"Zure sistemak ez dauka %s-n behar adina leku aske bertsio berritzeko (%dMB < "
-"%dMB)"
+msgid "Your password"
+msgstr "Zure pasahitza"
 
-#: ../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 "Instalazioak huts egin du"
+msgid "Forgotten password"
+msgstr "Ahaztutako pasahitza"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Instalaketaren egunkariak '%s'-n aurkitu daitezke"
+msgid "Password and email cannot be empty."
+msgstr "Pasahitza eta post@ ezin dira hutsik utzi."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Berriro saiatu"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Zure Mandriva kontuak ez dauka Mantenu Hedapen harpidetza gaituta."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Zorionak"
+msgid "Close"
+msgstr "Itxi"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Bertsio berritza Mandriva %s askapenera arrakastatsua izan da."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Zure sistema berrabiatu behar duzu."
+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 "Berrabiarazi"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Lerroko harpidetza"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Paketeen datu-basea blokeatuta dago. Itxi paketeen datu-basearekin\n"
-"lanean ari diren aplikazioak (beste mahaigain batean beste\n"
-"euskarri-kudeatzaile bat duzu, edo une honetan paketeak\n"
-"instalatzen ari zara?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Ezin izan da euskarria gehitu"
+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 "Banaketaren Bertsio berritzea"
@@ -757,6 +700,54 @@ msgstr "  --debug\t\t\t- erregistratu egindako ekintzak\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ezin dira update_source euskarritik paketeak eguneratu.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Zure Mandriva kontuak ez dauka Powerpack jaisteko harpidetza gaituta."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Zure sistemak ez dauka %s-n behar adina leku aske bertsio berritzeko (%"
+#~ "dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Instalazioak huts egin du"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Instalaketaren egunkariak '%s'-n aurkitu daitezke"
+
+#~ msgid "Retry"
+#~ msgstr "Berriro saiatu"
+
+#~ msgid "Congratulations"
+#~ msgstr "Zorionak"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Bertsio berritza Mandriva %s askapenera arrakastatsua izan da."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Zure sistema berrabiatu behar duzu."
+
+#~ msgid "Reboot"
+#~ msgstr "Berrabiarazi"
+
+#~ 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 ""
+#~ "Paketeen datu-basea blokeatuta dago. Itxi paketeen datu-basearekin\n"
+#~ "lanean ari diren aplikazioak (beste mahaigain batean beste\n"
+#~ "euskarri-kudeatzaile bat duzu, edo une honetan paketeak\n"
+#~ "instalatzen ari zara?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Ezin izan da euskarria gehitu"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/fa.po b/po/fa.po
index 583e985e..4b964ba7 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-02-05 04:12-0500\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian <en@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "بروزسازی‌هایی برای سیستم‌تان در دسترس
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -80,13 +80,13 @@ msgstr "بانک اطلاعات urpmi قفل شده است"
 msgid "Release not supported (too old release, or development release)"
 msgstr "انتشار پشتیبانی نشده است (انتشار بسیار قدیمی، یا انتشار توسعه‌ای)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,42 +103,42 @@ msgstr ""
 "\n"
 "پس از آن %s را دوباره شروع کنید."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "به‌کارافتاده؟"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "نصب کردن بروزسازی‌ها"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "بررسی بروزسازی‌ها"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "تنظیم شبکه"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -146,420 +146,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "راه انداختن drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "بعدی"
 
-#: ../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 "لغو"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "به راه انداختن MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "در حال محاسبه کردن بروزسازی‌های جدید...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "سیستم به روز است\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "بررسی کردن شبکه: بنظر از کار افتاده است\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "وب‌گاه اینترنت"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "درباره‌ی.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "خواندن پیکربندی\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "راه‌اندازی همیشگی در شروع"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "ترک"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "خطا"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "خطائی رخ داد"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "تأیید"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "گذرواژه‌ی اشتباه"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "گذرواژه‌ی اشتباه"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "خطا"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "خطائی رخ داد"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "تأیید"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "بستن"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -569,117 +516,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "نام ماشین:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "گذرواژه‌ی اشتباه"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "نصب شکست خورد"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "گذرواژه‌ی اشتباه"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "تبریکات"
+msgid "Close"
+msgstr "بستن"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "آغازگری مجدد"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "نام ماشین:"
 
-#: ../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 ""
-"بانک اطلاعات بسته‌ها قفل شده است. لطفاً برنامه‌های دیگر\n"
-"را که با بانک اطلاعات بسته‌ها کار می‌کنند ببندید ( آیا مدیر\n"
-"رسانه‌ی دیگری بر رومیزی دیگری دارید، یا اکنون در حال\n"
-"نصب بسته‌هاید؟)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -730,6 +675,29 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "قادر نبودن به بروزسازی بسته‌ها از رسانه‌ی update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "نصب شکست خورد"
+
+#~ msgid "Congratulations"
+#~ msgstr "تبریکات"
+
+#~ msgid "Reboot"
+#~ msgstr "آغازگری مجدد"
+
+#~ 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 ""
+#~ "بانک اطلاعات بسته‌ها قفل شده است. لطفاً برنامه‌های دیگر\n"
+#~ "را که با بانک اطلاعات بسته‌ها کار می‌کنند ببندید ( آیا مدیر\n"
+#~ "رسانه‌ی دیگری بر رومیزی دیگری دارید، یا اکنون در حال\n"
+#~ "نصب بسته‌هاید؟)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
+
 #~ msgid "Yes"
 #~ msgstr "بله"
 
diff --git a/po/fi.po b/po/fi.po
index f9af5c17..d2ef44cd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fi\n"
 "Report-Msgid-Bugs-To: \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-03-20 10:27+0200\n"
 "Last-Translator: Jani Välimaa <wally@mandriva.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrivalinux.org>\n"
@@ -58,7 +58,7 @@ msgstr "Järjestelmälle on saatavilla päivityksiä"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Mandriva Linux -jakelusta on saatavilla uusi versio"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Käytettävälle jakelulle on saatavilla lisäpakettilähde."
@@ -83,7 +83,7 @@ msgstr "Urpmi-tietokanta lukittu"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Jakelu ei ole tuettu (liian vanha tai kehitysversio)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -91,7 +91,7 @@ msgstr ""
 "Ohjelmistolähteitä ei löytynyt. Lisää lähteitä rpmdraken Ohjelmistolähteiden "
 "hallinnalla."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -108,42 +108,42 @@ msgstr ""
 "\n"
 "Tämän jälkeen käynnistä %s uudelleen."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Virhe päivitettäessä lähteitä."
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Asenna päivitykset"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Lisää lisäpakettilähde"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Tarkista päivitykset"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Aseta verkko"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Päivitä järjestelmä"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -153,74 +153,71 @@ msgstr ""
 "Perusylläpito jakelulle on päättynyt. Kiitos ylläpitolaajennuksen "
 "tilauksesta, nyt järjestelmä tulee pysymään ajantasalla %s asti."
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Käynnistetään drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Mandriva Linux -jakelun uusi versio"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Selaa"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux -jakelusta on saatavilla uusi versio."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Lisätietoja uudesta versiosta"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Päivitetäänkö jakeluun %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 "Älä kysy seuraavalla kerralla"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Lataa kaikki paketit kerralla"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Varoitus: Tarvitaan hyvin paljon vapaata levytilaa)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Minne paketit ladataan:"
 
-#: ../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 "Seuraava"
 
-#: ../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 "Peruuta"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -229,22 +226,22 @@ msgstr ""
 "Tämän Mandriva Linux -järjestelmän ylläpito on loppunut. Uusia "
 "ohjelmistopäivityksiä ei enää ilmesty."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Pitääksesi järjestelmän turvattuna, voit:"
 
-#: ../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 "Ylläpitolaajennus tulisi hankkia."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -252,17 +249,23 @@ msgid ""
 msgstr ""
 "Sinun tulisi hankkia ylläpitolaajennus tai päivittää uudempaan %sin versioon."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Järjestelmä tulisi päivittää uudempaan %sin versioon."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Jakelu ei ole enää tuettu"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Ylläpitolaajennus"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -271,7 +274,7 @@ msgstr ""
 "Hanki ylläpitolaajennus asennettuun versioon (%s) ja pidä se käytössä %s "
 "asti."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -280,17 +283,17 @@ msgstr ""
 "Päivitys vaatii nopean verkkoyhteyden (kaapeli, xDSL, ...) ja voi kestää "
 "muutamia tunteja."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Arvioitu ladattavan datan määrä: %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Kaikki muut käynnissä olevat ohjelmat tulisi sulkea ennen jatkamista."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -299,48 +302,48 @@ msgstr ""
 "Kannettava tulisi kytkeä verkkovirtaan ja käyttää WLAN-verkon sijaan "
 "lankaverkkoa, jos mahdollista."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Käynnistetään MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Etsitään uudet päivitykset...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Järjestelmä on ajantasalla\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tarkistetaan verkkoa: nähtävästi pois käytöstä\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 (C) %s, Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online avaa pääsyn Mandrivan Internet-palveluihin."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online-sivusto"
 
 #. -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 ""
@@ -348,78 +351,125 @@ msgstr ""
 "Jani Välimaa <wally@mandriva.org>\n"
 "Anssi Hannula <anssi@mandriva.org>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Huomautus"
 
-#: ../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 "Lisätietoja"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Lisää lähde"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Tietoja.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Päivitysasetukset"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käynnistä automaattisesti"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Poistu"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Uusi lähde saatavilla"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr "Käytössä on %s ja siksi myös oikeus päästä käsiksi lisäohjelmiin."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Asennetaanko lisäpakettilähde?"
 
-#: ../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 "Lisätään lisäpakettilähdettä"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Täytä my.mandriva.com -tilin tiedot lisäpakettilähteen lisäämiseksi"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Virhe"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Ilmeni virhe"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "My.mandriva.com -tililtä ei löydy %sin lataustilausta."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Virhe lisättäessä lähdettä"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Lisättiin lähde %s onnistuneesti."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Lisättiin lähde %s onnistuneesti."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -457,116 +507,13 @@ msgstr "Restricted"
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Täytä my.mandriva.com -tilin tiedot lisäpakettilähteen lisäämiseksi"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Lisätietoja my.mandriva.com -tilistä"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Sähköpostiosoite"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Salasana"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Unohdin salasanan"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Virhe"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Salasanaa ja sähköpostiosoitta ei voi jättää tyhjäksi."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Ilmeni virhe"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Lisättiin lähde %s onnistuneesti."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "My.mandriva.com -tililtä ei löydy %sin lataustilausta."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Sulje"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Virhe lisättäessä lähdettä"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Virhe noudettaessa listaa jakeluista:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Ylläpitolaajennus"
-
 #. -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 "
@@ -575,7 +522,7 @@ msgstr ""
 "Mandriva tarjoaa 12 kuukauden ajan päivityksiä työpöytäsovelluksiin (%s "
 "asti) ja 18 kuukauden ajan jakelun peruspaketteihin (%s asti)."
 
-#: ../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 "
@@ -584,7 +531,7 @@ msgstr ""
 "Nyt on myös saatavilla ylläpitolaajennus, joka tarjoaa 18 kuukauden ajan "
 "lisäpäivityksiä (%s asti)."
 
-#: ../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 "Voit tilata ylläpitolaajennuksen <b>heti</b>:"
@@ -594,12 +541,12 @@ msgstr "Voit tilata ylläpitolaajennuksen <b>heti</b>:"
 msgid "Lifetime policy"
 msgstr "Jakelun elinkaari"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Online-tilaus"
 
-#: ../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 "
@@ -608,107 +555,103 @@ msgstr ""
 "Täytä my.mandriva.com -tilin tiedot, jotta lisäpakettilähde voidaan lisätä "
 "Online-tilauksen jälkeen."
 
-#: ../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 "My.mandriva.com -tililtä ei löydy tilattua ylläpitolaajennusta."
+msgid "More information on your user account"
+msgstr "Lisätietoja my.mandriva.com -tilistä"
 
-#: ../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 "My.mandriva.com -tililtä ei löydy PowerPackin lataustilausta."
+msgid "Your email"
+msgstr "Sähköpostiosoite"
 
-#: ../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 ""
-"Levyllä %s ei ole tarpeeksi vapaata tilaa päivitykselle.\n"
-"Vapaana on %d Mt ja päivitys vaatii %d Mt."
+msgid "Your password"
+msgstr "Salasana"
 
-#: ../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 "Asennus epäonnistui"
+msgid "Forgotten password"
+msgstr "Unohdin salasanan"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Asennuslokit löytyvät hakemistosta %s"
+msgid "Password and email cannot be empty."
+msgstr "Salasanaa ja sähköpostiosoitta ei voi jättää tyhjäksi."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Yritä uudelleen"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "My.mandriva.com -tililtä ei löydy tilattua ylläpitolaajennusta."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Onnittelut"
+msgid "Close"
+msgstr "Sulje"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Päivitys Mandriva %s -julkaisuun onnistui."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Järjestelmä tulee käynnistää uudelleen."
+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 "Käynnistä uudelleen"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Online-tilaus"
 
-#: ../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 ""
-"Pakettitietokanta on lukittu. Muut pakettitietokantaa\n"
-"käyttävät sovellukset on suljettava (onko taustalla toinen\n"
-"Ohjelmistolähteiden hallinta toisella työpöydällä tai\n"
-"asennetaanko paketteja juuri nyt?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Virhe lisättäessä lähdettä"
+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 "Jakelun päivitys"
@@ -761,6 +704,53 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "My.mandriva.com -tililtä ei löydy PowerPackin lataustilausta."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Levyllä %s ei ole tarpeeksi vapaata tilaa päivitykselle.\n"
+#~ "Vapaana on %d Mt ja päivitys vaatii %d Mt."
+
+#~ msgid "Installation failed"
+#~ msgstr "Asennus epäonnistui"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Asennuslokit löytyvät hakemistosta %s"
+
+#~ msgid "Retry"
+#~ msgstr "Yritä uudelleen"
+
+#~ msgid "Congratulations"
+#~ msgstr "Onnittelut"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Päivitys Mandriva %s -julkaisuun onnistui."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Järjestelmä tulee käynnistää uudelleen."
+
+#~ msgid "Reboot"
+#~ msgstr "Käynnistä uudelleen"
+
+#~ 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 ""
+#~ "Pakettitietokanta on lukittu. Muut pakettitietokantaa\n"
+#~ "käyttävät sovellukset on suljettava (onko taustalla toinen\n"
+#~ "Ohjelmistolähteiden hallinta toisella työpöydällä tai\n"
+#~ "asennetaanko paketteja juuri nyt?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Virhe lisättäessä lähdettä"
+
+#~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr "Asennettu Mandriva Linuxin versio ei ole enää tuettu."
diff --git a/po/fr.po b/po/fr.po
index c25e2a2d..042268d2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-fr\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-03 18:44+0100\n"
 "Last-Translator: Christophe Berthelé <berthy@mandriva.org>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -61,7 +61,7 @@ msgstr "De nouvelles mises à jour sont disponibles pour votre système"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Une nouvelle version de la distribution Mandriva Linux est disponible"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Un nouveau dépôt de paquetages est disponible pour votre distribution."
@@ -88,7 +88,7 @@ msgstr ""
 "Cette version de Mandriva Linux n'est pas supportée (obsolète ou en "
 "développement)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -96,7 +96,7 @@ msgstr ""
 "Aucun dêpot n'a été trouvé. Vous devez en ajouter via le « Gestionnaire de "
 "Logiciels »."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -113,42 +113,42 @@ msgstr ""
 "\n"
 "Ensuite, redémarrez « %s »."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Erreur lors de la mise à jour des dépôts"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installer les mises à jour"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Ajouter un nouveau dépôt de paquetages"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Vérifier la disponibilité de mises à jour"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configurer le réseau"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Mettre à niveau le système"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -159,74 +159,71 @@ msgstr ""
 "inscription à la maintenance étendue, votre système restera à jour jusqu'au %"
 "s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lancement de drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nouvelle version de la distribution Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "naviguer"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Une nouvelle version de la distribution Mandriva Linux est disponible."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Plus d'information sur cette nouvelle version"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Voulez-vous migrer vers la nouvelle distribution « %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 "Ne pas demander la prochaine fois"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Télécharger tous les paquets avant d'installer"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Attention : vous aurez besoin de beaucoup d'espace disque libre"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Où télécharger les paquets :"
 
-#: ../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 "Suivant"
 
-#: ../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 "Annuler"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -235,22 +232,22 @@ msgstr ""
 "La maintenance de ce système Linux est finie. Cela signifie qu'il ne recevra "
 "plus de mises à jour."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Afin de conserver votre système sécurisé, vous pouvez :"
 
-#: ../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 "Vous devriez souscrire à la maintenance étendue."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -259,17 +256,23 @@ msgstr ""
 "Vous devriez soit souscrire à la maintenance étendue soit migrer vers une "
 "nouvelle version de la distribution « %s »"
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Vous devriez migrer vers la nouvelle distribution « %s »."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Votre distribution n'est plus supportée"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Maintenance étendue."
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -278,7 +281,7 @@ msgstr ""
 "Acheter la maintenance étendue pour cette version (%s) et la conserver "
 "jusqu'au %s"
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -287,19 +290,19 @@ msgstr ""
 "Cette mise à niveau requiert une connexion réseau haut débit (câble, "
 "xDSL, ...) et peut durer plusieurs heures."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Les données téléchargées sont estimées à %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Vous devriez fermer toutes les autres applications en cours d'exécution "
 "avant de continuer."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -308,48 +311,48 @@ msgstr ""
 "Vous devriez brancher votre portable sur le secteur et utiliser une "
 "connexion filaire plutôt que sans-fil si possible."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lancement de MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcul des nouvelles mises à jour ...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Le système est à jour\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Vérification de l'accès au réseau : il semble être désactivé\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 (C) %s par Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online donne accès aux services web de Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Site Mandriva Online"
 
 #. -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 ""
@@ -365,50 +368,48 @@ msgstr ""
 "Didier Herisson <didier.herisson@angstrom.uu.se>\n"
 "Rémy Clouard\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Attention"
 
-#: ../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 "Plus d'information"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Ajouter un dépôt"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "À propos ..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuration des mises à jour"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Toujours lancer au démarrage"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nouveau dépôt de paquetages disponible"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -417,176 +418,122 @@ msgstr ""
 "Vous utilisez la distribution « %s » et bénéficiez donc d'un accès privilégié "
 "à des paquetages supplémentaires."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Voulez-vous installer cette nouvelle source de paquetages ?"
 
-#: ../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 "Ajouter un nouveau dépôt de paquetages"
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Ici vous pouvez configurer l'applet des mises à jour"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Fréquence des mises à jours (heures)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Délai pour la première vérification (minutes)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Vérifier si une nouvelle version de « %s » existe"
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Vérifier si les média « %s » sont absents"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Restreint"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Entreprise"
+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 ""
 "Veuillez remplir vos identifiants afin d'ajouter un nouveau dépôt de "
 "paquetages"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Plus d'information sur votre compte utilisateur"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Votre courriel"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Votre mot de passe"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Mot de passe oublié"
-
-#: ../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 "Erreur"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Le mot de passe et le courriel ne peuvent être vides."
-
-#: ../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 "Une erreur est survenue"
 
-#: ../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 ""
+"Votre compte Mandriva n'est pas abonné au service de téléchargement %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Une erreur est survenue lors de l'ajout du dépôt"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Dépôt %s ajouté avec succè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 "Dépôt %s ajouté avec succè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 ""
-"Votre compte Mandriva n'est pas abonné au service de téléchargement %s."
+msgid "Here you can configure the updates applet"
+msgstr "Ici vous pouvez configurer l'applet des mises à jour"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Fermer"
+msgid "Update frequency (hours)"
+msgstr "Fréquence des mises à jours (heures)"
 
-#: ../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 "Une erreur est survenue lors de l'ajout du dépôt"
+msgid "First check delay (minutes)"
+msgstr "Délai pour la première vérification (minutes)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Errors lors de la récupération de la liste des distributions :"
+msgid "Check for newer \"%s\" releases"
+msgstr "Vérifier si une nouvelle version de « %s » existe"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Maintenance étendue."
+msgid "Check for missing \"%s\" media"
+msgstr "Vérifier si les média « %s » sont absents"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Restreint"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Entreprise"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Errors lors de la récupération de la liste des distributions :"
 
 #. -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 "
@@ -595,7 +542,7 @@ msgstr ""
 "Mandriva fournit 12 mois de mises à jour pour le bureau (jusqu'au %s) et 18 "
 "mois de support de base (jusqu'au %s) pour les distributions."
 
-#: ../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 "
@@ -604,7 +551,7 @@ msgstr ""
 "La maintenance étendue est désormains disponible afin de disposer de 18 mois "
 "additionnels de mises à jour (jusqu'au %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 "Vous pouvez souscrire <b>maintenant</b> à la maintenance étendue."
@@ -614,12 +561,12 @@ msgstr "Vous pouvez souscrire <b>maintenant</b> à la maintenance étendue."
 msgid "Lifetime policy"
 msgstr "Politique de cycle de vie"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Inscription en ligne"
 
-#: ../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 "
@@ -628,112 +575,104 @@ msgstr ""
 "Veuillez remplir vos identifiants afin d'ajouter un nouveau dépôt de "
 "paquetages une fois que vous êtes inscrit en ligne"
 
-#: ../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 ""
-"Votre compte Mandriva n'est pas abonné au service de maintenance étendue."
+msgid "More information on your user account"
+msgstr "Plus d'information sur votre compte utilisateur"
 
-#: ../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 ""
-"Votre compte Mandriva n'est pas abonné au service de téléchargement "
-"Powerpack."
+msgid "Your email"
+msgstr "Votre courriel"
 
-#: ../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 ""
-"Votre système n'a pas assez de place libre dans %s afin de mettre à niveau (%"
-"d Mo < %d Mo)"
+msgid "Your password"
+msgstr "Votre mot de passe"
 
-#: ../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 "Échec de l'installation"
+msgid "Forgotten password"
+msgstr "Mot de passe oublié"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Les journaux de l'installation sont disponibles dans « %s »"
+msgid "Password and email cannot be empty."
+msgstr "Le mot de passe et le courriel ne peuvent être vides."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Réessayer"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"Votre compte Mandriva n'est pas abonné au service de maintenance étendue."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Félicitations"
+msgid "Close"
+msgstr "Fermer"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
-"La mise à niveau vers la version Mandriva %s s'est terminée avec succès."
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Vous devez redémarrer votre système."
+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 "Redémarrage"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Inscription en ligne"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"La base de données des paquetages est verrouillée. Veuillez\n"
-"fermer les autres applications qui se servent de la base\n"
-"de données des paquetages (avez-vous un autre gestionnaire\n"
-"de dépôts logiciels ouvert sur un autre bureau, ou êtes-vous\n"
-"aussi en train d'installer des paquetages en même temps ?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Échec lors de l'ajout du dépôt"
+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 "Mise à niveau de la distribution"
@@ -786,6 +725,57 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Impossible de mettre à jour les paquetages du dépôt update_source.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Votre compte Mandriva n'est pas abonné au service de téléchargement "
+#~ "Powerpack."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Votre système n'a pas assez de place libre dans %s afin de mettre à "
+#~ "niveau (%d Mo < %d Mo)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Échec de l'installation"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Les journaux de l'installation sont disponibles dans « %s »"
+
+#~ msgid "Retry"
+#~ msgstr "Réessayer"
+
+#~ msgid "Congratulations"
+#~ msgstr "Félicitations"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr ""
+#~ "La mise à niveau vers la version Mandriva %s s'est terminée avec succès."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Vous devez redémarrer votre système."
+
+#~ msgid "Reboot"
+#~ msgstr "Redémarrage"
+
+#~ 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 ""
+#~ "La base de données des paquetages est verrouillée. Veuillez\n"
+#~ "fermer les autres applications qui se servent de la base\n"
+#~ "de données des paquetages (avez-vous un autre gestionnaire\n"
+#~ "de dépôts logiciels ouvert sur un autre bureau, ou êtes-vous\n"
+#~ "aussi en train d'installer des paquetages en même temps ?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Échec lors de l'ajout du dépôt"
+
+#~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
diff --git a/po/fur.po b/po/fur.po
index 13302746..095ecd90 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-06-28 16:55+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nissune atualizazion dispunibile pal to sistem"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -80,13 +80,13 @@ msgstr "database urpmi blocât"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,42 +103,42 @@ msgstr ""
 "\n"
 "Daspò, torne a inviâ %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Abilitade"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instale atualizazions"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Controle Atualizazions"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configure le rêt"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -146,420 +146,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Fâs lâ drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Pross"
 
-#: ../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 "Scancele"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Inviament de MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Instalant gnovis atualizazion...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sisteme al è atualizât\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controlant le rêt: e somee no facoltizade\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Sît online"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Avertence"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Informazions su.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Invie Configurazion"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Jessî"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, fuzzy, c-format
 msgid "New medium available"
 msgstr "No disponibii"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Fal"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Al è intravignût un fal"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Fal te zonte de font"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Va ben"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Password falade"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Password falade"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Fal"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Al è intravignût un fal"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Va ben"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Siere"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fal te zonte de font"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -569,117 +516,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Non dal computer:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Password falade"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalazion falade"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Password falade"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Congratulazions"
+msgid "Close"
+msgstr "Siere"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Torne a inviâ"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Non dal computer:"
 
-#: ../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 ""
-"Il database dai pachets al è blocât. Par plasè siare les altris aplicazions\n"
-"in vore cun i pachets dal database (âstu un altri gjestôr\n"
-"di fonts su un altri desktop, o stâtu instalant\n"
-"dizà dai pachets?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fal te zonte de font"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Benvignût su Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -731,6 +676,30 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Instalazion falade"
+
+#~ msgid "Congratulations"
+#~ msgstr "Congratulazions"
+
+#~ msgid "Reboot"
+#~ msgstr "Torne a inviâ"
+
+#~ 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 ""
+#~ "Il database dai pachets al è blocât. Par plasè siare les altris "
+#~ "aplicazions\n"
+#~ "in vore cun i pachets dal database (âstu un altri gjestôr\n"
+#~ "di fonts su un altri desktop, o stâtu instalant\n"
+#~ "dizà dai pachets?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fal te zonte de font"
+
 #~ msgid "Yes"
 #~ msgstr "Si"
 
diff --git a/po/ga.po b/po/ga.po
index fee1b76b..f8cb144c 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: br <LL@li.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -74,13 +74,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,42 +91,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Cumasaithe"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Feistigh córas"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Cumraigh gréasánú"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -134,420 +134,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Teacs"
 
-#: ../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 "Cealaigh"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Faoi..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Scoir"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Earráid"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Tharla earráid"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Tharla earráid"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ceart go Leor"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Gan pasfhocal"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Gan pasfhocal"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Earráid"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Tharla earráid"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Ceart go Leor"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Dún"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Tharla earráid"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -557,113 +504,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Gan pasfhocal"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Theip ar shuiteáil"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Gan pasfhocal"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Atriail"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Comhghairdeas"
+msgid "Close"
+msgstr "Dún"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
 #, c-format
-msgid "Reboot"
-msgstr "Atosaigh"
+msgid "Get Powerpack subscription!"
+msgstr ""
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
+msgid "Cancel, upgrade to Free Edition"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Ionad Rialaithe Mandriva Linux"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -709,6 +658,18 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Installation failed"
+#~ msgstr "Theip ar shuiteáil"
+
+#~ msgid "Retry"
+#~ msgstr "Atriail"
+
+#~ msgid "Congratulations"
+#~ msgstr "Comhghairdeas"
+
+#~ msgid "Reboot"
+#~ msgstr "Atosaigh"
+
 #~ msgid "Yes"
 #~ msgstr "Tá"
 
diff --git a/po/gl.po b/po/gl.po
index 5a521fc7..dd3e6490 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2008-03-30 15:40+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -52,7 +52,7 @@ msgstr "Hai novas actualizacións dispoñibles para o seu sistema"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -77,7 +77,7 @@ msgstr "a base de datos de urpmi está bloqueada"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión non soportada (versión antiga ou de desenvolvemento)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -85,7 +85,7 @@ msgstr ""
 "Non se atopou ningún soporte. Debe engadir algún soporte usando o 'Xestor de "
 "Soportes de Software'."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "Despois, reinicie \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "¿Habilitado"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Erro ó actualizar o soporte"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instala-las actualizacións"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Comprobar se hai Actualizacións"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configura-la Rede"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -145,420 +145,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Executando drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 "Non preguntarme a vindeira vez"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Seguinte"
 
-#: ../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 "Cancelar"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Executando MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesando as novas actualizacións...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Comprobando a Rede: parece que está deshabilitada\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 (C) %s de Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online da acceso ós servicios web de Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Sitio Web en Liña"
 
 #. -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 "Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Acerca de..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Lendo a configuración\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executar sempre ó inicia-lo sistema"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Pechar"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Erro"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Ocorreu un erro"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Fallo ó engadi-lo soporte"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Aceptar"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Contrasinal incorrecto"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Contrasinal incorrecto"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu un erro"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Aceptar"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Pechar"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fallo ó engadi-lo soporte"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -568,117 +515,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Descrición da máquina:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Contrasinal incorrecto"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Fallou a instalación"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Contrasinal incorrecto"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Volver tentar"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Noraboa"
+msgid "Close"
+msgstr "Pechar"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Reiniciar"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Descrición da máquina:"
 
-#: ../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 ""
-"A base de datos de paquetes está bloqueada. Por favor peche calquera\n"
-"outra aplicación que estea traballando ca base de datos de paquetes\n"
-"(¿ten outro xestor de soportes noutro escritorio, ou está instalando\n"
-"paquetes agora mesmo?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Fallo ó engadi-lo soporte"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -730,6 +675,32 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 "Non foi posible actualiza-los paquetes dende o soporte update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Fallou a instalación"
+
+#~ msgid "Retry"
+#~ msgstr "Volver tentar"
+
+#~ msgid "Congratulations"
+#~ msgstr "Noraboa"
+
+#~ msgid "Reboot"
+#~ msgstr "Reiniciar"
+
+#~ 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 ""
+#~ "A base de datos de paquetes está bloqueada. Por favor peche calquera\n"
+#~ "outra aplicación que estea traballando ca base de datos de paquetes\n"
+#~ "(¿ten outro xestor de soportes noutro escritorio, ou está instalando\n"
+#~ "paquetes agora mesmo?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Fallo ó engadi-lo soporte"
+
 #~ msgid "Yes"
 #~ msgstr "Si"
 
diff --git a/po/he.po b/po/he.po
index f7c398c7..3abf182a 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2008-03-01 14:44+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -55,7 +55,7 @@ msgstr "עדכונים חדשים זמינים עבור המערכת שלך"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -80,13 +80,13 @@ msgstr "בסיס הנתונים של urpmi נעול"
 msgid "Release not supported (too old release, or development release)"
 msgstr "גרסה לא נתמכת (גרסה ישנה מדי או גרסת פיתוח)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "לא נמצאו מקורות תוכנה, עליך להוסיף מקורות דרך 'ניהול מקורות תוכנה'."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "לאחר מכן יש לאתחל את \"%s\" מחדש."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "מופעל"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "שגיאה בעדכון המקור"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "התקן עדכונים"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "בדוק עדכונים"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "הגדר את הרשת"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -145,420 +145,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "מפעיל את drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 "אל תשאל אותי בפעם הבאה"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "המשך"
 
-#: ../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 "ביטול"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "מפעיל את MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "מנתח עדכונים חדשים...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "המערכת מעודכנת\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "בודק זמינות רשת: אין תגובה\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "זכויות היוצרים (C) %s שמורות למנדריבה"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "מנדריבה-אונליין מאפשר גישה לשירותי הרשת של מנדריבה."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "אתר מקוון"
 
 #. -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 "Dotan Kamber <kamberd@yahoo.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "אודות..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "הפעל תמיד באתחול המערכת"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "שגיאה"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "חלה שגיאה"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "חלה שגיאה בעת הוספת מקור"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "אישור"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "סיסמה שגוייה"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "סיסמה שגוייה"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "שגיאה"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "חלה שגיאה"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "אישור"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "סגור"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "חלה שגיאה בעת הוספת מקור"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -568,116 +515,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "אתר מקוון"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "סיסמה שגוייה"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "ההתקנה נכשלה"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "סיסמה שגוייה"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "נסה שנית"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "ברכותינו!"
+msgid "Close"
+msgstr "סגור"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "הפעלה מחדש"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "אתר מקוון"
 
-#: ../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 ""
-"בסיס נתוני החבילות נעול. עליך לסגור יישומים אחרים\n"
-"הניגשים לבסיס נתוני החבילות (האם יש לך מנהל מקורות\n"
-"נוסף בשולחן עבודה אחר, או אולי מבוצעת גם התקנת חבילות?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "חלה שגיאה בעת הוספת מקור"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr ""
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -728,6 +674,31 @@ msgstr "  --debug\t\t\t- תעד את הנעשה\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "ההתקנה נכשלה"
+
+#~ msgid "Retry"
+#~ msgstr "נסה שנית"
+
+#~ msgid "Congratulations"
+#~ msgstr "ברכותינו!"
+
+#~ msgid "Reboot"
+#~ msgstr "הפעלה מחדש"
+
+#~ 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 ""
+#~ "בסיס נתוני החבילות נעול. עליך לסגור יישומים אחרים\n"
+#~ "הניגשים לבסיס נתוני החבילות (האם יש לך מנהל מקורות\n"
+#~ "נוסף בשולחן עבודה אחר, או אולי מבוצעת גם התקנת חבילות?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "חלה שגיאה בעת הוספת מקור"
+
 #~ msgid "Yes"
 #~ msgstr "כן"
 
diff --git a/po/hi.po b/po/hi.po
index 46883db4..10439ff3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-08-21 14:31+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -53,7 +53,7 @@ msgstr "आपके तंत्र हेतु नये अपडेट उ�
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -79,13 +79,13 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "यह विमोचन संस्मरण समर्थित नहीं है (या तो बहुत प्राचीन या फ़िर विकास विमोचन संस्मरण है)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "इसके बाद, %s को पुनः आरम्भ करें।"
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "सक्रिय"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "अपडेटों का संसाधन"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "अपडेटो की जाँच"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "नेटवर्क की संरचना"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -145,420 +145,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ड्रैककनेक्ट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "अगला"
 
-#: ../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 "निरस्त"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, fuzzy, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "एमडीकेअपडेट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "नये अपडेटो की गणना की जा रही है...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "तंत्र आज-तक अपडेट है\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "नेटवर्क की जाँच की जा रही है: लगता है निष्क्रिय है\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "ऑनलाइन वेबस्थल"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "के बारे में ।"
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "संरचना पढ़ी जा रही है\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "शुरूवात में सदैव आरम्भ करें"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "निकास"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "त्रुटि"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "एक त्रुटि हो गयी है"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "ठीक"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "गलत कूटशब्द"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "गलत कूटशब्द"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "त्रुटि"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "एक त्रुटि हो गयी है"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "ठीक"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "बन्द"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -568,117 +515,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "मशीन नाम:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "गलत कूटशब्द"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "संसाधन असफ़ल"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "गलत कूटशब्द"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "बधाई हो"
+msgid "Close"
+msgstr "बन्द"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "रीबूट"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "मशीन नाम:"
 
-#: ../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 ""
-"पैकेजो का डाटाबेस ताला-बन्द है । कृपया पैकेजो के डाटाबेस के साथ\n"
-"कार्य कर रहे हुए अन्य कार्यक्रमों को समाप्त करें । (क्या आपके पास \n"
-"दूसरे डेस्कटाप पर अन्य माध्यम प्रबंधक है, या आप वर्तमान में साथ-साथ\n"
-"पैकेजो को संसाधित कर रहे है?)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -730,6 +675,29 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "एमडीकेअपडेट माध्यम से पैकेजों को अपडेट करने में असमर्थ ।\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "संसाधन असफ़ल"
+
+#~ msgid "Congratulations"
+#~ msgstr "बधाई हो"
+
+#~ msgid "Reboot"
+#~ msgstr "रीबूट"
+
+#~ 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 ""
+#~ "पैकेजो का डाटाबेस ताला-बन्द है । कृपया पैकेजो के डाटाबेस के साथ\n"
+#~ "कार्य कर रहे हुए अन्य कार्यक्रमों को समाप्त करें । (क्या आपके पास \n"
+#~ "दूसरे डेस्कटाप पर अन्य माध्यम प्रबंधक है, या आप वर्तमान में साथ-साथ\n"
+#~ "पैकेजो को संसाधित कर रहे है?)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
+
 #~ msgid "Yes"
 #~ msgstr "हाँ"
 
diff --git a/po/hr.po b/po/hr.po
index 46cf22ec..30463b69 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-01-04 21:26+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -52,7 +52,7 @@ msgstr "Nema novih datoteka dostupnih za Vas sistem!"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -77,13 +77,13 @@ msgstr "urpmi baza zaključana"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -94,42 +94,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Aktivirano"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instaliraj zakrpe"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri nadogradnje"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -137,420 +137,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Dalje"
 
-#: ../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 "Odustani"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Pokrećem MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Proračunavam nove nadogradnje...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je nadograđen\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mreži: čini se da je isključena\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online web stranica"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Čitam postavke\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Pokreni pri podizanju sustava"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Greška"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Pojavila se greška"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Provjeravam ovisnosti..."
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "U redu"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Kriva lozinka"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Kriva lozinka"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Pojavila se greška"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "U redu"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Provjeravam ovisnosti..."
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -560,113 +507,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Ime računala:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Kriva lozinka"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Kriva lozinka"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Čestitamo, pobijedili ste!"
+msgid "Close"
+msgstr "Zatvori"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Ponovno pokretanje sustava"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Ime računala:"
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Provjeravam ovisnosti..."
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -712,6 +661,18 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Installation failed"
+#~ msgstr "Instalacija nije uspjela"
+
+#~ msgid "Congratulations"
+#~ msgstr "Čestitamo, pobijedili ste!"
+
+#~ msgid "Reboot"
+#~ msgstr "Ponovno pokretanje sustava"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Provjeravam ovisnosti..."
+
 #~ msgid "Yes"
 #~ msgstr "Da"
 
diff --git a/po/hu.po b/po/hu.po
index 1895d1da..16b39055 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-2010.1\n"
 "Report-Msgid-Bugs-To: \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-04 10:05+0100\n"
 "Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -56,7 +56,7 @@ msgstr "Új frissítések érhetők el az Ön rendszeréhez"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "A Mandriva Linux disztribúciónak új verziója jelent meg"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Egyéb csomagforrás érhető el az ön disztribúciójához."
@@ -82,7 +82,7 @@ msgstr "A(z) \"urpmi\" adatbázis zárolt"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nem támogatott verzió (túl régi, vagy fejlesztői verzió)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -90,7 +90,7 @@ msgstr ""
 "Adatforrás nem található. Fel kell venni egy vagy több adatforrást a "
 "szoftverforrás-kezelővel."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -107,44 +107,44 @@ msgstr ""
 "\n"
 "Ez után indítsa el újra a(z) %s programot."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Hiba az adatforrás frissítésekor"
 
 # "Rendszerfrissítések telepítése" volt a 8.2-ben,
 #  ebből az utolsó 2 betű nem fért ki
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Frissítések telepítése"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Egyéb csomagforrás hozzáadása"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Frissítések keresése"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "A hálózat beállítása"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "A rendszer frissítése"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -155,74 +155,71 @@ msgstr ""
 "előfizetett a kiterjesztett karbantartásra, így a rendszere naprakész marad %"
 "s-ig."
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A DrakConnect indítása\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Mandriva Linux disztribúció új verziója"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Böngészés"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "A Mandriva Linux disztribúciónak új verziója jelent meg."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Több információ az új verzióról"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Tényleg frissíteni akar a '%s' disztribúcióra?"
 
-#: ../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 "Legközelebb ne kérdezze meg"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Egyszerre minden csomag letöltése"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Figyelem: Fel kell szabadítania egy helyet)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "A csomagok letöltési helye:"
 
-#: ../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 "Következő"
 
-#: ../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 "Mégsem"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -231,23 +228,23 @@ msgstr ""
 "Ennek a Mandriva Linuxnak a karbantartási ideje lejárt, nem fog többé "
 "frissítés megjelenni hozzá."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 "Ahhoz, hogy a rendszerét biztonságban tartsa, az alábbi dolgokat teheti:"
 
-#: ../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 "Beszerezhet kiterjesztett karbantartást."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -256,17 +253,23 @@ msgstr ""
 "Szükségessé vált, hogy előfizessen a rendszer kiterjesztett karbantartására, "
 "vagy frissítsen az újabb, %s disztribúcióra."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Szükségessé vált, hogy az újabb, %s disztribúcióra frissítsen."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ez a disztribúció többé nem támogatott"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Kiterjesztett karbantartás"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -275,7 +278,7 @@ msgstr ""
 "Fizessen elő kiterjesztett karbantartásra, amivel ez a verzió (%s) %s-ig "
 "naprakész marad."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -284,17 +287,17 @@ msgstr ""
 "Ehhez a frissítéshez nagy sávszélességű kapcsolat (Kábel, xDSL,...) "
 "szükséges és több órát is igénybe vehet a teljesítése."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "%s adat letöltésére van szükség"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Érdemes a többi nyitott alkalmazásokat bezárni folytatás előtt."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -303,97 +306,95 @@ msgstr ""
 "Rakja hálózati áramellátásra a laptopot és ha lehet váltson vezetékes "
 "hálózati kapcsolatra wifi helyett."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "\"MandrivaUpdate\" indítása\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Új frissítések meghatározása...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "A rendszer naprakész.\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "A hálózat ellenőrzése: úgy tűnik, nem aktív\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 (C) %s, Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 "A Mandriva Online hozzáférést biztosít a Mandriva webes szolgáltatásaihoz."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online weboldal"
 
 #. -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 "_: Lónyai Gergely <aleph@mandriva.org>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../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 "További információk"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Adathordozó felvétele"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Névjegy..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Frissítési beállítások"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Minden rendszerindításnál induljon el"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Új, elérhető adathordozó"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -401,28 +402,78 @@ msgid ""
 msgstr ""
 "Ön a '%s' disztribúciót használja, és további szoftverekhez van hozzáférése."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Szeretné a további szoftvereket tartalmazó csomagforrást használni?"
 
-#: ../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 "Egyéb csomagforrás hozzáadása"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Kérem töltse ki a hozzáférés adatait az egyéb adatforrás hozzáadásához"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Hiba"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Hiba lépett fel"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr ""
+"A te Mandriva hozzáféréseddel nincs lehetőséged a %s letöltéseket használni."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Hiba történt az adatforrás felvétele közben"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Sikerült a %s adatforrást hozzáadni."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Sikerült a %s adatforrást hozzáadni."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "OK"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -458,117 +509,13 @@ msgstr "Korlátozott"
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Kérem töltse ki a hozzáférés adatait az egyéb adatforrás hozzáadásához"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Több információ a felhasználói hozzáféréséről"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Az emailje"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "A jelszava"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Elfelejtett jelszó"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Hiba"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Mind a jelszót, mind az emailt meg kell adni."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Hiba lépett fel"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Sikerült a %s adatforrást hozzáadni."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr ""
-"A te Mandriva hozzáféréseddel nincs lehetőséged a %s letöltéseket használni."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Bezárás"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Hiba történt az adatforrás felvétele közben"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Hiba a disztribúciólista beszerzésében:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Kiterjesztett karbantartás"
-
 #. -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 "
@@ -578,7 +525,7 @@ msgstr ""
 "alkalmazások számára (maradt %s) és 18 hónapot a rendszerszintű "
 "alkalmazásokhoz (maradt %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 "
@@ -587,7 +534,7 @@ msgstr ""
 "A Kiterjesztett karbantartással további 18 hónap frissítés érhető el (maradt "
 "%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 "<b>Ajánlott</b> előfizetnie az alábbi kiterjesztett karbantartásra:"
@@ -597,12 +544,12 @@ msgstr "<b>Ajánlott</b> előfizetnie az alábbi kiterjesztett karbantartásra:"
 msgid "Lifetime policy"
 msgstr "Tervezett életciklus"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Online előfizetés"
 
-#: ../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 "
@@ -611,110 +558,104 @@ msgstr ""
 "Kérem töltse ki a hozzáférés adatait azon egyéb adatforrás hozzáadásához, "
 "amire online előfizetett"
 
-#: ../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 ""
-"A Mandriva hozzáféréséhez nem fizetett elő Kiterjesztett karbantartásra."
+msgid "More information on your user account"
+msgstr "Több információ a felhasználói hozzáféréséről"
 
-#: ../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 ""
-"A te Mandriva hozzáféréseddel nincs lehetőséged a Powerpack letöltéseket "
-"használni."
+msgid "Your email"
+msgstr "Az emailje"
 
-#: ../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 ""
-"A rendszeren nincs elegendő szabad hely a %s kiadásra frissítéshez (%d MB < %"
-"d MB)"
+msgid "Your password"
+msgstr "A jelszava"
 
-#: ../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 "A telepítés hibával ért véget."
+msgid "Forgotten password"
+msgstr "Elfelejtett jelszó"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "A telepítésről készített naplót a %s fájlban találja"
+msgid "Password and email cannot be empty."
+msgstr "Mind a jelszót, mind az emailt meg kell adni."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Újrapróbálás"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"A Mandriva hozzáféréséhez nem fizetett elő Kiterjesztett karbantartásra."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulálunk"
+msgid "Close"
+msgstr "Bezárás"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "A Mandriva %s kiadására történő frissítés sikeresen lezajlott."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "A rendszer újraindítása szükséges."
+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 "Újraindítás"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Online előfizetés"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"A csomagadatbázis zárolva van. Lépjen ki a csomagadatbázissal\n"
-"dolgozó egyéb alkalmazásokból (lehetséges, hogy használ egy másik\n"
-"adatforrás-kezelőt egy másik munkaasztalon, vagy esetleg éppen\n"
-"csomagokat telepít)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Nem sikerült felvenni az adatforrást"
+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 "Disztribúció frissítése"
@@ -765,6 +706,55 @@ msgstr "  --debug\t\t\t- a tevékenység naplózása\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "A te Mandriva hozzáféréseddel nincs lehetőséged a Powerpack letöltéseket "
+#~ "használni."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "A rendszeren nincs elegendő szabad hely a %s kiadásra frissítéshez (%d MB "
+#~ "< %d MB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "A telepítés hibával ért véget."
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "A telepítésről készített naplót a %s fájlban találja"
+
+#~ msgid "Retry"
+#~ msgstr "Újrapróbálás"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulálunk"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "A Mandriva %s kiadására történő frissítés sikeresen lezajlott."
+
+#~ msgid "You must restart your system."
+#~ msgstr "A rendszer újraindítása szükséges."
+
+#~ msgid "Reboot"
+#~ msgstr "Újraindítás"
+
+#~ 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 ""
+#~ "A csomagadatbázis zárolva van. Lépjen ki a csomagadatbázissal\n"
+#~ "dolgozó egyéb alkalmazásokból (lehetséges, hogy használ egy másik\n"
+#~ "adatforrás-kezelőt egy másik munkaasztalon, vagy esetleg éppen\n"
+#~ "csomagokat telepít)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Nem sikerült felvenni az adatforrást"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/hy.po b/po/hy.po
index 0692058a..27472a5e 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-03-20 23:50+0300\n"
 "Last-Translator: Lilit Azizbekyan <l@freenet.am>\n"
 "Language-Team: hy <yes@hay.am>\n"
@@ -49,7 +49,7 @@ msgstr "Ձեր համակարգի համար չկան առկա նորացում�
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -74,13 +74,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,42 +91,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Տեղադրել Նորացումները"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Ցանցի Ձևակերպում"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -134,420 +134,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Հրաժարվել"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Օնլայն ՎեբԷջ"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Զգուշացում"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Ծրագրի մասին.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Ուղարկել ձևակերպում"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Ելք"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, fuzzy, c-format
 msgid "New medium available"
 msgstr "Առկա չեն"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Սխալ"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "An error occurred"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
 #, c-format
-msgid "Restricted"
+msgid "An error occurred while adding medium"
 msgstr ""
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
+msgid "Ok"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Սխալ գաղտնաբառ է"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Սխալ գաղտնաբառ է"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Սխալ"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
+#: ../mdkapplet-config:80
 #, c-format
-msgid "An error occurred"
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Successfully added media %s."
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Ok"
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Փակել"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:101
 #, c-format
-msgid "An error occurred while adding medium"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -557,113 +504,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Մեքենայի անունը`"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Սխալ գաղտնաբառ է"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Սխալ գաղտնաբառ է"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Ձևակերպում"
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
+#, c-format
+msgid "Close"
+msgstr "Փակել"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Մեքենայի անունը`"
+
+#: ../mdkapplet_gui.pm:257
 #, c-format
-msgid "Reboot"
+msgid ""
+"Continue to use your new Powerpack account information to upgrade, or Cancel "
+"and upgrade to the Free Edition."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:260
 #, 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?)."
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
+msgid "Cancel, upgrade to Free Edition"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Բարի գալուստ Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -714,6 +663,10 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Անհնար է նորացնել փաթեթները update_source - ից:\n"
 
+#, fuzzy
+#~ msgid "Congratulations"
+#~ msgstr "Ձևակերպում"
+
 #~ msgid "Yes"
 #~ msgstr "Այո"
 
diff --git a/po/id.po b/po/id.po
index 5f2fc77f..59382b4e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2007-10-27 19:40+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -56,7 +56,7 @@ msgstr "Update baru tersedia untuk sistem Anda"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -81,7 +81,7 @@ msgstr "database urpmi terkunci"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Rilis tidak didukung (rilis terlalu lama, atau rilis pengembangan)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -89,7 +89,7 @@ msgstr ""
 "Tidak ditemukan media. Anda harus menambahkan media melalui 'Manajemen Media "
 "Perangkat Lunak'"
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,42 +105,42 @@ msgstr ""
 "\n"
 "Lalu jalankan ulang \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Aktifkan"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Kesalahan mengupdate media"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installasikan update-update"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Cek Update"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurasikan Jaringan"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -148,420 +148,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Menjalankan drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Selanjutnya"
 
-#: ../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 "Batal"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Menjalankan MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Menghitung update baru...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem up-to-date\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Memeriksa Jaringan: tampaknya dinonaktifkan\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 "Hak cipta (C) %s oleh Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online memberikan akses ke layanan web Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite Online"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Membaca konfigurasi\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Selalu jalankan ketika pembukaan"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Kesalahan"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Terjadi kesalahan"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Kesalahan ketika menambahkan media"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Kata sandi salah"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Kata sandi salah"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Kesalahan"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Terjadi kesalahan"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Tutup"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Kesalahan ketika menambahkan media"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -571,117 +518,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Deskripsi mesin:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Kata sandi salah"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Installasi gagal"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Kata sandi salah"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Coba kembali"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Selamat"
+msgid "Close"
+msgstr "Tutup"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Boot Ulang"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Deskripsi mesin:"
 
-#: ../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 ""
-"Database paket terkunci. Harap tutup aplikasi lain\n"
-"yang menggunakan database paket (apakah Anda memiliki manajer\n"
-"media pada desktop lain, atau Anda sedang menginstall\n"
-"paket juga?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Kesalahan ketika menambahkan media"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -733,6 +678,32 @@ msgstr "  --debug\t\t\t- mencatat apa yang sudah selesai\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gagal meng-update paket dari media update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Installasi gagal"
+
+#~ msgid "Retry"
+#~ msgstr "Coba kembali"
+
+#~ msgid "Congratulations"
+#~ msgstr "Selamat"
+
+#~ msgid "Reboot"
+#~ msgstr "Boot Ulang"
+
+#~ 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 ""
+#~ "Database paket terkunci. Harap tutup aplikasi lain\n"
+#~ "yang menggunakan database paket (apakah Anda memiliki manajer\n"
+#~ "media pada desktop lain, atau Anda sedang menginstall\n"
+#~ "paket juga?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Kesalahan ketika menambahkan media"
+
 #~ msgid "Yes"
 #~ msgstr "Ya"
 
diff --git a/po/is.po b/po/is.po
index ff346aae..a5e8802c 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2009-03-26 12:55+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -52,7 +52,7 @@ msgstr "Nýjar uppfærslur eru til fyrir kerfið þitt"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Ný útgáfa af Mandriva Linux hefur verið sett í dreifingu"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Auka pakkamiðill er til fyrir þína dreifingu."
@@ -77,7 +77,7 @@ msgstr "urpmi gagnagrunnur læstur"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Útgáfa ekki studd (of gömul útgáfa, eða tilraunaútgáfa)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -85,7 +85,7 @@ msgstr ""
 "Enginn miðill fannst. Þú verður að bæta við einhverjum miðlum með hugbúnaðar-"
 "miðla-tólinu."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,42 +101,42 @@ msgstr ""
 "\n"
 "Endurræstu síðan \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Virkur"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Villa við uppfærslu á miðli"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Setja inn uppfærslur"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Bæta við pakkamiðlum"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Athuga með uppfærslur"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Stilla nettengingu"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Uppfæra kerfið"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -144,120 +144,123 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Ræsi drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Ný útgáfa af Mandriva Linux dreifingunni"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Ný útgáfa af Mandriva Linux hefur verið sett í dreifingu."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Ítarlegri upplýsingar um þessa nýju útgáfu"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Viltu uppfæra í '%s' dreifinguna?"
 
-#: ../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 "Ekki spyrja aftur"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Næsta"
 
-#: ../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 "Hætta við"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Viltu uppfæra í '%s' dreifinguna?"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -266,17 +269,17 @@ msgstr ""
 "Þessi uppfærsla þarfnast háhraða nettengingar (beintenging, xDSL,...)  og "
 "getur tekið nokkra klukkutíma."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Áætlað er að það þurfi að sækja %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Þú ættir að loka öllum öðrum forritum áður en þú heldur áfram."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -285,96 +288,94 @@ msgstr ""
 "Þú ættir að tengja fartölvuna þína við rafmagn og nota beina nettengingu í "
 "stað þráðlauss ef hægt er."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Ræsi MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Vel nýjar uppfærslur ...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Kerfi er uppfært\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Athuga net: virðist aftengt\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 "Höfundaréttur (C) %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online veitir aðgang að Mandriva vefþjónustu."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Tengjast vefsvæði"
 
 #. -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 "Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../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 "Ítarlegri upplýsingar"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Bæta við miðli"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Um..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Stillingar á uppfærslum"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Ræsa alltaf þegar kveikt á vél"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Hætta"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nýr miðill tiltækur"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -382,187 +383,133 @@ msgid ""
 msgstr ""
 "Þú notar '%s' dreifinguna og hefur því forgangs-aðgang að aukahugbúnaði."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Vilt þú bæta við þessum auka-pakkamiðli?"
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 "Bæti við aukalegum pakkamiðli"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Hér getur þú stillt uppfærsluforritið"
-
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Update frequency (hours)"
-msgstr "Uppfærslutíðni (klukkustundir)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Töf á fyrstu athugun (mínútur)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr ""
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-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 "Fylltu inn auðkenni þitt svo hægt sé að bæta við pakkamiðli"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Ítarlegri upplýsingar um skráningu þína"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Netfangið þitt"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Lykilorðið þitt"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Gleymt lykilorð"
-
-#: ../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 "Villa"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Lykilorð og netfang má ekki vera autt."
-
-#: ../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 "Villa kom upp"
 
-#: ../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 skráningunni þinni er \"%s download\" ekki virkt."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Villa kom upp þegar reynt var að bæta við miðli"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Tókst að bæta við miðli %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 "Tókst að bæta við miðli %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 "Í lagi"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Í Mandriva skráningunni þinni er \"%s download\" ekki virkt."
+msgid "Here you can configure the updates applet"
+msgstr "Hér getur þú stillt uppfærsluforritið"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Loka"
+msgid "Update frequency (hours)"
+msgstr "Uppfærslutíðni (klukkustundir)"
 
-#: ../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 "Villa kom upp þegar reynt var að bæta við miðli"
+msgid "First check delay (minutes)"
+msgstr "Töf á fyrstu athugun (mínútur)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
+msgid "Check for missing \"%s\" media"
+msgstr ""
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr ""
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -572,118 +519,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Tengjast vefsvæði"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
 "have subscribed online"
 msgstr "Fylltu inn auðkenni þitt svo hægt sé að bæta við pakkamiðli"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "Í Mandriva skráningunni þinni er \"%s download\" ekki virkt."
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "Í Mandriva skráningunni þinni er \"Powerpack download\" ekki virkt."
+msgid "More information on your user account"
+msgstr "Ítarlegri upplýsingar um skráningu þína"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
-"Kerfið þitt hefur ekki nægilegt laust pláss á %s svo hægt sé að uppfæra (%"
-"dMB < %dMB)"
+msgid "Your email"
+msgstr "Netfangið þitt"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "Innsetning mistókst"
+msgid "Your password"
+msgstr "Lykilorðið þitt"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Innsetningarannála má finna í '%s'"
+msgid "Forgotten password"
+msgstr "Gleymt lykilorð"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "Reyna aftur"
+msgid "Password and email cannot be empty."
+msgstr "Lykilorð og netfang má ekki vera autt."
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "Til hamingju"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Í Mandriva skráningunni þinni er \"%s download\" ekki virkt."
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Tókst að uppfæra í útgáfu Mandriva %s."
+msgid "Close"
+msgstr "Loka"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "Þú verður að endurræsa kerfið þitt."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "Endurræsa"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
+
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Tengjast vefsvæði"
 
-#: ../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 ""
-"Pakkagagnagrunnur er læstur. Vinsamlega lokið öðrum forritum\n"
-"sem eru að vinna með gagnagrunninn (Er annar pakkastjóri í\n"
-"gangi á skjáborðinu þínu, eða ertu að setja inn pakka annarstaðar?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Villa þegar miðli var bætt við"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../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 "Uppfærsla dreifingar"
@@ -734,6 +678,52 @@ msgstr "  --debug\t\t\t- skrá niður allt sem gert er\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gat ekki uppfært pakka frá uppfærslumiðli.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "Í Mandriva skráningunni þinni er \"Powerpack download\" ekki virkt."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Kerfið þitt hefur ekki nægilegt laust pláss á %s svo hægt sé að uppfæra (%"
+#~ "dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Innsetning mistókst"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Innsetningarannála má finna í '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Reyna aftur"
+
+#~ msgid "Congratulations"
+#~ msgstr "Til hamingju"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Tókst að uppfæra í útgáfu Mandriva %s."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Þú verður að endurræsa kerfið þitt."
+
+#~ msgid "Reboot"
+#~ msgstr "Endurræsa"
+
+#~ 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 ""
+#~ "Pakkagagnagrunnur er læstur. Vinsamlega lokið öðrum forritum\n"
+#~ "sem eru að vinna með gagnagrunninn (Er annar pakkastjóri í\n"
+#~ "gangi á skjáborðinu þínu, eða ertu að setja inn pakka annarstaðar?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Villa þegar miðli var bætt við"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/it.po b/po/it.po
index 4425004f..724d1fdd 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \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-04-02 23:01+0200\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -57,7 +57,7 @@ msgstr "Disponibili nuovi aggiornamenti per il tuo sistema"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "È stata rilasciata una nuova versione di Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "È disponibile una nuova fonte di pacchetti per la tua distribuzione."
@@ -82,7 +82,7 @@ msgstr "database urpmi bloccato"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versione non supportata (troppo vecchia o di sviluppo)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -90,7 +90,7 @@ msgstr ""
 "Nessuna fonte trovata. Aggiungine qualcuna attraverso \"Gestione fonti "
 "software\"."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -107,42 +107,42 @@ msgstr ""
 "\n"
 "Poi riavvia \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Attivata"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Errore nell'aggiornare le fonti"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installa aggiornamenti"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Aggiunti un'altra fonte per i pacchetti"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla aggiornamenti"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la rete"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Aggiorna il sistema"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -153,75 +153,72 @@ msgstr ""
 "ringraziamo per aver sottoscritto l'estensione della manutenzione. Il tuo "
 "sistema verrà tenuto aggiornato fino al %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Sto avviando drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nuova versione della distribuzione Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Naviga"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 "È stata rilasciata una nuova versione della distribuzione Mandriva Linux."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Maggiori informazioni su questa nuova versione"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Vuoi aggiornare alla distribuzione \"%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 "Non chiederlo più"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Scarica subito tutti i pacchetti"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Attenzione: Ti servirà un bel po' di spazio libero)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Dove scaricare i pacchetti:"
 
-#: ../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 "Avanti"
 
-#: ../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 "Annulla"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -230,22 +227,22 @@ msgstr ""
 "La manutenzione di questo sistema Mandriva Linux è terminata. Ciò significa "
 "che non riceverai più i nuovi aggiornamenti del software."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Per mantenere sicuro il sistema, puoi:"
 
-#: ../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 "Dovresti sottoscrivere il programma di manutenzione prolungata."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -254,18 +251,24 @@ msgstr ""
 " Dovresti  sottoscrivere il programma di manutenzione prolungata o "
 "aggiornare il sistema ad una versione più recente della distribuzione %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 "Dovresti aggiornare ad una versione più recente della distribuzione %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Questa distribuzione non è più mantenuta."
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Manutenzione prolungata"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -274,7 +277,7 @@ msgstr ""
 "Acquista un'estensione della manutenzione per questa release  (%s) per "
 "mantenerla in funzione fino al %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -283,18 +286,18 @@ msgstr ""
 "Questo aggiornamento richiede una connessione a banda larga (cavo, "
 "xDSL, ...) e potrebbe richiedere diverse ore per essere completato."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Si stima che debbano essere scaricati %s di dati"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Prima di proseguire dovresti chiudere tutte le altre applicazioni attive."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -303,96 +306,94 @@ msgstr ""
 "Dovresti collegare il tuo laptop alla presa elettrica e scegliere la "
 "connessione ethernet rispetto a quella wifi, se possibile."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Si sta avviando MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcolo dei nuovi aggiornamenti in corso...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sistema è aggiornato\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controllo rete: sembra disattivata\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 di Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online dà accesso ai servizi web di Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Sito online"
 
 #. -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 "Andrea Celli (andrea.celli@libero.it)\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../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 "Ulteriori informazioni"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Aggiungi fonti"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Informazioni su..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configurazione aggiornamenti"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Esegui sempre all'avvio"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Esci"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nuova fonte disponibile"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -401,175 +402,121 @@ msgstr ""
 "Stai usando la distribuzione \"%s\" . Quindi hai un accesso privilegiato ai "
 "software aggiuntivi."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Vuoi installare questa fonte di software aggiuntivo?"
 
-#: ../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 "Aggiunta di una fonte aggiuntiva di pacchetti"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Qui puoi configurare l'applet degli aggiornamenti"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Frequenza aggiornamenti (ore)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Ritardo dal primo controllo (minuti)"
-
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Controlla se esistono release più recenti di  \"%s\" ."
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Verifica presenza delle fonti  \"%s\""
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Limitato"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Aziendale"
+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 ""
 "Scrivi l'identificativo (ID) del tuo account per aggiungere una nuova fonte "
 "di pacchetti"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Altre informazioni relative al tuo account utente"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "La tua email"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "La tua password"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Password dimenticata"
-
-#: ../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 "Errore"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Password ed email non possono essere omesse."
-
-#: ../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 "Si è verificato un errore"
 
-#: ../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 "Il tuo account Mandriva non consente di scaricare i pacchetti di %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Si è verificato un errore mentre si aggiungeva la fonte"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "È riuscita l'aggiunta delle fonti %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 "È riuscita l'aggiunta delle fonti %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 "Il tuo account Mandriva non consente di scaricare i pacchetti di %s."
+msgid "Here you can configure the updates applet"
+msgstr "Qui puoi configurare l'applet degli aggiornamenti"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Chiudi"
+msgid "Update frequency (hours)"
+msgstr "Frequenza aggiornamenti (ore)"
 
-#: ../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 "Si è verificato un errore mentre si aggiungeva la fonte"
+msgid "First check delay (minutes)"
+msgstr "Ritardo dal primo controllo (minuti)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Problemi nel recuperare l'elenco delle distribuzioni:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Controlla se esistono release più recenti di  \"%s\" ."
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Manutenzione prolungata"
+msgid "Check for missing \"%s\" media"
+msgstr "Verifica presenza delle fonti  \"%s\""
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Limitato"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Aziendale"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Problemi nel recuperare l'elenco delle distribuzioni:"
 
 #. -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 "
@@ -579,7 +526,7 @@ msgstr ""
 "18 mesi di aggiornamenti del sistema (fino al %s) per le proprie "
 "distribuzioni."
 
-#: ../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 "
@@ -588,7 +535,7 @@ msgstr ""
 "È ora disponibile un'estensione del supporto che garantisce altri 18 mesi di "
 "aggiornamenti (fino al %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 "Puoi richiedere <b>subito</b> la manutenzione prolungata:"
@@ -598,12 +545,12 @@ msgstr "Puoi richiedere <b>subito</b> la manutenzione prolungata:"
 msgid "Lifetime policy"
 msgstr "Gestione del ciclo di vita"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Adesione online"
 
-#: ../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 "
@@ -612,106 +559,103 @@ msgstr ""
 "Scrivi l'identificativo (ID) del tuo account per aggiungere una nuova fonte "
 "di pacchetti dopo che l'adesione online sarà completata."
 
-#: ../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 "Il tuo account Mandriva non comprende la manutenzione prolungata."
+msgid "More information on your user account"
+msgstr "Altre informazioni relative al tuo account utente"
 
-#: ../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 ""
-"Il tuo account Mandriva non consente di scaricare i pacchetti di Powerpack."
+msgid "Your email"
+msgstr "La tua email"
 
-#: ../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 ""
-"Non c'è abbastanza spazio libero su %s per l'aggiornamento (%dMB < %dMB)"
+msgid "Your password"
+msgstr "La tua password"
 
-#: ../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 "Installazione non riuscita"
+msgid "Forgotten password"
+msgstr "Password dimenticata"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "I rapporti sull'installazione sono in \"%s\""
+msgid "Password and email cannot be empty."
+msgstr "Password ed email non possono essere omesse."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Riprova"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Il tuo account Mandriva non comprende la manutenzione prolungata."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Complimenti"
+msgid "Close"
+msgstr "Chiudi"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "L'aggiornamento alla versione %s di Mandriva è riuscito."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Dovresti riavviare il sistema."
+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 "Riavvia"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Adesione online"
 
-#: ../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 ""
-"Il database dei pacchetti è già in uso, chiudere tutte le applicazioni\n"
-"che ne fanno uso (stai usando un altro gestore di pacchetti su di \n"
-"un altro desktop o stai già installando dei pacchetti?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Errore nell'aggiunta della fonte"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../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 "Aggiornamento della distribuzione"
@@ -762,3 +706,50 @@ msgstr "  --debug\t\t\t- mantiene un log delle azioni fatte\n"
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Impossibile aggiornare i pacchetti dalla fonte update_source.\n"
+
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Il tuo account Mandriva non consente di scaricare i pacchetti di "
+#~ "Powerpack."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Non c'è abbastanza spazio libero su %s per l'aggiornamento (%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Installazione non riuscita"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "I rapporti sull'installazione sono in \"%s\""
+
+#~ msgid "Retry"
+#~ msgstr "Riprova"
+
+#~ msgid "Congratulations"
+#~ msgstr "Complimenti"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "L'aggiornamento alla versione %s di Mandriva è riuscito."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Dovresti riavviare il sistema."
+
+#~ msgid "Reboot"
+#~ msgstr "Riavvia"
+
+#~ 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 ""
+#~ "Il database dei pacchetti è già in uso, chiudere tutte le applicazioni\n"
+#~ "che ne fanno uso (stai usando un altro gestore di pacchetti su di \n"
+#~ "un altro desktop o stai già installando dei pacchetti?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Errore nell'aggiunta della fonte"
diff --git a/po/ja.po b/po/ja.po
index c757dbb5..0802422c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2009-03-22 20:08+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -54,7 +54,7 @@ msgstr "新しい更新があります"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "新しいバージョンの Mandriva Linux がリリースされました"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -81,7 +81,7 @@ msgstr "urpmi データベースがロックされています"
 msgid "Release not supported (too old release, or development release)"
 msgstr "お使いのバージョンはサービスの対象外です (期限切れ/開発版)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -89,7 +89,7 @@ msgstr ""
 "メディアが見つかりません。RPM メディアマネージャでメディアを追加してくださ"
 "い。"
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,42 +105,42 @@ msgstr ""
 "\n"
 "その後、%s を再起動してください。"
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "有効"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "メディアの更新でエラー"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "システムを更新"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "付加的なパッケージメディア"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "更新をチェック"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "ネットワークの設定"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "システムをアップグレード"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -148,120 +148,123 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect を起動\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "新バージョンの Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "新しいバージョンの Mandriva Linux がリリースされました。"
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "この新しいバージョンの詳細情報"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "ディストリビューション %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 "次回から尋ねない"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "次へ"
 
-#: ../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 "キャンセル"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "ディストリビューション %s にアップグレードしますか？"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -270,17 +273,17 @@ msgstr ""
 "このアップグレードには高速な回線 (ケーブル、xDSL など) が必要です。完了するま"
 "でに数時間かかる場合があります。"
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "推定で %s のデータをダウンロードします"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "開始する前に実行中のすべてのアプリケーションを終了してください。"
 
-#: ../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 ""
 "ラップトップをお使いの場合は、電源を AC アダプタに切り替え、可能であれば Wi-"
 "Fi 接続よりイーサネット接続を優先してください。"
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate を起動\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "新しい更新を計算中...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "新しい更新はありません\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ネットワーク確認: 無効になっているようです\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 (C) %s by Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online は Mandriva ウェブサービスへのアクセスを提供します。"
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online ウェブサイト"
 
 #. -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 "Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../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 "詳細情報"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "メディアを追加"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "情報..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新の設定"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "起動時に常に開始する"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "新しいメディアが利用できます"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -387,190 +388,136 @@ msgstr ""
 "%s ディストリビューションをお使いなので、特典として付加的なソフトウェアもご利"
 "用いただけます。"
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "この付加的なソフトウェア用のリポジトリをインストールしますか？"
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 "付加的なパッケージメディアの追加"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "ここで更新アプレットの設定を行います"
-
-#: ../mdkapplet-config:71
-#, fuzzy, c-format
-msgid "Update frequency (hours)"
-msgstr "更新間隔 (秒)"
-
-#: ../mdkapplet-config:80
-#, fuzzy, c-format
-msgid "First check delay (minutes)"
-msgstr "最初のチェックの遅延 (秒)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr ""
-
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Restricted"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-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 ""
 "付加的なメディアを追加するには、あなたのアカウント ID を入力してください"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "ユーザアカウントの詳細"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "メールアドレス"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "パスワード"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "パスワードを忘れました"
-
-#: ../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 "エラー"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "パスワードとメールアドレスは空にはできません。"
-
-#: ../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 "エラーが発生しました"
 
-#: ../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 アカウントは %s のダウンロード申し込みが有効になっていませ"
+"ん。"
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "メディアを追加中にエラーが発生しました"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "メディア %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 "メディア %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."
+msgid "Here you can configure the updates applet"
+msgstr "ここで更新アプレットの設定を行います"
+
+#: ../mdkapplet-config:71
+#, fuzzy, c-format
+msgid "Update frequency (hours)"
+msgstr "更新間隔 (秒)"
+
+#: ../mdkapplet-config:80
+#, fuzzy, c-format
+msgid "First check delay (minutes)"
+msgstr "最初のチェックの遅延 (秒)"
+
+#: ../mdkapplet-config:89
+#, c-format
+msgid "Check for newer \"%s\" releases"
 msgstr ""
-"あなたの Mandriva アカウントは %s のダウンロード申し込みが有効になっていませ"
-"ん。"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Close"
-msgstr "閉じる"
+msgid "Check for missing \"%s\" media"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:95
 #, c-format
-msgid "An error occurred while adding medium"
-msgstr "メディアを追加中にエラーが発生しました"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -580,12 +527,12 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Online ウェブサイト"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
@@ -593,6 +540,31 @@ msgid ""
 msgstr ""
 "付加的なメディアを追加するには、あなたのアカウント ID を入力してください"
 
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
+#, c-format
+msgid "More information on your user account"
+msgstr "ユーザアカウントの詳細"
+
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
+#, c-format
+msgid "Your email"
+msgstr "メールアドレス"
+
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, c-format
+msgid "Your password"
+msgstr "パスワード"
+
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, c-format
+msgid "Forgotten password"
+msgstr "パスワードを忘れました"
+
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
+#, c-format
+msgid "Password and email cannot be empty."
+msgstr "パスワードとメールアドレスは空にはできません。"
+
 #: ../mdkapplet-extended-maintenance-helper:192
 #, fuzzy, c-format
 msgid ""
@@ -602,102 +574,71 @@ msgstr ""
 "あなたの Mandriva アカウントは %s のダウンロード申し込みが有効になっていませ"
 "ん。"
 
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr ""
-"あなたの Mandriva アカウントは Powerpack のダウンロード申し込みが有効になって"
-"いません。"
+msgid "Close"
+msgstr "閉じる"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
+msgid "Would you like Powerpack?"
 msgstr ""
-"あなたのシステムの %s にはアップグレードに必要な空き領域が残っていません (%"
-"dMB < %dMB)"
-
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "インストール失敗"
-
-#: ../mdkapplet-upgrade-helper:130
-#, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "'%s' にインストールのログがあります"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Retry"
-msgstr "再試行"
-
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "おめでとうございます"
-
-#: ../mdkapplet-upgrade-helper:147
-#, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Mandriva の %s リリースへのアップグレードに成功しました。"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
-#, c-format
-msgid "You must restart your system."
-msgstr "システムを再起動してください。"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Online ウェブサイト"
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:257
 #, c-format
-msgid "Reboot"
-msgstr "再起動"
+msgid ""
+"Continue to use your new Powerpack account information to upgrade, or Cancel "
+"and upgrade to the Free Edition."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:260
 #, 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?)."
+msgid "Continue and Authenticate!"
 msgstr ""
-"パッケージのデータベースがロックされています。パッケージの\n"
-"データベースを使用しているアプリケーションを閉じてください。\n"
-"(別のデスクトップでメディアマネージャを実行中、あるいはパッケージ\n"
-"を現在インストール中ではありませんか？)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "メディアの追加に失敗しました"
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../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 "ディストリビューションのアップグレード"
@@ -748,6 +689,55 @@ msgstr "  --debug\t\t\t- 記録を取る\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source メディアからパッケージを更新できません。\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "あなたの Mandriva アカウントは Powerpack のダウンロード申し込みが有効に"
+#~ "なっていません。"
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "あなたのシステムの %s にはアップグレードに必要な空き領域が残っていません "
+#~ "(%dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "インストール失敗"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "'%s' にインストールのログがあります"
+
+#~ msgid "Retry"
+#~ msgstr "再試行"
+
+#~ msgid "Congratulations"
+#~ msgstr "おめでとうございます"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Mandriva の %s リリースへのアップグレードに成功しました。"
+
+#~ msgid "You must restart your system."
+#~ msgstr "システムを再起動してください。"
+
+#~ msgid "Reboot"
+#~ msgstr "再起動"
+
+#~ 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 ""
+#~ "パッケージのデータベースがロックされています。パッケージの\n"
+#~ "データベースを使用しているアプリケーションを閉じてください。\n"
+#~ "(別のデスクトップでメディアマネージャを実行中、あるいはパッケージ\n"
+#~ "を現在インストール中ではありませんか？)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "メディアの追加に失敗しました"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/ka.po b/po/ka.po
index 1f3ac06d..5969771e 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-09-29 19:58+0400\n"
 "Last-Translator: \n"
 "Language-Team: Georgian <aiet@qartuli.com>\n"
@@ -49,7 +49,7 @@ msgstr "თქვენი სისტემა განახლებას
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -76,13 +76,13 @@ msgstr ""
 "ამ გამოშვების (Release) მხარდაჭერა არ გამაჩნია (ან მოძველებულია, ან "
 "development release არის)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -93,42 +93,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "აქტიური"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "განახლებების ინსტალირება"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "განახლებების შეამოწმება"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "ქსელის კონფიგურირება"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -136,420 +136,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ვიძახებ drakconnect-ს\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "შემდეგი"
 
-#: ../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 "სტოპ!"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "ვიძახებ MandrivaUpdate-ს\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "ვანგარიშობ გასაახლებელ პაკეტებს...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "სისტემა განახლებულია\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ვამოწმებ ქსელს: როგორც ჩანს გამორთულია\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "გაფრთხილება"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "შესახებ..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "კონფიგურაცის გადაგზავნა"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "მუდამ გამოიძახე სისტემის ჩატვირთვისას (startup)"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "გასვლა"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "შეცდომა"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "An error occurred"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
 #, c-format
-msgid "Restricted"
+msgid "An error occurred while adding medium"
 msgstr ""
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
+msgid "Ok"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "არასწორი პაროლი"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "არასწორი პაროლი"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "შეცდომა"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
+#: ../mdkapplet-config:80
 #, c-format
-msgid "An error occurred"
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Successfully added media %s."
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Ok"
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "დახურვა"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:101
 #, c-format
-msgid "An error occurred while adding medium"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -559,113 +506,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "სისტემის სახელი (Machine name):"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "არასწორი პაროლი"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "ინსტალაცია ჩაიშალა"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "არასწორი პაროლი"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "კონფიგურაცის გადაგზავნა"
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
+#, c-format
+msgid "Close"
+msgstr "დახურვა"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "სისტემის სახელი (Machine name):"
+
+#: ../mdkapplet_gui.pm:257
 #, c-format
-msgid "Reboot"
+msgid ""
+"Continue to use your new Powerpack account information to upgrade, or Cancel "
+"and upgrade to the Free Edition."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:260
 #, 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?)."
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
+msgid "Cancel, upgrade to Free Edition"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -717,6 +666,13 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source-ის მედიუმიდან პაკეტები ვერ განვაახლე.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "ინსტალაცია ჩაიშალა"
+
+#, fuzzy
+#~ msgid "Congratulations"
+#~ msgstr "კონფიგურაცის გადაგზავნა"
+
 #~ msgid "Yes"
 #~ msgstr "კი"
 
diff --git a/po/ko.po b/po/ko.po
index cbdcbd1f..d600109f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2002-08-16 12:34+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: korean <baedaron@hanafos.com>\n"
@@ -48,7 +48,7 @@ msgstr "네트웍 어댑터를 찾을 수 없습니다!"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -73,13 +73,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -90,42 +90,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "사용가"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "테마 설치"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "업데이트 버전"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "네트웍 설정"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -133,420 +133,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "사용자드레이크 실행"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "다음"
 
-#: ../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 "취소"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "맨드리바 온라인"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "연결 문제"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "시스템 모드"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "맨드리바 온라인"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "경고"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "정보..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "설정사항 읽는 중\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "종료"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "오류"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "오류 발생"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "오류 발생"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "확인"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "잘못된 암호"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "잘못된 암호"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "오류"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "오류 발생"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "확인"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "닫기"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "오류 발생"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -556,113 +503,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "컴퓨터 이름:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "잘못된 암호"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "설치 실패."
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "잘못된 암호"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "재시도"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "축하합니다."
+msgid "Close"
+msgstr "닫기"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "다시 시작"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "컴퓨터 이름:"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
+msgid "Cancel, upgrade to Free Edition"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -713,6 +662,18 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Installation failed"
+#~ msgstr "설치 실패."
+
+#~ msgid "Retry"
+#~ msgstr "재시도"
+
+#~ msgid "Congratulations"
+#~ msgstr "축하합니다."
+
+#~ msgid "Reboot"
+#~ msgstr "다시 시작"
+
 #~ msgid "Yes"
 #~ msgstr "예"
 
diff --git a/po/ku.po b/po/ku.po
index 7e5406c1..9a0f4350 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ku\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-12-14 20:33+0100\n"
 "Last-Translator: Kadir Dilsiz <kadir@linux-ku.com>\n"
 "Language-Team: Kurdî <team@linux-ku.com>\n"
@@ -54,7 +54,7 @@ msgstr "Rojaneyên nû heye ji bo sîstema we"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -79,13 +79,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -96,42 +96,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Çalak"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Nûjenkirina Ava Bike"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Nûjenkirinan Kontrol Bike"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Torê Saz Bike"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -139,420 +139,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect destpêdike\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "Betal"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Destpêkirina MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Rojanekirina Kontrol Bike...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sîstema we rojane bûye\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online WebSite"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Li bala we"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Der barê de..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Sazkirina te tê xwendin\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Di vekirina sîsteme de bişuxlîne"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Derkeve"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "çewt"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "An error occurred"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
 #, c-format
-msgid "Restricted"
+msgid "An error occurred while adding medium"
 msgstr ""
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
+msgid "Ok"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Şîfreya Çewt"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Şîfreya Çewt"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "çewt"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
+#: ../mdkapplet-config:80
 #, c-format
-msgid "An error occurred"
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Successfully added media %s."
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Ok"
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Bigire"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:101
 #, c-format
-msgid "An error occurred while adding medium"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -562,113 +509,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Navê Makîneyê:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Şîfreya Çewt"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Saz kirin bi ser neket."
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Şîfreya Çewt"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Serkeftin"
+msgid "Close"
+msgstr "Bigire"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Navê Makîneyê:"
+
+#: ../mdkapplet_gui.pm:257
 #, c-format
-msgid "Reboot"
+msgid ""
+"Continue to use your new Powerpack account information to upgrade, or Cancel "
+"and upgrade to the Free Edition."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:260
 #, 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?)."
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
+msgid "Cancel, upgrade to Free Edition"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Tu Bi Xêr Hatî Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -720,6 +669,12 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Saz kirin bi ser neket."
+
+#~ msgid "Congratulations"
+#~ msgstr "Serkeftin"
+
 #~ msgid "Yes"
 #~ msgstr "Erê"
 
diff --git a/po/ky.po b/po/ky.po
index c7c4e650..7530b569 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2009-09-22 10:12+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -51,7 +51,7 @@ msgstr "Сиздин системаңызды жаңылоо мүмкүнчүл�
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Mandriva Linux дистрибутивинин жаңы версиясы чыкты"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Сиздин дистрибутивиңиз үчүн жаңы кошумча пакеттер булагы табылды."
@@ -76,7 +76,7 @@ msgstr "urpmi берилиштер базасы кулпуланган"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Релиз колдоого ээ эмес (өтө эски же иштелип жаткан релиз)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -84,7 +84,7 @@ msgstr ""
 "Эч кандай булак табылган жок. Сиз 'Программа Булактардын Менеджер'ин "
 "колдонуп бир нече булактарды кошууңуз керек."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,42 +101,42 @@ msgstr ""
 "\n"
 "Андан соң, \"%s\" кайра иштетиңиз."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Иштетилди"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Булакты жаңылоодо ката чыкты"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Жаңылоолорду орнотуу"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Кошумча пакеттер булагын кошуу"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Жаңылоолорду текшерүү"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Тармакты конфигурациялоо"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Системаны жаңылоо"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -144,96 +144,93 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect иштетүү\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Mandriva Linux дистрибутивинин жаңы версиясы"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Mandriva Linux дистрибутивинин жаңы версиясы чыкты."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Жаңы версия жөнүндө кошумча маалымат"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "'%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 "Кийинки жолу башка менден сураба"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Кийинки"
 
-#: ../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 "Айнуу"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, fuzzy, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -243,24 +240,30 @@ msgstr ""
 "кандай жаңылоолор чыкпайт. Сизге %s дистрибутивдин жаңы версиясына жаңылануу "
 "керек."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "'%s' дистрибутивине жаңылоону каалайсызбы?"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -269,17 +272,17 @@ msgstr ""
 "Бул жаңылоо жогорку ылдамдыкта тармак туташууну (кабель, xDSL, ж.б.)  талап "
 "кылат жана бир ниче убакытты алышы мүмкүн."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Жүктөө маалымат көлөмү: %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Улантуу үчүн иштеп жаткан бардык программаларды жабуу керек."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -288,97 +291,95 @@ msgstr ""
 "Ноутбукту турактуу электр булагына кошуу зарыл жана мүмкүн болушунча\n"
 "сымсыз тармак туташуудан көрө кабельдик тармак туташууну колдонуу керек."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate иштетүү\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Жаңы жаңылоолор эсептелүүдө...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система жаңылоону талап кылбайт\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тармак текшерилүүдө: өчүрүлгөн көрүнөт\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 (C) %s by Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 "Mandriva Online, Mandriva веб кызматтарды колдонуу мүмкүнчүлүгүн берет."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлайндагы веб-сайт"
 
 #. -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 "Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Эскертүү"
 
-#: ../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 "Кошумча маалымат"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Булак кошуу"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Жөнүндө.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Жаңылоолор ырастоолору"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Дайыма старт учурунда ишке киргизүү"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Чыгуу"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Жаңы булак табылды"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -387,187 +388,133 @@ msgstr ""
 "Сиз '%s' дистрибутивин колдонуп жатасыз жана кошумча программаларды "
 "колдонууга укугуңуз бар."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Сиз кошумча пакеттер булагын кошууну каалайсызбы?"
 
-#: ../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 "Кошумча пакеттер булагын кошуу"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Бул жерде жаңылоолор аплеттин ыраста аласыз"
-
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Update frequency (hours)"
-msgstr "Жаңылоо жыштыгы (саат)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Биринчи текшерүүнү кийинкиге калтыруу убакыты (минута)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr ""
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-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 "Кошумча пакеттер булагын кошууда колдонуучү IDни киргизиңиз"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Колдонуучу аты жөнүндө кошумча маалымат"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Электрондук почта"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Сырсөз"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Унутулуп калган сырсөз"
-
-#: ../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 "Жаңылыштык"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Сырсөз жана э-почта бош болбошу керек."
-
-#: ../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 "Жаңылыштык орун алды"
 
-#: ../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 колодонуучу аты %s жүктөө катталышын камтыбайт."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Булакты кошууда ката чыкты"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "%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 "%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 "ОК"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Сиздин Mandriva колодонуучу аты %s жүктөө катталышын камтыбайт."
+msgid "Here you can configure the updates applet"
+msgstr "Бул жерде жаңылоолор аплеттин ыраста аласыз"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Жабуу"
+msgid "Update frequency (hours)"
+msgstr "Жаңылоо жыштыгы (саат)"
 
-#: ../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 "Булакты кошууда ката чыкты"
+msgid "First check delay (minutes)"
+msgstr "Биринчи текшерүүнү кийинкиге калтыруу убакыты (минута)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
+msgid "Check for missing \"%s\" media"
+msgstr ""
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr ""
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -577,120 +524,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Машинанын аты:"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
 "have subscribed online"
 msgstr "Кошумча пакеттер булагын кошууда колдонуучү IDни киргизиңиз"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "Сиздин Mandriva колодонуучу аты %s жүктөө катталышын камтыбайт."
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "Сиздин Mandriva колодонуучу аты Powerpack жүктөө катталышын камтыбайт."
+msgid "More information on your user account"
+msgstr "Колдонуучу аты жөнүндө кошумча маалымат"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
-"Сиздин системаңызда жаңылоо үчүн %s ичинде жетеринче бош көлөм калган жок (%"
-"d МБ < %d МБ)"
+msgid "Your email"
+msgstr "Электрондук почта"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "Орнотуу ийгиликсиз аяктады"
+msgid "Your password"
+msgstr "Сырсөз"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Орнотуу журналдары '%s' жерден тапсо болот"
+msgid "Forgotten password"
+msgstr "Унутулуп калган сырсөз"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "Кайрадан"
+msgid "Password and email cannot be empty."
+msgstr "Сырсөз жана э-почта бош болбошу керек."
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "Конфигурациялар"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Сиздин Mandriva колодонуучу аты %s жүктөө катталышын камтыбайт."
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Mandriva %s жаңылоосу ийгиликтүү аяктады."
+msgid "Close"
+msgstr "Жабуу"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "Системаны кайра өчүрүп иштетүү керек."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "Кайра жүктөө"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Машинанын аты:"
+
+#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Пакеттердин берилиштер базасы кулпуланган. Бул\n"
-"база менен иштеп жаткан тиркемелерди жабыңыз (сиз\n"
-"башка иш столунда башка булак менеджери менен иштеп,\n"
-"же учурда башка иш столунда пакеттерди орнотуп жаткан\n"
-"жоксузбу?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Булакты кошуу ийгиликсиздиги"
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Linux"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Linux"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../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 "Дитсрибутив жаңылоосу"
@@ -742,6 +684,55 @@ msgstr "  --debug\t\t\t- болгондорду журналга жазуу\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source булагынан пакеттерди жаңылоо мүмкүн эмес.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Сиздин Mandriva колодонуучу аты Powerpack жүктөө катталышын камтыбайт."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Сиздин системаңызда жаңылоо үчүн %s ичинде жетеринче бош көлөм калган жок "
+#~ "(%d МБ < %d МБ)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Орнотуу ийгиликсиз аяктады"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Орнотуу журналдары '%s' жерден тапсо болот"
+
+#~ msgid "Retry"
+#~ msgstr "Кайрадан"
+
+#~ msgid "Congratulations"
+#~ msgstr "Конфигурациялар"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Mandriva %s жаңылоосу ийгиликтүү аяктады."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Системаны кайра өчүрүп иштетүү керек."
+
+#~ msgid "Reboot"
+#~ msgstr "Кайра жүктөө"
+
+#~ 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 ""
+#~ "Пакеттердин берилиштер базасы кулпуланган. Бул\n"
+#~ "база менен иштеп жаткан тиркемелерди жабыңыз (сиз\n"
+#~ "башка иш столунда башка булак менеджери менен иштеп,\n"
+#~ "же учурда башка иш столунда пакеттерди орнотуп жаткан\n"
+#~ "жоксузбу?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Булакты кошуу ийгиликсиздиги"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/lt.po b/po/lt.po
index 4255292d..272fb727 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-09-26 16:38+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: \n"
@@ -53,7 +53,7 @@ msgstr "Jūsų sistemai yra atnaujinimų"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -78,13 +78,13 @@ msgstr "urpmi duomenų bazė užrakinta"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versija nepalaikoma (versija per sena arba dar kuriama)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -95,42 +95,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Įdiegti atnaujinimus"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Patikrinti atnaujinimus"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigūruoti tinklą"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -138,420 +138,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Paleidžiama drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Sekantis"
 
-#: ../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 "Atšaukti"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Paleidžiama MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Skaičiuojami paskutiniai atnaujinimai...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Siatema yra naujausia\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tikrinamas tinklas: atrodo, neveikia\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Interneto svetainė"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Dėmesio"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Apie..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Skaitau nustatymus\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Visada paleisti įkrovimo metu"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Klaida"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Įvyko klaida"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Įvyko klaida"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Gerai"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Neteisingas slaptažodis"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Neteisingas slaptažodis"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Klaida"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Įvyko klaida"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Gerai"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Uždaryti"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Įvyko klaida"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -561,113 +508,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Kompiuterio vardas:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Neteisingas slaptažodis"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Įdiegimas nepavyko"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Neteisingas slaptažodis"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Sveikinimai"
+msgid "Close"
+msgstr "Uždaryti"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Perkrauti"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Kompiuterio vardas:"
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -718,6 +667,15 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Įdiegimas nepavyko"
+
+#~ msgid "Congratulations"
+#~ msgstr "Sveikinimai"
+
+#~ msgid "Reboot"
+#~ msgstr "Perkrauti"
+
 #~ msgid "Yes"
 #~ msgstr "Taip"
 
diff --git a/po/ltg.po b/po/ltg.po
index d8f723a4..734814a6 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-02-17 17:39+0200\n"
 "Last-Translator: Unknown\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -77,13 +77,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -94,42 +94,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, fuzzy, c-format
 msgid "Enabled"
 msgstr "īslēgt"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Uzstuodeit jaunynuojumus"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Modernizeijumi"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Teikla konfigureišona"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -137,420 +137,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Palaist userdrake"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Tuoļuok"
 
-#: ../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 "Atceļt"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Dasaslādzu ...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemys režims"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Uzmaneibu"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Nūlosu konfiguraceju\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Izīt"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Klaida"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Atkluota kliuda"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Atkluota kliuda"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Labi"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Napareizs paroļs"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Napareizs paroļs"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Klaida"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Atkluota kliuda"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Labi"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Aizvērt"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Atkluota kliuda"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -560,113 +507,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Datora nūsaukums:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Napareizs paroļs"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalaceja naizadeve"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Napareizs paroļs"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Apsveicam"
+msgid "Close"
+msgstr "Aizvērt"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Puorsuoknēt"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Datora nūsaukums:"
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -718,6 +667,15 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Instalaceja naizadeve"
+
+#~ msgid "Congratulations"
+#~ msgstr "Apsveicam"
+
+#~ msgid "Reboot"
+#~ msgstr "Puorsuoknēt"
+
 #~ msgid "Yes"
 #~ msgstr "Da"
 
diff --git a/po/lv.po b/po/lv.po
index d9debfb5..5f5c6bd5 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2002-09-25 19:04+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -50,7 +50,7 @@ msgstr "Jūsu sistēmā nav tīkla adaptera!"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -75,13 +75,13 @@ msgstr "urpmi datubāze noslēgta"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,42 +92,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Atļauts"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instalēt tēmas"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Atjaunināt"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Tīkla konfigurēšana"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -135,420 +135,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Izpildīt userdrake"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Tālāk"
 
-#: ../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 "Atcelt"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Pieslēguma problēma"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistēmas režīms"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Uzmanību"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Kļūda"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Atklāta kļūda"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Atklāta kļūda"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Labi"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Nepareiza parole"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Nepareiza parole"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Kļūda"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Atklāta kļūda"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Labi"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Aizvērt"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Atklāta kļūda"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -558,113 +505,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Datora nosaukums:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Nepareiza parole"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalēšana neizdevās"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Nepareiza parole"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Apsveicam"
+msgid "Close"
+msgstr "Aizvērt"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Pārstartēt"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Datora nosaukums:"
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -715,6 +664,15 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Installation failed"
+#~ msgstr "Instalēšana neizdevās"
+
+#~ msgid "Congratulations"
+#~ msgstr "Apsveicam"
+
+#~ msgid "Reboot"
+#~ msgstr "Pārstartēt"
+
 #~ msgid "Yes"
 #~ msgstr "Jā"
 
diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index e4ddce80..ca7ababa 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -71,12 +71,12 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -87,406 +87,388 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid "Basic maintenance for this distribution has expired. Thanks to your subscription to extended maintenance, your system will be kept up to date until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid ""
 "Launching drakconnect\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid "Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid "You should either get extended maintenance or upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98 ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid "Purchase a maintenance extension for this version (%s) and keep it running until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid "You should put your laptop on AC and favor ethernet connection over wifi, if available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid ""
 "Launching MandrivaUpdate\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid ""
 "Computing new updates...\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid ""
 "System is up-to-date\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid ""
 "Checking Network: seems disabled\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid "You use '%s' distribution and therefore have privileged access to additional software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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-extended-maintenance-helper:186 ../mdkapplet-restricted-helper:68 ../mdkapplet-restricted-helper:80 ../mdkapplet-restricted-helper:146 ../mdkapplet-restricted-helper:151
+#: ../mdkapplet-add-media-helper:68 ../mdkapplet-config:43 ../mdkapplet-extended-maintenance-helper:77 ../mdkapplet-extended-maintenance-helper:186
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr ""
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr ""
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr ""
-
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
+msgid ""
+"Supported products are %s, '%s' is not on the list.\n"
+""
 msgstr ""
 
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Restricted"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:101
+#: ../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_gui.pm:209
 #, c-format
-msgid "Enterprise"
+msgid "Error"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:135 ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "An error occurred"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79 ../mdkapplet-extended-maintenance-helper:121 ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "More information on your user account"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:82 ../mdkapplet-extended-maintenance-helper:124 ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-add-media-helper:163 ../mdkapplet-extended-maintenance-helper:204
 #, c-format
-msgid "Your email"
+msgid "An error occurred while adding medium"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83 ../mdkapplet-extended-maintenance-helper:125 ../mdkapplet-restricted-helper:89
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Your password"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:87 ../mdkapplet-extended-maintenance-helper:129 ../mdkapplet-restricted-helper:93
+#: ../mdkapplet-add-media-helper:172 ../mdkapplet-extended-maintenance-helper:178 ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Forgotten password"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:97 ../mdkapplet-enterprise-update-helper:121 ../mdkapplet-enterprise-update-helper:158 ../mdkapplet-extended-maintenance-helper:91 ../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-add-media-helper:174 ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Error"
+msgid "Ok"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:97 ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121 ../mdkapplet-extended-maintenance-helper:160 ../mdkapplet-restricted-helper:122
+#: ../mdkapplet-config:71
 #, c-format
-msgid "An error occurred"
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:132 ../mdkapplet-enterprise-update-helper:133 ../mdkapplet-extended-maintenance-helper:178 ../mdkapplet-extended-maintenance-helper:179 ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133 ../mdkapplet-extended-maintenance-helper:179 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152 ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
+msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:158 ../mdkapplet-extended-maintenance-helper:204 ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:101
 #, c-format
-msgid "An error occurred while adding medium"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101 ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
 #. -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 ""
 
-#: ../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 (until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -496,106 +478,107 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../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)"
+msgid "Your password"
 msgstr ""
 
-#: ../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"
+msgid "Forgotten password"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid "Your Mandriva account does not have Extended Maintenance subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
+msgid "Close"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid "Since you don't have Powerpack rights you may visit mandriva store now and get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
 #, c-format
-msgid "Reboot"
+msgid "Get Powerpack subscription!"
 msgstr ""
 
-#: ../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?)."
+msgid "Continue to use your new Powerpack account information to upgrade, or Cancel and upgrade to the Free Edition."
+msgstr ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
+msgid "Cancel, upgrade to Free Edition"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, c-format
 msgid "Mandriva Flash"
 msgstr ""
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, c-format
 msgid "Mandriva Free"
 msgstr ""
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, c-format
 msgid "Mandriva Mini"
 msgstr ""
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, c-format
 msgid "Mandriva One"
 msgstr ""
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr ""
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 12ec9cf3..59c7c835 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2006-09-17 20:55-0700\n"
 "Last-Translator: Zoran Dimovski <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian\n"
@@ -53,7 +53,7 @@ msgstr "Достапни се нови ажурирања за вашиот си
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -79,13 +79,13 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Верзијата не е подржана (премногу стара верзија или верзија во развоја фаза)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "Потоа, рестатувајте го %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Овозможено"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај надоградувања"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигурирај мрежа"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -145,420 +145,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Вклучувам drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Следно"
 
-#: ../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 "Откажи"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Вклучувам MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ги пресметувам новите ажурирања...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системот е ажуриран\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверувам мрежа: изгледа е оневозможена\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 "Авторски права (C) %s од „Mandriva“"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "„Mandriva Online“ дава пристап до веб сервисите на „Mandriva“."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлајн Веб сајт"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "За..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Читам конфигурација\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Секогаш вклучувај при подигнување"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Напушти"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Грешка"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Се случи грешка"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Неуспех при додавање медиум"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Во ред"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Погрешна лозинка"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Погрешна лозинка"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Се случи грешка"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Во ред"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Затвори"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Неуспех при додавање медиум"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -568,116 +515,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Опис на машината:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Погрешна лозинка"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Неуспешна инсталација"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Погрешна лозинка"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Честитки"
+msgid "Close"
+msgstr "Затвори"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Рестартирај"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Опис на машината:"
 
-#: ../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 ""
-"Базата на пакети е заклучена. Затворете ги другите апликации\n"
-"што работат со неа (дали имате друг менаџер на медиуми на некој\n"
-"друг десктоп, или пак моментално инсталирате некои пакети?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Неуспех при додавање медиум"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "„Mandriva Online“"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -728,6 +674,28 @@ msgstr "  --debug\t\t\t- запишува што се случува\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не можам да ги ажурирам пакетите од медиумот update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Неуспешна инсталација"
+
+#~ msgid "Congratulations"
+#~ msgstr "Честитки"
+
+#~ msgid "Reboot"
+#~ msgstr "Рестартирај"
+
+#~ 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 ""
+#~ "Базата на пакети е заклучена. Затворете ги другите апликации\n"
+#~ "што работат со неа (дали имате друг менаџер на медиуми на некој\n"
+#~ "друг десктоп, или пак моментално инсталирате некои пакети?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Неуспех при додавање медиум"
+
 #~ msgid "Yes"
 #~ msgstr "Да"
 
diff --git a/po/mn.po b/po/mn.po
index 178ffa10..972f34f3 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2003-02-21 00:17+0100\n"
 "Last-Translator: Sanlig Badral <badral@chinggis.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -74,13 +74,13 @@ msgstr ""
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,42 +91,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Нээлттэй"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Тохируулах"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -134,420 +134,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Дараах"
 
-#: ../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 "Хүчингүй"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, c-format
 msgid "Mandriva Linux"
 msgstr ""
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr ""
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Тухай..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Гарах"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Алдаа"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
+msgid "An error occurred"
 msgstr ""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
 #, c-format
-msgid "Restricted"
+msgid "An error occurred while adding medium"
 msgstr ""
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ок"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Нууц үг:"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Нууц үг:"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Алдаа"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
+#: ../mdkapplet-config:80
 #, c-format
-msgid "An error occurred"
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Successfully added media %s."
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Хаах"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
+#: ../mdkapplet-config:95
 #, c-format
-msgid "An error occurred while adding medium"
+msgid "Restricted"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -557,113 +504,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Нууц үг:"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "Хэлбэр!"
+msgid "Forgotten password"
+msgstr "Нууц үг:"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
-#, fuzzy, c-format
-msgid "Congratulations"
-msgstr "Баяр хүргэе!"
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
+#, c-format
+msgid "Close"
+msgstr "Хаах"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:252
 #, c-format
-msgid "Reboot"
-msgstr "Дахин ачаал"
+msgid "Get Powerpack subscription!"
+msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
+msgid "Continue and Authenticate!"
 msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, c-format
 msgid "Mandriva Flash"
 msgstr ""
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, c-format
 msgid "Mandriva Free"
 msgstr ""
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, c-format
 msgid "Mandriva Mini"
 msgstr ""
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, c-format
 msgid "Mandriva One"
 msgstr ""
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr ""
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -715,6 +664,17 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "„update_source“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
 
+#, fuzzy
+#~ msgid "Installation failed"
+#~ msgstr "Хэлбэр!"
+
+#, fuzzy
+#~ msgid "Congratulations"
+#~ msgstr "Баяр хүргэе!"
+
+#~ msgid "Reboot"
+#~ msgstr "Дахин ачаал"
+
 #~ msgid "Yes"
 #~ msgstr "Тийм"
 
diff --git a/po/ms.po b/po/ms.po
index 20ad49f9..2151ee55 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-11-26 15:20+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -50,7 +50,7 @@ msgstr "Kemaskini baru terdapat untuk sistem anda"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -76,13 +76,13 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Keluaran tidak disokong (keluaran terlalu lama, atau keluaran pembangunan)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -93,42 +93,42 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr "dimatikan dalam ulanghidup."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Hidupkan"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Pasang kemaskini"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Periksa Kemaskini"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Tetapkan Rangkaian"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -136,420 +136,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Melaksanakan drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Berikut"
 
-#: ../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 "Batal"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Melaksanakan MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Memeriksa kemaskini baru...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem adalah terkini\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Pemeriksaan Rangkaian: seperti dimatikan\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hakcipta (C) %s Mandriva SA"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Lamanweb Dalam Talian"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Membaca konfigurasi\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Sentiasa lancar ketika permulaan"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Ralat"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Ralat telah berlaku"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Gagal apabila menambah media"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Salah katalaluan"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Salah katalaluan"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Ralat"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Ralat telah berlaku"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Tutup"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Gagal apabila menambah media"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -559,113 +506,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Nama mesin:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Salah katalaluan"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Salah katalaluan"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Ulangcuba"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Tahniah"
+msgid "Close"
+msgstr "Tutup"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Boot semula"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Nama mesin:"
 
-#: ../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 ""
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Gagal apabila menambah media"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -716,6 +665,21 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Instalasi gagal"
+
+#~ msgid "Retry"
+#~ msgstr "Ulangcuba"
+
+#~ msgid "Congratulations"
+#~ msgstr "Tahniah"
+
+#~ msgid "Reboot"
+#~ msgstr "Boot semula"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Gagal apabila menambah media"
+
 #~ msgid "Yes"
 #~ msgstr "Ya"
 
diff --git a/po/mt.po b/po/mt.po
index fd85cf74..5b62addb 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2004-10-02 06:19+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -78,13 +78,13 @@ msgstr "database urpmi imsakkar"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Verżjoni mhux sapportita (antika wisq, jew verżjoni ta' żvilupp)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -100,42 +100,42 @@ msgstr ""
 "\n"
 "Imbgħad, erġa’ startja %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Mixgħul"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installa aġġornamenti"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Iċċekkja għal aġġornamenti"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Ikkonfigura n-network"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -143,420 +143,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Qed jitħaddem drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Li jmiss"
 
-#: ../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 "Ikkanċella"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Qed jitħaddem MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Qed jiġu kalkulati aġġornamenti ġodda...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Is-sistema hija aġġornata\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Qed niċċekkja n-network... jidher li mitfi\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Sit online"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Twissija"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Dwar.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Ibgħat konfigurazzjoni"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Dejjem ħaddem mat-tlugħ"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Oħroġ"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Problema"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Inqalgħet problema"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Problema waqt iż-żieda ta' sors"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Password ħażina"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Password ħażina"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Problema"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Inqalgħet problema"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Agħlaq"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Problema waqt iż-żieda ta' sors"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -566,117 +513,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Isem tal-kompjuter:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Password ħażina"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Installazzjoni falliet"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Password ħażina"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Prosit"
+msgid "Close"
+msgstr "Agħlaq"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Irributja"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Isem tal-kompjuter:"
 
-#: ../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 ""
-"Id-databażi tal-pakketti huwa msakkar. Jekk jogħġbok agħlaq \n"
-"programmi oħra li qed jużaw id-databażi ta' pakketti (għandek xi\n"
-"kopja oħra ta' dan il-programm fuq desktop ieħor, jew qed tinstalla\n"
-"pakketti fl-istess ħin?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Problema waqt iż-żieda ta' sors"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -728,6 +673,29 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Installazzjoni falliet"
+
+#~ msgid "Congratulations"
+#~ msgstr "Prosit"
+
+#~ msgid "Reboot"
+#~ msgstr "Irributja"
+
+#~ 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 ""
+#~ "Id-databażi tal-pakketti huwa msakkar. Jekk jogħġbok agħlaq \n"
+#~ "programmi oħra li qed jużaw id-databażi ta' pakketti (għandek xi\n"
+#~ "kopja oħra ta' dan il-programm fuq desktop ieħor, jew qed tinstalla\n"
+#~ "pakketti fl-istess ħin?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Problema waqt iż-żieda ta' sors"
+
 #~ msgid "Yes"
 #~ msgstr "Iva"
 
diff --git a/po/nb.po b/po/nb.po
index aa968279..cba92ae8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \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-03 19:36+0100\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -60,7 +60,7 @@ msgstr "Det finnes nye oppdateringer for systemet ditt."
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "En ny versjon av Mandriva Linux er nå ute."
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Et ekstra pakkemedium er tilgjengelig for distribusjonen din."
@@ -86,13 +86,13 @@ msgstr "urpmi-databasen er låst."
 msgid "Release not supported (too old release, or development release)"
 msgstr "Utgaven din er ikke støtta (enten for gammel eller utviklingsutgave)."
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "Fant ingen medium. Du må legge til medium gjennom «Mediehåndtering»."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -108,42 +108,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 media"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringer"
 
-#: ../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 "Se etter oppdateringer"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Sett 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 "
@@ -153,74 +153,71 @@ msgstr ""
 "Grunnleggende vedlikehold for denne distribusjonen er ikke støtta. Siden du "
 "abonnerer på utvida vedlikehold, får du likevel oppdateringer fram til %s."
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starter 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 "En ny versjon av Mandriva Linux er nå ute."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Mer 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 "Vil du oppgradere 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 "Ikke spør igjen"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Last ned alle pakkene først"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Advarsel: Du trenger mye ledig diskplass)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Lagre pakkene 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 "
@@ -229,22 +226,22 @@ msgstr ""
 "Vedlikeholdet for dette Mandriva Linux-systemet har utløpt. Dette betyr at "
 "det ikke vil komme flere programvareoppdateringer."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "For å holde 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 skaffe utvidet vedlikehold."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -253,17 +250,23 @@ msgstr ""
 "Du bør enten skaffe utvidet vedlikehold, eller oppgradere til en nyere "
 "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 oppgradere til en nyere versjon av %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Distribusjonen er ikke lenger støtta"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Utvidet vedlikehold"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -272,7 +275,7 @@ msgstr ""
 "Kjøp en vedlikeholdsutvidelse for denne versjonen (%s) og la den kjøre fram "
 "til %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -281,17 +284,17 @@ msgstr ""
 "Denne oppgraderingen krever en nettverkstilkobling med høy båndbredde "
 "(kabel, XDSL) og kan ta flere timer å fullføre."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Beregnet nedlastingsdata: %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Du bør lukke alle andre program som kjører før du fortsetter."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -300,271 +303,215 @@ msgstr ""
 "Du bør koble den bærbare maskinen til strømuttaket, og om mulig bruke "
 "kabeltilkobling i stedet for trådløs."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Kjører MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Gransker nye oppdateringer …\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 ut til å være slått av\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 gir deg tilgang til vevtjenestene til Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Hjemmeside"
 
 #. -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 "Olav Dahlum <odahlum@gmail.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../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 "Mer 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 "Kjør 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 tilgjengelig"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr "Du benytter «%s» og har derfor tilgang til mer programvare."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Vil du legge til dette nye programvarelageret?"
 
-#: ../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 "Legger til nytt pakkemedium"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Her kan du sette opp oppdateringsprogrammet"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Oppdateringsfrekvens (timer)"
-
-#: ../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 "Se etter en ny utgave av «%s»"
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Se etter «%s»-medium som mangler"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Begrenset"
-
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:111
 #, 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-postadressen og passordet til kontoen din for å legge 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 "Mer informasjon om brukerkontoen 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 "Glemt 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-postfeltet kan ikke være tomt."
-
-#: ../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 oppsto en 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 ikke et nedlastingsabonnement for %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Feil under forsøk på å legge til medium"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Medium %s ble lagt til."
+
+#: ../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 "Medium %s ble lagt til."
 
-#: ../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 ikke et nedlastingsabonnement for %s."
+msgid "Here you can configure the updates applet"
+msgstr "Her kan du sette 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 (timer)"
 
-#: ../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 "Feil under forsøk på å legge til 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 distribusjonsliste:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Se etter en ny utgave av «%s»"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Utvidet vedlikehold"
+msgid "Check for missing \"%s\" media"
+msgstr "Se etter «%s»-medium som mangler"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Begrenset"
+
+#: ../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 distribusjonsliste:"
 
 #. -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 "
@@ -573,7 +520,7 @@ msgstr ""
 "Mandriva tilbyr tolv måneder med skrivebordsoppdateringer (fram til %s) og "
 "atten måneder med baseoppdateringer (fram til %s) for distribusjoner."
 
-#: ../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 "
@@ -582,7 +529,7 @@ msgstr ""
 "Utvidet vedlikehold er nå tilgjengelig for å få atten måneder med "
 "ytterligere oppdateringer (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 abonnere <b>med en gang</b> for å få utvidet vedlikehold:"
@@ -592,12 +539,12 @@ msgstr "Du kan abonnere <b>med en gang</b> for å få utvidet vedlikehold:"
 msgid "Lifetime policy"
 msgstr "Livstidspolitikk"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Nettbasert 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 "
@@ -606,108 +553,103 @@ msgstr ""
 "Vær vennlig å skrive inn ID-en for kontoen din når du har abonnert på nett, "
 "for å kunne legge til flere pakkebrønner."
 
-#: ../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 ikke utvidet vedlikeholdsabonnement slått på."
+msgid "More information on your user account"
+msgstr "Mer informasjon om brukerkontoen 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 ikke abonnementsnedlasting av PowerPack påslått."
+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 ikke nok ledig plass igjen på «%s» for en 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 "Glemt 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 finner installasjonslogger i «%s»"
+msgid "Password and email cannot be empty."
+msgstr "Passord- og e-postfeltet kan ikke være tomt."
 
-#: ../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 ikke utvidet vedlikeholdsabonnement slått på."
 
-#: ../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 nå 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å starte 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 "Nettbasert 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 andre programmer\n"
-"som bruker pakkedatabasen (har du en annen mediumshåndterer\n"
-"på et annet skrivebord, eller installeres pakker\n"
-"samtidig?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Feil under forsøk på å legge til medium"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../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 "Distribusjonsoppgradering"
@@ -757,3 +699,51 @@ msgstr "  --debug\t\t\t– logg hva som blir gjort.\n"
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Klarte ikke oppdatere pakker fra oppdateringsmedium.\n"
+
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Mandriva-kontoen din har ikke abonnementsnedlasting av PowerPack påslått."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Systemet ditt har ikke nok ledig plass igjen på «%s» for en oppgradering (%"
+#~ "d MB < %d MB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Feil ved installering"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Du finner installasjonslogger 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 nå fullført."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Du må starte 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 andre programmer\n"
+#~ "som bruker pakkedatabasen (har du en annen mediumshåndterer\n"
+#~ "på et annet skrivebord, eller installeres pakker\n"
+#~ "samtidig?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Feil under forsøk på å legge til medium"
diff --git a/po/nl.po b/po/nl.po
index 6f4a1ae0..8adeb4ec 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2008-12-10 23:10+0100\n"
 "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
 "Language-Team: Nederlands\n"
@@ -54,7 +54,7 @@ msgstr "Er zijn nieuwe herzieningen beschikbaar voor uw systeem"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Er is een nieuwe versie van Mandriva Linux uitgebracht"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Er is een extra pakketmedium beschikbaar voor uw distributie."
@@ -79,7 +79,7 @@ msgstr "urpmi-database gesloten"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Uitgave niet ondersteund (te oud, of een ontwikkelingsuitgave)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -87,7 +87,7 @@ msgstr ""
 "Geen medium gevonden. U dient er één of meer toe te voegen via ‘Software "
 "Mediabeheer’."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,42 +104,42 @@ msgstr ""
 "\n"
 "Daarna herstart u ‘%s’."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Er is een fout opgetreden bij het bijwerken van de media"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Herzieningen installeren"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Een extra pakketmedium toevoegen"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Herzieningen nagaan"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Netwerk configureren"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Het systeem bijwerken"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -147,120 +147,123 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect wordt gestart\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nieuwe versie van Mandriva Linux-distributie"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Er is een nieuwe versie van de Mandriva Linux-distributie uitgebracht."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Meer informatie over deze nieuwe versie"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Wilt u opwaarderen naar de distributie ‘%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 "Volgende keer niet meer vragen"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Volgende"
 
-#: ../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 "Annuleren"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Wilt u opwaarderen naar de distributie ‘%s’?"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -269,19 +272,19 @@ msgstr ""
 "Deze opwaardering vereist een netwerkverbinding met hoge bandbreedte (kabel, "
 "ADSL, …) en kan enkele uren in beslag nemen."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "De geschatte downloadgegevens zijn %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "U kunt het beste alle andere actieve toepassingen sluiten voordat u "
 "verdergaat."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -290,98 +293,96 @@ msgstr ""
 "U dient uw laptop op netstroom aan te sluiten en zo mogelijk een "
 "ethernetverbinding de voorkeur te geven boven wifi."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate wordt gestart\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Nieuwe herzieningen nagaan…\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systeem is bijgewerkt\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controle van het netwerk: lijkt uitgeschakeld te zijn\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 van Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online geeft toegang tot webdiensten van Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Webpagina"
 
 #. -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 ""
 "C. Verschuuren\n"
 "Reinout van Schouwen <reinout@gmail.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../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 "Meer informatie"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Media toevoegen"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Info…"
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Lezen instellingen\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Altijd starten bij systeemstart"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nieuw medium beschikbaar"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -390,188 +391,134 @@ msgstr ""
 "U gebruikt de distributie ‘%s’ en heeft daarom bevoorrechte toegang tot "
 "extrasoftware."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Wilt u dit extra softwaredepot installeren?"
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 "Toevoegen van extra pakketmedium…"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr ""
-
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr ""
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr ""
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-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 ""
 "Vul uw account-gebruikersnaam in om een extra pakketmedium toe te voegen"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Meer informatie over uw gebruikersaccount"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Uw e-mailadres"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Uw wachtwoord"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Wachtwoord vergeten"
-
-#: ../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 "Fout"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Wachtwoord en e-mailadres mogen niet leeg zijn."
-
-#: ../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 "Er is een fout opgetreden"
 
-#: ../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 "Uw Mandriva-account bevat geen %s-downloadabonnement."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Er is een fout opgetreden bij het toevoegen van het medium"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Media %s met succes toegevoegd"
+
+#: ../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 "Media %s met succes toegevoegd"
 
-#: ../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 "Uw Mandriva-account bevat geen %s-downloadabonnement."
+msgid "Here you can configure the updates applet"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Sluiten"
+msgid "Update frequency (hours)"
+msgstr ""
 
-#: ../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 "Er is een fout opgetreden bij het toevoegen van het medium"
+msgid "First check delay (minutes)"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Check for newer \"%s\" releases"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
+msgid "Check for missing \"%s\" media"
+msgstr ""
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr ""
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr ""
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -581,12 +528,12 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Computeromschrijving:"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, fuzzy, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
@@ -594,107 +541,103 @@ msgid ""
 msgstr ""
 "Vul uw account-gebruikersnaam in om een extra pakketmedium toe te voegen"
 
-#: ../mdkapplet-extended-maintenance-helper:192
-#, fuzzy, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "Uw Mandriva-account bevat geen %s-downloadabonnement."
-
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "Uw Mandriva-account bevat geen Powerpack-downloadabonnement."
+msgid "More information on your user account"
+msgstr "Meer informatie over uw gebruikersaccount"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
-"Uw computer heeft niet genoeg ruimte over in %s voor de opwaardering (%dMB < "
-"%dMB)"
+msgid "Your email"
+msgstr "Uw e-mailadres"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid "Installation failed"
-msgstr "Installatie mislukt"
+msgid "Your password"
+msgstr "Uw wachtwoord"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Installatielogboek is te vinden in ‘%s’"
+msgid "Forgotten password"
+msgstr "Wachtwoord vergeten"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Retry"
-msgstr "Opnieuw"
+msgid "Password and email cannot be empty."
+msgstr "Wachtwoord en e-mailadres mogen niet leeg zijn."
 
-#: ../mdkapplet-upgrade-helper:143
-#, c-format
-msgid "Congratulations"
-msgstr "Gefeliciteerd"
+#: ../mdkapplet-extended-maintenance-helper:192
+#, fuzzy, c-format
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Uw Mandriva-account bevat geen %s-downloadabonnement."
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Opwaardering naar Mandriva versie %s geslaagd."
+msgid "Close"
+msgstr "Sluiten"
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "You must restart your system."
-msgstr "U dient uw computer te herstarten."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "Reboot"
-msgstr "Herstarten"
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Computeromschrijving:"
+
+#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Pakketdatabank is vergrendeld. Sluit alstublieft andere programma's \n"
-"die met de pakketdatabank werken (loopt Software Mediabeheer\n"
-"al op een ander werkblad, of bent u op het moment al \n"
-"pakketten aan het installeren?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Toevoegen medium mislukt"
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online %s"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online %s"
 
-#: ../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 "Distributie-opwaardering"
@@ -746,6 +689,53 @@ msgstr "  --debug\t\t\t- in logboek bijhouden wat er gebeurt\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "Uw Mandriva-account bevat geen Powerpack-downloadabonnement."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Uw computer heeft niet genoeg ruimte over in %s voor de opwaardering (%"
+#~ "dMB < %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Installatie mislukt"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Installatielogboek is te vinden in ‘%s’"
+
+#~ msgid "Retry"
+#~ msgstr "Opnieuw"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gefeliciteerd"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Opwaardering naar Mandriva versie %s geslaagd."
+
+#~ msgid "You must restart your system."
+#~ msgstr "U dient uw computer te herstarten."
+
+#~ msgid "Reboot"
+#~ msgstr "Herstarten"
+
+#~ 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 ""
+#~ "Pakketdatabank is vergrendeld. Sluit alstublieft andere programma's \n"
+#~ "die met de pakketdatabank werken (loopt Software Mediabeheer\n"
+#~ "al op een ander werkblad, of bent u op het moment al \n"
+#~ "pakketten aan het installeren?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Toevoegen medium mislukt"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
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 ""
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 345e6bb0..f7ea6b05 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -5,7 +5,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: 2005-03-26 22:30+0530\n"
 "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
 "Language-Team: punlinux-i18n@lists.sourceforge.net\n"
@@ -50,7 +50,7 @@ msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਨਵੇਂ ਨਵੀਨੀ�
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -75,13 +75,13 @@ msgstr "urpmi ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ"
 msgid "Release not supported (too old release, or development release)"
 msgstr "ਜਾਰੀ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ (ਬਹੁਤ ਪੁਰਾਣਾ ਵਰਜਨ ਹੈ ਜਾਂ ਵਿਕਾਸ ਜਾਰੀ ਹੈ)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -98,42 +98,42 @@ msgstr ""
 "\n"
 "ਤਦ, %s ਮੁੜ ਚਲਾਓ।"
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "ਯੋਗ"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "ਨਵੀਨੀਕਰਨ ਇੰਸਟਾਲ"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "ਨਵੀਨੀਕਰਨ ਜਾਂਚ"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "ਨੈਟਵਰਕ ਸੰਰਚਨਾ"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -141,420 +141,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "ਅੱਗੇ"
 
-#: ../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 "ਰੱਦ ਕਰੋ"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "ਨਵੇਂ ਨਵੀਨੀਕਰਨ ਲਈ ਗਣਨਾ ਜਾਰੀ ਹੈ...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "ਸਿਸਟਮ ਨਵੀਨ ਹੈ।\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ਨੈਟਵਰਕ ਪੜਤਾਲ: ਆਯੋਗ ਜਾਪਦਾ ਹੈ\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "ਆਨਲਾਇਨ ਵੈੱਬਸਾਇਟ"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "ਇਸ ਬਾਰੇ..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "ਸੰਰਚਨਾ ਪੜੀ ਜਾ ਰਹੀ ਹੈ\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਹਮੇਸ਼ਾ ਚਾਲੂ ਕਰੋ"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "ਗਲਤੀ"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਫਲ"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "ਠੀਕ ਹੈ"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ:"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ:"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "ਗਲਤੀ"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "ਠੀਕ ਹੈ"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "ਬੰਦ ਕਰੋ"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਫਲ"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -564,117 +511,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ:"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ:"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "ਮੁਬਾਰਕ"
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "ਮੁੜ-ਚਾਲੂ"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
 
-#: ../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 ""
-"ਪੈਕੇਜ ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਪੈਕੇਜ ਡਾਟਾਬੇਸ ਨਾਲ ਕੰਮ ਕਰਦੇ\n"
-"ਹੋਰ ਕਾਰਜ ਬੰਦ ਕਰੋ (ਕੀ ਤੁਸੀਂ ਹੋਰ ਪੈਕੇਜ ਪ੍ਰਬੰਧਕ ਖੋਲਿਆ ਹੈ, ਜਾਂ ਤੁਸੀਂ\n"
-"ਇਸ ਸਮੇਂ ਕੋਈ ਹੋਰ ਪੈਕੇਜ ਵੀ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ\n"
-"ਕਰ ਰਹੋ ਹੋ?)।"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਫਲ"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -725,6 +670,29 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨੀਕਰਨ ਲਈ ਅਸਫਲ ਹੈ।\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ"
+
+#~ msgid "Congratulations"
+#~ msgstr "ਮੁਬਾਰਕ"
+
+#~ msgid "Reboot"
+#~ msgstr "ਮੁੜ-ਚਾਲੂ"
+
+#~ 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 ""
+#~ "ਪੈਕੇਜ ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਪੈਕੇਜ ਡਾਟਾਬੇਸ ਨਾਲ ਕੰਮ ਕਰਦੇ\n"
+#~ "ਹੋਰ ਕਾਰਜ ਬੰਦ ਕਰੋ (ਕੀ ਤੁਸੀਂ ਹੋਰ ਪੈਕੇਜ ਪ੍ਰਬੰਧਕ ਖੋਲਿਆ ਹੈ, ਜਾਂ ਤੁਸੀਂ\n"
+#~ "ਇਸ ਸਮੇਂ ਕੋਈ ਹੋਰ ਪੈਕੇਜ ਵੀ ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ\n"
+#~ "ਕਰ ਰਹੋ ਹੋ?)।"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਫਲ"
+
 #~ msgid "Yes"
 #~ msgstr "ਹਾਂ"
 
diff --git a/po/pl.po b/po/pl.po
index 3d33bfed..72baef6f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \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-17 15:02+0100\n"
 "Last-Translator: Marek Walczak <kubdat@poczta.fm>\n"
 "Language-Team:  <pl@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Dostępne są nowe aktualizacje dla Twojego systemu"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Udostępniono nową wersję dystrybucji Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Dodatkowy nośnik z pakietami jest dostępny dla Twojej dystrybucji."
@@ -85,14 +85,14 @@ msgstr "urpmi baza danych zablokowana"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nieobsługiwane wydanie (za stare, lub wydanie rozwojowe)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 "Nie odnaleziono nośnika. Dodaj nośnik w 'Menedżerze Nośników Oprogramowania'."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,42 +109,42 @@ msgstr ""
 "\n"
 "Następnie uruchom ponownie \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Błąd w trakcie aktualizowania nośnika"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Zainstaluj aktualizacje"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Dodaj dodatkowy nośnik z pakietami"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Sprawdź aktualizacje"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Skonfiguruj sieć"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Zaktualizuj system do nowej wersji"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -154,74 +154,71 @@ msgstr ""
 "Podstawowe wsparcie dla tej dystrybucji wygasło. Dziękujemy za Twój "
 "abonament rozszerzonego wsparcia, system będzie uaktualniany do dnia %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Uruchamianie programu drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nowa wersja dystrybucji Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Udostępniono nową wersję dystrybucji Mandriva Linux."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Więcej informacji na temat nowej wersji"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Czy chcesz zaktualizować system do wersji %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 "Nie pytaj mnie ponownie"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Pobierz wszystkie pakiety naraz"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Ostrzeżenie: Będziesz potrzebował sporo wolnego miejsca)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Gdzie można pobrać pakiety:"
 
-#: ../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 "Dalej"
 
-#: ../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 "Anuluj"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -230,22 +227,22 @@ msgstr ""
 "Wsparcie dla tej wersji Mandriva Linux wygasło. Aktualizacje dla tego "
 "systemu nie będą dostarczane."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Aby utrzymać system bezpiecznym, możesz:"
 
-#: ../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 "Powinieneś otrzymać rozszerzone wsparcie."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -254,24 +251,30 @@ msgstr ""
 "Powinieneś przedłużyć abonament rozszerzonego wsparcia lub dokonać "
 "aktualizacji do nowszej wersji %s dystrybucji."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Powinieneś zaktualizować system do nowszej wersji %s dystrybucji."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Twoja dystrybucja nie jest już wspierana"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Rozszerzone Wsparcie"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr "Wykup rozszerzone wsparcie dla tej wersji (%s) otrzymasz je do %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -280,19 +283,19 @@ msgstr ""
 "Aktualizacja wymaga łącza internetowego o wysokiej przepustowości (kablówka, "
 "xDSL, ...) i może potrwać kilka godzin."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Przewidywana ilość danych do pobrania to %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Przed kontynuowaniem instalacji zaleca się zamknięcie wszystkich "
 "uruchomionych programów."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -301,96 +304,94 @@ msgstr ""
 "Podłącz notebooka do zasilania oraz połącz się z internetem z wykorzystaniem "
 "połączenia kablowego zamiast bezprzewodowego, np. wifi."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Uruchamianie polecenia MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Przetwarzanie nowych aktualizacji...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System jest aktualny\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sprawdzanie sieci: wygląda na wyłączoną\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 (C) %s by Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online umożliwia korzystanie z usług sieciowych Mandrivy."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Witryna internetowa"
 
 #. -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 "Marek Walczak <kubdat@poczta.pl>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../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 "Więcej informacji"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Dodaj nośnik"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "O programie..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Konfiguracja aktualizacji"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Uruchamiaj przy starcie"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Udostępniono nowy nośnik"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -399,28 +400,79 @@ msgstr ""
 "Używasz dystrybucji %s i w związku z tym masz uprzywilejowany dostęp do "
 "dodatkowego oprogramowania."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Czy chcesz zainstalować dodatkowy nośnik z pakietami?"
 
-#: ../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 "Dodawanie dodatkowego nośnika z pakietami"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Wprowadź ID Twojego konta, aby dodać dodatkowy nośnik z pakietami"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Błąd"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Wystąpił błąd"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr ""
+"Na Twoim koncie w systemie Mandrivy nie ma informacji na temat subskrypcji %"
+"s'a."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Wystąpił błąd podczas dodawania nośnika"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Nośnik %s został dodany."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Nośnik %s został dodany."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -456,118 +508,13 @@ msgstr "Ograniczone"
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Wprowadź ID Twojego konta, aby dodać dodatkowy nośnik z pakietami"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Więcej informacji jest dostępna w panelu Twojego konta"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Twój e-mail"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Twoje hasło"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Zapomniałem hasła"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Błąd"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Pola hasła i adresu e-mail nie mogą być puste."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Wystąpił błąd"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Nośnik %s został dodany."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr ""
-"Na Twoim koncie w systemie Mandrivy nie ma informacji na temat subskrypcji %"
-"s'a."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Zamknij"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Wystąpił błąd podczas dodawania nośnika"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Nieudane pobranie listy dystrybucji:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Rozszerzone Wsparcie"
-
 #. -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 "
@@ -576,7 +523,7 @@ msgstr ""
 "Mandriva przez 12 miesięcy dostarcza aktualizacje (aż do %s) i 18 miesięcy "
 "aktualizuje bazę (aż do %s) dla dystrybucji."
 
-#: ../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 "
@@ -585,7 +532,7 @@ msgstr ""
 "Rozszerzone wsparcie jest dostępne, przez 18 miesięcy dostaniesz dodatkowe "
 "aktualizacje (aż do %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 "Subskrybuj <b>teraz</b> by otrzymać rozszerzone wsparcie:"
@@ -595,12 +542,12 @@ msgstr "Subskrybuj <b>teraz</b> by otrzymać rozszerzone wsparcie:"
 msgid "Lifetime policy"
 msgstr "Polityka czasu ważności"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Subskrypcja online"
 
-#: ../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 "
@@ -608,109 +555,104 @@ msgid ""
 msgstr ""
 "Wprowadź ID Twojego konta abonenta, aby dodać dodatkowy nośnik z pakietami"
 
-#: ../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 ""
-"Na Twoim koncie Mandrivy nie ma aktywnego abonamentu Rozszerzonego Wsparcia."
+msgid "More information on your user account"
+msgstr "Więcej informacji jest dostępna w panelu Twojego konta"
 
-#: ../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 ""
-"Na Twoim koncie w systemie Mandrivy nie ma informacji na temat subskrypcji "
-"PowerPack'a."
+msgid "Your email"
+msgstr "Twój e-mail"
 
-#: ../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 ""
-"Niewystarczająca ilość miejsca na %s do wykonania aktualizacji (%dMB < %dMB)"
+msgid "Your password"
+msgstr "Twoje hasło"
 
-#: ../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 "Instalacja zakończyła się niepowodzeniem"
+msgid "Forgotten password"
+msgstr "Zapomniałem hasła"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Informacje z instalacji znajdują się w '%s'"
+msgid "Password and email cannot be empty."
+msgstr "Pola hasła i adresu e-mail nie mogą być puste."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Spróbuj ponownie"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"Na Twoim koncie Mandrivy nie ma aktywnego abonamentu Rozszerzonego Wsparcia."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulacje"
+msgid "Close"
+msgstr "Zamknij"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Aktualizacja systemu do wersji Mandriva %s przebiegła pomyśłnie."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Uruchom komputer ponownie."
+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 "Uruchom ponownie"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Subskrypcja online"
 
-#: ../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 ""
-"Baza danych pakietów jest zablokowana. Zamknij inne\n"
-"aplikacje działające z bazą danych pakietów (czy masz może\n"
-"uruchomionego innego menedżera nośników lub też\n"
-"aktualnie instalowane są jakieś pakiety?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Niepowodzenie podczas dodawania nośnika"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../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 "Aktualizacja dystrybucji"
@@ -762,6 +704,55 @@ msgstr "  --debug\t\t\t- zapisuj wykonane operacje\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Na Twoim koncie w systemie Mandrivy nie ma informacji na temat "
+#~ "subskrypcji PowerPack'a."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Niewystarczająca ilość miejsca na %s do wykonania aktualizacji (%dMB < %"
+#~ "dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Instalacja zakończyła się niepowodzeniem"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Informacje z instalacji znajdują się w '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Spróbuj ponownie"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulacje"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Aktualizacja systemu do wersji Mandriva %s przebiegła pomyśłnie."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Uruchom komputer ponownie."
+
+#~ msgid "Reboot"
+#~ msgstr "Uruchom ponownie"
+
+#~ 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 ""
+#~ "Baza danych pakietów jest zablokowana. Zamknij inne\n"
+#~ "aplikacje działające z bazą danych pakietów (czy masz może\n"
+#~ "uruchomionego innego menedżera nośników lub też\n"
+#~ "aktualnie instalowane są jakieś pakiety?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Niepowodzenie podczas dodawania nośnika"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/pt.po b/po/pt.po
index 0f87f06f..99136c8f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \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-05-01 02:36+0100\n"
 "Last-Translator: Zé <mmodem00@gmal.com>\n"
 "Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
@@ -62,7 +62,7 @@ msgstr "Estão disponíveis novas actualizações para o seu sistema"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Foi lançada uma nova versão da distribuição Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Esta disponível uma média adicional para a sua distribuição."
@@ -88,7 +88,7 @@ msgstr "base de dados urpmi trancada"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Lançamento não suportado (demasiado antigo ou de desenvolvimento)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -96,7 +96,7 @@ msgstr ""
 "Nenhuma média encontrada. Precisa adicionar alguma média através do 'Gestor "
 "de Médias de Programas'."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -113,42 +113,42 @@ msgstr ""
 "\n"
 "Depois, reinicie  a \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Erro ao actualizar média"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizações"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Adicionar média de pacotes adicional"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar Actualizações"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar Rede"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Actualizar o sistema"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -158,74 +158,71 @@ msgstr ""
 "Expirou a  manutenção básica da sua distribuição. Obrigado pelasubscrição de "
 "extensão da manutenção, o seu sistema continuará actualizado até %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A lançar drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nova versão da distribuição Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Procurar"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Foi lançada uma nova versão da distribuição Mandriva Linux"
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Mais informação acerca desta nova versão"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Deseja actualizar para a distribuição '%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 "Não perguntar da próxima vez"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Transferir todos os pacotes de uma só vez"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Aviso: Irá precisar de bastante espaço livre em disco)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Para onde transferir os pacotes:"
 
-#: ../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 "Próximo"
 
-#: ../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 "Cancelar"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -234,22 +231,22 @@ msgstr ""
 "Terminou a manutenção desta versão Mandriva Linux. Não serão entregues mais "
 "actualizações para este sistema."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Para manter o seu sistema seguro, pode:"
 
-#: ../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 "Deve obter manutenção extendida."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -258,17 +255,23 @@ msgstr ""
 "Deve obter manutenção extendida ou actualizar para uma nova versão da "
 "distribuição %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Deve actualizar para uma nova versão da distribuição %s"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "A sua distribuição já não é suportada."
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Manutenção Extendida"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -277,7 +280,7 @@ msgstr ""
 "Compre uma extensão da manutenção para esta versão(%s) e mantenha-a a correr "
 "até %s:"
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -286,17 +289,17 @@ msgstr ""
 "Esta actualização requer uma conexão com grande largura de banda (cabo, "
 "xDSL, ...) e pode levar algumas horas até terminar."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "A estimativa da transferência de dados, será até %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Deve fechar todas as outras aplicações antes de continuar."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -305,96 +308,94 @@ msgstr ""
 "Deve ligar o seu portátil à corrente eléctrica para favorecer a conexão "
 "ethernet em vez da conexão sem-fio, se disponível."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "A iniciar o  MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "A calcular novas actualizações...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificação da Rede: parece desactivada\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Em-linha %s"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Direitos de Autor (C) %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "A Mandriva Em-linha dá acesso aos serviços web Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Sítio Web Em-linha"
 
 #. -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 "Zé <ze@mandriva.org>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../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 "Mais informação"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Adicionar média"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Acerca..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuração das Actualizações"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executar sempre no arranque"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nova média disponível"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -403,176 +404,122 @@ msgstr ""
 "Usa a distribuição '%s', como tal tem acesso privilegiado a programas "
 "adicionais."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Deseja instalar este repositório de programas adicional?"
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr "Servidor Mandriva Enterprise"
 
-#: ../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 "A adicionar uma média de pacotes adicionais"
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Aqui pode configurar o mini-aplicativo de actualizações"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Frequência de actualização (horas)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Atraso da primeira verificação (minutos)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Verificar novos lançamentos \"%s\""
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Verificar médias \"%s\" em falta"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Restricted"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
+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 ""
 "Por favor indique o ID da sua conta para adicionar médias de pacotes "
 "adicionais"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Mais informação na sua conta de utilizador"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "O seu endereço electrónico"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "A sua senha"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Senha esquecida"
-
-#: ../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 "Erro"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "O campo da senha e do endereço electrónico não podem estar vazios."
-
-#: ../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 "Ocorreu um erro"
 
-#: ../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 ""
+"A sua conta Mandriva não tem uma subscrição de transferência %s activada."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Ocorreu um erro ao adicionar a média"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Média adicionada com sucesso %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 "Média adicionada com sucesso %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 ""
-"A sua conta Mandriva não tem uma subscrição de transferência %s activada."
+msgid "Here you can configure the updates applet"
+msgstr "Aqui pode configurar o mini-aplicativo de actualizações"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Fechar"
+msgid "Update frequency (hours)"
+msgstr "Frequência de actualização (horas)"
 
-#: ../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 "Ocorreu um erro ao adicionar a média"
+msgid "First check delay (minutes)"
+msgstr "Atraso da primeira verificação (minutos)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Falha ao obter lista da distribuição:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Verificar novos lançamentos \"%s\""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Manutenção Extendida"
+msgid "Check for missing \"%s\" media"
+msgstr "Verificar médias \"%s\" em falta"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Restricted"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Enterprise"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Falha ao obter lista da distribuição:"
 
 #. -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 "
@@ -581,7 +528,7 @@ msgstr ""
 "A Mandriva dá 12 meses de actualizações de ecrã (até %s) e 18 meses de "
 "actualizações base (até %s) para distribuições."
 
-#: ../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 "
@@ -590,7 +537,7 @@ msgstr ""
 "A manutenção extendida está agora disponível para obter 18 meses de "
 "actualizações adicionais (até%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 "Pode subscrever <b>agora</b> para obter manutenção extendida:"
@@ -600,12 +547,12 @@ msgstr "Pode subscrever <b>agora</b> para obter manutenção extendida:"
 msgid "Lifetime policy"
 msgstr "Politica vitalícia"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Subscrição em-linha"
 
-#: ../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 "
@@ -614,109 +561,104 @@ msgstr ""
 "Por favor indique no ID da sua conta para adicionar média de pacotes "
 "adicionais assim que se tenha subscrito em-linha"
 
-#: ../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 ""
-"A sua conta Mandriva não tem uma subscrição de Manutenção Extendida activada."
+msgid "More information on your user account"
+msgstr "Mais informação na sua conta de utilizador"
 
-#: ../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 ""
-"A sua conta Mandriva não tem uma subscrição de transferência Powerpack "
-"activada."
+msgid "Your email"
+msgstr "O seu endereço electrónico"
 
-#: ../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 ""
-"O seu sistema não tem espaço suficiente em %s para actualizar (%dMB < %dMB)"
+msgid "Your password"
+msgstr "A sua senha"
 
-#: ../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 "Instalação falhada"
+msgid "Forgotten password"
+msgstr "Senha esquecida"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Os registos da instalação podem ser encontrados em '%s'"
+msgid "Password and email cannot be empty."
+msgstr "O campo da senha e do endereço electrónico não podem estar vazios."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Tentar novamente"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"A sua conta Mandriva não tem uma subscrição de Manutenção Extendida activada."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Parabéns"
+msgid "Close"
+msgstr "Fechar"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Actualização para o lançamento Mandriva %s terminada."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Tem que reiniciar o seu sistema."
+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 "Reiniciar"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Subscrição em-linha"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"A base de dados dos pacotes está trancada. Por favor feche\n"
-"as outras aplicações que estejam em execução com a base\n"
-"de dados dos pacotes (tem outro gestor de médias noutro\n"
-"ecrã, ou está actualmente também a instalar pacotes?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Falha ao adicionar média"
+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 "Actualização da Distribuição"
@@ -768,6 +710,55 @@ msgstr "  --debug\t\t\t- registar o que é feito\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Não é possível actualizar os pacotes da média update_source.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "A sua conta Mandriva não tem uma subscrição de transferência Powerpack "
+#~ "activada."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "O seu sistema não tem espaço suficiente em %s para actualizar (%dMB < %"
+#~ "dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Instalação falhada"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Os registos da instalação podem ser encontrados em '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Tentar novamente"
+
+#~ msgid "Congratulations"
+#~ msgstr "Parabéns"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Actualização para o lançamento Mandriva %s terminada."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Tem que reiniciar o seu sistema."
+
+#~ msgid "Reboot"
+#~ msgstr "Reiniciar"
+
+#~ 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 ""
+#~ "A base de dados dos pacotes está trancada. Por favor feche\n"
+#~ "as outras aplicações que estejam em execução com a base\n"
+#~ "de dados dos pacotes (tem outro gestor de médias noutro\n"
+#~ "ecrã, ou está actualmente também a instalar pacotes?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Falha ao adicionar média"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 34bf3592..1371bc98 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \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-03 15:52-0200\n"
 "Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
 "Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
@@ -57,7 +57,7 @@ msgstr "Atualizações disponíveis para o seu sistema"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Foi lançada uma nova versão da distribuição Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -83,7 +83,7 @@ msgstr "Base de Dados do urpmi trancada"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versão não suportada (versão muito antiga ou de desenvolvimento)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -91,7 +91,7 @@ msgstr ""
 "Nenhuma mídia encontrada. Adicione mídias pelo 'Configurar Mídias para "
 "Atualização e Instalação de Novos Programas'."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -108,42 +108,42 @@ msgstr ""
 "\n"
 "Depois, reinicie o \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Erro ao Atualizar Mídia"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalar Atualizações"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Adicionar mídia com programas adicionais"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar Atualizações"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar Rede"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Atualizar o Sistema"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -154,74 +154,71 @@ msgstr ""
 "assinatura para obter manutenção estendida, seu sistema será mantido "
 "atualizado até %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lançando o Drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nova versão da Distribuição Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Navegar"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Foi lançada uma nova versão do Mandriva Linux."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Mais Informações sobre esta nova Versão"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Você deseja atualizar para a distribuição '%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 "Não perguntar na próxima vez"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Baixar todos os programas de uma vez"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Aviso: Você vai precisar de bastante espaço livre em disco)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Para onde baixar os pacotes:"
 
-#: ../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 "Próximo"
 
-#: ../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 "Cancelar"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -230,22 +227,22 @@ msgstr ""
 "A manutenção deste sistema Mandriva Linux chegou ao seu final. Isto "
 "significa que você não receberá mais atualizações de programas."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "A fim de manter seu sistema seguro, você pode:"
 
-#: ../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 "Você deveria obter manutenção estendida."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -254,17 +251,23 @@ msgstr ""
 "Você deveria ou adquirir a manutenção estendida ou atualizar para uma versão "
 "mais nova da distribuição %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Você deveria atualizar para uma versão mais nova da distribuição %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "A sua distribuição não é mais suportada"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Manutenção Estendida"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -273,7 +276,7 @@ msgstr ""
 "Compre a manutenção estendida para esta versão (%s) e mantenha-a rodando até "
 "%s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -282,17 +285,17 @@ msgstr ""
 "Esta atualização requer uma conexão de banda larga (Cabo, xDSL,...) e pode "
 "levar horas para completar."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Aproximadamente %s de dados será baixado"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Você deve fechar todos os outros programas antes de continuar."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -301,48 +304,48 @@ msgstr ""
 "Sugerimos que você conecte o cabo de força do seu notebook e selecione uma "
 "conexão por cabo ao invés de rede sem fio"
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Lançando o MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Computando novas atualizações...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está atualizado\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Analisando Rede: Parece desativada\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 (C) %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online da Acesso para Serviços Web Mandriva"
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite Online"
 
 #. -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 ""
@@ -352,50 +355,48 @@ msgstr ""
 "com>,Felipe Arruda <felipemiguel@gmail.com>,Sergio Rafael Lemke "
 "<sergio@mandriva.com.br>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../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 "Mais Informações"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Adicionar Mídia"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Sobre.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configurar Atualizações"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Iniciar com o sistema"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nova Mídia Disponível"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -404,28 +405,77 @@ msgstr ""
 "Você usa a distribuição '%s' e com isso tem acesso privilegiado a programas "
 "extras."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Você deseja adicionar esta mídia com programas extras ?"
 
-#: ../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 "Adicionando a mídia com programas extras"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Por favor, forneça a ID da sua conta para adicionarmos esta nova Mídia"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Erro"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Ocorreu um Erro"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "Sua conta Mandriva não possui assinatura para download %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Ocorreu um Erro ao Adicionar Mídia"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Mídia %s Adicionada com Sucesso."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Mídia %s Adicionada com Sucesso."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "Ok"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -461,116 +511,13 @@ msgstr "Restrita"
 msgid "Enterprise"
 msgstr "Empresa"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Por favor, forneça a ID da sua conta para adicionarmos esta nova Mídia"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Mais Informações sobre sua Conta de Usuário"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Seu E-Mail"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Sua Senha"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Esqueci Minha Senha :("
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "E-Mail e senha não podem ser vazios."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu um Erro"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Mídia %s Adicionada com Sucesso."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Sua conta Mandriva não possui assinatura para download %s."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Fechar"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Ocorreu um Erro ao Adicionar Mídia"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Falha ao obter a lista de distribuições:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Manutenção Estendida"
-
 #. -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 "
@@ -580,7 +527,7 @@ msgstr ""
 "e 18 meses de atualizações de sistema base (até o %s) para suas "
 "distribuições."
 
-#: ../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 "
@@ -589,7 +536,7 @@ msgstr ""
 "Manutenção Estendida está disponível para obter 18 meses extras de "
 "atualizações (até %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 "Você pode assinar <b>agora</b> para obter manutenção estendida:"
@@ -599,12 +546,12 @@ msgstr "Você pode assinar <b>agora</b> para obter manutenção estendida:"
 msgid "Lifetime policy"
 msgstr "Política de Suporte"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Assinatura Online"
 
-#: ../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 "
@@ -613,109 +560,105 @@ msgstr ""
 "Por favor, forneça a ID de sua conta para assim que você fizer a inscrição "
 "online adicionarmos uma mídia de programas extra."
 
-#: ../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 ""
-"Sua conta Mandriva não possui assinatura para Manutenção Estendida "
-"habilitada."
+msgid "More information on your user account"
+msgstr "Mais Informações sobre sua Conta de Usuário"
 
-#: ../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 "Sua conta Mandriva não possui assinatura para download PowerPack."
+msgid "Your email"
+msgstr "Seu E-Mail"
 
-#: ../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 ""
-"O seu Sistema não possui espaço suficiente em %s para a atualização (%dMB < %"
-"dMB)"
+msgid "Your password"
+msgstr "Sua Senha"
 
-#: ../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 "Instalação Falhou"
+msgid "Forgotten password"
+msgstr "Esqueci Minha Senha :("
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Os logs de instalação poderão ser encontrados em '%s'"
+msgid "Password and email cannot be empty."
+msgstr "E-Mail e senha não podem ser vazios."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Tentar Novamente"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"Sua conta Mandriva não possui assinatura para Manutenção Estendida "
+"habilitada."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Parabéns"
+msgid "Close"
+msgstr "Fechar"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Atualização para o Mandriva %s finalizada com sucesso :)"
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Você deve Reiniciar o Sistema."
+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 "Reiniciar"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Assinatura Online"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"A base de dados de programas está trancada. Feche os\n"
-"programas que podem estar usando esta base\n"
-"(Gerenciador em outra área de trabalho ou caso\n"
-" esteja instalando algum programa)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Falha Enquanto Adicionava Mídia"
+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 "Atualização da Distribuição"
@@ -767,6 +710,53 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Não foi possível atualizar os programas da mídia update_source.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "Sua conta Mandriva não possui assinatura para download PowerPack."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "O seu Sistema não possui espaço suficiente em %s para a atualização (%dMB "
+#~ "< %dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Instalação Falhou"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Os logs de instalação poderão ser encontrados em '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Tentar Novamente"
+
+#~ msgid "Congratulations"
+#~ msgstr "Parabéns"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Atualização para o Mandriva %s finalizada com sucesso :)"
+
+#~ msgid "You must restart your system."
+#~ msgstr "Você deve Reiniciar o Sistema."
+
+#~ msgid "Reboot"
+#~ msgstr "Reiniciar"
+
+#~ 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 ""
+#~ "A base de dados de programas está trancada. Feche os\n"
+#~ "programas que podem estar usando esta base\n"
+#~ "(Gerenciador em outra área de trabalho ou caso\n"
+#~ " esteja instalando algum programa)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Falha Enquanto Adicionava Mídia"
+
+#~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
diff --git a/po/ro.po b/po/ro.po
index cbfdce75..4687f710 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ro\n"
 "Report-Msgid-Bugs-To: https://qa.mandriva.com\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-21 14:20+0100\n"
 "Last-Translator: Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian <cooker-i18n@mandrivalinux.org>\n"
@@ -93,7 +93,7 @@ msgstr "Noi actualizări vă sînt disponibile pentru sistem"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "O nouă versiune a distribuției Mandriva Linux a fost lansată"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -120,7 +120,7 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Versiunea nu este suportată (este prea veche sau este versiune de dezvoltare)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -128,7 +128,7 @@ msgstr ""
 "Nu s-au găsit medii. Trebuiesc adăugate medii prin „Gestionarul de medii de "
 "programe”. "
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -145,42 +145,42 @@ msgstr ""
 "\n"
 "Apoi reporniți \"%s\"."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Activat"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Eroare la actualizarea mediului"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instalare actualizări pentru sistem"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Adaugă mediu de pachete adițional"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Verificare actualizări"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Configurare rețea"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Actualizare majoră a sistemului"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -191,74 +191,71 @@ msgstr ""
 "abonamentului vostru la mentenanța extinsă, sistemul va continua să fie "
 "actualizat pînă-n data de %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Se lansează drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Versiune nouă a distribuției Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Navigare"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "O nouă versiune a distribuției Mandriva Linux a fost lansată."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Informații suplimentare despre această nouă versiune"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Doriți să avansați la distribuția „%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 "Nu se cere confirmare data viitoare"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Descarcă toate pachetele odată"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Avertisment: Veți avea nevoie de destul spațiu liber)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Unde se descarcă pachetele:"
 
-#: ../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 "Înainte"
 
-#: ../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 "Anulează"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -267,22 +264,22 @@ msgstr ""
 "Mentenanța acestei versiuni de Mandriva Linux s-a sfîrșit. Nu se vor mai "
 "produce actualizări pentru acest sistem."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Pentru a vă păstra sistemul securizat, puteți:"
 
-#: ../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 "Ar trebui să obțineți mentenanță extinsă."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -291,17 +288,23 @@ msgstr ""
 "Ar trebui să obțineți o mentenanță extinsă sau să avansați la o versiune "
 "recentă a distribuției %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Ar trebui să avansați la o versiune recentă a distribuției %s. "
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Distribuția voastră nu mai este suportată"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Mentenanță extinsă"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -310,7 +313,7 @@ msgstr ""
 "Cumpărați o mentenanță extinsă pentru această versiune (%s) și o conservați "
 "pînă în %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -319,18 +322,18 @@ msgstr ""
 "Această actualizare majoră necesită o conexiune la rețea rapidă (cablu, "
 "xDSL, ...) și poate dura cîteva ore."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Estimarea datelor de descărcat este de %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Ar trebui să închideți toate aplicațiile lansate înainte de a continua."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -339,48 +342,48 @@ msgstr ""
 "Ar trebui să vă conectați portabilul la încărcător și să optați pentru o "
 "conexiune Ethernet în loc de WiFi."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Se lansează MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Se calculează actualizările...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemul este la zi cu actualizările\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificare rețea: se pare că este dezactivată\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 "Drepturi de autor (C) %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online permite accesul la serviciile web Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Sit online"
 
 #. -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 ""
@@ -393,50 +396,48 @@ msgstr ""
 "Cosmin HUMENIUC <cosmin@mandrivausers.ro>, 2008\n"
 "Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>, 2008, 2009\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../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 "Informații suplimentare"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Adaugă mediu"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Despre..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configurare actualizări"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lansează întotdeauna la pornire"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Terminare"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Nou mediu disponibil"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -445,176 +446,122 @@ msgstr ""
 "Aveți distribuția '%s' și de aceea aveți un acces privilegiat la programe "
 "adiționale."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Doriți să instalați acest depozit de programe adiționale?"
 
-#: ../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 "Se adaugă un mediu de pachete adițional"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Aici puteți configura mini-aplicația de actualizări"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Frecvența actualizărilor (ore)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Perioadă pînă la prima verificare (minute)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Verificați dacă este disponibilă o nouă versiune de „%s”"
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Verificați dacă mediile „%s” sînt absente"
-
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Restricted"
-msgstr "Restrticționat"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Antrepriză"
+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 ""
 "Introduceți-vă identificatorul contului pentru a adăuga un mediu de pachete "
 "adițional"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Informații suplimentare despre contul vostru de utilizator"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Adresa voastră electroniă"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Parola voastră"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Parolă uitată"
-
-#: ../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 "Eroare"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Parola și adresa electronică nu pot fi goale."
-
-#: ../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 "S-a produs o eroare"
 
-#: ../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 ""
+"Contul vostru Mandriva nu are activat opțiunea de descărcare a versiunii %s"
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "S-a produs o eroare la adăugarea mediului"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "S-a adăugat cu succes mediul %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 "S-a adăugat cu succes mediul %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 ""
-"Contul vostru Mandriva nu are activat opțiunea de descărcare a versiunii %s"
+msgid "Here you can configure the updates applet"
+msgstr "Aici puteți configura mini-aplicația de actualizări"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Închide"
+msgid "Update frequency (hours)"
+msgstr "Frecvența actualizărilor (ore)"
 
-#: ../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 "S-a produs o eroare la adăugarea mediului"
+msgid "First check delay (minutes)"
+msgstr "Perioadă pînă la prima verificare (minute)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Eroare la preloarea listei de distribuții:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Verificați dacă este disponibilă o nouă versiune de „%s”"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Mentenanță extinsă"
+msgid "Check for missing \"%s\" media"
+msgstr "Verificați dacă mediile „%s” sînt absente"
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Restrticționat"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Antrepriză"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Eroare la preloarea listei de distribuții:"
 
 #. -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 "
@@ -623,7 +570,7 @@ msgstr ""
 "Mandriva furnizează 12 luni de actualizări pentru birou (pînă în %s) și 18 "
 "luni de actualizări de bază (pînă în %s) pentru distribuții."
 
-#: ../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 "
@@ -632,7 +579,7 @@ msgstr ""
 "Mentenanța extinsă este acum disponibilă pentru a dispune de 18 luni "
 "suplimentare de actualizări (pînă în %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 "Vă puteți abona <b>chiar acum</b> pentru a obține mentenanță extinsă:"
@@ -642,12 +589,12 @@ msgstr "Vă puteți abona <b>chiar acum</b> pentru a obține mentenanță extins
 msgid "Lifetime policy"
 msgstr "Politică de durată de viață"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Abonare online"
 
-#: ../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 "
@@ -656,109 +603,103 @@ msgstr ""
 "Introduceți identificatorul contului vostru pentru a adăuga un mediu de "
 "pachete adițional odată ce v-ați abonat online"
 
-#: ../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 "Contul vostru Mandriva nu are activat opțiunea de mentenanță extinsă."
+msgid "More information on your user account"
+msgstr "Informații suplimentare despre contul vostru de utilizator"
 
-#: ../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 ""
-"Contul vostru Mandriva nu are activat opțiunea de descărcare a versiunii "
-"Powerpack"
+msgid "Your email"
+msgstr "Adresa voastră electroniă"
 
-#: ../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 ""
-"Sistemul nu vă dispune de spațiu suficient pe %s pentru o actualizare majoră "
-"(%dMo < %dMo)"
+msgid "Your password"
+msgstr "Parola voastră"
 
-#: ../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 "Instalare eșuată"
+msgid "Forgotten password"
+msgstr "Parolă uitată"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Jurnalele de instalare pot fi găsite în „%s”"
+msgid "Password and email cannot be empty."
+msgstr "Parola și adresa electronică nu pot fi goale."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Reîncercare"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Contul vostru Mandriva nu are activat opțiunea de mentenanță extinsă."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Felicitări"
+msgid "Close"
+msgstr "Închide"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Avansarea la versiunea Mandriva %s s-a încheiat cu succes."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Trebuie să reporniți sistemul."
+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 "Redemarează"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Abonare online"
 
-#: ../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 ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Baza de date cu pachete este blocată. Închideți celelalte\n"
-"aplicații care lucrează cu baza de date (aveți alt gestionar de\n"
-"pachete pe alt birou, sau instalați alte pachete în același\n"
-"timp?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Adăugare de mediu eșuată"
+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 "Actualizare majoră de distribuție"
@@ -810,6 +751,55 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nu se pot actualiza pachetele de pe mediul update_source.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Contul vostru Mandriva nu are activat opțiunea de descărcare a versiunii "
+#~ "Powerpack"
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Sistemul nu vă dispune de spațiu suficient pe %s pentru o actualizare "
+#~ "majoră (%dMo < %dMo)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Instalare eșuată"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Jurnalele de instalare pot fi găsite în „%s”"
+
+#~ msgid "Retry"
+#~ msgstr "Reîncercare"
+
+#~ msgid "Congratulations"
+#~ msgstr "Felicitări"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Avansarea la versiunea Mandriva %s s-a încheiat cu succes."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Trebuie să reporniți sistemul."
+
+#~ msgid "Reboot"
+#~ msgstr "Redemarează"
+
+#~ 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 ""
+#~ "Baza de date cu pachete este blocată. Închideți celelalte\n"
+#~ "aplicații care lucrează cu baza de date (aveți alt gestionar de\n"
+#~ "pachete pe alt birou, sau instalați alte pachete în același\n"
+#~ "timp?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Adăugare de mediu eșuată"
+
+#~ msgid ""
 #~ "This Mandriva Linux system maintenance has ended. It means it will not "
 #~ "receive any new software update."
 #~ msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 811ec0e8..5e4915ac 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2009-10-20 08:31+0500\n"
 "Last-Translator: akdengi <kazancas@mandriva.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -62,7 +62,7 @@ msgstr "Для системы доступны новые обновления"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Выпущена новая версия дистрибутива Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Для данного дистрибутива доступен дополнительный источник пакетов."
@@ -87,7 +87,7 @@ msgstr "База данных urpmi заблокирована"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версия не поддерживается (слишком старый или разрабатываемый релиз)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -95,7 +95,7 @@ msgstr ""
 "Источник не найден. Нужно добавить хотя бы один источник с помощью менеджера "
 "источников программ."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -111,42 +111,42 @@ msgstr ""
 "\n"
 "А затем перезапустите «%s»."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Включён"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Не удалось обновить источник"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Установить обновления"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Добавить дополнительный источник пакетов"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Проверить обновления"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Настроить сеть"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Обновление системы"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -156,75 +156,72 @@ msgstr ""
 "Базовая поддержка для этого дистрибутива завершена. Подписавшись на "
 "расширенную поддержку вы сможете получать обновления до %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запуск drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Новая версия дистрибутива Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Обзор"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Выпущена новая версия дистрибутива Mandriva Linux."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Подробная информация об этой новой версии"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Выполнить обновление до версии «%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 "Не спрашивать в следующий раз"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Скачать все пакеты одновременно"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 "(Предупреждение: Вам потребуется достаточно много свободного места на диске)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Куда скачиваются пакеты:"
 
-#: ../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 "Далее"
 
-#: ../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 "Отмена"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -233,23 +230,23 @@ msgstr ""
 "Поддержка этого дистрибутива завершена. Для него больше не будет выпускаться "
 "никаких обновлений."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 "Для того чтобы продолжать держать вашу систему в безопасности, вы должны:"
 
-#: ../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 "Вы должны заказать расширенную поддержку."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -258,17 +255,23 @@ msgstr ""
 "Вы должны или заказать расширеную поддержку или обновиться до более новой "
 "версии дистрибутива  %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Вы должны обновиться до новой версии дистрибутива: %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ваш дистрибутив больше не поддерживается."
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Расширенная поддержка"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -277,7 +280,7 @@ msgstr ""
 "Купите расширенную поддержку для этой версии (%s) и продолжайте ее "
 "использовать до %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -286,17 +289,17 @@ msgstr ""
 "Для данного обновления требуется высокоскоростное подключение к Интернету "
 "(кабельное, xDSL и т.п.), и это может занять продолжительное время."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Вычисленный объем данных для загрузки: %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Сначала необходимо закрыть все запущенные приложения."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -305,98 +308,96 @@ msgstr ""
 "Ноутбук следует подключить к источнику постоянного тока и по возможности "
 "использовать проводное подключение вместо беспроводного."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Запуск Mandriva Update\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Определяются новые обновления...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система не нуждается в обновлении\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка сети: похоже отключена\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 (C) %s Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online предоставляет доступ к веб-службам Mandriva."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Открыть веб-сайт"
 
 #. -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 ""
 "Павел Марьянов <acid_jack@ukr.net>\n"
 "Александр Казанцев <kazancas@mandriva.ru>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../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 "Дополнительные сведения"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Добавление источника"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "О программе..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Настройка обновлений"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Всегда запускать при старте"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Выход"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Доступен новый источник"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -405,175 +406,121 @@ msgstr ""
 "Вы используете дистрибутив «%s», поэтому у вас есть доступ к дополнительным "
 "программам."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Установить этот дополнительный источник пакетов?"
 
-#: ../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 "Добавление дополнительного источника пакетов"
 
-#: ../mdkapplet-config:69
-#, c-format
-msgid "Here you can configure the updates applet"
-msgstr "Настройка аплета обновлений"
-
-#: ../mdkapplet-config:71
-#, c-format
-msgid "Update frequency (hours)"
-msgstr "Частота обновлений (часы)"
-
-#: ../mdkapplet-config:80
-#, c-format
-msgid "First check delay (minutes)"
-msgstr "Задержка перед первой проверкой (минуты)"
-
-#: ../mdkapplet-config:89
-#, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr "Проверить на наличие нового релиза \"%s\""
-
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Проверить на наличие пропущенных источников \"%s\""
-
-#: ../mdkapplet-config:95
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Restricted"
-msgstr "Ограниченные"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
+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 ""
 "Для добавления дополнительного источника пакетов ведите логин своей учётной "
 "записи"
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Дополнительные сведения об учётной записи"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Адрес электронной почты"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Пароль"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Забыли пароль?"
-
-#: ../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 "Ошибка"
 
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Введите пароль и адрес электронной почты"
-
-#: ../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 "Возникла ошибка"
 
-#: ../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 не включена подписка на загрузку %s."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "При добавлении источника возникла ошибка"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Источник «%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 "Источник «%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 "ОК"
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Для вашей учётной записи Mandriva не включена подписка на загрузку %s."
+msgid "Here you can configure the updates applet"
+msgstr "Настройка аплета обновлений"
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Close"
-msgstr "Закрыть"
+msgid "Update frequency (hours)"
+msgstr "Частота обновлений (часы)"
 
-#: ../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 "При добавлении источника возникла ошибка"
+msgid "First check delay (minutes)"
+msgstr "Задержка перед первой проверкой (минуты)"
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Сбой при получении списка дистрибутивов:"
+msgid "Check for newer \"%s\" releases"
+msgstr "Проверить на наличие нового релиза \"%s\""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Расширенная поддержка"
+msgid "Check for missing \"%s\" media"
+msgstr "Проверить на наличие пропущенных источников \"%s\""
+
+#: ../mdkapplet-config:95
+#, c-format
+msgid "Restricted"
+msgstr "Ограниченные"
+
+#: ../mdkapplet-config:101
+#, c-format
+msgid "Enterprise"
+msgstr "Enterprise"
+
+#: ../mdkapplet-extended-maintenance-helper:86
+#, c-format
+msgid "Failure while retrieving distributions list:"
+msgstr "Сбой при получении списка дистрибутивов:"
 
 #. -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 "
@@ -582,7 +529,7 @@ msgstr ""
 "Mandriva предоставляет для вашего дистрибутива 12 месяцев обновлений ПО (до %"
 "s) и 18 месяцев базовых обновлений (до %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 "
@@ -590,7 +537,7 @@ msgid ""
 msgstr ""
 "Расширенная поддержка дает вам дополнительно 18 месяцев обновлений (до %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 "Вы можете подписаться на расширенную поддержку <b>прямо сейчас</b>:"
@@ -600,12 +547,12 @@ msgstr "Вы можете подписаться на расширенную п�
 msgid "Lifetime policy"
 msgstr "Политика обновлений ПО"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Онлайн подписка"
 
-#: ../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 "
@@ -614,110 +561,105 @@ msgstr ""
 "Для добавления дополнительного источника пакетов при онлайн подписке введите "
 "ID своей учётной записи"
 
-#: ../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 не включена подписка на Расширенную "
-"поддержку."
+msgid "More information on your user account"
+msgstr "Дополнительные сведения об учётной записи"
 
-#: ../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 не включена подписка на загрузку Powerpack."
+msgid "Your email"
+msgstr "Адрес электронной почты"
 
-#: ../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 ""
-"В системе осталось недостаточно свободного места на %s для обновления (%d МБ "
-"< %d МБ)"
+msgid "Your password"
+msgstr "Пароль"
 
-#: ../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 "Ошибка установки"
+msgid "Forgotten password"
+msgstr "Забыли пароль?"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Не удаётся найти журнал установки «%s»"
+msgid "Password and email cannot be empty."
+msgstr "Введите пароль и адрес электронной почты"
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Повторить попытку"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"Для вашей учётной записи Mandriva не включена подписка на Расширенную "
+"поддержку."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Поздравляем"
+msgid "Close"
+msgstr "Закрыть"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Обновление до Mandriva версии %s выполнено успешно"
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Необходимо перезагрузить систему."
+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 "Перезагрузка"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Онлайн подписка"
 
-#: ../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 ""
-"База данных пакетов заблокирована. Закройте другие приложения,\n"
-"работающие с базой данных пакетов (может на другом рабочем\n"
-"столе запущена ещё одна копия менеджера источников, или сейчас\n"
-"идёт установка пакетов в другом окне?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Не удалось добавить источник"
+msgid "Continue and Authenticate!"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
+
+#: ../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 "Обновление дистрибутива"
@@ -770,6 +712,55 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не удаётся обновить пакеты из источника update_source.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Для вашей учётной записи Mandriva не включена подписка на загрузку "
+#~ "Powerpack."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "В системе осталось недостаточно свободного места на %s для обновления (%d "
+#~ "МБ < %d МБ)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Ошибка установки"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Не удаётся найти журнал установки «%s»"
+
+#~ msgid "Retry"
+#~ msgstr "Повторить попытку"
+
+#~ msgid "Congratulations"
+#~ msgstr "Поздравляем"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Обновление до Mandriva версии %s выполнено успешно"
+
+#~ msgid "You must restart your system."
+#~ msgstr "Необходимо перезагрузить систему."
+
+#~ msgid "Reboot"
+#~ msgstr "Перезагрузка"
+
+#~ 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 ""
+#~ "База данных пакетов заблокирована. Закройте другие приложения,\n"
+#~ "работающие с базой данных пакетов (может на другом рабочем\n"
+#~ "столе запущена ещё одна копия менеджера источников, или сейчас\n"
+#~ "идёт установка пакетов в другом окне?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Не удалось добавить источник"
+
+#~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr "Выпущена новая версия дистрибутива Mandriva Linux."
diff --git a/po/sc.po b/po/sc.po
index 1b950b8d..c192cd0b 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-09-05 19:00+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -54,7 +54,7 @@ msgstr "Ajorronus a disposta po su sistema tuu"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -79,13 +79,13 @@ msgstr "su database de urpmi est serrau"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Release no suportada (tropu beça, o de adelantamentu)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "Apustis, torra a allui %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Abivau"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Aposenta is ajorronus"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla is Ajorronus"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Assètia Arretza"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -145,420 +145,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Seu alluendi drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Sighi"
 
-#: ../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 "Annudda"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Seu alluendi MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Seu carculendi atrus ajorronus...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Su sistema est ajorronau\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Seu controllendi s'arretza: parit disabivada\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Jassu online"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Atentu"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Apitzus de..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Seu ligendi s'assètiu\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lança sempri a s'alluidura"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Bessi"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Faddina"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Faddina"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Faddina açungendi su mèdiu."
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Password sballiada"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Password sballiada"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Faddina"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Faddina"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Serra"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Faddina açungendi su mèdiu."
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -568,117 +515,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Nòmini màkina:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Password sballiada"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Aposentadura faddia"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Password sballiada"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Cumprimentus"
+msgid "Close"
+msgstr "Serra"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Torra a allui"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Nòmini màkina:"
 
-#: ../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 ""
-"Su database de is pakitus est serrau. Serra is atrus programas\n"
-"ki traballant cun su database de pakitus (tenis unu atru manijadori\n"
-"de mèdius in d-una atra scriania, o jai imoi ses aposentendi\n"
-"pakitus?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Faddina açungendi su mèdiu."
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -729,6 +674,29 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Aposentadura faddia"
+
+#~ msgid "Congratulations"
+#~ msgstr "Cumprimentus"
+
+#~ msgid "Reboot"
+#~ msgstr "Torra a allui"
+
+#~ 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 ""
+#~ "Su database de is pakitus est serrau. Serra is atrus programas\n"
+#~ "ki traballant cun su database de pakitus (tenis unu atru manijadori\n"
+#~ "de mèdius in d-una atra scriania, o jai imoi ses aposentendi\n"
+#~ "pakitus?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Faddina açungendi su mèdiu."
+
 #~ msgid "Yes"
 #~ msgstr "Eya"
 
diff --git a/po/sk.po b/po/sk.po
index 64232797..15741253 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2005-09-21 14:06+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -50,7 +50,7 @@ msgstr "Sú dostupné nové aktualizácie pre váš systém"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -76,13 +76,13 @@ msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Táto verzia nie je podporovaná (je príliš stará alebo je vo fáze vývoja)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -98,42 +98,42 @@ msgstr ""
 "\n"
 "Potom reštartujte %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Inštalácia aktualizácií"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Skontrolovať aktualizácie"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Nastaviť sieť"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -141,420 +141,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spúšťanie drakconnect\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Ďalej"
 
-#: ../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 "Zrušiť"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "Spúšťanie MandrivaUpdate\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Hľadanie nových aktualizácií...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Váš systém je dostatočne aktualizovaný\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrolovanie siete: zrejme je vypnutá\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Online web"
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Varovanie"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "O.."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Načítavanie konfigurácie\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Spustiť po štarte"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Chyba"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Vyskytla sa chyba"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Chyba pri pridávaní zdroja"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "OK"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Nesprávne heslo"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Nesprávne heslo"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Chyba"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Vyskytla sa chyba"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "OK"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Zatvoriť"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Chyba pri pridávaní zdroja"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -564,116 +511,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Meno počítača:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Nesprávne heslo"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Inštalácia zlyhala"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Nesprávne heslo"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Gratulujeme"
+msgid "Close"
+msgstr "Zatvoriť"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
+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 "Reštart"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Meno počítača:"
 
-#: ../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 ""
-"Databáza balíkov je uzamknutá. Ukončite iné aplikácie, ktoré\n"
-"pracujú s databázou balíkov (napríklad iný správca balíkov na\n"
-"inej ploche, alebo sa práve inštalujú iné balíky?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Chyba pri pridávaní zdroja"
+msgid "Continue and Authenticate!"
+msgstr ""
+
+#: ../mdkapplet_gui.pm:261
+#, c-format
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, fuzzy, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, fuzzy, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, fuzzy, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, fuzzy, c-format
 msgid "Mandriva One"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, fuzzy, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva Online"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
@@ -724,6 +670,28 @@ msgstr ""
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 
+#~ msgid "Installation failed"
+#~ msgstr "Inštalácia zlyhala"
+
+#~ msgid "Congratulations"
+#~ msgstr "Gratulujeme"
+
+#~ msgid "Reboot"
+#~ msgstr "Reštart"
+
+#~ 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 ""
+#~ "Databáza balíkov je uzamknutá. Ukončite iné aplikácie, ktoré\n"
+#~ "pracujú s databázou balíkov (napríklad iný správca balíkov na\n"
+#~ "inej ploche, alebo sa práve inštalujú iné balíky?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Chyba pri pridávaní zdroja"
+
 #~ msgid "Yes"
 #~ msgstr "Áno"
 
diff --git a/po/sl.po b/po/sl.po
index b45c5f62..0d950764 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \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-05-09 19:29+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -59,7 +59,7 @@ msgstr "Za vaš sistem so na voljo nove posodobitve"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Izdana je bila nova različica distribucije Mandriva Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Za vašo distribucijo je na voljo dodaten vir paketov."
@@ -84,7 +84,7 @@ msgstr "Podatkovna zbirka urpmi je zaklenjena"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Izdaja ni podprta (prestara ali razvojna različica)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -92,7 +92,7 @@ msgstr ""
 "Ni moč najti virov. Vire lahko dodate s pomočjo upravljalnika virov "
 "programske opreme."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,42 +109,42 @@ msgstr ""
 "\n"
 "Potem ponovno zaženite »%s«."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Napaka pri posodabljanju"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Namesti posodobitve"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Dodaj dodatni vir paketov"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Pregled posodobitev"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavitev omrežja"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Nadgradi sistem"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -155,74 +155,71 @@ msgstr ""
 "naročnino na podaljšano vzdrževanje. Posodobitve za vaš sistem bodo na voljo "
 "do %s."
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "»drakconnect« se zaganja\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Nova različica distribucije Mandriva Linux"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Brskaj"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Izdana je bila nova različica distribucije Mandriva Linux."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Več podatkov o novi različici"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Ali želite nadgraditi na različico »%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 "Ne vprašuj več"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Prenesi vse pakete naenkrat"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Opozorilo: potrebno bo precej prostega prostora)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Kam naj se prenesejo paketi:"
 
-#: ../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 "Naprej"
 
-#: ../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 "Prekliči"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -231,22 +228,22 @@ msgstr ""
 "Vzdrževanje te različice Mandriva Linuxa se je izteklo. Za to različico ne "
 "bo na voljo nobenih posodobitev več."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Da ohranite svoj sistem varen, priporočamo:"
 
-#: ../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 "Da si priskrbite podaljšano vzdrževanje."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -255,17 +252,23 @@ msgstr ""
 "Da si priskrbite podaljšano vzdrževanje, ali pa nadgradite na novejšo "
 "različico distribucije %s."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Da nadgradite na novejšo različico distribucije %s."
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ta distribucije ni več podprta"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Podaljšano vzdrževanje"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -273,7 +276,7 @@ msgid ""
 msgstr ""
 "Kupite podaljšanje vzdrževanja za to različico (%s) in jo uporabljajte do %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -282,17 +285,17 @@ msgstr ""
 "Za to nadgradnjo je potrebna širokopasovna povezava (kabel, DSL, ...) in "
 "lahko traja več ur."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Ocenjena velikost prenesenih podatkov bo %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Pred nadaljevanjem je priporočljivo, da zaprete vse zagnane programe."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -301,96 +304,94 @@ msgstr ""
 "Priporočljivo je, da prenosnik priključite na omrežno napajanje in namesto "
 "brezžične povezave uporabljate povezavo prek omrežnega kabla."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "»MandrivaUpdate« se zaganja\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesiranje novih popravkov ...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je posodobljen\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Preverjanje omrežja: izgleda onemogočeno\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 "Avtorske pravice © %s, Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online omogoča dostop do spletnih storitev Mandriva"
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Spletna stran"
 
 #. -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 "Jure Repinc <jlp@holodeck1.com>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../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 "Več podatkov"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Dodaj vir"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "O ..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Nastavitev posodobitev"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Vedno zaženi ob zagonu"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Na voljo je nov vir"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -399,28 +400,77 @@ msgstr ""
 "Uporabljate distribucijo »%s« in imate zato privilegij dostopati do dodatnih "
 "programov."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Ali želite dodati ta dodaten vir programov?"
 
-#: ../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 "Dodajanje dodatnega vira paketov"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Za dodajanje dodatnega vira paketov vnesite ID svojega računa"
+
+#: ../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_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Napaka"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Prišlo je do napake"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "Vaš račun pri Mandrivi nima omogočene naročnine za prenos %s-a."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Prišlo je do napake pri dodajanju vira"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Vir %s je bil uspešno dodan."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Vir %s je bil uspešno dodan."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "V redu"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -456,116 +506,13 @@ msgstr "Omejeno"
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Za dodajanje dodatnega vira paketov vnesite ID svojega računa"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Več podatkov o vašem uporabniškem računu"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Vaša e-pošta"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Vaše geslo"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Pozabljeno geslo"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Napaka"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Geslo in e-pošta ne smeta biti prazna."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Prišlo je do napake"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../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 "Vir %s je bil uspešno dodan."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "V redu"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Vaš račun pri Mandrivi nima omogočene naročnine za prenos %s-a."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Zapri"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Prišlo je do napake pri dodajanju vira"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Napaka pri pridobivanju seznama distribucij:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Podaljšano vzdrževanje"
-
 #. -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 "
@@ -574,7 +521,7 @@ msgstr ""
 "Mandriva za distribucije zagotavlja 12 mesecev posodobitev za namizje (do %"
 "s) in 18 mesecev posodobitev za osnovo (do %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 "
@@ -583,7 +530,7 @@ msgstr ""
 "Na voljo je podaljšano vzdrževanje, ki zagotavlja 18 mesecev dodatnih "
 "posodobitev (do %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 "Podaljšano vzdrževanje si lahko zagotovite <b>takoj sedaj</b>:"
@@ -593,12 +540,12 @@ msgstr "Podaljšano vzdrževanje si lahko zagotovite <b>takoj sedaj</b>:"
 msgid "Lifetime policy"
 msgstr "Politika glede življenjske dobe"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Spletna naročnina"
 
-#: ../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 "
@@ -607,108 +554,104 @@ msgstr ""
 "Po tem, ko prek spleta zaključite naročnino, vnesite ID svojega računa in "
 "dodan bo nov vir za pakete."
 
-#: ../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 ""
-"Vaš račun pri Mandrivi nima omogočene naročnine na podaljšano vzdrževanje."
+msgid "More information on your user account"
+msgstr "Več podatkov o vašem uporabniškem računu"
 
-#: ../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 "Vaš račun pri Mandrivi nima omogočene naročnine za prenos PowerPack-a."
+msgid "Your email"
+msgstr "Vaša e-pošta"
 
-#: ../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 ""
-"Vaš računalnik na %s nima več na voljo dovolj prostora za nadgradnjo (%d MiB "
-"< %d MiB)"
+msgid "Your password"
+msgstr "Vaše geslo"
 
-#: ../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 "Namestitev ni uspela"
+msgid "Forgotten password"
+msgstr "Pozabljeno geslo"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Dnevnik namestitve lahko najdete v »%s«"
+msgid "Password and email cannot be empty."
+msgstr "Geslo in e-pošta ne smeta biti prazna."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Poskusi znova"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr ""
+"Vaš račun pri Mandrivi nima omogočene naročnine na podaljšano vzdrževanje."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Čestitke"
+msgid "Close"
+msgstr "Zapri"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Nadgradnja na različico Mandriva %s je bila uspešna."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Računalnik je potrebno znova zagnati."
+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 "Ponovni zagon"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Spletna naročnina"
 
-#: ../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 ""
-"Zbirka podatkov o paketih je zaklenjena. Zaprite vse\n"
-"programe, ki uporabljajo podatkovno zbirko paketov (je mogoče\n"
-"na drugem namizju odprt še en upravitelj virov, ali zdaj\n"
-"nameščate pakete?)."
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:260
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Neuspeh pri dodajanju vira"
+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 "Nadgradnja distribucije"
@@ -759,6 +702,54 @@ msgstr "  --debug\t\t\t- zapisuj, kaj je opravljeno\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 
+#~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr ""
+#~ "Vaš račun pri Mandrivi nima omogočene naročnine za prenos PowerPack-a."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Vaš računalnik na %s nima več na voljo dovolj prostora za nadgradnjo (%d "
+#~ "MiB < %d MiB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Namestitev ni uspela"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Dnevnik namestitve lahko najdete v »%s«"
+
+#~ msgid "Retry"
+#~ msgstr "Poskusi znova"
+
+#~ msgid "Congratulations"
+#~ msgstr "Čestitke"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Nadgradnja na različico Mandriva %s je bila uspešna."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Računalnik je potrebno znova zagnati."
+
+#~ msgid "Reboot"
+#~ msgstr "Ponovni zagon"
+
+#~ 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 ""
+#~ "Zbirka podatkov o paketih je zaklenjena. Zaprite vse\n"
+#~ "programe, ki uporabljajo podatkovno zbirko paketov (je mogoče\n"
+#~ "na drugem namizju odprt še en upravitelj virov, ali zdaj\n"
+#~ "nameščate pakete?)."
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Neuspeh pri dodajanju vira"
+
 #, fuzzy
 #~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
diff --git a/po/sq.po b/po/sq.po
index c9e7173c..c3d9d29d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline 0.15 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2002-09-24 15:30+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr ""
@@ -78,13 +78,13 @@ msgstr "baza e të dhënave urpmi është e mbyllur"
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,42 +101,42 @@ msgstr ""
 "\n"
 "Dhe, riniseni %s."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Aktivizuar"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Instaloi azhurnimet"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr ""
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Azhurnimi"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfigurim i rrjetin"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -144,420 +144,367 @@ msgid ""
 "until %s"
 msgstr ""
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Nise userdrake"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr ""
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../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 "Tjetër"
 
-#: ../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 "Anulo"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr ""
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
 "the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr ""
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
 "until %s."
 msgstr ""
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Lidhje e ballafaquar"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Modë i sistemit"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, fuzzy, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr ""
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -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 ""
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Kujdes"
 
-#: ../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 ""
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Në lidhje me..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Lexim i konfiguracionit\n"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Dalje"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr ""
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
 "software."
 msgstr ""
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr ""
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr ""
 
-#: ../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 ""
 
-#: ../mdkapplet-config:69
+#: ../mdkapplet-add-media-helper:111
 #, c-format
-msgid "Here you can configure the updates applet"
+msgid "Supported products are %s, '%s' is not on the list.\n"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mdkapplet-add-media-helper:120
 #, c-format
-msgid "Update frequency (hours)"
+msgid "Please fill in your account ID to add an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../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_gui.pm:209
 #, c-format
-msgid "First check delay (minutes)"
-msgstr ""
+msgid "Error"
+msgstr "Gabim"
 
-#: ../mdkapplet-config:89
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
 #, c-format
-msgid "Check for newer \"%s\" releases"
-msgstr ""
+msgid "An error occurred"
+msgstr "Një gabim është paraqitur"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:141
 #, c-format
-msgid "Check for missing \"%s\" media"
+msgid "Your Mandriva account does not have %s download subscription enabled."
 msgstr ""
 
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr ""
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, fuzzy, c-format
+msgid "An error occurred while adding medium"
+msgstr "Një gabim është paraqitur"
 
-#: ../mdkapplet-config:101
+#: ../mdkapplet-add-media-helper:170
 #, c-format
-msgid "Enterprise"
+msgid "Successfully added media!"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "Please fill in your account ID to add an additional package medium"
+msgid "Successfully added media %s."
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
 #, c-format
-msgid "More information on your user account"
-msgstr ""
+msgid "Ok"
+msgstr "Ok"
 
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
+#: ../mdkapplet-config:69
 #, c-format
-msgid "Your email"
+msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, fuzzy, c-format
-msgid "Your password"
-msgstr "Parulla e gabuar"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, fuzzy, c-format
-msgid "Forgotten password"
-msgstr "Parulla e gabuar"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../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
-#, c-format
-msgid "Error"
-msgstr "Gabim"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
+#: ../mdkapplet-config:71
 #, c-format
-msgid "Password and email cannot be empty."
+msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Një gabim është paraqitur"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:80
 #, c-format
-msgid "Successfully added media %s."
+msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
+#: ../mdkapplet-config:89
 #, c-format
-msgid "Ok"
-msgstr "Ok"
+msgid "Check for newer \"%s\" releases"
+msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:146
+#: ../mdkapplet-config:95 ../mdkapplet-config:101
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Check for missing \"%s\" media"
 msgstr ""
 
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
+#: ../mdkapplet-config:95
 #, c-format
-msgid "Close"
-msgstr "Mbylle"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Një gabim është paraqitur"
+msgid "Restricted"
+msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-config:101
 #, c-format
-msgid "Failure while retrieving distributions list:"
+msgid "Enterprise"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
-msgid "Extended Maintenance"
+msgid "Failure while retrieving distributions list:"
 msgstr ""
 
 #. -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 ""
 
-#: ../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 "
 "(until %s)."
 msgstr ""
 
-#: ../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 ""
@@ -567,113 +514,115 @@ msgstr ""
 msgid "Lifetime policy"
 msgstr ""
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, fuzzy, c-format
 msgid "Online subscription"
 msgstr "Emri i Makinës:"
 
-#: ../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 ""
 
-#: ../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."
+msgid "More information on your user account"
 msgstr ""
 
-#: ../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."
+msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:79
-#, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
+#, fuzzy, c-format
+msgid "Your password"
+msgstr "Parulla e gabuar"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
-#, c-format
-msgid "Installation failed"
-msgstr "Instalimi dështio"
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
+#, fuzzy, c-format
+msgid "Forgotten password"
+msgstr "Parulla e gabuar"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
 msgstr ""
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Urime"
+msgid "Close"
+msgstr "Mbylle"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
+msgid "Would you like Powerpack?"
 msgstr ""
author	Egoitz Rodriguez <egoitzro@gmail.com>	2014-10-12 20:44:07 +0200
committer	Pascal Terjan <pterjan@gmail.com>	2014-10-20 21:47:27 +0000
commit	f9667a459d78178b4042d56738ff6344f9d50e16 (patch)
tree	22a68962ffa2942b9e6f5f87e41ad27f6ea22cdc /rescue
parent	03f4e1dd9e90eba3e5c83c5a4fb939e91b711e94 (diff)
download	drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar.gz drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar.bz2 drakx-f9667a459d78178b4042d56738ff6344f9d50e16.tar.xz drakx-f9667a459d78178b4042d56738ff6344f9d50e16.zip