sync with code

76 files changed, 11617 insertions, 22004 deletions

diff --git a/po/af.po b/po/af.po
index 09e1fdbe..40af71a5 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-af\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -19,70 +19,65 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "Vir enige probleem stuur 'n e-pos na support@mageiaonline.com\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Net 'n oomblik, opsoek na beskikbare pakette..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "RPM-databasisnavraag het misluk\n"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -98,518 +93,328 @@ msgstr ""
 "\n"
 "Herbegin net %s daarna."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Aktiveer"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installeer updaterings"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigureer die Netwerk"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Volgende"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Kyk vir Opdaterings"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Omtrent.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Konfigurasie"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Eindig"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, fuzzy, c-format
-msgid "New medium available"
-msgstr "Nie Beskikbaar"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fout"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Masjiennaam:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "'n Fout het voorgekom"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "'n Fout het voorgekom"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux Online Span"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Verkeerde wagwoord"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Verkeerde wagwoord"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fout"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Maak toe"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr "Kies jou geografiese posisie"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Linux Online Span"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Linux Online Span"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -623,37 +428,67 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- druk hierdie help boodskap.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- loods Mageia Update.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - loods Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Masjiennaam:"
+
+#~ msgid "An error occurred"
+#~ msgstr "'n Fout het voorgekom"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "'n Fout het voorgekom"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#, fuzzy
+#~ msgid "New medium available"
+#~ msgstr "Nie Beskikbaar"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux Online Span"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Kies jou geografiese posisie"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux Online Span"
 
diff --git a/po/am.po b/po/am.po
index 62ef24db..b5ef192f 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -15,70 +15,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr ""
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -89,518 +84,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "ያስችላል"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "የሚቀጥለው"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "ተወው"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr ""
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "ውጣ"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "ስህተት"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "ስህተት ተፈጥሯል"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "ስህተት ተፈጥሯል"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "እሺ"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "ሚስጢራዊ ቃል"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "ስህተት"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "ዝጋ"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr ""
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mgaupdate:60
 #, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -608,36 +413,54 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr ""
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "An error occurred"
+#~ msgstr "ስህተት ተፈጥሯል"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "ስህተት ተፈጥሯል"
+
+#~ msgid "Ok"
+#~ msgstr "እሺ"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
 #, fuzzy
 #~ msgid "Mandiva Free"
 #~ msgstr "Mageia Online"
diff --git a/po/ar.po b/po/ar.po
index b224b186..61cc0620 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -22,17 +22,17 @@ msgstr ""
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "سيفحص وجود تحديثات عند %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "نظامك محدّث"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -41,54 +41,49 @@ msgstr ""
 "مشكلة في ضبط الخدمة. رجاء تحقّق من السجلّ وأرسل رسالة إلىsupport@mageiaonline."
 "com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "اتنظر من فضلك، يجري البحث عن الحزم المتاحة..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "هناك تحديثات متوفّرة لنظامك"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "يتوفر إصدار جديد من توزيعة لينكس ماندريفا"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "يتوفر وسيط إضافي للحزم لتوزيعتك."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "الشّبكة متوقّفة. رجاء اضبط شبكتك"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "الخدمة غير مُنشَّطة. رجاء اضغط على \"Online Website\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "أقفلت قاعدة بيانات urpmi"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "هذه الإصدارة غير مدعومة (إما بسبب أنها قديمة جداً، أو أنها إصدارة تطويريّة)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "لا توجد وسائط، تجب إضافة بعض الوسائط عبر 'مدير وسائط البرامج'."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,168 +98,129 @@ msgstr ""
 "البرامج لتمكين واحد على الأقل (أشر عليها في عمود %s).\n"
 "ثم أعد تشغيل %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "مُفعَّل"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "خطأ في تحديث الوسيط"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "ثبّت التّحديثات"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "أضف وسيط حزم إضافي"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "التمس تحديثات"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "اضبط الشّبكة"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "ترقية النظام"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "يُقدح drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "إصدار جديد من توزيعة لينكس ماندريفا"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "أُطلق إصدار جديد من توزيعة لينكس ماندريفا."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "معلومات إضافية حول هذا الإصدار الجديد"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "هل تريد الترقية إلى التوزيعة '%s' ؟"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "لا تسألني في المرة القادمة"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "التالي"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "ألغِ"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "هل تريد الترقية إلى التوزيعة '%s' ؟"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -273,17 +229,17 @@ msgstr ""
 "هذه الترقية تتطلب اتصالا شبكيا عريض النطاق (اتصال الكبل، دي إس إل، ...) وقد "
 "يستغرق عدة ساعات ليكتمل"
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "المقدار التقريبي للبيانات التي ستنزل هو %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "ينبغي أن تغلق كل التطبيقات الأخرى العاملة قبل المتابعة"
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -292,48 +248,48 @@ msgstr ""
 "ينبغي أن توصل حاسوبك المحمول بتيار الكهرباء المتناوبة (AC)، ويفضل استخدام "
 "الاتصال السلكي (ethernet) بدل اللاسلكي (wifi) إن أمكن."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "محدّث ماندريفا (MageiaUpdate) يُقدح\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "حساب التّحديثات الجديدة...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "النّظام محدّث\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "فحص الشّبكة: تبدو معطّلة\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "حقوق النشر (C) %s لماندريفا"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "ماندريفا أونلاين تقدم وصولا إلى خدمات ماندريفا على الشبكة"
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "موقع ماندريفا على الإنترنت"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -343,287 +299,136 @@ msgstr ""
 "Ossama M. Khayat <okhayat@yahoo.com>, 2004, 2005.\n"
 "Yaser Ammar <linux.uae@gawab.com>2009\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "معلومات إضافية"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "أضف وسائط"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "عَن..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "ضبط التحديثات"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "اقدحه دومًا عند البدء"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "اخرج"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "يتوفر وسط جديد"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr "أنت تستخدم توزيعة '%s' ولذلك يحق لك الوصول إلى برامج إضافية."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "هل تريد تثبيت مستودع البرامج الإضافي هذا؟"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "إضافة وسيط حزم إضافي"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "فضلاً اكتب مُعرِّف حسابك لإضافة وسيط حزم إضافي"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "خطأ"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "موقع ماندريفا على الإنترنت"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "حدث خطأ"
-
-#: ../mdkapplet-add-media-helper:200
-#, fuzzy, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "حدث خطأ أثناء إضافة الوسيط"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "نجحت إضافة الوسائط %s."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "نجحت إضافة الوسائط %s."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "موافق"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "بإمكانك هنا ضبط بريمج التحديثات"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, fuzzy, c-format
 msgid "Update frequency (hours)"
 msgstr "تكرار التحديث (بالثواني)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, fuzzy, c-format
 msgid "First check delay (minutes)"
 msgstr "زمن أول فحص"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "ماندريفا أونلاين %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "معلومات إضافية عن حسابك"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "بريدك الإلكتروني"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "كلمة سرك"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "نسيت كلمة السر"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "خطأ"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "كلمة السر والبريد الإلكتروني لا يمكن تركهما خاليين."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "أغلق"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "ماندريفا أونلاين %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "ماندريفا بَور باك"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "ترقية التوزيعة"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -636,36 +441,87 @@ msgstr ""
 "\n"
 "الاستعمال:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- إظهار رسالة المساعدة هذه.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- تشغيل برنامج تحديث ماندريفا تلقائيّاً.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- تشغيل مسطورات mnf معينة.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- الوضع النصي من برنامج تحديث ماندريفا.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- سجل ما يحدث\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "لا يمكن تحديث الحزم من وسيط التحديث.\n"
 
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "فضلاً اكتب مُعرِّف حسابك لإضافة وسيط حزم إضافي"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "موقع ماندريفا على الإنترنت"
+
+#~ msgid "An error occurred"
+#~ msgstr "حدث خطأ"
+
+#, fuzzy
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "حدث خطأ أثناء إضافة الوسيط"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "نجحت إضافة الوسائط %s."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "نجحت إضافة الوسائط %s."
+
+#~ msgid "Ok"
+#~ msgstr "موافق"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "يتوفر وسيط إضافي للحزم لتوزيعتك."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "أضف وسيط حزم إضافي"
+
+#~ msgid "New medium available"
+#~ msgstr "يتوفر وسط جديد"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr "أنت تستخدم توزيعة '%s' ولذلك يحق لك الوصول إلى برامج إضافية."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "هل تريد تثبيت مستودع البرامج الإضافي هذا؟"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "ماندريفا أونلاين %s"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "ماندريفا بَور باك"
+
 #, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "ماندريفا أونلاين %s"
diff --git a/po/ast.po b/po/ast.po
index 9fe2df22..e3e8302e 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline_es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -16,17 +16,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Verificaránse anovamientos a les %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "El sistema ta anováu a día de güei"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,47 +35,42 @@ msgstr ""
 "Problema de configuración del serviciu. Por favor verifica los ficheros de "
 "rexistru y unvie un corréu a support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Por favor espera, guetando los paquetes disponibles..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hai nuevos anovamientos disponibles pal sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Foi llanzáu una nueva versión de Mageia Linux"
 
-#: ../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"
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La rede nun ta activa. Configurala por favor"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "El serviciu nun ta activáu. Calca sobro \"Web Online\"."
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de datos d'urpmi bloquiada"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión nun sofitada (mui antigua o versión en desendolcu)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -83,7 +78,7 @@ msgstr ""
 "Nun alcontráu dengún mediu. Tienes d'amestar un col \"Alministrador de "
 "preseos de software\"."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,120 +96,102 @@ msgstr ""
 "\n"
 "Dempués, vuelve a entamar \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Activada"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Fallu anovando'l sofitu"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalar anovamientos"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Amestar mediu de programes adicionales"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar anovamientos"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar rede"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Anovar el sistema"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Espiró'l caltenimientu básicu pa esta distribución. Gracies a la to "
-"soscrición al caltenimientu estendíu, el sistema caltendráse anováu fasta'l "
-"%s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Llanzando drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nueva versión de Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Restolar"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Una nueva versión de Mageia Linux ta disponible"
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Más información tocante a esta nueva versión"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "¿Quies anovar a la distribución '%s'?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Nun volver a entrugar"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Baxar tolos paquetes de secute"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Avitu: Necesites abondo espaciu llibre)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Onde baxar los paquetes:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Encaboxar"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -223,55 +200,27 @@ msgstr ""
 "Finó'l caltenimientu del sistema Mageia Linux. Esto significa que nun "
 "recibirás nengún anovamientu nuevu de software."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Pa caltener el to sistema seguru, puedes:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Deberíes obtener caltenimientu estendíu."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Deberíes obtener un caltenimientu estendíu o anovar a una versión más nueva "
-"de la distribución %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "La to distribución nun ye sofitada más"
 
-#: ../mdkapplet:547
-#, fuzzy, c-format
-msgid "Extended Maintenance"
-msgstr "Deberíes obtener caltenimientu estendíu."
-
-#: ../mdkapplet:552
-#, fuzzy, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Mercar una estensión de caltenimientu pa esta versión (%s) y caltenelo "
-"furrulando."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -280,18 +229,18 @@ msgstr ""
 "Esti anovamientu necesita una conexón de banda ancha alta (cable, xDSL, ...) "
 "y puede tardar abondes hores en finar."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "La baxada estimada será de %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -300,335 +249,182 @@ 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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Llanzando MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calculando anovamientos nuevos...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema ta al día\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificando rede: paez tar desactivada\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mandiva Online da accesu a los servicios web de Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Softastur <alministradores@softastur.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Avisu"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Más Información"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Amestar preseos"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Tocante a..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuración d'anovamientos"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Llanzar siempres al aniciu"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Colar"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nuevu mediu disponible"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Uses la distribución '%s', entós tienes accesu privilexiáu pa programes "
-"adicionales."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "¿Quies amestar esti repositoriu de programes adicionales?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Amestando un mediu de programes adicionales"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fallu"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, fuzzy, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Deberíes obtener caltenimientu estendíu."
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Descripción de la máquina:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Hebo un fallu"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "La to cuenta de Mageia nun tien soscripción pa baxar %s "
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fallu al amestar sofitu"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "Preséu %s amestáu."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Preséu %s amestáu."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Aceutar"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Equí puedes configurar el notificador d'anovamientos"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Frecuencia de verificaciones (hora)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Primer Verificación (minutos)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Comprobar por releases \"%s\" nueves"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Comprobar por preseos \"%s\" que falten"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Restrinxíu"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Empresa"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Más información na to cuenta d'usuariu"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "El to corréu"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "La to contraseña"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Escaecí la contraseña"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fallu"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Contraseña y corréu nun pueden tar ermos."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zarrar"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Anovamientu de la Distribución"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -642,36 +438,135 @@ msgstr ""
 "\n"
 "usu:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- amosar esti mensax d'aida.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update llanzáu automáticamente.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- lanzar scripts específicos mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update en versión testu.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- facer un rexistru de lo que se faiga\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 
+#~ 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 ""
+#~ "Espiró'l caltenimientu básicu pa esta distribución. Gracies a la to "
+#~ "soscrición al caltenimientu estendíu, el sistema caltendráse anováu "
+#~ "fasta'l %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Deberíes obtener caltenimientu estendíu."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Deberíes obtener un caltenimientu estendíu o anovar a una versión más "
+#~ "nueva de la distribución %s."
+
+#, fuzzy
+#~ msgid "Extended Maintenance"
+#~ msgstr "Deberíes obtener caltenimientu estendíu."
+
+#, fuzzy
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Mercar una estensión de caltenimientu pa esta versión (%s) y caltenelo "
+#~ "furrulando."
+
+#~ 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."
+
+#, fuzzy
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Deberíes obtener caltenimientu estendíu."
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Descripción de la máquina:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Hebo un fallu"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "La to cuenta de Mageia nun tien soscripción pa baxar %s "
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Fallu al amestar sofitu"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "Preséu %s amestáu."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Preséu %s amestáu."
+
+#~ msgid "Ok"
+#~ msgstr "Aceutar"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Una mediu adicional de paquetes ta disponible pa la distribución"
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Amestar mediu de programes adicionales"
+
+#~ msgid "New medium available"
+#~ msgstr "Nuevu mediu disponible"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Uses la distribución '%s', entós tienes accesu privilexiáu pa programes "
+#~ "adicionales."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "¿Quies amestar esti repositoriu de programes adicionales?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Comprobar por preseos \"%s\" que falten"
+
+#~ msgid "Restricted"
+#~ msgstr "Restrinxíu"
+
+#~ msgid "Enterprise"
+#~ msgstr "Empresa"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/az.po b/po/az.po
index ff1cf459..8b9e145a 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Yeniləmələri yoxla"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sisteminiz yenidir"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,54 +38,49 @@ msgstr ""
 "Xidmət qurğu xətası. Xahiş edirik qeydlərdəki xətanı tapın və "
 "support@mageiaonline.com ünvanına məktub göndərin."
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Xahiş edirik gözləyin, mövcud paketlər tapılır..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Şəbəkə fəal deyil. Xahiş edirik şəbəkənizi quraşdırın"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Xidmət fəallaşdırılmayıb. Xahiş edirik \"Online Veb Saytı\" düyməsinə basın"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi databeyzi qıfıllıdır"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,518 +97,328 @@ msgstr ""
 "\n"
 "Daha sonra, %s'i yenidən başladın."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Fəal"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Yeniləmələri qur"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Yeniləmələri Yoxla"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Şəbəkəni Quraşdır"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect başladılır\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Sonrakı"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate başladılır\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Yeniləmələr hesablanır...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem yenidir\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Şəbəkə Yoxlanır: deyəsən qeyri-fəaldır\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Haqqında..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Qurğuları Göndər"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Həmişə başlanğıcda işə sal"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Çıx"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Xəta"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Kompüter adı:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Bir xəta oldu"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Medium əlavə etmə xətası"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Oldu"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Səhv parol"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Səhv parol"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Xəta"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Bağla"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -626,37 +431,59 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- bu yardım ismarışını göstər.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update launched automatically.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - launch Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Kompüter adı:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Bir xəta oldu"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Medium əlavə etmə xətası"
+
+#~ msgid "Ok"
+#~ msgstr "Oldu"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/be.po b/po/be.po
index d70a81ce..de2bb1c0 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -15,70 +15,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr ""
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -89,518 +84,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Далей"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Адмена"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr ""
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr ""
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Увага!"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Выхад"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Памылка"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Памылка"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Зачыніць"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr ""
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr ""
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr ""
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr ""
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr ""
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mgaupdate:60
 #, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -608,36 +413,39 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr ""
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "Ok"
+#~ msgstr "Ок"
+
 #, fuzzy
 #~ msgid "Installation failed"
 #~ msgstr "Усталяванне SILO"
diff --git a/po/bg.po b/po/bg.po
index 4273ee9d..3c5a2320 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Проверка за актуализации"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Вашата система е обновена"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,55 +39,50 @@ msgstr ""
 "Проблем в конфигурация на услуга. Моля проверете журналните файлове и "
 "изпратете е-поща на support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Моля изчакайте\n"
 "Пакетите се сортират"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Налични са актуализации за вашата система"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мрежата е неактивна. Конфигурирайте мрежата си"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Услугата е неактивна. Натиснете \"Online Website\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "базата данни на urpmi е заключена"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версията не се подържа (много стара, или в процес на разработка)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,518 +99,328 @@ msgstr ""
 "\n"
 "След това рестартирайте %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Да разреша"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Инсталиране на актуализации"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Проверка за актуализации"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигуриране на мрежа"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Стартиране на drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Следващ"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Стартиране на MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Събиране на нови актуализации...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системата е обновена\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка на мрежата: изглежда забранена\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Относно..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Прочитане на конфигурацията\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Зареждане при стартиране"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Изход"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Име на машината:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Появи се грешка"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Грешка при добавяне на източник"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Грешна парола"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Грешна парола"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Грешка"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Затваряне"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -629,37 +434,59 @@ msgstr ""
 "\n"
 "начин на ползване:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr " --help\t\t- показва това помощно съобщение.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- стартира автоматично Mageia Update.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- стартиране на mnf скриптове.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- обновяване на Mageia в текстов режим.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не е възможна актуализацията на пакетите от източника.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Име на машината:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Появи се грешка"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Грешка при добавяне на източник"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/bn.po b/po/bn.po
index fe989304..dd685ee5 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "আপডেট পরীক্ষা করো"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "আপনার সিস্টেম আপ-টু-ডেট আছে"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,54 +39,49 @@ msgstr ""
 "support@mageiaonline.com এ মেইল করুন"
 
 # উপলব্ধ
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "উপস্থিত প্যাকেজসমুহ খোঁজা হচ্ছে, অনুগ্রহ করে অপেক্ষা করুন..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "আপনার সিস্টেমের জন্য নতুন আপডেট উপস্হিত আছে"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "নেটওয়ার্ক বর্তমানে বন্ধ আছে। অনুগ্রহ করে আপনার নেটওয়ার্ক কনফিগার করুন"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "পরিসেবা (service) বর্তমানে সক্রিয় নেই। অনুগ্রহ করে \"অনলাইন ওয়েবসাইট\"-এ ক্লিক করুন"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi ডাটাবেস লক করা আছে"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "সংস্করণটির সমর্থন নেই (খুব পুরানো, অথবা ডেভেলপমেন্ট সংস্করণ)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,518 +99,328 @@ msgstr ""
 "এর পরে %s পুনরায় চালু করুন।"
 
 #  আছে কি
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "সক্রিয়"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "আপডেট গুলো ইনস্টল করো"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "আপডেট পরীক্ষা করো"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "নেটওয়ার্ক কনফিগার করো"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "পরবর্তী"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate চালু করা হচ্ছে\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "নতুন আপডেট পরীক্ষা করা হচ্ছে...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "সিস্টেম আপ-টু-ডেট আছে\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "নেটওয়ার্ক পরীক্ষা করা হচ্ছে: সম্ভবত নিষ্ক্রিয় করা আছে\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "অনলাইন ওয়েবসাইট"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "পরিচিতি..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "কনফিগারেশন প্রেরণ করুন"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "সবসময় স্টার্টআপে আরম্ভ করো"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "প্রস্থান"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "ত্রুটি"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "মেশিনের নাম:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "ঠিক আছে"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "ম্যান্ড্রিব অনলাইন"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "ভূল পাসওয়ার্ড"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "ভূল পাসওয়ার্ড"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "ত্রুটি"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "বন্ধ"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "ম্যান্ড্রিব অনলাইন"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -628,37 +433,59 @@ msgstr ""
 "\n"
 "ব্যবহার বিধি:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr " --help\t\t- এই সহায়িকা বার্তা প্রদর্শন করো।\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update স্বয়ংক্রিয়ভাবে চালু করা হয়েছে।\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - Mageia Update চালু করো।\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source মাধ্যম থেকে প্যাকেজ আপডেট করা যায় নি।\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "মেশিনের নাম:"
+
+#~ msgid "An error occurred"
+#~ msgstr "একটি ত্রুটি সম্পাদিত হয়েছে"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "মাধ্যম যোগ করার প্রক্রিয়া বিফল হয়েছে"
+
+#~ msgid "Ok"
+#~ msgstr "ঠিক আছে"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "ম্যান্ড্রিব অনলাইন"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "ম্যান্ড্রিব অনলাইন"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "ম্যান্ড্রিব অনলাইন"
 
diff --git a/po/br.po b/po/br.po
index ff2ac1eb..ac40c5c7 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -17,71 +17,66 @@ msgstr ""
 "Plural-Forms: nplurals=1;plural=0\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Bremañaet eo ho reiziad"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr ""
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Gortozit mar plij, o klask ar pakadoù hegerz ..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Marv eo ar rouedad. Kefluniañ anezhañ mar plij"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "N'eo ket bev ar servij. Klikit ouzh « Lec'hienn gwiad Online » mar plij"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "krouilhet eo stlennvon urpmi"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,520 +87,330 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Bevaatet "
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Fazi en ur bremañaat ar medium"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Bremañaat"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Kefluniañ ar rouedad"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Bremañaat ar reizhiad"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "O loc'hañ drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Furchal"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "A heul"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "O loc'hañ MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Bremañaet eo ar reiziad\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s gant %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, 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:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Ho evezh"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "A-brepoz ..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Kefluniadur an nevezioù"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Loc'hañ atav pa loc'her ar reizhiad"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Medium nevez zo dibres"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fazi"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Deskrivadur an ostiz :"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ur fazi zo bet"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fazi en ur ouzhpennañ ar medium"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Mat eo"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Ho tremenger"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Kollet eo an tremenger"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fazi"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Serriñ"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -619,36 +424,59 @@ msgstr ""
 "\n"
 "arveriadur :\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr ""
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Deskrivadur an ostiz :"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ur fazi zo bet"
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Fazi en ur ouzhpennañ ar medium"
+
+#~ msgid "Ok"
+#~ msgstr "Mat eo"
+
+#~ msgid "New medium available"
+#~ msgstr "Medium nevez zo dibres"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/bs.po b/po/bs.po
index 0ca50517..ec45176e 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -24,17 +24,17 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Provjeri ispravke"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je up-to-date"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -43,54 +43,49 @@ msgstr ""
 "Problem kod podešavanja servisa. Provjerite logove i pošaljite mail za "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Molim sačekajte, tražim dostupne pakete..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nove ispravke su dostupne za vaš sistem"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža ne radi. Podesite vašu mrežu"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktiviran. Kliknite na \"Online web stranica\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza podataka je zaključana"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 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:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -106,518 +101,328 @@ msgstr ""
 "\n"
 "Zatim, restartujte %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Uključeno"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, fuzzy, c-format
 msgid "Error updating media"
 msgstr "Ažuriram medije...\n"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj ispravke"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri da li ima ispravki"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Dalje"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Pokrećem MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Izračunavam nove ispravke...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je up-to-date\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mrežu: čini se da je isključena\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Autorska prava (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online vam omogućuje pristup Mageia web uslugama."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Čitam konfiguraciju\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Uvijek pokreni na početku"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Opis računara:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Došlo je do greške"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Neuspjeh u dodavanju medija"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Pogrešna šifra"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Pogrešna šifra"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Greška"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -630,37 +435,59 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- štampa ovu poruku.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update se automatski pokreće.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- pokreni skripte specifične za mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- tekstualna verzija Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- ispisuje sve što se radi\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Opis računara:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Došlo je do greške"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Neuspjeh u dodavanju medija"
+
+#~ msgid "Ok"
+#~ msgstr "U redu"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
 
diff --git a/po/ca.po b/po/ca.po
index 03319a44..d4bd8af6 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "El vostre sistema està actualitzat"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,53 +40,48 @@ msgstr ""
 "Problema de configuració del servei. Comproveu els logs i envieu un correu a "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Espereu mentre es cerquen els paquets disponibles... "
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La xarxa està inactiva. Si us plau configureu-la"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "la base de dades de l'urpmi està bloquejada"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "Després reinicieu la %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Habilitat"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instal·la actualitzacions"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Comprova actualitzacions"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la xarxa"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "S'està executant drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Següent"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "S'està executant MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "S'estan computant les noves actualitzacions...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema està actualitzat\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "S'està comprovant la xarxa: sembla estar desactivada\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Advertència"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Quant a..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Envia la configuració"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executa sempre al inici"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, fuzzy, c-format
-msgid "New medium available"
-msgstr "No disponible"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Error"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Nom de màquina:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "S'ha produït un error"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fallada al afegir una font"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "D'acord"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "L'equip Mageia Linux Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Contrasenya incorrecta"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Contrasenya incorrecta"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Error"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Tanca"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr "Escolliu la vostra ubicació geogràfica"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "L'equip Mageia Linux Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "L'equip Mageia Linux Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -628,37 +433,67 @@ msgstr ""
 "\n"
 "sintaxi:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- mostra aquest missatge d'ajuda.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update es llança automàticament.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- versió en mode text de Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Nom de màquina:"
+
+#~ msgid "An error occurred"
+#~ msgstr "S'ha produït un error"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Fallada al afegir una font"
+
+#~ msgid "Ok"
+#~ msgstr "D'acord"
+
+#, fuzzy
+#~ msgid "New medium available"
+#~ msgstr "No disponible"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "L'equip Mageia Linux Online"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Escolliu la vostra ubicació geogràfica"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "L'equip Mageia Linux Online"
 
diff --git a/po/cs.po b/po/cs.po
index 1687403d..57f58b76 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 21:55+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -23,17 +23,17 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Aktualizace se zkontrolují v %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém je plně aktuální"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,47 +42,42 @@ msgstr ""
 "Problém s nastavením služby. Zkontrolujte prosím záznamy a pošlete email na "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prosím počkejte, hledám dostupné balíčky…"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Pro váš systém jsou k dispozici nové aktualizace"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Byla vydána nová verze distribuce Mageia Linux"
 
-#: ../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ů."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Síť není dostupná, nastavte ji prosím"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba není aktivována. Klepněte prosím na „Online webové stránky”"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "databáze urpmi je zamknutá"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Verze není podporována (příliš stará nebo vývojová verze)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -90,7 +85,7 @@ msgstr ""
 "Nebyl nalezen žádný zdroj softwaru. Je třeba přidat alespoň jeden zdroj "
 "pomocí Správce zdrojů softwaru."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -106,120 +101,103 @@ msgstr ""
 "\n"
 "Poté znovu spusťte „%s”."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Povolen"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Chyba při aktualizaci zdroje"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalovat aktualizace"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Přidat dodatečný zdroj balíčků"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Zkontrolovat aktualizace"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavit síť"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Povýšit systém"
 
-#: ../mdkapplet:394
-#, 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 ""
-"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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Obdržen signál SIGHUP (pravděpodobně skončilo povýšení), restartuji aplet."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spouští se drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nová verze distribuce Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Prohlížet"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Byla vydána nová verze distribuce Mageia Linux."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Více informací o této nové verzi"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Chcete povýšit systém na distribuci „%s”?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Příště se už neptat"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Stáhnout všechny balíčky najednou"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, 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:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Kam stáhnout balíčky:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Další"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -228,55 +206,27 @@ msgstr ""
 "Podpora tohoto systému Mageia Linux skončila. To znamená, že již nebudou k "
 "dispozici žádné nové aktualizace softwaru."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, 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:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Měli byste pořídit rozšířenou podporu."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Buď byste měli pořídit rozšířenou podporu nebo povýšit na novější verzi "
-"distribuce %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Vaše distribuce již není nadále podporována"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Rozšířená podpora"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Pořiďte si rozšířenou podporu pro tuto verzi (%s) a zachovejte svůj systém v "
-"provozu do %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -285,18 +235,18 @@ msgstr ""
 "Toto povýšení vyžaduje širokopásmové síťové připojení (kabelové, xDSL, …) a "
 "celkem může trvat několik hodin."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Odhadovaná velikost stažených dat bude %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -305,344 +255,184 @@ 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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Spouští se MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Vyhledávám nové aktualizace…\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systém je aktuální\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontroluji síť: zdá se nedostupná\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright ©%s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online umožňuje přístup k webovým službám společnosti Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, 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:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Varování"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Více informací"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Přidat zdroj"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "O aplikaci…"
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Nastavení aktualizací"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Vždy spustit při startu"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Konec"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Dostupný nový zdroj"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Používáte distribuci „%s” a máte tudíž privilegovaný přístup k dalšímu "
-"software."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Chcete nainstalovat tento dodatečný zdroj software?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Přidávám dodatečný zdroj balíčků"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Podporované produkty jsou %s, „%s” není na seznamu.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Chyba"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Selhalo získávání seznamu distribucí:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Společnost Mageia 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-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Nyní je k dispozici rozšířená podpora, která zahrnuje 18 měsíců dodatečných "
-"aktualizací (do %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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>:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Politika životnosti"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Online předplatné"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Vyskytla se chyba"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Váš účet Mageia nemá aktivní předplacené stažení verze %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Během přidávání zdroje nastala chyba"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Zdroj byl úspěšně přidán!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Zdroj %s byl úspěšně přidán."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Zde lze nastavit aplet pro aktualizace"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Frekvence aktualizací (hodiny)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Prodleva před první kontrolou (minuty)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Zjišťovat dostupnost nových vydání „%s”"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Kontrolovat chybějící zdroje „%s”"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Omezený"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack vám přináší tu nejlepší zkušenost s Linuxem na desktopu: "
-"stabilitu a efektivitu řešení s otevřenými zdroji spolu s exkluzivním "
-"softwarem a oficiální podporou společnosti Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Vlastnosti Mageia Linuxu"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Více informací o vašem uživatelském účtu"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Váš email"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Vaše heslo"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Zapomenuté heslo"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Chyba"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Heslo a email nesmí být prázdné."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Vyberte svou verzi k povýšení"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Váš přístup k distribuci Powerpack skončil"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "Nyní je k dispozici %s, můžete povýšit na:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "Distribuce Mageia Linux s dalším softwarem a oficiální podporou."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Volně dostupná distribuce se 100%% otevřenými zdrojovými kódy."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Povýšení distribuce"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -656,36 +446,176 @@ msgstr ""
 "\n"
 "Použití:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- vytiskne tuto nápovědu.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- automatické spuštění Mageia Update.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- spustí skripty specifické pro MNF.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- textová verze Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- zaznamenávat co se děje\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 
+#~ 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 ""
+#~ "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"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Měli byste pořídit rozšířenou podporu."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Buď byste měli pořídit rozšířenou podporu nebo povýšit na novější verzi "
+#~ "distribuce %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Rozšířená podpora"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Pořiďte si rozšířenou podporu pro tuto verzi (%s) a zachovejte svůj "
+#~ "systém v provozu do %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Podporované produkty jsou %s, „%s” není na seznamu.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Selhalo získávání seznamu distribucí:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Společnost Mageia poskytuje u distribucí 12 měsíců aktualizací pro "
+#~ "desktopy (do %s) a 18 měsíců základních aktualizací (až do %s)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Nyní je k dispozici rozšířená podpora, která zahrnuje 18 měsíců "
+#~ "dodatečných aktualizací (do %s)."
+
+#~ 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>:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Politika životnosti"
+
+#~ msgid "Online subscription"
+#~ msgstr "Online předplatné"
+
+#~ msgid "An error occurred"
+#~ msgstr "Vyskytla se chyba"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Váš účet Mageia nemá aktivní předplacené stažení verze %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Během přidávání zdroje nastala chyba"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Zdroj byl úspěšně přidán!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Zdroj %s byl úspěšně přidán."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Pro vaši distribuci je k dispozici dodatečný zdroj balíčků."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Přidat dodatečný zdroj balíčků"
+
+#~ msgid "New medium available"
+#~ msgstr "Dostupný nový zdroj"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Používáte distribuci „%s” a máte tudíž privilegovaný přístup k dalšímu "
+#~ "software."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Chcete nainstalovat tento dodatečný zdroj software?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Kontrolovat chybějící zdroje „%s”"
+
+#~ msgid "Restricted"
+#~ msgstr "Omezený"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack vám přináší tu nejlepší zkušenost s Linuxem na desktopu: "
+#~ "stabilitu a efektivitu řešení s otevřenými zdroji spolu s exkluzivním "
+#~ "softwarem a oficiální podporou společnosti Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Vlastnosti Mageia Linuxu"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Vyberte svou verzi k povýšení"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Váš přístup k distribuci Powerpack skončil"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "Nyní je k dispozici %s, můžete povýšit na:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr "Distribuce Mageia Linux s dalším softwarem a oficiální podporou."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/cy.po b/po/cy.po
index 16e608c1..3fdbd52a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2009-10-01 16:32+0100\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Meddal.com\n"
@@ -19,17 +19,17 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Gwirio diweddariadau ar %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Mae'r system yn gyfredol"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,48 +38,43 @@ msgstr ""
 "Problemau ffurfweddu'r gwasanaethwr. Gwiriwch gofnodion ac anfon e-byst at "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mae dosbarthiad newydd o Mageia Linux wedi ei ryddhau"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nid yw'r rhwydwaith ar gael.  Ffurfweddwch eich rhwydwaith"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Nid yw'r gwasanaeth ar gael. Cliciwch \"Gwefan Ar-lein\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "Cronfa ddata urpmi wedi cloi"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 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:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -87,7 +82,7 @@ msgstr ""
 "Heb ganfod cyfrwng. Rhaid ychwanegu cyfrwng drwy'r \"Rheolwr Cyfrwng "
 "Meddalwedd\""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,170 +99,129 @@ msgstr ""
 "\n"
 "Yna ailgychwyn %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Galluogwyd"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Gwall wrth diweddaru cyfrwng"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Gosod diweddariadau"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Ychwanegu cyfrwng pecynnau ychwanegol"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Gwirio Diweddariad"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu'r Rhwydwaith"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Diweddaru'r system"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Cychwyn drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Fersiwn newydd o ddosbarthiad Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mae dosbarthiad newydd o Mageia Linux wedi ei ryddhau."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Mwy o wybodaeth am y fersiwn newydd"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Hoffech chi ddiweddaru i ddosbarthiad '%s'??"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Peidio gofyn y tro nesaf"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Nesaf"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, fuzzy, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Nid yw'r dosbarthiad yn cael ei gynnal bellach. Ni fydd diweddariadau "
-"pellach. Dylech ddiweddaru i fersiwn mwy diweddar o ddosbarthiad %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Hoffech chi ddiweddaru i ddosbarthiad '%s'??"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -276,17 +230,17 @@ msgstr ""
 "Mae'r diweddariad yn gofyn am gysylltiad rhwydwaith band llydan cyflym "
 "(cebl, xDSL,...) a gall gymryd rhai oriau i'w gwblhau."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Amcan o'r data i'w lwytho i lawr yw %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Dylech gau pob rhaglen sy'n rhedeg cyn parhau."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -295,335 +249,182 @@ msgstr ""
 "Dylech osod eich gliniadur ar gyflenwad trydan ac mae ethernet yn well na'r "
 "diwifr, os yn bosib."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Cychwyn MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Cyfrifo diweddariadau newydd...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Mae'r system yn gyfredol\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Hawlfraint (C) %s  %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online yw gwasanaethau gwe Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "-:Rhoslyn Prys <post@meddal.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Rhagor o Wybodaeth"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Ychwanegu cyfrwng"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Ynghylch..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Ffurfweddiad Diweddaru"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Cyfrwng newydd ar gael"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Rydych yn defnyddio dosbarthiad '%s' ac o ganlyniad mae gennych fynediad "
-"breintiedig i feddalwedd ychwanegol."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Hoffech chi osod y storfa o feddalwedd ychwanegol?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Ychwanegu cyfrwng pecynnau ychwanegol"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Gwall"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Disgrifiad y peiriant:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Digwyddodd gwall"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Nid yw eich cyfrif Mageia yn cynnwystanysgrifiad llwytho %s i lawr."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Digwyddodd gwall wrth ychwanegu cyfrwng"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "Wedi ychwanegu cyfrwng %s yn llwyddiannus."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Wedi ychwanegu cyfrwng %s yn llwyddiannus."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Iawn"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Yma mae modd ffurfweddu'r rhaglennig diweddaru"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Amlder diweddaru (awr)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Oedi gwiriad cyntaf (munud)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Rhagor o wybodaeth am eich cyfrif defnyddiwr"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Eich e-bost"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Eich cyfrinair"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Cyfrinair wedi ei anghofio"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Gwall"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Nid oes modd i'r cyfrinair a'r e-bost fod yn wag"
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Linux"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Linux"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Diweddaru'r Dosbarthiad"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -637,36 +438,99 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- argraffu'r neges cymorth hon.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- cychwyn Mageia Update yn awtomatig\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- cychwyn sgriptiau mnf penodol.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- fersiwn modd testun o Mageia Update\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- cofnodi'r hyn sydd wedi ei wneud\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Nid yw'r dosbarthiad yn cael ei gynnal bellach. Ni fydd diweddariadau "
+#~ "pellach. Dylech ddiweddaru i fersiwn mwy diweddar o ddosbarthiad %s."
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Disgrifiad y peiriant:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Digwyddodd gwall"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Nid yw eich cyfrif Mageia yn cynnwystanysgrifiad llwytho %s i lawr."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Digwyddodd gwall wrth ychwanegu cyfrwng"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "Wedi ychwanegu cyfrwng %s yn llwyddiannus."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Wedi ychwanegu cyfrwng %s yn llwyddiannus."
+
+#~ msgid "Ok"
+#~ msgstr "Iawn"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Mae cyfrwng pecynnau ychwanegol ar gael ar gyfer eich dosbarthiad."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Ychwanegu cyfrwng pecynnau ychwanegol"
+
+#~ msgid "New medium available"
+#~ msgstr "Cyfrwng newydd ar gael"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Rydych yn defnyddio dosbarthiad '%s' ac o ganlyniad mae gennych fynediad "
+#~ "breintiedig i feddalwedd ychwanegol."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Hoffech chi osod y storfa o feddalwedd ychwanegol?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/da.po b/po/da.po
index bd74c4d6..a3bcd093 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 09:56+0200\n"
 "Last-Translator: Keld Simonsen <keld@keldix.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -22,17 +22,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vil tjekke for opdateringer klokken %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Dit system er opdateret"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -41,48 +41,43 @@ msgstr ""
 "Problem med konfiguration af tjeneste. Tjek venligst loggene og send post "
 "til support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vent venligst, finder tilgængelige pakker..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nye opdateringer er tilgængelige for dit system"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "En ny version af Mageia Linux distributionen er blevet udgivet"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netværket er nede. Konfigurér venligst dit netværk"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjeneste er ikke aktiveret. Klik på \"Websted på nettet\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-database låst"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Udgivelse ikke understøttet (for gammel udgivelse, eller udviklingsudgivelse)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -90,7 +85,7 @@ msgstr ""
 "Intet medie fundet. Du skal tilføje et medie via 'Administration af "
 "programmedier'."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -106,122 +101,104 @@ msgstr ""
 "\n"
 "Derefter skal '%s' genstartes."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Fejl ved opdatering af medie"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installér opdateringer"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Tilføj nyt pakkemedie"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Tjek for opdateringer"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurér netværk"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Opgradér systemet"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Grundlæggende vedligeholdelse for denne distribution er ikke understøttet. "
-"Da du abonnerer på udvidet vedligeholdelse, får du alligevel opdateringer "
-"frem til %s."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Modtog SIGHUP-signal (formentlig er en opgradering færdig), genstarter "
 "miniprogram."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Begynder på drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Ny version af Mageia Linux distributionen"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Gennemsé"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "En ny version af Mageia Linux distributionen er blevet udgivet."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Mere info om denne nye version"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Ønsker du at opgradere til '%s' distributionen?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Spørg ikke næste gang"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Hent alle pakker på en gang"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, 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:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Hvor skal pakker hentes til: "
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Næste"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -230,55 +207,27 @@ msgstr ""
 "Vedligeholdelsen for dette Mageia Linux-system er udløbet. Dette betyderr at "
 "det ikke vil komme flere programopdateringer."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "For at holde systemet sikkert, kan du:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Du bør skaffe udvidet vedligeholdelse."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Du bør enten få udvidet vedligeholdelse eller opgradere til en nyere version "
-"af %s-distributionen."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Du bør opgradere til en nyere version af '%s'-distributionen?"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Distributionen er ikke længere understøttet"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Udvidet vedligeholdelse"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Køp en vedligeholdelsesudvidelse for denne version (%s) og lad den køre frem "
-"til %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -287,17 +236,17 @@ msgstr ""
 "Denne opgradering kræver en hurtig netværksforbindelse (kabel, xDSL, ...)  "
 "og kan tage en del timer at gøre færdig."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Beregnet hentningstid for data vil være %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -306,345 +255,182 @@ msgstr ""
 "Du bør tilsutte din bærbare til lysnettet, og foretrække en "
 "ethernetforbindelse fremfor wifi, om muligt."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Start MageiaUpdate op\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Beregner nye opdateringer...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er opdateret\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tjekker netværk: ser ud til at være deaktiveret\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Ophavsret © %s ved %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online giver adgang til Mageias webtjenester."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Keld Simonsen,<keld@dkuug.dk>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Mere information"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Tilføj medie"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Om..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Konfigurering af opdateringer"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Start altid op ved opstart"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nyt medie tilgængeligt"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Du bruger distributionen '%s' og har derfor priviligeret adgang til "
-"yderligere programmel."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Ønsker du at installere dette ekstra programmel-repositorie?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Tilføjer et ekstra pakkemedie"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "De understøttede produkter er %s, '%s' er ikke på listen.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fejl"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Fejl ved hentning af distributionsliste:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia tilbyder tolv måneder med skrivebordsopdateringer (frem til %s) og "
-"atten måneder med basisopdateringer (frem til %s) for distributioner."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Udvidet vedligeholdelse er nu tilgængelig for at få atten måneder med "
-"yderligere opdateringer (frem til %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-"Du kan abonnere <b>med det samme</b> for at få udvidet vedligeholdelse:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Levetidspolitik"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Abonnement på nettet"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "En fejl indtraf"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Din Mageia-konto har ikke aktiveret %s download abonnement."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Der skete en fejl ved tilføjelse af medie"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Tilføjede medie uden problemer!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Tilføjede medie %s uden problemer."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "O.k."
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Her kan du konfigurere updates-appletten"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Opdateringsfrekvens (timer)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Forsinkelse på første check (minutter)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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
-#, c-format
-msgid "Restricted"
-msgstr "Begrænset"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Virksomhed"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Linux giver dig den bedste oplevelse med skrivebordet. Stabilitet og "
-"effektivitet fra åben kildetekst-løsninger, sammen med eksklusivt programmel "
-"and officiel understøttelse fra Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux faciliteter"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Mere information om din brugerkonto"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Din epost"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Din adgangskode"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Glemt adgangskode"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fejl"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Adgangskode og epost kan ikke være tomme."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Luk"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Vælg ønsket opgraderingsversion"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Din adgang til PowerPack er forbi"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s er nu tilgængelig, du kan opgradere til:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Mageia Linux-distributionen med endnu mere programmel og officiel "
-"understøttelse."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Den frit tilgængelige distribution byggende 100 %% på åben kildetekst."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Opgradering af distribution"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -657,36 +443,179 @@ msgstr ""
 "\n"
 "brug:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- udskriv denne hjælpebesked.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update startes automatisk.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t - start mnf-specifikke skripter.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- teksttilstandsversion af Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- log der laves\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kan ikke opdatere pakker fra update_source-medie.\n"
 
+#~ 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 ""
+#~ "Grundlæggende vedligeholdelse for denne distribution er ikke "
+#~ "understøttet. Da du abonnerer på udvidet vedligeholdelse, får du "
+#~ "alligevel opdateringer frem til %s."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Du bør skaffe udvidet vedligeholdelse."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Du bør enten få udvidet vedligeholdelse eller opgradere til en nyere "
+#~ "version af %s-distributionen."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Udvidet vedligeholdelse"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Køp en vedligeholdelsesudvidelse for denne version (%s) og lad den køre "
+#~ "frem til %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "De understøttede produkter er %s, '%s' er ikke på listen.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Fejl ved hentning af distributionsliste:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia tilbyder tolv måneder med skrivebordsopdateringer (frem til %s) og "
+#~ "atten måneder med basisopdateringer (frem til %s) for distributioner."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Udvidet vedligeholdelse er nu tilgængelig for at få atten måneder med "
+#~ "yderligere opdateringer (frem til %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr ""
+#~ "Du kan abonnere <b>med det samme</b> for at få udvidet vedligeholdelse:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Levetidspolitik"
+
+#~ msgid "Online subscription"
+#~ msgstr "Abonnement på nettet"
+
+#~ msgid "An error occurred"
+#~ msgstr "En fejl indtraf"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Din Mageia-konto har ikke aktiveret %s download abonnement."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Der skete en fejl ved tilføjelse af medie"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Tilføjede medie uden problemer!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Tilføjede medie %s uden problemer."
+
+#~ msgid "Ok"
+#~ msgstr "O.k."
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Et nyt pakkemedie er tilgængelig til din distribution."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Tilføj nyt pakkemedie"
+
+#~ msgid "New medium available"
+#~ msgstr "Nyt medie tilgængeligt"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Du bruger distributionen '%s' og har derfor priviligeret adgang til "
+#~ "yderligere programmel."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Ønsker du at installere dette ekstra programmel-repositorie?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Tjek for manglende medie med %s"
+
+#~ msgid "Restricted"
+#~ msgstr "Begrænset"
+
+#~ msgid "Enterprise"
+#~ msgstr "Virksomhed"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Linux giver dig den bedste oplevelse med skrivebordet. Stabilitet "
+#~ "og effektivitet fra åben kildetekst-løsninger, sammen med eksklusivt "
+#~ "programmel and officiel understøttelse fra Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux faciliteter"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Vælg ønsket opgraderingsversion"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Din adgang til PowerPack er forbi"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s er nu tilgængelig, du kan opgradere til:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Mageia Linux-distributionen med endnu mere programmel og officiel "
+#~ "understøttelse."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/de.po b/po/de.po
index b35a1833..1fa397a8 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -27,17 +27,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Überprüfe Updates um %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ihr System ist aktuell"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -46,48 +46,43 @@ msgstr ""
 "Konfigurationsproblem des Dienstes. Bitte überprüfen Sie die Log-Datei und "
 "senden Sie eine Mail an support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Suche nach vorhandenen Paketen, bitte warten ..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Neue Aktualisierungen für Ihr System verfügbar"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Eine neue Version von Mageia Linux ist erschienen"
 
-#: ../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"
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Kein Netzwerk. Bitte konfigurieren Sie Ihr Netzwerk"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst nicht verfügbar. Klicken Sie auf „Online Webseite“"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi Datenbank ist gesperrt"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Version wird nicht unterstützt (zu alte Version, oder Entwicklungsversion)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -95,7 +90,7 @@ msgstr ""
 "Kein Medium gefunden. Sie müssen einige Medien mit dem 'Software Medien "
 "Manager' hinzufügen"
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -112,120 +107,102 @@ msgstr ""
 "\n"
 "Starten Sie anschließend erneut \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Fehler beim Aktualisieren des Mediums"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Aktualisieren"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Weitere Paketquelle hinzufügen"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Überprüfe Updates"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Netzwerk konfigurieren"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Das System aktualisieren"
 
-#: ../mdkapplet:394
-#, fuzzy, 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 ""
-"Die normale Wartung für diese Version ist ausgelaufen. Danke für Ihre "
-"Registrieung für erweiterte Wartung, Ihr System wird bis zum %s aktuell "
-"gehalten"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starte drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Neue Version der Mageia Linux Distribution"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, fuzzy, c-format
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Eine neue Version von Mageia Linux ist erschienen."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Mehr Informationen über diese neue Version"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Wollen Sie auf '%s'-Distribution aktualisieren?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Das nächste mal nicht mehr Nachfragen"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Alle Pakete auf einmal herunterladen"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Warnung: Es wird viel Speicherplatz benötigt)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Wo man Pakete herunterladen kann:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Weiter"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -234,55 +211,27 @@ msgstr ""
 "Die Wartungsdauer für diese Mageia-Ausgabe ist beendet. Für dieses System "
 "werden keine Aktualisierungen mehr geliefert."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Um Ih System sicher zu erhalten, können Sie:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, fuzzy, c-format
-msgid "You should get extended maintenance."
-msgstr "Sie sollte sich für die erweiterte Wartung registrieren."
-
-#: ../mdkapplet:528
-#, fuzzy, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Sie sollten sich entweder für erweiterte Wartung registrieren oder auf eine "
-"neuere Version der %s Distribution wechseln."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ihre Distribution wird nicht länger unterstützt"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Erweiterte Wartung"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Kaufen Sie eine Wartungserweiterung für  diese Version (%s) und nutzen Sie "
-"sie weiter bis zum %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -292,17 +241,17 @@ msgstr ""
 "(Kabel, xDSL,...)  und kann mehrere Stunden benötigen, um vollständig zu "
 "sein."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Die geschätzten Download-Daten werden %s groß sein"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Sie sollten alle anderen Programme beenden, bevor sie fortfahren."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -311,346 +260,185 @@ 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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Starte MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Berechne neue Updates...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System ist aktuell\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Überprüfe Netzwerk: Scheint abgeschaltet\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 "Durch Mageia Online erhalten Sie Zugriff auf Internetangebote von Mageia"
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "_: Nicolas Bauer & rastafarii@mandrivauser.de\n"
 "_: Oliver Burger & oliver@mandrivauser.de\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Mehr Informationen"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Quellen hinzufügen"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Über..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Konfiguration der Aktualisierungen"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Immer beim Start ausführen"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Neue Paketquelle verfügbar"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Sie nutzen die '%s' Distribution und haben deshalb Zugang zu zusätzlicher "
-"Software."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Wollen Sie diese zusätzliche Softwarequelle einrichten?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Füge eine weitere Paketquelle hinzu"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fehler"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Holen der Distributionslisten fehlgeschlagen:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia bietet 12 Monate Desktop-Aktualisierungen (bis zum %s) und 18 Monate "
-"Basis-Aktualisierungen (bis zum %s) für seine Distributionen."
-
-#: ../mdkapplet-add-media-helper:167
-#, fuzzy, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Erweiterte Wartung ist nun verfügbar, um 18 Monate zusätzliche "
-"Aktualisierungen (bis zum %s) zu erhalten."
-
-#: ../mdkapplet-add-media-helper:170
-#, fuzzy, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-"Sie können sich <b>jetzt</b> registrieren, um die erweiterte Wartung zu "
-"erhalten:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Lebenszeit-Richtlinie"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Online Registrierung"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ein Fehler ist aufgetreten"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "In Ihrem Mageia Account ist kein %s Download-Abonnement aktiviert."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fehler beim Hinzufügen eines Mediums"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "Medium %s wurde erfolgreich hinzugefügt."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Medium %s wurde erfolgreich hinzugefügt."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Hier können Sie das Aktualisierungs-Applet einrichten"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Aktualisierungs-Frequenz (Stunden)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Wartezeit vor der ersten Überprüfung (Minuten)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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
-#, c-format
-msgid "Restricted"
-msgstr "Beschränkt"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Mehr Informationen über Ihr Benutzerkonto"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Ihre Emailadresse"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Ihr Passwort"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Vergessenes Passwort"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fehler"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Passwort und Mailadresse können nicht leer sein."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Schließen"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Distributionsaktualisierung"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -664,36 +452,157 @@ msgstr ""
 "\n"
 "Verwendung: \n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- Ausgabe dieser Hilfe.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Aktualisierung startet automatisch.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- starte mnf spezifische Skripte.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Textmodus Version der Mageia Aktualisierung.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr " --debug\t\t\t- protokolliere was gemacht wird\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Aktualisieren der Pakete vom Update-Medium nicht möglich.\n"
 
+#, fuzzy
+#~ 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 ""
+#~ "Die normale Wartung für diese Version ist ausgelaufen. Danke für Ihre "
+#~ "Registrieung für erweiterte Wartung, Ihr System wird bis zum %s aktuell "
+#~ "gehalten"
+
+#, fuzzy
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Sie sollte sich für die erweiterte Wartung registrieren."
+
+#, fuzzy
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Sie sollten sich entweder für erweiterte Wartung registrieren oder auf "
+#~ "eine neuere Version der %s Distribution wechseln."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Erweiterte Wartung"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Kaufen Sie eine Wartungserweiterung für  diese Version (%s) und nutzen "
+#~ "Sie sie weiter bis zum %s."
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Holen der Distributionslisten fehlgeschlagen:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia bietet 12 Monate Desktop-Aktualisierungen (bis zum %s) und 18 "
+#~ "Monate Basis-Aktualisierungen (bis zum %s) für seine Distributionen."
+
+#, fuzzy
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Erweiterte Wartung ist nun verfügbar, um 18 Monate zusätzliche "
+#~ "Aktualisierungen (bis zum %s) zu erhalten."
+
+#, fuzzy
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr ""
+#~ "Sie können sich <b>jetzt</b> registrieren, um die erweiterte Wartung zu "
+#~ "erhalten:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Lebenszeit-Richtlinie"
+
+#~ msgid "Online subscription"
+#~ msgstr "Online Registrierung"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ein Fehler ist aufgetreten"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "In Ihrem Mageia Account ist kein %s Download-Abonnement aktiviert."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Fehler beim Hinzufügen eines Mediums"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "Medium %s wurde erfolgreich hinzugefügt."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Medium %s wurde erfolgreich hinzugefügt."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Eine weitere Paketquelle ist für Ihre Distribution verfügbar"
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Weitere Paketquelle hinzufügen"
+
+#~ msgid "New medium available"
+#~ msgstr "Neue Paketquelle verfügbar"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Sie nutzen die '%s' Distribution und haben deshalb Zugang zu zusätzlicher "
+#~ "Software."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Wollen Sie diese zusätzliche Softwarequelle einrichten?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Nach fehlenden \"%s\" Quellen suchen"
+
+#~ msgid "Restricted"
+#~ msgstr "Beschränkt"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/el.po b/po/el.po
index c3a2cf4a..902a8fcc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2012-05-23 19:57+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -28,17 +28,17 @@ msgstr ""
 
 # αναφέρεται στην ώρα
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Θα γίνει έλεγχος ενημερώσεων στις %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Το σύστημα σας είναι ενημερωμένο "
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -47,49 +47,44 @@ msgstr ""
 "Πρόβλημα υπηρεσίας ρυθμίσεων. Παρακαλώ ελέγξτε τις καταγραφές και στείλτε "
 "μήνυμα στο support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Παρακαλώ περιμένετε, γίνεται αναζήτηση διαθέσιμων πακέτων..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Υπάρχουν νέες ενημερώσεις για το σύστημά σας"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Μια νέα έκδοση της διανομής Mageia είναι διαθέσιμη"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Ένα πρόσθετο μέσο πακέτων είναι διαθέσιμο για την διανομή σας."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Το δίκτυο δεν λειτουργεί.Παρακαλώ διαμορφώστε το δίκτυο σας "
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Η υπηρεσία δεν είναι ενεργοποιημένη. Παρακαλώ κάντε κλικ στην «Ιστοσελίδα "
 "Mageia Online» "
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "η βάση δεδομένων urpmi είναι κλειδωμένη"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Η έκδοση δεν υποστηρίζεται ( πολύ παλιά έκδοση ή έκδοση σε ανάπτυξη)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -97,7 +92,7 @@ msgstr ""
 "Δε βρέθηκε κάποιο μέσο. Πρέπει να προσθέσεις κάποια μέσα, χρησιμοποιώντας το "
 "«Διαχειριστή Μέσων Λογισμικού»."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -114,122 +109,104 @@ msgstr ""
 "\n"
 "Έπειτα, εκκινήστε ξανά το «%s»."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Σφάλμα στην ενημέρωση των μέσων"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Εγκατάσταση ενημερώσεων"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Προσθήκη νέου μέσου πακέτων"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Έλεγχος ενημερώσεων"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Ρύθμιση δικτύου"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Αναβάθμιση του συστήματος"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Η βασική συντήρηση γι' αυτή τη διανομή έχει λήξη. Ευχαριστούμε για την "
-"εγγραφή σας στην εκτεταμένη υποστήριξη, το σύστημά σας θα ενημερώνεται μέχρι "
-"τις %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Λήφθηκε σήμα SIGHUP (πιθανότατα τελείωσε μια αναβάθμιση), επανεκκίνηση της "
 "μικροεφαρμογής"
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Εκτέλεση drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Νέα έκδοση της διανομής Mageia"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Περιήγηση"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Μια νέα έκδοση της διανομής Mageia είναι διαθέσιμη."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Περισσότερες πληροφορίες για την νέα έκδοση"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Θέλετε να κάνετε αναβάθμιση στη νέα διανομή «%s» ;"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Μη με ρωτήσεις την επόμενη φορά"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Άμεση λήψη όλων των πακέτων"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Προσοχή: Θα χρειαστείτε αρκετό ελεύθερο χώρο)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Προορισμός λήψης των πακέτων:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -238,55 +215,27 @@ msgstr ""
 "Η συντήρηση αυτού του συστήματος Mageia έχει σταματήσει. Αυτό σημαίνει πως "
 "δεν θα λαμβάνεται νέες ενημερώσεις πλέον."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Για να διατηρηθεί το σύστημα σας ασφαλές, μπορείτε να:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Θα πρέπει να αποκτήσετε εκτεταμένη συντήρηση."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Θα πρέπει είτε να αποκτήσετε εκτεταμένη συντήρηση ή να αναβαθμίσετε σε μια "
-"νεότερη έκδοση της διανομής %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Θα πρέπει να αναβαθμίσετε σε μια νεότερη έκδοση της διανομής %s."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Η διανομή σας δεν υποστηρίζεται πλέον"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Εκτεταμένη συντήρηση"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Αγοράστε μια επέκταση συντήρησης για τη συγκεκριμένη έκδοση (%s) και "
-"συνεχίστε την λειτουργία της μέχρι το %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -295,18 +244,18 @@ msgstr ""
 "Η αναβάθμιση απαιτεί υψηλό εύρος σύνδεσης (cable, xDSL, ...) και μπορεί να "
 "χρειαστεί μερικές ώρες για να ολοκληρωθεί."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Το εκτιμώμενο μέγεθος των δεδομένων προς λήψη είναι %s "
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Θα πρέπει να κλείσετε όλες τις άλλες εκτελούμενες εφαρμογές πριν συνεχίσετε."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -315,350 +264,185 @@ msgstr ""
 "Θα πρέπει να συνδέσετε τον φορητό σας υπολογιστή στον φορτιστή AC και να "
 "προτιμήσετε ethernet σύνδεση αντί για wifi, αν είναι διαθέσιμη."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr " Εκτέλεση μικροεφαρμογής MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Επεξεργασία νέων αναβαθμίσεων...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Το σύστημα είναι ενημερωμένο\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Έλεγχος δικτύου: φαίνεται απενεργοποιημένο\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Πνευματικά δικαιώματα (C) %s από %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 "Η Mageia Online παρέχει πρόσβαση στις διαδικτυακές υπηρεσίες της Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Nikos Papadopoulos <231036448@freemail.gr>\n"
 "Glentadakis Dimitrios <dglent@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Περισσότερες πληροφορίες"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Προσθήκη μέσου"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Σχετικά..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Ρύθμιση Ενημερώσεων"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Να εκτελείται πάντοτε στην εκκίνηση"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Νέο μέσο διαθέσιμο"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Χρησιμοποιείτε την διανομή «%s» και και επωφελείστε επομένως από μια "
-"προνομιούχο πρόσβαση σε πρόσθετα πακέτα."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Θέλετε να εγκαταστήσετε αυτό το νέο αποθετήριο λογισμικού ;"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Προσθήκη ενός νέου μέσου πακέτων"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Τα υποστηριζόμενα προϊόντα είναι %s, το «%s» δεν είναι στην λίστα.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-"Παρακαλώ συμπληρώστε τα στοιχεία του λογαριασμού σας για να προσθέσετε ένα "
-"νέο μέσο πακέτων."
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Η ανάκτηση της λίστας των διανομών απέτυχε:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Η Mageia παρέχει 12 μήνες ενημερώσεις για την επιφάνεια εργασίας (μέχρι τις "
-"%s) και 18 μήνες βασικές ενημερώσεις (μέχρι τις %s) για τις διανομές."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Η εκτεταμένη συντήρηση είναι πλέον διαθέσιμη για να αποκτήσετε 18 μήνες "
-"πρόσθετες ενημερώσεις (μέχρι τις %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-"Μπορείτε να εγγραφείτε <b>τώρα αμέσως</b> για να αποκτήσετε εκτεταμένη "
-"συντήρηση:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Πολιτική χρόνου ζωής"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Εγγραφή στο διαδίκτυο"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Προκλήθηκε σφάλμα"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Ο λογαριασμός σας Mageia δεν έχει συνδρομή στην υπηρεσία λήψης του %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Παρουσιάστηκε σφάλμα κατά την προσθήκη του μέσου"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Η προσθήκη του μέσου έγινε με επιτυχία!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Η προσθήκη του μέσου %s έγινε με επιτυχία."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Εντάξει"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Εδώ μπορείτε να ρυθμίσετε την εφαρμογή ενημερώσεων"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Συχνότητα ενημερώσεων (ώρες)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Χρονική αναμονή πρώτης ενημέρωσης (λεπτά)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Η Mageia Powerpack σας προσφέρει την καλύτερη εμπειρία επιφάνειας εργασίας "
-"Linux: την σταθερότητα και αποτελεσματικότητα του ανοιχτού λογισμικού σε "
-"συνδυασμό με αποκλειστικές εφαρμογές και επίσημη υποστήριξη Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr "Χαρακτηριστικά της Mageia"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Περισσότερες πληροφορίες για τον λογαριασμό σας"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Το ηλ.ταχυδρομείο σας"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Ο κωδικός σας"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Έχω ξεχάσει τον κωδικό πρόσβασης"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Θα πρέπει να συμπληρώσετε τον κωδικό και το ηλ.ταχυδρομείο σας."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Επιλέξτε την έκδοση αναβάθμισης"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Η πρόσβασή σας στην Powerpack έχει λήξει"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "η %s είναι τώρα διαθέσιμη, μπορείτε να αναβαθμίσετε στην:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Η διανομή Mageia με ακόμα περισσότερες εφαρμογές και επίσημη υποστήριξη."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Η 100%% διανομή ανοιχτού λογισμικού ελεύθερα διαθέσιμη."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Αναβάθμιση διανομής"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -672,36 +456,182 @@ msgstr ""
 "\n"
 "χρήση:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- εκτύπωση αυτού του μηνύματος βοήθειας.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Αυτόματη εκτέλεση του Mageia Update.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- εκτέλεση ειδικών mnf σεναρίων.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- έκδοση του Mageia Update σε μορφή κειμένου.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- καταγραφή γενόμενων\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Αδύνατη η ενημέρωση των πακέτων από το μέσο update_source.\n"
 
+#~ 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 ""
+#~ "Η βασική συντήρηση γι' αυτή τη διανομή έχει λήξη. Ευχαριστούμε για την "
+#~ "εγγραφή σας στην εκτεταμένη υποστήριξη, το σύστημά σας θα ενημερώνεται "
+#~ "μέχρι τις %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Θα πρέπει να αποκτήσετε εκτεταμένη συντήρηση."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Θα πρέπει είτε να αποκτήσετε εκτεταμένη συντήρηση ή να αναβαθμίσετε σε "
+#~ "μια νεότερη έκδοση της διανομής %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Εκτεταμένη συντήρηση"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Αγοράστε μια επέκταση συντήρησης για τη συγκεκριμένη έκδοση (%s) και "
+#~ "συνεχίστε την λειτουργία της μέχρι το %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr ""
+#~ "Τα υποστηριζόμενα προϊόντα είναι %s, το «%s» δεν είναι στην λίστα.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "Παρακαλώ συμπληρώστε τα στοιχεία του λογαριασμού σας για να προσθέσετε "
+#~ "ένα νέο μέσο πακέτων."
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Η ανάκτηση της λίστας των διανομών απέτυχε:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Η Mageia παρέχει 12 μήνες ενημερώσεις για την επιφάνεια εργασίας (μέχρι "
+#~ "τις %s) και 18 μήνες βασικές ενημερώσεις (μέχρι τις %s) για τις διανομές."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Η εκτεταμένη συντήρηση είναι πλέον διαθέσιμη για να αποκτήσετε 18 μήνες "
+#~ "πρόσθετες ενημερώσεις (μέχρι τις %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr ""
+#~ "Μπορείτε να εγγραφείτε <b>τώρα αμέσως</b> για να αποκτήσετε εκτεταμένη "
+#~ "συντήρηση:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Πολιτική χρόνου ζωής"
+
+#~ msgid "Online subscription"
+#~ msgstr "Εγγραφή στο διαδίκτυο"
+
+#~ msgid "An error occurred"
+#~ msgstr "Προκλήθηκε σφάλμα"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "Ο λογαριασμός σας Mageia δεν έχει συνδρομή στην υπηρεσία λήψης του %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Παρουσιάστηκε σφάλμα κατά την προσθήκη του μέσου"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Η προσθήκη του μέσου έγινε με επιτυχία!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Η προσθήκη του μέσου %s έγινε με επιτυχία."
+
+#~ msgid "Ok"
+#~ msgstr "Εντάξει"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Ένα πρόσθετο μέσο πακέτων είναι διαθέσιμο για την διανομή σας."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Προσθήκη νέου μέσου πακέτων"
+
+#~ msgid "New medium available"
+#~ msgstr "Νέο μέσο διαθέσιμο"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Χρησιμοποιείτε την διανομή «%s» και και επωφελείστε επομένως από μια "
+#~ "προνομιούχο πρόσβαση σε πρόσθετα πακέτα."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Θέλετε να εγκαταστήσετε αυτό το νέο αποθετήριο λογισμικού ;"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Έλεγχος αν λείπουν τα μέσα «%s»"
+
+#~ msgid "Restricted"
+#~ msgstr "Με περιορισμούς"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Η Mageia Powerpack σας προσφέρει την καλύτερη εμπειρία επιφάνειας "
+#~ "εργασίας Linux: την σταθερότητα και αποτελεσματικότητα του ανοιχτού "
+#~ "λογισμικού σε συνδυασμό με αποκλειστικές εφαρμογές και επίσημη υποστήριξη "
+#~ "Mageia."
+
+#~ msgid "Mageia Features"
+#~ msgstr "Χαρακτηριστικά της Mageia"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Επιλέξτε την έκδοση αναβάθμισης"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Η πρόσβασή σας στην Powerpack έχει λήξει"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "η %s είναι τώρα διαθέσιμη, μπορείτε να αναβαθμίσετε στην:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Η διανομή Mageia με ακόμα περισσότερες εφαρμογές και επίσημη υποστήριξη."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/eo.po b/po/eo.po
index b3d21a2f..36f54e04 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -19,17 +19,17 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Serĉu ĝisdatigojn"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Via sistemo estas ĝisdata"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,54 +38,49 @@ msgstr ""
 "Problemo pri serva konfigurado. Bonvole sendu retmesaĝon al "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Bonvole atendu, mi serĉas haveblajn pakaĵojn..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Novaj ĝisdatigojn estas haveblajn por via sistemo"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Reto estas haltita. Bonvole konfiguru vian reton"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servo ne estas aktiva. Bonvole musklaku \"TTT-a retejo\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-datenbazo ŝlosita"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Sistemversiono ne konvenas (tro malnova versiono, aŭ disvolva versiono)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,518 +97,328 @@ msgstr ""
 "\n"
 "Poste, restartigu (%s)."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Ĉu enŝaltita"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalu ĝisdatigojn"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Serĉu ĝisdatigojn"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Konfiguru la reton"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanĉu drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Ne demandu min venontfoje"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Sekvanta"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Lanĉu MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Kalkulu novajn ĝisdatigojn...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemo estas ĝisdata\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrolante Reton: ĝi ŝajnas haltita\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Kopirajto (C) %s ĉe %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Averto"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Pri..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Legas konfiguradon\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Ĉiam startu post sistemstartado"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Eliru"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Eraro"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Maŝinnomo:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Eraro okazis"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Paneo ĉe aldono de portilo"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Jeso"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Malĝusta pasvorto"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Malĝusta pasvorto"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Eraro"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Fermu"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -627,37 +432,59 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- presu tiun helpmesaĝon.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update startos aŭtomate.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - startas Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Maŝinnomo:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Eraro okazis"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Paneo ĉe aldono de portilo"
+
+#~ msgid "Ok"
+#~ msgstr "Jeso"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/es.po b/po/es.po
index 003933ec..7495fd79 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline_es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 09:18-0300\n"
 "Last-Translator: Diego Bello Carreño <dbello@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -25,17 +25,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n>1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Verificará actualizaciones a las %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema está actualizado"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,47 +44,42 @@ msgstr ""
 "Problema de configuración del servicio. Por favor verifique sus archivos de "
 "registro y envie un correo a support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Por favor espere, encontrando los paquetes disponibles..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hay nuevas actualizaciones disponibles para su sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Ha sido publicada una nueva versión de Mageia Linux"
 
-#: ../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"
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La red no está activa. Configúrela por favor"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "El servicio no está activado. Haga clic sobre \"Sitio web en línea\"."
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de datos de urpmi bloqueada"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión no soportada (muy antigua o versión de desarrollo)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -92,7 +87,7 @@ msgstr ""
 "No se encontró ningún soporte. Debe añadir uno con el \"Administrador de "
 "soportes de software\"."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,122 +105,104 @@ msgstr ""
 "\n"
 "Luego, reinicie \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Error actualizando el soporte"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizaciones"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Añadir soporte con Programas Adicionales"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar actualizaciones"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar red"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Actualizar el sistema"
 
-#: ../mdkapplet:394
-#, 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 ""
-"El mantenimiento básico para esta distribución ha expirado. Gracias a su "
-"suscripción para ampliar el mantenimiento su sistema seguirá estando "
-"actualizado hasta %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Se recibido SIGHUP (probablemente ha terminado una actualización), "
 "reiniciando el applet."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lanzando drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nueva versión de Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Examinar"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Una nueva versión de Mageia Linux está disponible"
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Más información acerca de esta nueva versión"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "¿Desea actualizar a distribución '%s'?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "No volver a preguntar"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Descargar todos los paquetes de una vez"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Advertencia: Necesitará una gran cantidad de espacio libre)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Dónde descargar paquetes:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -234,55 +211,27 @@ msgstr ""
 "El mantenimiento de esta versión de Mageia Linux ha finalizado. No se "
 "entregarán mas actualizaciones para este sistema."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Para mantener su sistema seguro, usted puede:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Debería obtener una ampliación del mantenimiento."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Debería obtener una ampliación del mantenimiento o actualizar a una versión "
-"más reciente de la distribución %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Su distribución ya no es soportada"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Mantenimiento ampliado"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Compre una ampliación de mantenimiento para esta versión (%s) y manténgala "
-"operativa hasta %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -291,18 +240,18 @@ msgstr ""
 "Esta actualización necesita una conexión de banda ancha (cable, xDSL, ...) y "
 "puede requerir muchas horas para completarse."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "La descarga estimada será de %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -311,347 +260,182 @@ 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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Lanzando MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calculando nuevas actualizaciones...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "El sistema está actualizado\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificando red: parece estar deshabilitada\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright © %s por %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mandiva Online da acceso a los servicios web de Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Fabián Mandelbaum <fmandelbaum@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Más Información"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Añadir soportes"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Acerca..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuración de Actualizaciones"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lanzar siempre al arrancar"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nuevo soporte disponible"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Usted utiliza la distribución '%s', y por tanto tiene acceso privilegiado "
-"para programas adicionales."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "¿Desea añadir este soporte para acceder programas adicionales?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Añadiendo un soporte de programas adicionales"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Los productos con soporte son %s, '%s' no está en la lista. \n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Error"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Error al obtener lista de distribuciones:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia provee 12 meses de actualizaciones de escritorio (hasta %s) y 18 "
-"meses de actualizaciones base (hasta el %s) para las distribuciones."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"La ampliación de mantenimiento está ahora disponible para tener 18 meses de "
-"actualizaciones adicionales (hasta %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-"Usted puede suscribirse <b>ahora mismo</b> para obtener la ampliación de "
-"mantenimiento:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Política de tiempo de vida"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Suscripción en línea"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ha ocurrido un error"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Su cuenta de Mageia no tiene suscripción para descarga %s "
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Ha ocurrido un error al añadir el soporte"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "¡Soporte añadido satisfactoriamente!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Soporte %s añadido satisfactoriamente."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Aquí se puede configurar el notificador de actualizaciones"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Frecuencia de verificaciones (horas)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Demora de la primera verificación (minutos)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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
-#, c-format
-msgid "Restricted"
-msgstr "Restringido"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Empresarial"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack le brinda la mejor de la experiencia Linux para el "
-"escritorio: estabilidad y eficiencia de soluciones de código abierto junto "
-"con aplicaciones exclusivas y soporte oficial de Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Características de Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Más información en su cuenta de usuario"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Su correo electrónico"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Su contraseña"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "No recuerdo mi contraseña"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Error"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "La contraseña y correo no pueden estar en blanco."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Seleccione su versión de actualización"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Su acceso a Powerpack ha terminado"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s está ahora disponible, puede actualizarlo a:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"La distribución Mageia Linux con incluso más aplicaciones y soporte oficial."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "La distribución 100%% código abierto disponible gratuitamente."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Actualización de Distribución"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -665,36 +449,183 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- mostrar este mensaje de ayuda.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update ejecutado automáticamente.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- ejecutar scripts específicos de mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update en versión texto.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- hacer un registro de lo que se hace\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 
+#~ 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 ""
+#~ "El mantenimiento básico para esta distribución ha expirado. Gracias a su "
+#~ "suscripción para ampliar el mantenimiento su sistema seguirá estando "
+#~ "actualizado hasta %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Debería obtener una ampliación del mantenimiento."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Debería obtener una ampliación del mantenimiento o actualizar a una "
+#~ "versión más reciente de la distribución %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Mantenimiento ampliado"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Compre una ampliación de mantenimiento para esta versión (%s) y "
+#~ "manténgala operativa hasta %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Los productos con soporte son %s, '%s' no está en la lista. \n"
+
+#~ 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."
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Error al obtener lista de distribuciones:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia provee 12 meses de actualizaciones de escritorio (hasta %s) y 18 "
+#~ "meses de actualizaciones base (hasta el %s) para las distribuciones."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "La ampliación de mantenimiento está ahora disponible para tener 18 meses "
+#~ "de actualizaciones adicionales (hasta %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr ""
+#~ "Usted puede suscribirse <b>ahora mismo</b> para obtener la ampliación de "
+#~ "mantenimiento:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Política de tiempo de vida"
+
+#~ msgid "Online subscription"
+#~ msgstr "Suscripción en línea"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ha ocurrido un error"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Su cuenta de Mageia no tiene suscripción para descarga %s "
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Ha ocurrido un error al añadir el soporte"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "¡Soporte añadido satisfactoriamente!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Soporte %s añadido satisfactoriamente."
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr ""
+#~ "Un soporte adicional de programas está disponible para su distribución"
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Añadir soporte con Programas Adicionales"
+
+#~ msgid "New medium available"
+#~ msgstr "Nuevo soporte disponible"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Usted utiliza la distribución '%s', y por tanto tiene acceso privilegiado "
+#~ "para programas adicionales."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "¿Desea añadir este soporte para acceder programas adicionales?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Verificar el medio \"%s\" que falta"
+
+#~ msgid "Restricted"
+#~ msgstr "Restringido"
+
+#~ msgid "Enterprise"
+#~ msgstr "Empresarial"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack le brinda la mejor de la experiencia Linux para el "
+#~ "escritorio: estabilidad y eficiencia de soluciones de código abierto "
+#~ "junto con aplicaciones exclusivas y soporte oficial de Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Características de Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Seleccione su versión de actualización"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Su acceso a Powerpack ha terminado"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s está ahora disponible, puede actualizarlo a:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "La distribución Mageia Linux con incluso más aplicaciones y soporte "
+#~ "oficial."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/et.po b/po/et.po
index 4dfed682..372d43cd 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2011-05-17 17:08+0200\n"
 "Last-Translator: Marek Laane <bald@smail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Uuenduste kontrollimine kell %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Teie süsteemis pole midagi uuendada"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,47 +39,42 @@ msgstr ""
 "Teenuse seadistamise probleem. Palun kontrollige logisid ja saatke e-kiri "
 "aadressile support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Palun oodake, otsitakse kättesaadavaid pakette..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Teie süsteemile on uuendusi"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Ilmunud on Mageia distributsiooni uus versioon"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Teie distributsioonile on saadaval täiendav andmekandja."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Võrk on maas. Palun seadistage võrk"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Teenus pole aktiveeritud. Palun valige \"Veebilehekülg\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi andmebaas on lukus"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Väljalase pole toetatud (liiga vana või arendusversioon)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -87,7 +82,7 @@ msgstr ""
 "Andmekandjat ei leitud. Andmekandja tuleb lisada tarkvaraallikate halduri "
 "abil."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,178 +99,133 @@ msgstr ""
 "\n"
 "Seejärel käivitage \"%s\" uuesti."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Viga andmekandja uuendamisel"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Uuenduste paigaldamine"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Täiendava andmekandja lisamine"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Uuenduste kontrollimine"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Uuenda süsteemi"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Selle distributsiooni põhihooldusperiood on läbi. Kuna olete tellinud "
-"hooldusperioodi pikendamise, hoitakse Teie süsteemi uuendatuna kuni %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Saadi signaal SIGHUP (arvatavasti uuendamine lõpetati), aplett käivitatakse "
 "uuesti."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnecti käivitamine\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia distributsiooni uus versioon"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Sirvi"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Ilmunud on Mageia distributsiooni uus versioon."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Rohkem teavet uue versiooni kohta"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Kas soovite uuendada ja paigaldada '%s'?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Rohkem ei küsita"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Kõigi pakettide korraga allalaadimine"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Hoiatus: see vajab päris palju vaba ruumi)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Pakettide allalaadimise koht:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Edasi"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
-"Selle Mageia süsteemi hooldusperiood on läbi. See tähendab, et Te ei "
-"saa enam tarkvara uuendusi."
+"Selle Mageia süsteemi hooldusperiood on läbi. See tähendab, et Te ei saa "
+"enam tarkvara uuendusi."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Hoidmaks süsteemi turvalisena, võite"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Te võite hooldusperioodi pikendada."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Te võite hooldusperioodi pikendada või siis uuendada %s distributsiooni "
-"uuema versiooni peale."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Te võite uuendada %s distributsiooni uuema versiooni peale.?"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Teie distributsioon ei ole enam toetatud"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Hooldusperioodi pikendamine"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Osta selle versiooni hooldusperioodi pikendamise (%s) ja hoida oma süsteemi "
-"töös kuni %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -284,17 +234,17 @@ msgstr ""
 "See uuendus nõuab suure läbilaskevõimega võrguühendust (kaabel, xDSL...) ja "
 "võib vajada lõpetamiseks mitu tundi."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Tõmmatavaid andmeid on hinnanguliselt %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -303,342 +253,182 @@ msgstr ""
 "Sülearvuti oleks mõttekas panna seinatoitele ning võimaluse korral tasuks "
 "WiFi-le eelistada Ethernet-ühendust."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate'i käivitamine\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Uuenduste kontrollimine...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Midagi pole uuendada\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Võrgu kontroll: paistab, et võrk ei tööta\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Autoriõigus (C) %s: %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online võimaldab kasutada Mageia veebiteenuseid."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Marek Laane <bald@smail.ee>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Rohkem teavet"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Lisa andmekandjad"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Info..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Uuendamise seadistamine"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käivitatakse alati käivitumisel"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Saadaval on uus andmekandja"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Te kasutate distributsiooni '%s' ja saate seepärast võimaluse paigaldada "
-"lisatarkvara."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Kas soovite lisada täiendava andmekandja?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Täiendava andmekandja lisamine"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Toetatud tooted on %s, '%s' pole nimekirjas.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Viga"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Distributsiooni nimekirja hankimine nurjus:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia pakub uuendusi töölauale 12 kuud (kuni %s) ja baassüsteemile 18 kuud "
-"(kuni %s)."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Nüüd on olemas võimalus ka hankida hooldusperioodi pikendamine 18 kuu võrra "
-"(kuni %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Te võite hooldusperioodi pikendamise <b>otsekohe tellida</b>:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Hooldusperioodi reeglid"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Internetitellimus"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Tekkis viga"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Teie Mageia kontol ei ole %s allalaadimine tellitud."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Tekkis viga andmekandja lisamisel"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Andmekandja lisati edukalt!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Andmekandja %s lisati edukalt."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Olgu"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Siin saab seadistada uuendamisapletti"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Uuendamise sagedus (tundides)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Esimese kontrollimise viivitus (minutites)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Uuema \"%s\" väljalaske olemasolu kontrollimine"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Puuduva \"%s\" andmekandja olemasolu kontrollimine"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Piiratud"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack pakub Teile parimaid Linuxi kogemusi töölaual: avatud "
-"lähtekoodi stabiilsus ja tõhusus käsikäes eksklusiivse tarkvara ja Mageia "
-"ametliku tugiteenusega."
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr "Mageia omadused"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Rohkem teavet Teie kasutajakonto kohta"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Teie e-posti aadress"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Teie parool"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Olen parooli unustanud"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Viga"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Parool ja e-posti aadress tuleb kindlasti anda."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Uuendamisversiooni valimine"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Teie Powerpacki kasutamisõigus on lõppenud"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s on nüüd saadaval, Te võite valida:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "Mageia veel rohkema tarkvaraga ja ametliku tugiteenusega."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "100%% avatud lähtekoodiga ning vabalt ja tasuta saadaval."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Distributsiooni uuendamine"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -652,33 +442,169 @@ msgstr ""
 "\n"
 "Kasutamine:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- selle abiteate näitamine.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update käivitatakse automaatselt.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- käivitatakse MNF-spetsiifilised skriptid.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update'i tekstiversioon.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- toimingud logitakse\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 
+#~ 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 ""
+#~ "Selle distributsiooni põhihooldusperiood on läbi. Kuna olete tellinud "
+#~ "hooldusperioodi pikendamise, hoitakse Teie süsteemi uuendatuna kuni %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Te võite hooldusperioodi pikendada."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Te võite hooldusperioodi pikendada või siis uuendada %s distributsiooni "
+#~ "uuema versiooni peale."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Hooldusperioodi pikendamine"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Osta selle versiooni hooldusperioodi pikendamise (%s) ja hoida oma "
+#~ "süsteemi töös kuni %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Toetatud tooted on %s, '%s' pole nimekirjas.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "Palun sisestage täiendava andmekandja lisamiseks oma konto ID"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Distributsiooni nimekirja hankimine nurjus:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia pakub uuendusi töölauale 12 kuud (kuni %s) ja baassüsteemile 18 "
+#~ "kuud (kuni %s)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Nüüd on olemas võimalus ka hankida hooldusperioodi pikendamine 18 kuu "
+#~ "võrra (kuni %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Te võite hooldusperioodi pikendamise <b>otsekohe tellida</b>:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Hooldusperioodi reeglid"
+
+#~ msgid "Online subscription"
+#~ msgstr "Internetitellimus"
+
+#~ msgid "An error occurred"
+#~ msgstr "Tekkis viga"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Teie Mageia kontol ei ole %s allalaadimine tellitud."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Tekkis viga andmekandja lisamisel"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Andmekandja lisati edukalt!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Andmekandja %s lisati edukalt."
+
+#~ msgid "Ok"
+#~ msgstr "Olgu"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Teie distributsioonile on saadaval täiendav andmekandja."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Täiendava andmekandja lisamine"
+
+#~ msgid "New medium available"
+#~ msgstr "Saadaval on uus andmekandja"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Te kasutate distributsiooni '%s' ja saate seepärast võimaluse paigaldada "
+#~ "lisatarkvara."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Kas soovite lisada täiendava andmekandja?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Puuduva \"%s\" andmekandja olemasolu kontrollimine"
+
+#~ msgid "Restricted"
+#~ msgstr "Piiratud"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack pakub Teile parimaid Linuxi kogemusi töölaual: avatud "
+#~ "lähtekoodi stabiilsus ja tõhusus käsikäes eksklusiivse tarkvara ja Mageia "
+#~ "ametliku tugiteenusega."
+
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia omadused"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Uuendamisversiooni valimine"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Teie Powerpacki kasutamisõigus on lõppenud"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s on nüüd saadaval, Te võite valida:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr "Mageia veel rohkema tarkvaraga ja ametliku tugiteenusega."
diff --git a/po/eu.po b/po/eu.po
index 4454c1ac..76286967 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-29 21:26+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Basque <kde-i18n-doc@kde.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Eguneraketak egiaztatu %s-n"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Zure sistema eguneratuta dago"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,48 +39,43 @@ msgstr ""
 "Zerbitzuaren konfigurazio arazoa. Mesedez aztertu erregistroak eta bidali "
 "posta support@mageiaonline.com helbidera"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Itxaron, pakete erabilgarriak bilatzen..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Zure sistemarentzako eguneraketa berriak eskuragarri daude"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia Linux banaketaren bertsio berri bat kaleratu da"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sarea erorita dago. Mesedez konfiguratu zure sarea"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Zerbitzua ez dago aktibatuta. Mesedez klikatu \"Lerroko Webgunea\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi datubasea blokeatuta"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Bertsio hau ez dago sostengaturik (bertsio zaharregia, edo garapen bertsioa)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -88,7 +83,7 @@ msgstr ""
 "Ez da euskarririk aurkitu. Euskarriren bat erantsi behar duzu 'Software "
 "Euskarri Kudeatzailea' bitartez."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,121 +100,104 @@ msgstr ""
 "\n"
 "Ondoren, \"%s\" berrabiarazi."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Akatsa euskarri eguneratzerakoan"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalatu eguneratzeak"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Erantsi pakete euskarri osagarria"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Egiaztatu eguneratzeak"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Konfiguratu sarea"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Sistema bertsio berritu"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Banaketa honentzako oinarrizko mantenua amaitu da. Mantenu  hedatuan duzun "
-"harpidetzari esker, zure sistema %s arte eguneratuko da."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "SIGHUP jaso da (baliteke bertsio berritze bat amaitu izatea), applet-a "
 "berrabiatzen."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconect abiarazten\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia Linux banaketaren bertsio berria"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Arakatu"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia Linux banaketaren bertsio berri bat kaleratu da."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Bertsio berri honi buruzko informazio gehiago"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "'%s' banaketara bertsio berritu nahi duzu?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Ez galdetu berriz"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Jaitsi pakete guztiak batera"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Oharra: leku aske haundi xamarra beharko duzu)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Paketeak nora jaitsi:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -228,55 +206,27 @@ msgstr ""
 "Mageia Linux bertsio honentzako mantenua amaitu da. Ez dira sistema "
 "honentzako eguneraketa gehiago hornituko."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Zure sistema seguru mantentzeko, egin dezakezu:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Mantenu hedatua hartu beharko zenuke."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Mantenu hedatua hartu edo %s banaketaren bertsio berriago batera berritu "
-"beharko zenuke."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "%s banaketaren bertsio berriago batera berritu beharko zenuke."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Zure banaketak ez du aurrerantzean euskarririk izango"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Mantenu hedatua"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Erosi bertsio honentzako (%s) mantenuaren luzapen bat eta jarraitu "
-"erabiltzen %s arte."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -285,19 +235,19 @@ msgstr ""
 "Bertsio berritze honek banda zabalera haundiko sare lotura (kablea, "
 "xDSL, ...)  behar du eta osatzeko orduak beharko ditu."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Jaitsi behar den datu kopurua %s izango dela kalkulatu da"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Jarraitu aurretik martxan dauden gainontzeko aplikazio guztiak itxi beharko "
 "zenituzke."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -306,344 +256,182 @@ msgstr ""
 "Magalekoa sare elektrikora konektatu beharko zenuke eta wifi loturaren "
 "gainetik ethernet hobetsi, eskuragarri badago."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate abiarazten\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Eguneraketa berriak kalkulatzen...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistema eguneratzera doa\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sare egiaztaketa: desgaituta dagoela dirudi\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online-k Mageia web zerbitzuetara sarbidea ematen du."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Informazio gehiago"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Euskarria erantsi"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Honi buruz..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Eguneraketen ezarpena"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Jaurti beti hasterakoan"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Irten"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Euskarri berria eskuragarri"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"'%s' banaketa erabiltzen duzu, ondorioz software osagarrira sarbide "
-"pribilegioa daukazu."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Pakete gordetegi osagarri hau erantsi nahi duzu?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Pakete euskarri berri bat eransten"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Euskarria duten produktuak %s dira, '%s' ez dago zerrendan.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Errorea"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Akatsa banaketen zerrenda eskuratzerakoan:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageiak banaketetan 12 hilabetez mahaigainaren eguneraketak hornitzen ditu "
-"(%s arte) eta 18 hilabez oinarriaren eguneraketak (%s arte)."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Mantenu hedatua eskuragarri dago orain 18 hilabetez eguneraketa gehigarriak "
-"jasotzeko (%s arte)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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:"
-
-# Lifetime => Gazteleraz "Ciclo de vida"?
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Biziarteko politika"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Lerroko harpidetza"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Akats bat gertatu da"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Zure Mageia kontuak ez dauka %s jaisteko harpidetza gaituta."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Akatsa gertatu da euskarria eransterakoan"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Euskarria egokiro erantsi da!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "%s euskarria erantsi da."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ados"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Hemen eguneraketa appleta konfiguratu dezakezu"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Eguneratzeko maiztasuna (orduak)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Lehenengo egiaztapenerako atzerapena (minutuak)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Egiaztatu \"%s\"-ren kaleratze berriak"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Egiaztatu falta den \"%s\" euskarria"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Mugatuta"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enpresa"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack-ek mahaigainerako Linux esperientziarik onena ekartzen "
-"dizu: iturburu irekiko ebazpideen egonkortasun eta eraginkortasuna, software "
-"esklusibo eta Mageiaren euskarri ofizialarekin batera."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux-en ezaugarriak"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Zure erabiltzaile kontuaren gaineko informazio gehiago"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Zure post@"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Zure pasahitza"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Ahaztutako pasahitza"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Errorea"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Pasahitza eta post@ ezin dira hutsik utzi."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Itxi"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Aukeratu bertsio berritzeko zure bertsioa"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Zure Powerpack atzipena amaitu da"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s eskuragarri dago orain, honetara bertsio berritu dezakezu:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Mageia Linux banaketa oraindik software gehiago eta euskarri ofizialarekin."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "%%100 Iturburu irekiko banaketa doan eskuragarri."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Banaketaren Bertsio berritzea"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -657,36 +445,180 @@ msgstr ""
 "\n"
 "erabilera:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- laguntza-mezu hau inprimatzen du.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update automatikoki abiarazten du.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- jaurti mnf script espezifikoak.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update-ren testu moduko bertsioa.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- erregistratu egindako ekintzak\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ezin dira update_source euskarritik paketeak eguneratu.\n"
 
+#~ 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 ""
+#~ "Banaketa honentzako oinarrizko mantenua amaitu da. Mantenu  hedatuan "
+#~ "duzun harpidetzari esker, zure sistema %s arte eguneratuko da."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Mantenu hedatua hartu beharko zenuke."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Mantenu hedatua hartu edo %s banaketaren bertsio berriago batera berritu "
+#~ "beharko zenuke."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Mantenu hedatua"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Erosi bertsio honentzako (%s) mantenuaren luzapen bat eta jarraitu "
+#~ "erabiltzen %s arte."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Euskarria duten produktuak %s dira, '%s' ez dago zerrendan.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "Mesedez bete zure kontu ID, pakete euskarri osagarri bat eransteko"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Akatsa banaketen zerrenda eskuratzerakoan:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageiak banaketetan 12 hilabetez mahaigainaren eguneraketak hornitzen "
+#~ "ditu (%s arte) eta 18 hilabez oinarriaren eguneraketak (%s arte)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Mantenu hedatua eskuragarri dago orain 18 hilabetez eguneraketa "
+#~ "gehigarriak jasotzeko (%s arte)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr ""
+#~ "Izen eman dezakezu <b>oraintxe bertan</b> mantenu hedatua jasotzeko:"
+
+# Lifetime => Gazteleraz "Ciclo de vida"?
+#~ msgid "Lifetime policy"
+#~ msgstr "Biziarteko politika"
+
+#~ msgid "Online subscription"
+#~ msgstr "Lerroko harpidetza"
+
+#~ msgid "An error occurred"
+#~ msgstr "Akats bat gertatu da"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Zure Mageia kontuak ez dauka %s jaisteko harpidetza gaituta."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Akatsa gertatu da euskarria eransterakoan"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Euskarria egokiro erantsi da!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "%s euskarria erantsi da."
+
+#~ msgid "Ok"
+#~ msgstr "Ados"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr ""
+#~ "Zure banaketaren pakete euskarri berri osagarri bat eskuragarri dago."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Erantsi pakete euskarri osagarria"
+
+#~ msgid "New medium available"
+#~ msgstr "Euskarri berria eskuragarri"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "'%s' banaketa erabiltzen duzu, ondorioz software osagarrira sarbide "
+#~ "pribilegioa daukazu."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Pakete gordetegi osagarri hau erantsi nahi duzu?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Egiaztatu falta den \"%s\" euskarria"
+
+#~ msgid "Restricted"
+#~ msgstr "Mugatuta"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enpresa"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack-ek mahaigainerako Linux esperientziarik onena ekartzen "
+#~ "dizu: iturburu irekiko ebazpideen egonkortasun eta eraginkortasuna, "
+#~ "software esklusibo eta Mageiaren euskarri ofizialarekin batera."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux-en ezaugarriak"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Aukeratu bertsio berritzeko zure bertsioa"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Zure Powerpack atzipena amaitu da"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s eskuragarri dago orain, honetara bertsio berritu dezakezu:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Mageia Linux banaketa oraindik software gehiago eta euskarri "
+#~ "ofizialarekin."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/fa.po b/po/fa.po
index 2a0960e6..7bc57cd2 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -22,17 +22,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "بررسی بروزسازی‌ها"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "سیستم‌تان بروز است"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -41,53 +41,48 @@ msgstr ""
 "اشکال تنظیم سرویس. لطفا ثبت‌ها را کنترل کرده و پستی را به "
 "support@mageiaonline.com ارسال کنید"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "لطفا صبر کنید، در حال یافتن بسته‌های موجود..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "بروزسازی‌هایی برای سیستم‌تان در دسترس است"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "شبکه پایین است. لطفا شبکه‌تان را تنظیم کنید"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "سرویس فعال نشده است. لطفا بر \"وب‌گاه اینترنتی\" کلیک کنید"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "بانک اطلاعات urpmi قفل شده است"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "انتشار پشتیبانی نشده است (انتشار بسیار قدیمی، یا انتشار توسعه‌ای)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,518 +99,328 @@ msgstr ""
 "\n"
 "پس از آن %s را دوباره شروع کنید."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "به‌کارافتاده؟"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "نصب کردن بروزسازی‌ها"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "بررسی بروزسازی‌ها"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "تنظیم شبکه"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "راه انداختن drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "بعدی"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "به راه انداختن MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "در حال محاسبه کردن بروزسازی‌های جدید...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "سیستم به روز است\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "بررسی کردن شبکه: بنظر از کار افتاده است\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "وب‌گاه اینترنت"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "درباره‌ی.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "خواندن پیکربندی\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "راه‌اندازی همیشگی در شروع"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "ترک"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "خطا"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "نام ماشین:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "خطائی رخ داد"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "تأیید"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "گذرواژه‌ی اشتباه"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "گذرواژه‌ی اشتباه"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "خطا"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "بستن"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -628,37 +433,59 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- چاپ این پیام راهنما.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update بطور خودکار اجرا شد.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - اجرای Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "قادر نبودن به بروزسازی بسته‌ها از رسانه‌ی update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "نام ماشین:"
+
+#~ msgid "An error occurred"
+#~ msgstr "خطائی رخ داد"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "ناموفق بودن هنگام اضافه کردن رسانه"
+
+#~ msgid "Ok"
+#~ msgstr "تأیید"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
diff --git a/po/fi.po b/po/fi.po
index 85b3983d..ced7db28 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2011-05-15 11:15+0300\n"
 "Last-Translator: Jani Välimaa <wally@mageia.org>\n"
 "Language-Team: Finnish <mageia-i18n@mageia.org>\n"
@@ -26,17 +26,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Tarkistetaan päivitykset klo %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Järjestelmä on ajantasalla"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -45,47 +45,42 @@ msgstr ""
 "Palvelun asetusongelma. Tarkista lokit ja lähetä sähköpostia osoitteeseen "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Etsitään saatavilla olevia paketteja..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Järjestelmälle on saatavilla päivityksiä"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia-jakelusta on saatavilla uusi versio"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Verkko on alhaalla. Aseta verkko."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Palvelua ei ole otettu käyttöön. Paina \"Online-sivusto\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "Urpmi-tietokanta lukittu"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Jakelu ei ole tuettu (liian vanha tai kehitysversio)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -93,7 +88,7 @@ msgstr ""
 "Ohjelmistolähteitä ei löytynyt. Lisää lähteitä rpmdraken Ohjelmistolähteiden "
 "hallinnalla."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,121 +105,104 @@ msgstr ""
 "\n"
 "Tämän jälkeen käynnistä %s uudelleen."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Virhe päivitettäessä lähteitä."
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Asenna päivitykset"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Lisää lisäpakettilähde"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Tarkista päivitykset"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Aseta verkko"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Päivitä järjestelmä"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Perusylläpito jakelulle on päättynyt. Kiitos ylläpitolaajennuksen "
-"tilauksesta, nyt järjestelmä tulee pysymään ajantasalla %s asti."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Vastaanotettiin SIGHUP (todennäköisesti päivitys on valmis), käynnistetään "
 "sovelma uudelleen."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Käynnistetään drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia-jakelun uusi versio"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Selaa"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia-jakelusta on saatavilla uusi versio."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Lisätietoja uudesta versiosta"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Päivitetäänkö jakeluun %s?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Älä kysy seuraavalla kerralla"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Lataa kaikki paketit kerralla"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Varoitus: Tarvitaan hyvin paljon vapaata levytilaa)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Minne paketit ladataan:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -233,54 +211,27 @@ msgstr ""
 "Tämän Mageia-järjestelmän ylläpito on loppunut. Uusia ohjelmistopäivityksiä "
 "ei enää ilmesty."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Pitääksesi järjestelmän turvattuna, voit:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Ylläpitolaajennus tulisi hankkia."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Sinun tulisi hankkia ylläpitolaajennus tai päivittää uudempaan %sin versioon."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Järjestelmä tulisi päivittää uudempaan %sin versioon."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Jakelu ei ole enää tuettu"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Ylläpitolaajennus"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Hanki ylläpitolaajennus asennettuun versioon (%s) ja pidä se käytössä %s "
-"asti."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -289,17 +240,17 @@ msgstr ""
 "Päivitys vaatii nopean verkkoyhteyden (kaapeli, xDSL, ...) ja voi kestää "
 "muutamia tunteja."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Arvioitu ladattavan datan määrä: %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Kaikki muut käynnissä olevat ohjelmat tulisi sulkea ennen jatkamista."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -308,48 +259,48 @@ msgstr ""
 "Kannettava tulisi kytkeä verkkovirtaan ja käyttää WLAN-verkon sijaan "
 "lankaverkkoa, jos mahdollista."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Käynnistetään MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Etsitään uudet päivitykset...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Järjestelmä on ajantasalla\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tarkistetaan verkkoa: nähtävästi pois käytöstä\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s, %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online avaa pääsyn Mageian Internet-palveluihin."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -357,296 +308,138 @@ msgstr ""
 "Jani Välimaa <wally@mandriva.org>\n"
 "Anssi Hannula <anssi@mandriva.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Huomautus"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Lisätietoja"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Lisää lähde"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Tietoja.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Päivitysasetukset"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käynnistä automaattisesti"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Poistu"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Uusi lähde saatavilla"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, 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:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Asennetaanko lisäpakettilähde?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Lisätään lisäpakettilähdettä"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Tuetut tuotteet ovat %s, %s ei löydy listalta.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Virhe"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Virhe noudettaessa listaa jakeluista:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia tarjoaa 12 kuukauden ajan päivityksiä työpöytäsovelluksiin (%s asti) "
-"ja 18 kuukauden ajan jakelun peruspaketteihin (%s asti)."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Nyt on myös saatavilla ylläpitolaajennus, joka tarjoaa 18 kuukauden ajan "
-"lisäpäivityksiä (%s asti)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Voit tilata ylläpitolaajennuksen <b>heti</b>:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Jakelun elinkaari"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Online-tilaus"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ilmeni virhe"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "My.mandriva.com -tililtä ei löydy %sin lataustilausta."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Virhe lisättäessä lähdettä"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Lisättiin lähde onnistuneesti!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Lisättiin lähde %s onnistuneesti."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Päivityssovelman asetukset"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Päivitysväli (tuntia)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 "Ensimmäisen (käynnistyksen jälkeisen)\n"
 "tarkistuksen viive (minuuttia)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Tarkista uuden %s -julkaisun varalta"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Tarkista puuttuvat %s -lähteet"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Restricted"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack tuo sinulle parhaan Linux kokemuksen työpöydälle: avoimen "
-"lähdekoodin perustuva vakaat ja tehokaat ratkaisut yhdistettynä "
-"eksklusiivisiin ohjelmistoihin ja Mageian viralliseen tukeen."
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr "Mageian ominaisuudet"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Lisätietoja käyttäjätilistä"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Sähköpostiosoite"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Salasana"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Unohdin salasanan"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Virhe"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Salasanaa ja sähköpostiosoitta ei voi jättää tyhjäksi."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Sulje"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Valitse päivitysversio"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Powerpack-oikeutesi on päättynyt"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s on nyt saatavilla, voit pävittää tuotteeseen:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "Mageia-jakelu jossa en vielä enemmän ohjelmistoja ja virallista tukea."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "100%% avoimen lähdekoodin jakelu vapaasti saatavilla."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Jakelun päivitys"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -660,36 +453,172 @@ msgstr ""
 "\n"
 "Käyttö:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- tulosta tämä viesti.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update käynnistetään automaattisesti.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- käynnistä mnf-aiheiset skriptit.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- tekstipohjainen Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- kirjaa tapahtumalokiin\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 
+#~ 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 ""
+#~ "Perusylläpito jakelulle on päättynyt. Kiitos ylläpitolaajennuksen "
+#~ "tilauksesta, nyt järjestelmä tulee pysymään ajantasalla %s asti."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Ylläpitolaajennus tulisi hankkia."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Sinun tulisi hankkia ylläpitolaajennus tai päivittää uudempaan %sin "
+#~ "versioon."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Ylläpitolaajennus"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Hanki ylläpitolaajennus asennettuun versioon (%s) ja pidä se käytössä %s "
+#~ "asti."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Tuetut tuotteet ovat %s, %s ei löydy listalta.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Virhe noudettaessa listaa jakeluista:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia tarjoaa 12 kuukauden ajan päivityksiä työpöytäsovelluksiin (%s "
+#~ "asti) ja 18 kuukauden ajan jakelun peruspaketteihin (%s asti)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Nyt on myös saatavilla ylläpitolaajennus, joka tarjoaa 18 kuukauden ajan "
+#~ "lisäpäivityksiä (%s asti)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Voit tilata ylläpitolaajennuksen <b>heti</b>:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Jakelun elinkaari"
+
+#~ msgid "Online subscription"
+#~ msgstr "Online-tilaus"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ilmeni virhe"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "My.mandriva.com -tililtä ei löydy %sin lataustilausta."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Virhe lisättäessä lähdettä"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Lisättiin lähde onnistuneesti!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Lisättiin lähde %s onnistuneesti."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Käytettävälle jakelulle on saatavilla lisäpakettilähde."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Lisää lisäpakettilähde"
+
+#~ msgid "New medium available"
+#~ msgstr "Uusi lähde saatavilla"
+
+#~ 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."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Asennetaanko lisäpakettilähde?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Tarkista puuttuvat %s -lähteet"
+
+#~ msgid "Restricted"
+#~ msgstr "Restricted"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack tuo sinulle parhaan Linux kokemuksen työpöydälle: "
+#~ "avoimen lähdekoodin perustuva vakaat ja tehokaat ratkaisut yhdistettynä "
+#~ "eksklusiivisiin ohjelmistoihin ja Mageian viralliseen tukeen."
+
+#~ msgid "Mageia Features"
+#~ msgstr "Mageian ominaisuudet"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Valitse päivitysversio"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Powerpack-oikeutesi on päättynyt"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s on nyt saatavilla, voit pävittää tuotteeseen:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Mageia-jakelu jossa en vielä enemmän ohjelmistoja ja virallista tukea."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/fr.po b/po/fr.po
index 28c6db52..03108b60 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-fr\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2012-06-02 14:57+0100\n"
 "Last-Translator: Rémi Verschelde <remi@verschelde.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -27,71 +27,72 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n>1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vérification de la disponibilité de mises à jour à %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Votre système est à jour"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
+msgid ""
+"Service configuration problem. Please check logs and send mail to "
+"support@mageiaonline.com"
 msgstr ""
-"Problème lors de la configuration du service. Vérifiez les journaux et envoyez-les à : \n"
+"Problème lors de la configuration du service. Vérifiez les journaux et "
+"envoyez-les à : \n"
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Veuillez patienter, recherche des paquetages disponibles..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "De nouvelles mises à jour sont disponibles pour votre système"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Une nouvelle version de la distribution Mageia est disponible"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Le réseau n'est pas disponible. Vérifiez la configuration du réseau"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Service non activé. Cliquez sur « Site Mageia Online »"
 
-#: ../mdkapplet:135
-#: ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de donnée urpmi verrouillée"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
-msgstr "Cette version de Mageia Linux n'est pas supportée (obsolète ou en développement)"
+msgstr ""
+"Cette version de Mageia Linux n'est pas supportée (obsolète ou en "
+"développement)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
-msgid "No medium found. You must add some media through 'Software Media Manager'."
-msgstr "Aucun dêpot n'a été trouvé. Vous devez en ajouter via le « Gestionnaire de Logiciels »."
+msgid ""
+"No medium found. You must add some media through 'Software Media Manager'."
+msgstr ""
+"Aucun dêpot n'a été trouvé. Vous devez en ajouter via le « Gestionnaire de "
+"Logiciels »."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -108,238 +109,204 @@ msgstr ""
 "\n"
 "Ensuite, redémarrez « %s »."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Erreur lors de la mise à jour des dépôts"
 
-#: ../mdkapplet:224
-#: ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installer les mises à jour"
 
-#: ../mdkapplet:225
-#: ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Ajouter un nouveau dépôt de paquetages"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Vérifier la disponibilité de mises à jour"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configurer le réseau"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Mettre à niveau le système"
 
-#: ../mdkapplet:394
-#, 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 "La maintenance de base de cette distribution est finie. Grâce à votre inscription à la maintenance étendue, votre système restera à jour jusqu'au %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
-msgstr "Signal SIGHUP reçu (une mise à niveau s'est probablement achevée), redémarrage de l'applet."
+msgstr ""
+"Signal SIGHUP reçu (une mise à niveau s'est probablement achevée), "
+"redémarrage de l'applet."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lancement de drakconnect\n"
 
-#: ../mdkapplet:459
-#: ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nouvelle version de la distribution Mageia"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "naviguer"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Une nouvelle version de la distribution Mageia est disponible."
 
-#: ../mdkapplet:475
-#: ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Plus d'information sur cette nouvelle version"
 
-#: ../mdkapplet:477
-#: ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Voulez-vous migrer vers la nouvelle distribution « %s » ?"
 
-#: ../mdkapplet:479
-#: ../mdkapplet:576
-#: ../mdkapplet:1033
-#: ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Ne pas demander la prochaine fois"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Télécharger tous les paquets avant d'installer"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, 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:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Où télécharger les paquets :"
 
-#: ../mdkapplet:493
-#: ../mdkapplet:581
-#: ../mdkapplet:658
-#: ../mdkapplet:1034
-#: ../mdkapplet:1064
-#: ../mdkapplet_gui.pm:232
-#: ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Suivant"
 
-#: ../mdkapplet:493
-#: ../mdkapplet:581
-#: ../mdkapplet:658
-#: ../mdkapplet:1034
-#: ../mdkapplet:1064
-#: ../mdkapplet_gui.pm:232
-#: ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
-msgid "Maintenance for this Mageia version has ended. No more updates will be delivered for this system."
-msgstr "Le support de cette version de Mageia est terminé. Cela signifie qu'elle ne recevra plus de mises à jour."
+msgid ""
+"Maintenance for this Mageia version has ended. No more updates will be "
+"delivered for this system."
+msgstr ""
+"Le support de cette version de Mageia est terminé. Cela signifie qu'elle ne "
+"recevra plus de mises à jour."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Afin de conserver votre système sécurisé, vous pouvez :"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Vous devriez souscrire à la maintenance étendue."
-
-#: ../mdkapplet:528
-#, c-format
-msgid "You should either get extended maintenance or upgrade to a newer version of the %s distribution."
-msgstr "Vous devriez soit souscrire à la maintenance étendue soit migrer vers une nouvelle version de la distribution « %s »"
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Vous devriez migrer vers la nouvelle distribution « %s »."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Votre distribution n'est plus supportée"
 
-#: ../mdkapplet:547
+#: ../mgaapplet:545
 #, c-format
-msgid "Extended Maintenance"
-msgstr "Maintenance étendue."
-
-#: ../mdkapplet:552
-#, c-format
-msgid "Purchase a maintenance extension for this version (%s) and keep it running until %s."
-msgstr "Acheter la maintenance étendue pour cette version (%s) et la conserver jusqu'au %s"
-
-#: ../mdkapplet:649
-#, c-format
-msgid "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  and may take several hours to complete."
-msgstr "Cette mise à niveau requiert une connexion réseau haut débit (câble, xDSL, ...) et peut durer plusieurs heures."
+msgid ""
+"This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
+"and may take several hours to complete."
+msgstr ""
+"Cette mise à niveau requiert une connexion réseau haut débit (câble, "
+"xDSL, ...) et peut durer plusieurs heures."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Les données téléchargées sont estimées à %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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."
+msgstr ""
+"Vous devriez fermer toutes les autres applications en cours d'exécution "
+"avant de continuer."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
-msgid "You should put your laptop on AC and favor ethernet connection over wifi, if available."
-msgstr "Vous devriez brancher votre portable sur le secteur et utiliser une connexion filaire plutôt que sans-fil si possible."
+msgid ""
+"You should put your laptop on AC and favor ethernet connection over wifi, if "
+"available."
+msgstr ""
+"Vous devriez brancher votre portable sur le secteur et utiliser une "
+"connexion filaire plutôt que sans-fil si possible."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Lancement de MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcul des nouvelles mises à jour ...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Le système est à jour\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, 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:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s par %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online donne accès aux services web de Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Site Mageia Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -355,336 +322,323 @@ msgstr ""
 "Didier Herisson <didier.herisson@angstrom.uu.se>\n"
 "Rémy Clouard\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Attention"
 
-#: ../mdkapplet:935
-#: ../mdkapplet:940
-#: ../mdkapplet:948
-#: ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Plus d'information"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Ajouter un dépôt"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "À propos ..."
 
-#: ../mdkapplet:969
-#: ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuration des mises à jour"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Toujours lancer au démarrage"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../mdkapplet:1023
-#: ../mdkapplet:1028
-#: ../mdkapplet:1053
-#: ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nouveau dépôt de paquetages disponible"
-
-#: ../mdkapplet:1030
-#: ../mdkapplet:1060
-#, c-format
-msgid "You use '%s' distribution and therefore have privileged access to additional software."
-msgstr "Vous utilisez la distribution « %s » et bénéficiez donc d'un accès privilégié à des paquetages supplémentaires."
-
-#: ../mdkapplet:1032
-#: ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Voulez-vous installer cette nouvelle source de paquetages ?"
-
-#: ../mdkapplet:1061
-#: ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84
-#: ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Ajouter un nouveau dépôt de paquetages"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Les produits garantis sont %s, « %s » n'est pas dans la liste.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148
-#: ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225
-#: ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Erreur"
-
-#: ../mdkapplet-add-media-helper:149
-#, 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:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
-msgstr "Mageia 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-add-media-helper:167
-#, c-format
-msgid "Extended maintenance is now available to get 18 months of additional updates (until %s)."
-msgstr "La maintenance étendue est désormains disponible afin de disposer de 18 mois additionnels de mises à jour (jusqu'au %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Vous pouvez souscrire <b>maintenant</b> à la maintenance étendue."
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Politique de cycle de vie"
-
-#: ../mdkapplet-add-media-helper:175
-#: ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Inscription en ligne"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Une erreur est survenue"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Votre compte Mageia n'est pas abonné au service de téléchargement %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, 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:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Dépôt ajouté avec succès !"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Dépôt %s ajouté avec succès."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Ici vous pouvez configurer l'applet des mises à jour"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Fréquence des mises à jours (heures)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Délai pour la première vérification (minutes)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
-msgstr "Mageia Powerpack vous apporte le meilleur de Linux pour les PC : la stabilité et l'efficacité de solutions open source combinées à des logiciels exclusifs et l'assistance officielle de Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr "Caractéristiques de Mageia"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Plus d'information sur votre compte utilisateur"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Votre courriel"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Votre mot de passe"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Mot de passe oublié"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Erreur"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Le mot de passe et le courriel ne peuvent être vides."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Fermer"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Choisissez votre version de mise à niveau"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Votre accès à Powerpack est terminé"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s est disponible, vous pouvez mettre à niveau vers :"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178
-#: ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181
-#: ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "La distribution Mageia avec encore plus de logiciels et une assistance officielle."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "La distribution 100%% open source disponible gratuitement."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Mise à niveau de la distribution"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate version %s\n"
 "Copyright © %s Mageia.\n"
-"Ceci est un logiciel libre qui peut être redistribué selon les termes de la Licence Publique Générale GNU.\n"
+"Ceci est un logiciel libre qui peut être redistribué selon les termes de la "
+"Licence Publique Générale GNU.\n"
 "\n"
 "utilisation :\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- affiche ce message d'aide.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update est lancé automatiquement.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- lance les scripts spécifiques à mnf. \n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- mode texte de Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- enregistre les actions dans le journal\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 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 ""
+#~ "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 ""
+#~ "La maintenance de base de cette distribution est finie. Grâce à votre "
+#~ "inscription à la maintenance étendue, votre système restera à jour "
+#~ "jusqu'au %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Vous devriez souscrire à la maintenance étendue."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Vous devriez soit souscrire à la maintenance étendue soit migrer vers une "
+#~ "nouvelle version de la distribution « %s »"
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Maintenance étendue."
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Acheter la maintenance étendue pour cette version (%s) et la conserver "
+#~ "jusqu'au %s"
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Les produits garantis sont %s, « %s » n'est pas dans la liste.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Errors lors de la récupération de la liste des distributions :"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia 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."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "La maintenance étendue est désormains disponible afin de disposer de 18 "
+#~ "mois additionnels de mises à jour (jusqu'au %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Vous pouvez souscrire <b>maintenant</b> à la maintenance étendue."
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Politique de cycle de vie"
+
+#~ msgid "Online subscription"
+#~ msgstr "Inscription en ligne"
+
+#~ msgid "An error occurred"
+#~ msgstr "Une erreur est survenue"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "Votre compte Mageia n'est pas abonné au service de téléchargement %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Une erreur est survenue lors de l'ajout du dépôt"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Dépôt ajouté avec succès !"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Dépôt %s ajouté avec succès."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr ""
+#~ "Un nouveau dépôt de paquetages est disponible pour votre distribution."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Ajouter un nouveau dépôt de paquetages"
+
+#~ msgid "New medium available"
+#~ msgstr "Nouveau dépôt de paquetages disponible"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Vous utilisez la distribution « %s » et bénéficiez donc d'un accès "
+#~ "privilégié à des paquetages supplémentaires."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Voulez-vous installer cette nouvelle source de paquetages ?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Vérifier si les média « %s » sont absents"
+
+#~ msgid "Restricted"
+#~ msgstr "Restreint"
+
+#~ msgid "Enterprise"
+#~ msgstr "Entreprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack vous apporte le meilleur de Linux pour les PC : la "
+#~ "stabilité et l'efficacité de solutions open source combinées à des "
+#~ "logiciels exclusifs et l'assistance officielle de Mageia."
+
+#~ msgid "Mageia Features"
+#~ msgstr "Caractéristiques de Mageia"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Choisissez votre version de mise à niveau"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Votre accès à Powerpack est terminé"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s est disponible, vous pouvez mettre à niveau vers :"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "La distribution Mageia avec encore plus de logiciels et une assistance "
+#~ "officielle."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/fur.po b/po/fur.po
index 1da9ee63..1b300b3c 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -24,70 +24,65 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Controle atualizazions"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Il sisteme al è atualizât\n"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr ""
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Par plasè spiete, o cîr pachets disponibii..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Nissune atualizazion dispunibile pal to sistem"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Le rêt e je stacade. Frache su \"configure le rêt\""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizi no disponibil. Frache su \"configurazion\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi blocât"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,518 +99,328 @@ msgstr ""
 "\n"
 "Daspò, torne a inviâ %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Abilitade"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instale atualizazions"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Controle Atualizazions"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configure le rêt"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Fâs lâ drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Pross"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Scancele"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Benvignût su Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Inviament de MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Instalant gnovis atualizazion...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sisteme al è atualizât\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controlant le rêt: e somee no facoltizade\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Benvignût su Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Avertence"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Informazions su.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Invie Configurazion"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Jessî"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, fuzzy, c-format
-msgid "New medium available"
-msgstr "No disponibii"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fal"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Non dal computer:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Al è intravignût un fal"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fal te zonte de font"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Va ben"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Benvignût su Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Password falade"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Password falade"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fal"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Siere"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Benvignût su Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Benvignût su Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Benvignût su Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Benvignût su Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Benvignût su Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -629,37 +434,63 @@ msgstr ""
 "\n"
 "ûs:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- stampe chest mes di jutori.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update inviât automatichementri.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - invie Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Non dal computer:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Al è intravignût un fal"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Fal te zonte de font"
+
+#~ msgid "Ok"
+#~ msgstr "Va ben"
+
+#, fuzzy
+#~ msgid "New medium available"
+#~ msgstr "No disponibii"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Benvignût su Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Benvignût su Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Benvignût su Mageia Online"
 
diff --git a/po/ga.po b/po/ga.po
index abfac831..7a7c727e 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -16,72 +16,67 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr ""
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Fan tamall\n"
 "Ag scrios pacáistí"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,518 +87,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Cumasaithe"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Feistigh córas"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Cumraigh gréasánú"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Teacs"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Ionad Rialaithe Mageia Linux"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Ionad Rialaithe Mageia Linux"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Faoi..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Scoir"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Earráid"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Tharla earráid"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Tharla earráid"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ceart go Leor"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Ionad Rialaithe Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Gan pasfhocal"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Gan pasfhocal"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Earráid"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Dún"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Ionad Rialaithe Mageia Linux"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Ionad Rialaithe Mageia Linux"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Ionad Rialaithe Mageia Linux"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Ionad Rialaithe Mageia Linux"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Ionad Rialaithe Mageia Linux"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mgaupdate:60
 #, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -611,36 +416,54 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr ""
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
+#~ msgid "An error occurred"
+#~ msgstr "Tharla earráid"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Tharla earráid"
+
+#~ msgid "Ok"
+#~ msgstr "Ceart go Leor"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Ionad Rialaithe Mageia Linux"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Ionad Rialaithe Mageia Linux"
+
 #, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Ionad Rialaithe Mageia Linux"
diff --git a/po/gl.po b/po/gl.po
index 9387eeb6..6fa0c498 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Comprobará as actualizacións en %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,47 +38,42 @@ msgstr ""
 "Problema na configuración do servicio. Por favor comprobe os logs e envíe un "
 "correo-e a support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Por favor agarde, buscando os paquetes dispoñibles..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hai novas actualizacións dispoñibles para o seu sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A rede está caída. Configure a súa rede"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O servicio non está activado. Clique en \"Sitio Web en Liña\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "a base de datos de urpmi está bloqueada"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versión non soportada (versión antiga ou de desenvolvemento)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -86,7 +81,7 @@ msgstr ""
 "Non se atopou ningún soporte. Debe engadir algún soporte usando o 'Xestor de "
 "Soportes de Software'."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "Despois, reinicie \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "¿Habilitado"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Erro ó actualizar o soporte"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instala-las actualizacións"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Comprobar se hai Actualizacións"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configura-la Rede"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Executando drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Non preguntarme a vindeira vez"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Executando MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesando as novas actualizacións...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Comprobando a Rede: parece que está deshabilitada\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s de %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online da acceso ós servicios web de Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Leandro Regueiro <leandro.regueiro@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Acerca de..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Lendo a configuración\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executar sempre ó inicia-lo sistema"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Pechar"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Descrición da máquina:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu un erro"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Fallo ó engadi-lo soporte"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Aceptar"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Contrasinal incorrecto"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Contrasinal incorrecto"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Erro"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Pechar"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -627,38 +432,60 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- amosa esta mensaxe de axuda.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- executar Mageia Update automaticamente.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- executa scripts mnf específicos.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- versión en modo texto de Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- rexistrar o que se fai\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 "Non foi posible actualiza-los paquetes dende o soporte update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Descrición da máquina:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ocorreu un erro"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Fallo ó engadi-lo soporte"
+
+#~ msgid "Ok"
+#~ msgstr "Aceptar"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
 
diff --git a/po/he.po b/po/he.po
index ffbe20c5..c83a596d 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2008-03-01 14:44+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -22,17 +22,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "עדכונים יבדקו ב-%s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "המערכת מעודכנת"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -41,53 +41,48 @@ msgstr ""
 "חלה תקלה בעת הגדרת השרות. באפשרותך לדווח על התקלה ל: support@mandrivaonline."
 "net"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "נא להמתין בעת קריאת מסד הנתונים של החבילות..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "עדכונים חדשים זמינים עבור המערכת שלך"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "הרשת לא פעילה. עליך להגדיר את הרשת"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "השירות לא הופעל. עליך ללחוץ על \"אתר מקוון\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "בסיס הנתונים של urpmi נעול"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "גרסה לא נתמכת (גרסה ישנה מדי או גרסת פיתוח)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "לא נמצאו מקורות תוכנה, עליך להוסיף מקורות דרך 'ניהול מקורות תוכנה'."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "לאחר מכן יש לאתחל את \"%s\" מחדש."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "מופעל"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "שגיאה בעדכון המקור"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "התקן עדכונים"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "בדוק עדכונים"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "הגדר את הרשת"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "מפעיל את drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "אל תשאל אותי בפעם הבאה"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "המשך"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "מפעיל את MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "מנתח עדכונים חדשים...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "המערכת מעודכנת\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "בודק זמינות רשת: אין תגובה\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "זכויות היוצרים (C) %s שמורות למנדריבה"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "מנדריבה-אונליין מאפשר גישה לשירותי הרשת של מנדריבה."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "אתר מקוון"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Dotan Kamber <kamberd@yahoo.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "אודות..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "הפעל תמיד באתחול המערכת"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "שגיאה"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "אתר מקוון"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "חלה שגיאה"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "חלה שגיאה בעת הוספת מקור"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "אישור"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "מנדריבה-אונליין %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "סיסמה שגוייה"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "סיסמה שגוייה"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "שגיאה"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "סגור"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "מנדריבה-אונליין %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr ""
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -627,37 +432,55 @@ msgstr ""
 "\n"
 "שימוש:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- הדפס הודעת עזרה זו.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t-Mageia Update יופעל אוטומטי \n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- launch mnf specific scripts.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- גרסה טקסטואלית של אשף העדכונים.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- תעד את הנעשה\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "אתר מקוון"
+
+#~ msgid "An error occurred"
+#~ msgstr "חלה שגיאה"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "חלה שגיאה בעת הוספת מקור"
+
+#~ msgid "Ok"
+#~ msgstr "אישור"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "מנדריבה-אונליין %s"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "מנדריבה-אונליין %s"
 
diff --git a/po/hi.po b/po/hi.po
index b8d58cce..7d02de0c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-08-21 14:31+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "अपडेटो की जाँच"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "आपका तंत्र आज-तक अप-टू-डेट है"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,54 +39,49 @@ msgstr ""
 "सेवा संरचना समस्या । कॄपया लॉग की जाँच करें और निम्न पते पर एक विपत्र संदेश भेजें "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "कृपया प्रतीक्षा करें, उपलब्ध पैकेजों को पता लगाया जा रहा है..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "आपके तंत्र हेतु नये अपडेट उपलब्ध है"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "नेटवर्क डॉउन है । कृपया अपने नेटवर्क की संरचना करें"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "सेवा सक्रिय नहीं है । कृपया \"ऑनलाइन वेब-स्थल\" पर क्लिक करें"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "यू०आर०पी०एम०आई० डाटाबेस बंद है"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "यह विमोचन संस्मरण समर्थित नहीं है (या तो बहुत प्राचीन या फ़िर विकास विमोचन संस्मरण है)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "इसके बाद, %s को पुनः आरम्भ करें।"
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "सक्रिय"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "अपडेटों का संसाधन"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "अपडेटो की जाँच"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "नेटवर्क की संरचना"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ड्रैककनेक्ट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "अगला"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, fuzzy, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "एमडीकेअपडेट को आरम्भ किया जा रहा है\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "नये अपडेटो की गणना की जा रही है...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "तंत्र आज-तक अपडेट है\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "नेटवर्क की जाँच की जा रही है: लगता है निष्क्रिय है\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "ऑनलाइन वेबस्थल"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "के बारे में ।"
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "संरचना पढ़ी जा रही है\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "शुरूवात में सदैव आरम्भ करें"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "निकास"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "त्रुटि"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "मशीन नाम:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "एक त्रुटि हो गयी है"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "ठीक"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "मैनड्रिवऑनलाइन"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "गलत कूटशब्द"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "गलत कूटशब्द"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "त्रुटि"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "बन्द"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "मैनड्रिवऑनलाइन"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "मैनड्रिवऑनलाइन"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -628,37 +433,59 @@ msgstr ""
 "\n"
 "प्रयोग:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- यह सहायता संदेश छापें ।\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- एमडीकेअपडेट का स्वचालित रूप से शुरू होना ।\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- एमएनएफ़ विशिष्ट स्क्रिप्टों को चलाएँ।\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- मैनड्रिव अपडेट का पाठ विधा संस्मरण।\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "एमडीकेअपडेट माध्यम से पैकेजों को अपडेट करने में असमर्थ ।\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "मशीन नाम:"
+
+#~ msgid "An error occurred"
+#~ msgstr "एक त्रुटि हो गयी है"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "असफ़लता जब माध्यम को जोड़ा जा रहा था..."
+
+#~ msgid "Ok"
+#~ msgstr "ठीक"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "मैनड्रिवऑनलाइन"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "मैनड्रिवऑनलाइन"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "मैनड्रिवऑनलाइन"
 
diff --git a/po/hr.po b/po/hr.po
index f45e8c2a..20fb338b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 0\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-01-04 21:26+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -17,17 +17,17 @@ msgstr ""
 "X-Generator: TransDict server\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Provjeri nadogradnje"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je ažuran"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -36,55 +36,50 @@ msgstr ""
 "Problem s konfiguracijom servisa. Molimo provjerite logove i pošaljite mail "
 "na support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 "Molimo pričekajte\n"
 "Sortiram pakete"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nema novih datoteka dostupnih za Vas sistem!"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Mreža je pala. Molimo podesite mrežu"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis nije aktivan. Molimo kliknite na \"Online Website\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza zaključana"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -95,518 +90,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Aktivirano"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instaliraj zakrpe"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Provjeri nadogradnje"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokrećem drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Dalje"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Pokrećem MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Proračunavam nove nadogradnje...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je nadograđen\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Provjeravam mreži: čini se da je isključena\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "O programu..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Čitam postavke\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Pokreni pri podizanju sustava"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Ime računala:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Pojavila se greška"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Provjeravam ovisnosti..."
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Kriva lozinka"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Kriva lozinka"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Greška"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mgaupdate:60
 #, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -614,37 +419,59 @@ msgid ""
 "usage:\n"
 msgstr ""
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- ispiši ovaj tekst s pomoći.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update pokrenuto automatski.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - pokreni Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Ime računala:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Pojavila se greška"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Provjeravam ovisnosti..."
+
+#~ msgid "Ok"
+#~ msgstr "U redu"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/hu.po b/po/hu.po
index 7855ab58..ce6a0756 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-2010.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-20 19:11+0100\n"
 "Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -23,17 +23,17 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Frissítések keresésének következő időpontja: %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "A rendszer naprakész"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,48 +42,43 @@ msgstr ""
 "Szolgáltatásbeállítási probléma; ellenőrizze a naplókat és küldjön levelet a "
 "következő címre: support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "A rendelkezésre álló csomagok lekérdezése..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Új frissítések érhetők el az Ön rendszeréhez"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "A Mageia Linux disztribúciónak új verziója jelent meg"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A hálózat nem aktív. Állítsa be a hálózatot."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "A szolgáltatás nincs aktiválva. Kattintson az \"Online weboldal\" funkcióra."
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "A(z) \"urpmi\" adatbázis zárolt"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nem támogatott verzió (túl régi, vagy fejlesztői verzió)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -91,7 +86,7 @@ msgstr ""
 "Adatforrás nem található. Fel kell venni egy vagy több adatforrást a "
 "szoftverforrás-kezelővel."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -108,124 +103,106 @@ msgstr ""
 "\n"
 "Ez után indítsa el újra a(z) %s programot."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Engedélyezve"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, 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:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Frissítések telepítése"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Egyéb csomagforrás hozzáadása"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Frissítések keresése"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "A hálózat beállítása"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "A rendszer frissítése"
 
-#: ../mdkapplet:394
-#, 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 ""
-"A disztribúció alap karbantartási ciklusa lejárt. Köszönjük, hogy "
-"előfizetett a kiterjesztett karbantartásra, így a rendszere naprakész marad "
-"%s-ig."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "SIGHUP érkezett (valószínűleg frissítés befejezése miatt), az alkalmazás "
 "újraindul."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A DrakConnect indítása\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia Linux disztribúció új verziója"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Böngészés"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "A Mageia Linux disztribúciónak új verziója jelent meg."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Több információ az új verzióról"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Tényleg frissíteni akar a '%s' disztribúcióra?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Legközelebb ne kérdezze meg"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Egyszerre minden csomag letöltése"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Figyelem: Fel kell szabadítania egy helyet)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "A csomagok letöltési helye:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Következő"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -234,56 +211,28 @@ msgstr ""
 "Ennek a Mageia Linuxnak a karbantartási ideje lejárt, nem fog többé "
 "frissítés megjelenni hozzá."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, 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:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Beszerezhet kiterjesztett karbantartást."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-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:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ez a disztribúció többé nem támogatott"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Kiterjesztett karbantartás"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Fizessen elő kiterjesztett karbantartásra, amivel ez a verzió (%s) %s-ig "
-"naprakész marad."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -292,17 +241,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:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "%s adat letöltésére van szükség"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -311,345 +260,182 @@ msgstr ""
 "Rakja hálózati áramellátásra a laptopot és ha lehet váltson vezetékes "
 "hálózati kapcsolatra wifi helyett."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "\"MageiaUpdate\" indítása\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Új frissítések meghatározása...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "A rendszer naprakész.\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "A hálózat ellenőrzése: úgy tűnik, nem aktív\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s, %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "A Mageia Online hozzáférést biztosít a Mageia webes szolgáltatásaihoz."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "_: Lónyai Gergely <aleph@mandriva.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "További információk"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Adathordozó felvétele"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Névjegy..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Frissítési beállítások"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Minden rendszerindításnál induljon el"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Új, elérhető adathordozó"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Ön a '%s' disztribúciót használja, és további szoftverekhez van hozzáférése."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Szeretné a további szoftvereket tartalmazó csomagforrást használni?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Egyéb csomagforrás hozzáadása"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "A támogatott termékek között - %s - nincs a '%s'.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Hiba"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Hiba a disztribúciólista beszerzésében:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"A Mageia minden disztibúción 12 hónap frissítést biztosít a munkaasztali "
-"alkalmazások számára (maradt %s) és 18 hónapot a rendszerszintű "
-"alkalmazásokhoz (maradt %s)."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"A Kiterjesztett karbantartással további 18 hónap frissítés érhető el (maradt "
-"%s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Tervezett életciklus"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Online előfizetés"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Hiba lépett fel"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-"A te Mageia hozzáféréseddel nincs lehetőséged a %s letöltéseket használni."
-
-#: ../mdkapplet-add-media-helper:226
-#, 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:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Sikerült az adatforrást hozzáadni!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Sikerült a %s adatforrást hozzáadni."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Itt tudja beállítani a frissítő alkalmazást"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Frissítés gyakorisága (óra)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Első ellenőrzés előtti várakozás (perc)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Az új \"%s\" kiadás ellenőrzése"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "A hiányzó \"%s\" média ellenőrzése"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Korlátozott"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"A Mageia Powerpack adja önnek a legjobb Linux élményt: stabilitás és "
-"eredményesség a nyílt forrású megoldásoknak köszönhetően, exkluzív "
-"szoftverek és a Mageia hivatalos támogatása."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux jellemzői"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, 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_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Az emailje"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "A jelszava"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Elfelejtett jelszó"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Hiba"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Mind a jelszót, mind az emailt meg kell adni."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Kérem válasszon frissítéshez verziót"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "A Powerpack hozzáférése lejárt"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s már elérhető, és tud rá frissíteni:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"A Mageia Linux disztribúció most még több szoftverrel és hivatalos "
-"támogatással."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "A 100%%-ig Szabad Forrású disztribúció ingyen elérhető."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Disztribúció frissítése"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -662,36 +448,181 @@ msgstr ""
 "\n"
 "Használat:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- jelen segítség megjelenítése\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update automatikus indítása\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- MNF-specifikus szkriptek indítása\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- a Mageia Update szöveges felületű verziója\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- a tevékenység naplózása\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "A csomagok Mageia Update-adatforrásból való frissítése sikertelen.\n"
 
+#~ 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 ""
+#~ "A disztribúció alap karbantartási ciklusa lejárt. Köszönjük, hogy "
+#~ "előfizetett a kiterjesztett karbantartásra, így a rendszere naprakész "
+#~ "marad %s-ig."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Beszerezhet kiterjesztett karbantartást."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Szükségessé vált, hogy előfizessen a rendszer kiterjesztett "
+#~ "karbantartására, vagy frissítsen az újabb, %s disztribúcióra."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Kiterjesztett karbantartás"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Fizessen elő kiterjesztett karbantartásra, amivel ez a verzió (%s) %s-ig "
+#~ "naprakész marad."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "A támogatott termékek között - %s - nincs a '%s'.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Hiba a disztribúciólista beszerzésében:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "A Mageia minden disztibúción 12 hónap frissítést biztosít a munkaasztali "
+#~ "alkalmazások számára (maradt %s) és 18 hónapot a rendszerszintű "
+#~ "alkalmazásokhoz (maradt %s)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "A Kiterjesztett karbantartással további 18 hónap frissítés érhető el "
+#~ "(maradt %s)."
+
+#~ 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:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Tervezett életciklus"
+
+#~ msgid "Online subscription"
+#~ msgstr "Online előfizetés"
+
+#~ msgid "An error occurred"
+#~ msgstr "Hiba lépett fel"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "A te Mageia hozzáféréseddel nincs lehetőséged a %s letöltéseket használni."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Hiba történt az adatforrás felvétele közben"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Sikerült az adatforrást hozzáadni!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Sikerült a %s adatforrást hozzáadni."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Egyéb csomagforrás érhető el az ön disztribúciójához."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Egyéb csomagforrás hozzáadása"
+
+#~ msgid "New medium available"
+#~ msgstr "Új, elérhető adathordozó"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Ön a '%s' disztribúciót használja, és további szoftverekhez van "
+#~ "hozzáférése."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Szeretné a további szoftvereket tartalmazó csomagforrást használni?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "A hiányzó \"%s\" média ellenőrzése"
+
+#~ msgid "Restricted"
+#~ msgstr "Korlátozott"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "A Mageia Powerpack adja önnek a legjobb Linux élményt: stabilitás és "
+#~ "eredményesség a nyílt forrású megoldásoknak köszönhetően, exkluzív "
+#~ "szoftverek és a Mageia hivatalos támogatása."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux jellemzői"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Kérem válasszon frissítéshez verziót"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "A Powerpack hozzáférése lejárt"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s már elérhető, és tud rá frissíteni:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "A Mageia Linux disztribúció most még több szoftverrel és hivatalos "
+#~ "támogatással."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/hy.po b/po/hy.po
index c9284cf6..f5062d63 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,81 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Ստուգել նորացումները"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, fuzzy, c-format
 msgid "Your system is up-to-date"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr ""
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Ձեր համակարգի համար չկան առկա նորացումներ"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, fuzzy, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ցանցը անհասանելի է: Ստուգեք \"Ցանցի ձևակերպումը\""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, fuzzy, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Ծառայությունը մատչելի չէ: Հպեք \"ձևակերպել\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,518 +87,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Տեղադրել Նորացումները"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Ցանցի Ձևակերպում"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Հրաժարվել"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Բարի գալուստ Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Ստուգել Նորացումները"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Համակարգը զբաղված է: Սպասեք..."
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Բարի գալուստ Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Օնլայն ՎեբԷջ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Զգուշացում"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Ծրագրի մասին.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Ուղարկել ձևակերպում"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Ելք"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, fuzzy, c-format
-msgid "New medium available"
-msgstr "Առկա չեն"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Սխալ"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Մեքենայի անունը`"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr ""
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Բարի գալուստ Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Սխալ գաղտնաբառ է"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Սխալ գաղտնաբառ է"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Սխալ"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Փակել"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Բարի գալուստ Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Բարի գալուստ Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Բարի գալուստ Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Բարի գալուստ Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Բարի գալուստ Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -616,37 +421,53 @@ msgstr ""
 "\n"
 "կիրառում`\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- ցուցադրել այս տեղեկանքը:\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update ավտոմատ բեռնում:\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - աշխատացնել Mageia Update:\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Անհնար է նորացնել փաթեթները update_source - ից:\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Մեքենայի անունը`"
+
+#, fuzzy
+#~ msgid "New medium available"
+#~ msgstr "Առկա չեն"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Բարի գալուստ Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Բարի գալուստ Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Բարի գալուստ Mageia Online"
 
diff --git a/po/id.po b/po/id.po
index aa5969ba..d3e76d22 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,28 +12,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Akan memeriksa update pada %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistem Anda sudah up-to-date"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,47 +42,42 @@ msgstr ""
 "Masalah konfigurasi layanan. Harap perika file log dan kirimkan mail ke "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Harap tunggu, mencari paket yang tersedia..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Update baru tersedia untuk sistem Anda"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Jaringan sedang non-aktif. Harap konfigurasikan jaringan Anda"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Layanan tidak diaktifkan. Silahkan klik pada \"Website Online\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Rilis tidak didukung (rilis terlalu lama, atau rilis pengembangan)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -90,7 +85,7 @@ msgstr ""
 "Tidak ditemukan media. Anda harus menambahkan media melalui 'Manajemen Media "
 "Perangkat Lunak'"
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -106,518 +101,328 @@ msgstr ""
 "\n"
 "Lalu jalankan ulang \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Aktifkan"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Kesalahan mengupdate media"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installasikan update-update"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Cek Update"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurasikan Jaringan"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Menjalankan drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Selanjutnya"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Menjalankan MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Menghitung update baru...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem up-to-date\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Memeriksa Jaringan: tampaknya dinonaktifkan\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Hak cipta (C) %s oleh %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online memberikan akses ke layanan web Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Membaca konfigurasi\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Selalu jalankan ketika pembukaan"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Kesalahan"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Deskripsi mesin:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Terjadi kesalahan"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Kesalahan ketika menambahkan media"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Kata sandi salah"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Kata sandi salah"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Kesalahan"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -631,37 +436,59 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- cetak pesan bantuan ini.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update dijalankan secara otomatis.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- jalankan script khusus mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- versi mode teks dari Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- mencatat apa yang sudah selesai\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gagal meng-update paket dari media update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Deskripsi mesin:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Terjadi kesalahan"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Kesalahan ketika menambahkan media"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
 
diff --git a/po/is.po b/po/is.po
index c67dfc0a..b871fb36 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Athuga með uppfærslur klukkan %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Kerfið þitt er uppfært"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,47 +38,42 @@ msgstr ""
 "Vandræði með þjónustustillingar. Athugið annála og sendið póst til "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Augnablik, leita að tiltækum pökkum..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nýjar uppfærslur eru til fyrir kerfið þitt"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Ný útgáfa af Mageia Linux hefur verið sett í dreifingu"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netið er ekki tengt. Vinsamlega stillið nettengingu"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Þjónusta ekki virk, Vinsamlega smellið á \"Tengjast vefsvæði\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi gagnagrunnur læstur"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 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:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -86,7 +81,7 @@ msgstr ""
 "Enginn miðill fannst. Þú verður að bæta við einhverjum miðlum með hugbúnaðar-"
 "miðla-tólinu."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,168 +97,129 @@ msgstr ""
 "\n"
 "Endurræstu síðan \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Virkur"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Villa við uppfærslu á miðli"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Setja inn uppfærslur"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Bæta við pakkamiðlum"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Athuga með uppfærslur"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Stilla nettengingu"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Uppfæra kerfið"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Ræsi drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Ný útgáfa af Mageia Linux dreifingunni"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Ný útgáfa af Mageia Linux hefur verið sett í dreifingu."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Ítarlegri upplýsingar um þessa nýju útgáfu"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Viltu uppfæra í '%s' dreifinguna?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Ekki spyrja aftur"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Næsta"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Viltu uppfæra í '%s' dreifinguna?"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -272,17 +228,17 @@ msgstr ""
 "Þessi uppfærsla þarfnast háhraða nettengingar (beintenging, xDSL,...)  og "
 "getur tekið nokkra klukkutíma."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Áætlað er að það þurfi að sækja %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Þú ættir að loka öllum öðrum forritum áður en þú heldur áfram."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -291,334 +247,182 @@ msgstr ""
 "Þú ættir að tengja fartölvuna þína við rafmagn og nota beina nettengingu í "
 "stað þráðlauss ef hægt er."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Ræsi MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Vel nýjar uppfærslur ...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Kerfi er uppfært\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Athuga net: virðist aftengt\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Höfundaréttur (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online veitir aðgang að Mageia vefþjónustu."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Ítarlegri upplýsingar"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Bæta við miðli"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Um..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Stillingar á uppfærslum"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Ræsa alltaf þegar kveikt á vél"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Hætta"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nýr miðill tiltækur"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Þú notar '%s' dreifinguna og hefur því forgangs-aðgang að aukahugbúnaði."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Vilt þú bæta við þessum auka-pakkamiðli?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Bæti við aukalegum pakkamiðli"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Villa"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Tengjast vefsvæði"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Villa kom upp"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Í Mageia skráningunni þinni er \"%s download\" ekki virkt."
-
-#: ../mdkapplet-add-media-helper:226
-#, 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:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "Tókst að bæta við miðli %s."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Tókst að bæta við miðli %s."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Í lagi"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Hér getur þú stillt uppfærsluforritið"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Uppfærslutíðni (klukkustundir)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Töf á fyrstu athugun (mínútur)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Ítarlegri upplýsingar um skráningu þína"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Netfangið þitt"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Lykilorðið þitt"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Gleymt lykilorð"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Villa"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Lykilorð og netfang má ekki vera autt."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Loka"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Uppfærsla dreifingar"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -631,36 +435,87 @@ msgstr ""
 "\n"
 "notkun:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- prenta þessa hjálp.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Uppfærslur keyrðar sjálfvirkt.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- ræsa sértækar mnf skriftur.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- textahams útgáfa af Mageia Uppfærslum.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- skrá niður allt sem gert er\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gat ekki uppfært pakka frá uppfærslumiðli.\n"
 
+#~ 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"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Tengjast vefsvæði"
+
+#~ msgid "An error occurred"
+#~ msgstr "Villa kom upp"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Í Mageia skráningunni þinni er \"%s download\" ekki virkt."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Villa kom upp þegar reynt var að bæta við miðli"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "Tókst að bæta við miðli %s."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Tókst að bæta við miðli %s."
+
+#~ msgid "Ok"
+#~ msgstr "Í lagi"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Auka pakkamiðill er til fyrir þína dreifingu."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Bæta við pakkamiðlum"
+
+#~ msgid "New medium available"
+#~ msgstr "Nýr miðill tiltækur"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Þú notar '%s' dreifinguna og hefur því forgangs-aðgang að aukahugbúnaði."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Vilt þú bæta við þessum auka-pakkamiðli?"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
diff --git a/po/it.po b/po/it.po
index 635cf693..bb3f65ec 100644
--- a/po/it.po
+++ b/po/it.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-09 19:41+0200\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <timl@frelists.org>\n"
@@ -25,17 +25,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Controllo aggiornamenti alle %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Il sistema è aggiornato"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,47 +44,42 @@ msgstr ""
 "Problema di configurazione del server. Controlla i log e scrivi a "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Attendere, ricerca pacchetti disponibili in corso..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Disponibili nuovi aggiornamenti per il tuo sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "È stata rilasciata una nuova versione di Mageia Linux"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "La rete è disattivata. Configura la rete"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servizio non attivato. Clicca su \"Sito web online\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi bloccato"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versione non supportata (troppo vecchia o di sviluppo)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -92,7 +87,7 @@ msgstr ""
 "Nessuna fonte trovata. Aggiungine qualcuna attraverso \"Gestione fonti "
 "software\"."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,123 +104,105 @@ msgstr ""
 "\n"
 "Poi riavvia \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Attivata"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Errore nell'aggiornare le fonti"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installa aggiornamenti"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Aggiunti un'altra fonte per i pacchetti"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla aggiornamenti"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configura la rete"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Aggiorna il sistema"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Il periodo iniziale di manutenzione per questa distribuzione è terminato. Ti "
-"ringraziamo per aver sottoscritto l'estensione della manutenzione. Il tuo "
-"sistema verrà tenuto aggiornato fino al %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Ricevuto segnale SIGHUP (probabilmente per aggiornamento completato), si "
 "riavvia l'applet."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Sto avviando drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nuova versione della distribuzione Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Naviga"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 "È stata rilasciata una nuova versione della distribuzione Mageia Linux."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Maggiori informazioni su questa nuova versione"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Vuoi aggiornare alla distribuzione \"%s\"?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Non chiederlo più"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Scarica subito tutti i pacchetti"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Attenzione: Ti servirà un bel po' di spazio libero)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Dove scaricare i pacchetti:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Avanti"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -234,56 +211,28 @@ msgstr ""
 "La manutenzione di questo sistema Mageia Linux è terminata. Ciò significa "
 "che non riceverai più i nuovi aggiornamenti del software."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Per mantenere sicuro il sistema, puoi:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Dovresti sottoscrivere il programma di manutenzione prolungata."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-" Dovresti  sottoscrivere il programma di manutenzione prolungata o "
-"aggiornare il sistema ad una versione più recente della distribuzione %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Questa distribuzione non è più mantenuta."
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Manutenzione prolungata"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Acquista un'estensione della manutenzione per questa release  (%s) per "
-"mantenerla in funzione fino al %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -292,18 +241,18 @@ msgstr ""
 "Questo aggiornamento richiede una connessione a banda larga (cavo, "
 "xDSL, ...) e potrebbe richiedere diverse ore per essere completato."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Si stima che debbano essere scaricati %s di dati"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 "Prima di proseguire dovresti chiudere tutte le altre applicazioni attive."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -312,347 +261,182 @@ msgstr ""
 "Dovresti collegare il tuo laptop alla presa elettrica e scegliere la "
 "connessione ethernet rispetto a quella wifi, se possibile."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Si sta avviando MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Calcolo dei nuovi aggiornamenti in corso...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Il sistema è aggiornato\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controllo rete: sembra disattivata\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright © %s di %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online dà accesso ai servizi web di Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Andrea Celli (andrea.celli@libero.it)\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Ulteriori informazioni"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Aggiungi fonti"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Informazioni su..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configurazione aggiornamenti"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Esegui sempre all'avvio"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Esci"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nuova fonte disponibile"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Stai usando la distribuzione \"%s\" . Quindi hai un accesso privilegiato ai "
-"software aggiuntivi."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Vuoi installare questa fonte di software aggiuntivo?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Aggiunta di una fonte aggiuntiva di pacchetti"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "I prodotti supportati sono  %s, '%s' non è nell'elenco.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-"Per aggiungere una nuova fonte di pacchetti scrivi qui l'identificativo (ID) "
-"del tuo account "
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Errore"
-
-#: ../mdkapplet-add-media-helper:149
-#, 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:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia fornisce 12 mesi di aggiornamenti delle applicazioni (fino al %s) e "
-"18 mesi di aggiornamenti del sistema (fino al %s) per le proprie "
-"distribuzioni."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"È ora disponibile un'estensione del supporto che garantisce altri 18 mesi di "
-"aggiornamenti (fino al %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Puoi richiedere <b>subito</b> la manutenzione prolungata:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Gestione del ciclo di vita"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Adesione online"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Si è verificato un errore"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Il tuo account Mageia non consente di scaricare i pacchetti di %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Si è verificato un errore mentre si aggiungeva la fonte"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Le font sono state aggiunte!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Sono state aggiunte le fonti %s."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Qui puoi configurare l'applet degli aggiornamenti"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Frequenza aggiornamenti (ore)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Ritardo dal primo controllo (minuti)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, 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"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack ti guida verso verso la migliore esperienza nell'uso di un "
-"desktop Linux: la stabilità ed efficienza delle soluzioni open source, "
-"integrata da software esclusivi e dal supporto ufficiale Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Caratteristiche di Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Altre informazioni relative al tuo account utente"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "La tua email"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "La tua password"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Password dimenticata"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Errore"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Password ed email non possono essere omesse."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Chiudi"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Scegli la versione di aggiornamento"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "L'accesso a Powerpack è scaduto"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s è ora disponibile, puoi fare l'aggiornamento a:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"La distribuzione  Mageia Linux con sempre più software ed assistenza "
-"ufficiale."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "La distribuzione al 100%% Open Source e ottenibile liberamente."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Aggiornamento della distribuzione"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -666,36 +450,182 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- stampa questo messaggio d'aiuto.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update avviato automaticamente.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- lancia gli script specifici di mnf. \n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update in versione testuale.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- mantiene un log delle azioni fatte\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Impossibile aggiornare i pacchetti dalla fonte update_source.\n"
 
+#~ 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 ""
+#~ "Il periodo iniziale di manutenzione per questa distribuzione è terminato. "
+#~ "Ti ringraziamo per aver sottoscritto l'estensione della manutenzione. Il "
+#~ "tuo sistema verrà tenuto aggiornato fino al %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Dovresti sottoscrivere il programma di manutenzione prolungata."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ " Dovresti  sottoscrivere il programma di manutenzione prolungata o "
+#~ "aggiornare il sistema ad una versione più recente della distribuzione %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Manutenzione prolungata"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Acquista un'estensione della manutenzione per questa release  (%s) per "
+#~ "mantenerla in funzione fino al %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "I prodotti supportati sono  %s, '%s' non è nell'elenco.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "Per aggiungere una nuova fonte di pacchetti scrivi qui l'identificativo "
+#~ "(ID) del tuo account "
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Problemi nel recuperare l'elenco delle distribuzioni:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia fornisce 12 mesi di aggiornamenti delle applicazioni (fino al %s) "
+#~ "e 18 mesi di aggiornamenti del sistema (fino al %s) per le proprie "
+#~ "distribuzioni."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "È ora disponibile un'estensione del supporto che garantisce altri 18 mesi "
+#~ "di aggiornamenti (fino al %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Puoi richiedere <b>subito</b> la manutenzione prolungata:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Gestione del ciclo di vita"
+
+#~ msgid "Online subscription"
+#~ msgstr "Adesione online"
+
+#~ msgid "An error occurred"
+#~ msgstr "Si è verificato un errore"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Il tuo account Mageia non consente di scaricare i pacchetti di %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Si è verificato un errore mentre si aggiungeva la fonte"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Le font sono state aggiunte!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Sono state aggiunte le fonti %s."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr ""
+#~ "È disponibile una nuova fonte di pacchetti per la tua distribuzione."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Aggiunti un'altra fonte per i pacchetti"
+
+#~ msgid "New medium available"
+#~ msgstr "Nuova fonte disponibile"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Stai usando la distribuzione \"%s\" . Quindi hai un accesso privilegiato "
+#~ "ai software aggiuntivi."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Vuoi installare questa fonte di software aggiuntivo?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Verifica presenza delle fonti  \"%s\""
+
+#~ msgid "Restricted"
+#~ msgstr "Limitato"
+
+#~ msgid "Enterprise"
+#~ msgstr "Aziendale"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack ti guida verso verso la migliore esperienza nell'uso di "
+#~ "un desktop Linux: la stabilità ed efficienza delle soluzioni open source, "
+#~ "integrata da software esclusivi e dal supporto ufficiale Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Caratteristiche di Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Scegli la versione di aggiornamento"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "L'accesso a Powerpack è scaduto"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s è ora disponibile, puoi fare l'aggiornamento a:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "La distribuzione  Mageia Linux con sempre più software ed assistenza "
+#~ "ufficiale."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/ja.po b/po/ja.po
index 7e70888a..1dcdf771 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "%s に更新をチェックします"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "新しい更新はありません"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,49 +40,43 @@ msgstr ""
 "サービスの設定に問題があります。ログを調べて support@mageiaonline.com にメー"
 "ルしてください。"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "利用可能なパッケージを探しています。お待ちください..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "新しい更新があります"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "新しいバージョンの Mageia Linux がリリースされました"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-"お使いのディストリビューションには付加的なパッケージメディアがあります。"
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ネットワークが未接続です。ネットワークを設定してください。"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "サービスが有効になっていません。「Online ウェブサイト」を選択してください。"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi データベースがロックされています"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "お使いのバージョンはサービスの対象外です (期限切れ/開発版)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -90,7 +84,7 @@ msgstr ""
 "メディアが見つかりません。RPM メディアマネージャでメディアを追加してくださ"
 "い。"
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -106,168 +100,129 @@ msgstr ""
 "\n"
 "その後、%s を再起動してください。"
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "有効"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "メディアの更新でエラー"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "システムを更新"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "付加的なパッケージメディア"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "更新をチェック"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "ネットワークの設定"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "システムをアップグレード"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect を起動\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "新バージョンの Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "新しいバージョンの Mageia Linux がリリースされました。"
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "この新しいバージョンの詳細情報"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "ディストリビューション %s にアップグレードしますか？"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "次回から尋ねない"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "次へ"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "ディストリビューション %s にアップグレードしますか？"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -276,17 +231,17 @@ msgstr ""
 "このアップグレードには高速な回線 (ケーブル、xDSL など) が必要です。完了するま"
 "でに数時間かかる場合があります。"
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "推定で %s のデータをダウンロードします"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "開始する前に実行中のすべてのアプリケーションを終了してください。"
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -295,338 +250,182 @@ msgstr ""
 "ラップトップをお使いの場合は、電源を AC アダプタに切り替え、可能であれば Wi-"
 "Fi 接続よりイーサネット接続を優先してください。"
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate を起動\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "新しい更新を計算中...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "新しい更新はありません\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ネットワーク確認: 無効になっているようです\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online は Mageia ウェブサービスへのアクセスを提供します。"
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "詳細情報"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "メディアを追加"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "情報..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新の設定"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "起動時に常に開始する"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "新しいメディアが利用できます"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"%s ディストリビューションをお使いなので、特典として付加的なソフトウェアもご利"
-"用いただけます。"
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "この付加的なソフトウェア用のリポジトリをインストールしますか？"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "付加的なパッケージメディアの追加"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-"付加的なメディアを追加するには、あなたのアカウント ID を入力してください"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "エラー"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Online ウェブサイト"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "エラーが発生しました"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-"あなたの Mageia アカウントは %s のダウンロード申し込みが有効になっていませ"
-"ん。"
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "メディアを追加中にエラーが発生しました"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "メディア %s を追加しました。"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "メディア %s を追加しました。"
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "ここで更新アプレットの設定を行います"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, fuzzy, c-format
 msgid "Update frequency (hours)"
 msgstr "更新間隔 (秒)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, fuzzy, c-format
 msgid "First check delay (minutes)"
 msgstr "最初のチェックの遅延 (秒)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "ユーザアカウントの詳細"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "メールアドレス"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "パスワード"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "パスワードを忘れました"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "エラー"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "パスワードとメールアドレスは空にはできません。"
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "閉じる"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "ディストリビューションのアップグレード"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -639,36 +438,92 @@ msgstr ""
 "\n"
 "使用方法 :\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- このヘルプメッセージを出力\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update を自動的に起動する。\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- MNF 固有のスクリプトを起動する。\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- テキストモードの Mageia Update\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- 記録を取る\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source メディアからパッケージを更新できません。\n"
 
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "付加的なメディアを追加するには、あなたのアカウント ID を入力してください"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Online ウェブサイト"
+
+#~ msgid "An error occurred"
+#~ msgstr "エラーが発生しました"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "あなたの Mageia アカウントは %s のダウンロード申し込みが有効になっていませ"
+#~ "ん。"
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "メディアを追加中にエラーが発生しました"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "メディア %s を追加しました。"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "メディア %s を追加しました。"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr ""
+#~ "お使いのディストリビューションには付加的なパッケージメディアがあります。"
+
+#~ msgid "Add additional package medium"
+#~ msgstr "付加的なパッケージメディア"
+
+#~ msgid "New medium available"
+#~ msgstr "新しいメディアが利用できます"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "%s ディストリビューションをお使いなので、特典として付加的なソフトウェアも"
+#~ "ご利用いただけます。"
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "この付加的なソフトウェア用のリポジトリをインストールしますか？"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
diff --git a/po/ka.po b/po/ka.po
index 81e55a4f..ce8b2839 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 0.15\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2004-09-29 19:58+0400\n"
 "Last-Translator: \n"
 "Language-Team: Georgian <aiet@qartuli.com>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "განახლებების შემოწმება"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "თქვენი სისტემა განახლებულია"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,55 +35,50 @@ msgstr ""
 "პრობლემა სერვისების კონფიგურაციაში. გთხოვთ გადაამოწმოთ აღრიცხვის ფაილები "
 "(logs) დაგამოაგზავნოთ ფოსტა მისმართზე support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "თქვენი სისტემა განახლებას საჭიროებს"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ქსელი მიუწვდომელია. შეასწორეთ ქსელის კონფიგურაცია"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "სერვისი არ არის აქტივირებული. დააწკაპუნეთ „Online Website“-ზე"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi მონაცემთა ბაზა ჩაკეტილია"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "ამ გამოშვების (Release) მხარდაჭერა არ გამაჩნია (ან მოძველებულია, ან "
 "development release არის)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -94,518 +89,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "აქტიური"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "განახლებების ინსტალირება"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "განახლებების შეამოწმება"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "ქსელის კონფიგურირება"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ვიძახებ drakconnect-ს\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "შემდეგი"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "სტოპ!"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "ვიძახებ MageiaUpdate-ს\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "ვანგარიშობ გასაახლებელ პაკეტებს...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "სისტემა განახლებულია\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ვამოწმებ ქსელს: როგორც ჩანს გამორთულია\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "გაფრთხილება"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "შესახებ..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "კონფიგურაცის გადაგზავნა"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "მუდამ გამოიძახე სისტემის ჩატვირთვისას (startup)"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "გასვლა"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "შეცდომა"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "სისტემის სახელი (Machine name):"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr ""
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "არასწორი პაროლი"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "არასწორი პაროლი"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "შეცდომა"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "დახურვა"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -619,37 +424,49 @@ msgstr ""
 "\n"
 "გამოყენება:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- აჩვენე ეს დამხმარე ტექსტი.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update-ის ავტომატური გამოძახებ.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- mnf სპეფიციკის სკრიფტების გამოძახევა.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update-ის newt ვერსია.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source-ის მედიუმიდან პაკეტები ვერ განვაახლე.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "სისტემის სახელი (Machine name):"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/ko.po b/po/ko.po
index a1fd4eb8..e81ec3cc 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -17,70 +17,65 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "보안 업데이트"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "문의사항은 support@mageiaonline.com로 메일 주세요.\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "기다려 주세요. 유효한 팩키지 검색 중..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "네트웍 어댑터를 찾을 수 없습니다!"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -91,518 +86,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "사용가"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "테마 설치"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "업데이트 버전"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "네트웍 설정"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "사용자드레이크 실행"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "다음"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "취소"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "맨드리바 온라인"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "연결 문제"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "시스템 모드"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "맨드리바 온라인"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "경고"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "정보..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "설정사항 읽는 중\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "종료"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "오류"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "컴퓨터 이름:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "오류 발생"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "오류 발생"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "확인"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "맨드리바 온라인"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "잘못된 암호"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "잘못된 암호"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "오류"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "닫기"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr "님이 거주하는 지역을 선택하세요."
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "맨드리바 온라인"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "맨드리바 온라인"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -615,37 +420,63 @@ msgstr ""
 "\n"
 "usage:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- 이 도움말 출력.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "컴퓨터 이름:"
+
+#~ msgid "An error occurred"
+#~ msgstr "오류 발생"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "오류 발생"
+
+#~ msgid "Ok"
+#~ msgstr "확인"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "맨드리바 온라인"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr "님이 거주하는 지역을 선택하세요."
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "맨드리바 온라인"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "맨드리바 온라인"
 
diff --git a/po/ku.po b/po/ku.po
index 5c765543..94b3b8ba 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-ku\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural= n != 1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Nûjenkirinan Kontrol Bike"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sîstema we rojane bû"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,53 +40,48 @@ msgstr ""
 "Ji bo pirsgirêkan tu dikarî ji navnîşana support@manrakeonline.net re e-"
 "peyamekêbişînî"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Rojaneyên nû heye ji bo sîstema we"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Tor sekiniye. Ji kerema xwe re tora xwe eyar bikin"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,518 +92,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Çalak"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Nûjenkirina Ava Bike"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Nûjenkirinan Kontrol Bike"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Torê Saz Bike"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect destpêdike\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Betal"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Tu Bi Xêr Hatî Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Destpêkirina MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Rojanekirina Kontrol Bike...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sîstema we rojane bûye\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Tu Bi Xêr Hatî Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Li bala we"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Der barê de..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Sazkirina te tê xwendin\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Di vekirina sîsteme de bişuxlîne"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Derkeve"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "çewt"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Navê Makîneyê:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr ""
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Tu Bi Xêr Hatî Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Şîfreya Çewt"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Şîfreya Çewt"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "çewt"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Bigire"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Tu Bi Xêr Hatî Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Tu Bi Xêr Hatî Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Tu Bi Xêr Hatî Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Tu Bi Xêr Hatî Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Tu Bi Xêr Hatî Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -622,37 +427,49 @@ msgstr ""
 "\n"
 "xebitandina wê:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- ev peyama alîkariyê nîşan dide.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Navê Makîneyê:"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Tu Bi Xêr Hatî Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Tu Bi Xêr Hatî Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Tu Bi Xêr Hatî Mageia Online"
 
diff --git a/po/ky.po b/po/ky.po
index 5f4ee1e8..2c46f9db 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2009-09-22 10:12+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -18,17 +18,17 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Жаңылоолор %s көрсөтүлгөн убакытта текшерилет"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Система жаңылоону талап кылбайт"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -37,47 +37,42 @@ msgstr ""
 "Кызматты конфигурациялоо проблемасы. Логдорду карап чыгып андан соң "
 "support@mageiaonline.com дарегин кат жазыңыз"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Күтө туруңуз, мүмкүн болгон пакеттер изделүүдө..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Сиздин системаңызды жаңылоо мүмкүнчүлүгү бар"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia Linux дистрибутивинин жаңы версиясы чыкты"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Сиздин дистрибутивиңиз үчүн жаңы кошумча пакеттер булагы табылды."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Тармак иштеген эмес. Тармакты конфигурациялаңыз"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Кызмат активдештирилген эмес. \"Онлайн веб-сайты\"н басыңыз"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi берилиштер базасы кулпуланган"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Релиз колдоого ээ эмес (өтө эски же иштелип жаткан релиз)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -85,7 +80,7 @@ msgstr ""
 "Эч кандай булак табылган жок. Сиз 'Программа Булактардын Менеджер'ин "
 "колдонуп бир нече булактарды кошууңуз керек."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,171 +97,129 @@ msgstr ""
 "\n"
 "Андан соң, \"%s\" кайра иштетиңиз."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Иштетилди"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Булакты жаңылоодо ката чыкты"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Жаңылоолорду орнотуу"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Кошумча пакеттер булагын кошуу"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Жаңылоолорду текшерүү"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Тармакты конфигурациялоо"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Системаны жаңылоо"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect иштетүү\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia Linux дистрибутивинин жаңы версиясы"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia Linux дистрибутивинин жаңы версиясы чыкты."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Жаңы версия жөнүндө кошумча маалымат"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "'%s' дистрибутивине жаңылоону каалайсызбы?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Кийинки жолу башка менден сураба"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Кийинки"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Айнуу"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, fuzzy, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Бул дистрибутивдин версиясы мындан ары колдоодон баш тартылды. Мындан ары эч "
-"кандай жаңылоолор чыкпайт. Сизге %s дистрибутивдин жаңы версиясына жаңылануу "
-"керек."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "'%s' дистрибутивине жаңылоону каалайсызбы?"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -275,17 +228,17 @@ msgstr ""
 "Бул жаңылоо жогорку ылдамдыкта тармак туташууну (кабель, xDSL, ж.б.)  талап "
 "кылат жана бир ниче убакытты алышы мүмкүн."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Жүктөө маалымат көлөмү: %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Улантуу үчүн иштеп жаткан бардык программаларды жабуу керек."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -294,335 +247,182 @@ msgstr ""
 "Ноутбукту турактуу электр булагына кошуу зарыл жана мүмкүн болушунча\n"
 "сымсыз тармак туташуудан көрө кабельдик тармак туташууну колдонуу керек."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate иштетүү\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Жаңы жаңылоолор эсептелүүдө...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система жаңылоону талап кылбайт\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тармак текшерилүүдө: өчүрүлгөн көрүнөт\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online, Mageia веб кызматтарды колдонуу мүмкүнчүлүгүн берет."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлайндагы веб-сайт"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Эскертүү"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Кошумча маалымат"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Булак кошуу"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Жөнүндө.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Жаңылоолор ырастоолору"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Дайыма старт учурунда ишке киргизүү"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Чыгуу"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Жаңы булак табылды"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Сиз '%s' дистрибутивин колдонуп жатасыз жана кошумча программаларды "
-"колдонууга укугуңуз бар."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Сиз кошумча пакеттер булагын кошууну каалайсызбы?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Кошумча пакеттер булагын кошуу"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Кошумча пакеттер булагын кошууда колдонуучү IDни киргизиңиз"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Жаңылыштык"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Машинанын аты:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Жаңылыштык орун алды"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Сиздин Mageia колодонуучу аты %s жүктөө катталышын камтыбайт."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Булакты кошууда ката чыкты"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "%s булагы ийгиликтүү кошулду."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "%s булагы ийгиликтүү кошулду."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "ОК"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Бул жерде жаңылоолор аплеттин ыраста аласыз"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Жаңылоо жыштыгы (саат)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Биринчи текшерүүнү кийинкиге калтыруу убакыты (минута)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Колдонуучу аты жөнүндө кошумча маалымат"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Электрондук почта"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Сырсөз"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Унутулуп калган сырсөз"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Жаңылыштык"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Сырсөз жана э-почта бош болбошу керек."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Жабуу"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Linux"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Linux"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Дитсрибутив жаңылоосу"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -636,36 +436,100 @@ msgstr ""
 "\n"
 "колдонулушу:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- бул маалыматты чыгаруу.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update автоматтык түрдө иштетүү.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- mnf аныкталган скриптерди иштетүү.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update текстинин ыкма версиясы.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- болгондорду журналга жазуу\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source булагынан пакеттерди жаңылоо мүмкүн эмес.\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Бул дистрибутивдин версиясы мындан ары колдоодон баш тартылды. Мындан ары "
+#~ "эч кандай жаңылоолор чыкпайт. Сизге %s дистрибутивдин жаңы версиясына "
+#~ "жаңылануу керек."
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "Кошумча пакеттер булагын кошууда колдонуучү IDни киргизиңиз"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Машинанын аты:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Жаңылыштык орун алды"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Сиздин Mageia колодонуучу аты %s жүктөө катталышын камтыбайт."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Булакты кошууда ката чыкты"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "%s булагы ийгиликтүү кошулду."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "%s булагы ийгиликтүү кошулду."
+
+#~ msgid "Ok"
+#~ msgstr "ОК"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Сиздин дистрибутивиңиз үчүн жаңы кошумча пакеттер булагы табылды."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Кошумча пакеттер булагын кошуу"
+
+#~ msgid "New medium available"
+#~ msgstr "Жаңы булак табылды"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Сиз '%s' дистрибутивин колдонуп жатасыз жана кошумча программаларды "
+#~ "колдонууга укугуңуз бар."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Сиз кошумча пакеттер булагын кошууну каалайсызбы?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/lt.po b/po/lt.po
index a21c4c4c..b1caf465 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-09-26 16:38+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: \n"
@@ -20,17 +20,17 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Patikrinti atnaujinimus"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Jūsų sistema yra naujausia"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,53 +39,48 @@ msgstr ""
 "Paslaugos konfigūravimo problema. Patikrinkite įrašus ir išsiųskite el. "
 "laišką adresu support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prašom palaukti.Pašalinami paketai"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Jūsų sistemai yra atnaujinimų"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Tinklas neveikia. Sukonfigūruokite tinklą"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Paslauga neįjungta. Paspauskite \"Interneto svetainė\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi duomenų bazė užrakinta"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versija nepalaikoma (versija per sena arba dar kuriama)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -96,518 +91,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Įdiegti atnaujinimus"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Patikrinti atnaujinimus"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigūruoti tinklą"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Paleidžiama drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Sekantis"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Paleidžiama MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Skaičiuojami paskutiniai atnaujinimai...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Siatema yra naujausia\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tikrinamas tinklas: atrodo, neveikia\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Dėmesio"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Apie..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Skaitau nustatymus\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Visada paleisti įkrovimo metu"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Klaida"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Kompiuterio vardas:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Įvyko klaida"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Įvyko klaida"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Gerai"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Neteisingas slaptažodis"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Neteisingas slaptažodis"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Klaida"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Uždaryti"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr "Pasirinkite jūsų geografinę padėtį"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -620,37 +425,63 @@ msgstr ""
 " \n"
 "naudojimas:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- spausdinti šį pagalbos pranešimą.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update paleista automatiškai.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- paleisti specialius mnf skriptus.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- tekstinės veiksenos Mageia Update versija.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Kompiuterio vardas:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Įvyko klaida"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Įvyko klaida"
+
+#~ msgid "Ok"
+#~ msgstr "Gerai"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Pasirinkite jūsų geografinę padėtį"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/ltg.po b/po/ltg.po
index 0e358ffd..58f84d07 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2004-02-17 17:39+0200\n"
 "Last-Translator: Unknown\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Atvārtū portu puorbaude"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "Problemu gadīnī syutit e-posta viesti iz support@mageiaonline.com\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Mekleju pīejamuos pakūtnis"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -48,43 +48,38 @@ msgstr ""
 "%s\n"
 "ir pīejami iz jiusu sistemys.\n"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -95,518 +90,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, fuzzy, c-format
 msgid "Enabled"
 msgstr "īslēgt"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Uzstuodeit jaunynuojumus"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Modernizeijumi"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Teikla konfigureišona"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Palaist userdrake"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Tuoļuok"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Atceļt"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Dasaslādzu ...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemys režims"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Uzmaneibu"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Nūlosu konfiguraceju\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Izīt"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Klaida"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Datora nūsaukums:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Atkluota kliuda"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Atkluota kliuda"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Labi"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Napareizs paroļs"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Napareizs paroļs"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Klaida"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr "Nūruodit sovu geografiskū atsarosšonuos vītu"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -620,37 +425,63 @@ msgstr ""
 "\n"
 "pīlītuojums:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- drukuot itū paliedzeibys tekstu.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- atjaunuot vysu informaceju.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Datora nūsaukums:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Atkluota kliuda"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Atkluota kliuda"
+
+#~ msgid "Ok"
+#~ msgstr "Labi"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Nūruodit sovu geografiskū atsarosšonuos vītu"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/lv.po b/po/lv.po
index 0432e1a7..9e23a7e4 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -19,70 +19,65 @@ msgstr ""
 "2);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Drošības atjauninājumi"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "Problēmu gadījumā sūtiet vēstuli uz support@mageiaonline.com\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Lūdzu gaidiet, meklēju pieejamās pakotnes..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "Jūsu sistēmā nav tīkla adaptera!"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi datubāze noslēgta"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -93,518 +88,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Atļauts"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "Instalēt tēmas"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Atjaunināt"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Tīkla konfigurēšana"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Izpildīt userdrake"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Tālāk"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Pieslēguma problēma"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistēmas režīms"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Uzmanību"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Par..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Nolasu konfigurāciju\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Iziet"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Kļūda"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Datora nosaukums:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Atklāta kļūda"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Atklāta kļūda"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Labi"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Nepareiza parole"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Nepareiza parole"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Kļūda"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Aizvērt"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr "Norādiet savu ģeogrāfisko atrašanās vietu"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -617,37 +422,63 @@ msgstr ""
 "\n"
 "Pielietojums:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- drukāt šo palīdzības tekstu.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --update\t\t- izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Datora nosaukums:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Atklāta kļūda"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Atklāta kļūda"
+
+#~ msgid "Ok"
+#~ msgstr "Labi"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Norādiet savu ģeogrāfisko atrašanās vietu"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/mgaonline.pot b/po/mgaonline.pot
index 32dc2153..5956d49f 100644
--- a/po/mgaonline.pot
+++ b/po/mgaonline.pot
@@ -6,77 +6,72 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
 msgstr ""
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -87,506 +82,334 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr ""
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid ""
 "Launching drakconnect\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034 ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034 ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid "Maintenance for this Mageia version has ended. No more updates will be delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr ""
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid "You should either get extended maintenance or upgrade to a newer version of the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid "Purchase a maintenance extension for this version (%s) and keep it running until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid "You should put your laptop on AC and favor ethernet connection over wifi, if available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid ""
 "Launching MageiaUpdate\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid ""
 "Computing new updates...\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid ""
 "System is up-to-date\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid ""
 "Checking Network: seems disabled\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr ""
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid ""
 "_: Translator(s) name(s) & email(s)\n"
 ""
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950 ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr ""
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid "You use '%s' distribution and therefore have privileged access to additional software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid ""
-"Supported products are %s, '%s' is not on the list.\n"
-""
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193 ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid "Extended maintenance is now available to get 18 months of additional updates (until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr ""
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:245
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:212
 #, c-format
-msgid "Close"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
+msgid "Error"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:306
+#: ../mgaapplet_gui.pm:213
 #, c-format
-msgid "Your Powerpack access has ended"
+msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:309
+#: ../mgaapplet_gui.pm:235
 #, c-format
-msgid "%s is now available, you can upgrade to:"
+msgid "Close"
 msgstr ""
 
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr ""
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr ""
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr ""
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr ""
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr ""
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
+#: ../mgaupdate:60
 #, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
@@ -594,42 +417,42 @@ msgid ""
 ""
 msgstr ""
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid ""
 "  --help\t\t- print this help message.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid ""
 "  --auto\t\t- Mageia Update launched automatically.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid ""
 "  --mnf\t\t\t- launch mnf specific scripts.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid ""
 "  --noX\t\t\t- text mode version of Mageia Update.\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid ""
 "  --debug\t\t\t- log what is done\n"
 ""
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid ""
 "Unable to update packages from update_source medium.\n"
diff --git a/po/mk.po b/po/mk.po
index 2d4eb3f7..054ce054 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2006-09-17 20:55-0700\n"
 "Last-Translator: Zoran Dimovski <zoki.dimovski@gmail.com>\n"
 "Language-Team: Macedonian\n"
@@ -20,17 +20,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Вашиот систем е ажуриран"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,54 +39,49 @@ msgstr ""
 "Проблем при конфигурирање на сервисот. Ве молиме проверете ги логовите и "
 "испратете пошта на  support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Почекајте, пронаоѓање на достапните пакети..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Достапни се нови ажурирања за вашиот систем"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мрежата не работи. Ве молиме конфигурирајте ја вашата мрежа"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Сервисот не е вклучен. Ве молиме притиснете на \"Онлајн Веб сајт\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "базата на податоци на urpmi е заклучена"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Верзијата не е подржана (премногу стара верзија или верзија во развоја фаза)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "Потоа, рестатувајте го %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Овозможено"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај надоградувања"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Провери за ажурирање"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Конфигурирај мрежа"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Вклучувам drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Следно"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Вклучувам MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ги пресметувам новите ажурирања...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системот е ажуриран\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверувам мрежа: изгледа е оневозможена\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Авторски права (C) %s од „%s“"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "„Mageia Online“ дава пристап до веб сервисите на „Mageia“."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Онлајн Веб сајт"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "За..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Читам конфигурација\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Секогаш вклучувај при подигнување"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Напушти"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Опис на машината:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Се случи грешка"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Неуспех при додавање медиум"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Во ред"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Погрешна лозинка"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Погрешна лозинка"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Грешка"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "„Mageia Online“"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -627,37 +432,59 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- ја печати оваа помошна порака.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Автоматско вклучување на Mageia Update.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- вклучува одредени mnf скрипти.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- верзија на Mageia Update во текстуален режим.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- запишува што се случува\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не можам да ги ажурирам пакетите од медиумот update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Опис на машината:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Се случи грешка"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Неуспех при додавање медиум"
+
+#~ msgid "Ok"
+#~ msgstr "Во ред"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "„Mageia Online“"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
 
diff --git a/po/mn.po b/po/mn.po
index 9d43e837..a3097f68 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -18,70 +18,65 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "Та гарсан асуудлаа support@mageiaonline.com рүү илгээнэ үү\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,518 +87,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Нээлттэй"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr ""
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Тохируулах"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Дараах"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr ""
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr ""
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Тухай..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr ""
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Гарах"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Алдаа"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Нууц үг:"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Нууц үг:"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Алдаа"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Хаах"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr ""
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr ""
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr ""
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr ""
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr ""
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -617,36 +422,39 @@ msgstr ""
 "\n"
 "Ашиглалт: \n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- Энэ тусламжийг хэвлэх.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- Бүх мэдээллийг шинэчлэх.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "„update_source“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
 
+#~ msgid "Ok"
+#~ msgstr "Ок"
+
 #, fuzzy
 #~ msgid "Installation failed"
 #~ msgstr "Хэлбэр!"
diff --git a/po/ms.po b/po/ms.po
index 86a98c6e..01364176 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -17,17 +17,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Periksa kemaskini"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistem anda telah dikemaskini"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -36,54 +36,49 @@ msgstr ""
 "Masalah tetapan servis. Sila periksa log dan hantar mel ke "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, fuzzy, c-format
 msgid "Please wait, finding available packages..."
 msgstr "muat ulang senarai pakej yg tersedia"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Kemaskini baru terdapat untuk sistem anda"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Rangkaian tidak berfungsi. Sila tetapkan rangkaian anda"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Servis tidak diaktifkan. Sila klik pada \"Laman Web Online\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi terkunci"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Keluaran tidak disokong (keluaran terlalu lama, atau keluaran pembangunan)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -94,518 +89,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr "dimatikan dalam ulanghidup."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Hidupkan"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Pasang kemaskini"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Periksa Kemaskini"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Tetapkan Rangkaian"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Melaksanakan drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Berikut"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Melaksanakan MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Memeriksa kemaskini baru...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem adalah terkini\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Pemeriksaan Rangkaian: seperti dimatikan\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Hakcipta (C) %s %s SA"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Keterangan..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Membaca konfigurasi\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Sentiasa lancar ketika permulaan"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Ralat"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Nama mesin:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ralat telah berlaku"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Gagal apabila menambah media"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Salah katalaluan"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Salah katalaluan"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Ralat"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Tutup"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -618,37 +423,59 @@ msgstr ""
 "\n"
 "penggunaan:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- cetak mesej bantuan ini.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- kemaskini semua maklumat.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - kemaskini semua maklumat.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Nama mesin:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ralat telah berlaku"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Gagal apabila menambah media"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/mt.po b/po/mt.po
index d2ba99e4..fc183c08 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -20,17 +20,17 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Iċċekkja aġġornamenti"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Is-sistema tiegħek hija aġġornata"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,53 +39,48 @@ msgstr ""
 "Hemm problema fil-konfigurazzjoni. Iċċekkja l-logs u ibgħat imejl "
 "lilsupport@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Stenna ftit, qed insib pakketti disponibbli..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "In-network mhux imtella'. Jekk jogħġbok issettja n-network."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "is-servizz mhux attivat. Jekk jogħġbok klikkja fuq \"Sit online\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "database urpmi imsakkar"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Verżjoni mhux sapportita (antika wisq, jew verżjoni ta' żvilupp)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -101,518 +96,328 @@ msgstr ""
 "\n"
 "Imbgħad, erġa’ startja %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Mixgħul"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installa aġġornamenti"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Iċċekkja għal aġġornamenti"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Ikkonfigura n-network"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Qed jitħaddem drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Li jmiss"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Qed jitħaddem MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Qed jiġu kalkulati aġġornamenti ġodda...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Is-sistema hija aġġornata\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Qed niċċekkja n-network... jidher li mitfi\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Twissija"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Dwar.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Ibgħat konfigurazzjoni"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Dejjem ħaddem mat-tlugħ"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Oħroġ"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Problema"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Isem tal-kompjuter:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Inqalgħet problema"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Problema waqt iż-żieda ta' sors"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Password ħażina"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Password ħażina"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Problema"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Agħlaq"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -626,37 +431,59 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update jitħaddem awtomatikament.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - ħaddem Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Isem tal-kompjuter:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Inqalgħet problema"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Problema waqt iż-żieda ta' sors"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/nb.po b/po/nb.po
index 973bcfbc..7a77b93c 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 12:13+0200\n"
 "Last-Translator: Keld Simonsen <keld@keldix.comm>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -27,17 +27,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vil se etter oppdateringer på %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert."
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -46,54 +46,49 @@ msgstr ""
 "Feil ved oppsett av tjenesten. Kontroller loggene og kontakt "
 "support@mageiaonline.com."
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Ser etter tilgjengelige pakker. Vent litt …"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Det finnes nye oppdateringer for systemet ditt."
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "En ny versjon av Mageia Linux er nå ute."
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 "Nettverket er ikke tilgjengelig. Kontroller at nettverksoppsettet fungerer."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjenesten er ikke startet. Velg «Hjemmeside»."
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-databasen er låst."
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Utgaven din er ikke støtta (enten for gammel eller utviklingsutgave)."
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, 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:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,121 +104,104 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Feil ved oppdatering av media"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringer"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Legg til ekstra pakkemedium"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Se etter oppdateringer"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Sett opp nettverket"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Oppgrader systemet"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Grunnleggende vedlikehold for denne distribusjonen er ikke støtta. Siden du "
-"abonnerer på utvida vedlikehold, får du likevel oppdateringer fram til %s."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Fikk SIGHUP-signal (sannsynligvis er en oppgradering ferdig). Starter "
 "programmet på nytt."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Starter drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Ny versjon av Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "En ny versjon av Mageia Linux er nå ute."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Mer informasjon om denne nye versjonen"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Vil du oppgradere til «%s»?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Ikke spør igjen"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Last ned alle pakkene først"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Advarsel: Du trenger mye ledig diskplass)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Lagre pakkene i mappa:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Neste"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -232,55 +210,27 @@ msgstr ""
 "Vedlikeholdet for dette Mageia Linux-systemet har utløpt. Dette betyr at det "
 "ikke vil komme flere programvareoppdateringer."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "For å holde systemet sikkert, kan du:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Du bør skaffe utvidet vedlikehold."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Du bør enten skaffe utvidet vedlikehold, eller oppgradere til en nyere "
-"versjon av %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Distribusjonen er ikke lenger støtta"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Utvidet vedlikehold"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Kjøp en vedlikeholdsutvidelse for denne versjonen (%s) og la den kjøre fram "
-"til %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -289,17 +239,17 @@ msgstr ""
 "Denne oppgraderingen krever en nettverkstilkobling med høy båndbredde "
 "(kabel, XDSL) og kan ta flere timer å fullføre."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Beregnet nedlastingsdata: %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -308,343 +258,182 @@ msgstr ""
 "Du bør koble den bærbare maskinen til strømuttaket, og om mulig bruke "
 "kabeltilkobling i stedet for trådløs."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Kjører MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Gransker nye oppdateringer …\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er oppdatert\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerer nettverk: ser ut til å være slått av\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright © %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online gir deg tilgang til vevtjenestene til Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Olav Dahlum <odahlum@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Mer informasjon"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Legg til medium"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Om …"
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Oppdateringsoppsett"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Kjør ved oppstart"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nytt medium tilgjengelig"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, 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:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Vil du legge til dette nye programvarelageret?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Legger til nytt pakkemedium"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "De støttede produktene er %s, «%s» er ikke på lista.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Feil"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Feil ved henting av distribusjonsliste:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia tilbyr tolv måneder med skrivebordsoppdateringer (fram til %s) og "
-"atten måneder med baseoppdateringer (fram til %s) for distribusjoner."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Utvidet vedlikehold er nå tilgjengelig for å få atten måneder med "
-"ytterligere oppdateringer (fram til %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Livstidspolitikk"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Nettbasert abonnement"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Det oppsto en feil"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Mageia-kontoen din har ikke et nedlastingsabonnement for %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Feil under forsøk på å legge til medium"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "La til medium."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Medium %s ble lagt til."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Her kan du sette opp oppdateringsprogrammet"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Oppdateringsfrekvens (timer)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Pause før første sjekk (minutt)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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
-#, c-format
-msgid "Enterprise"
-msgstr "Bedrift"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Linux gir deg den beste opplevelsen for skrivebordet. Stabilitet og "
-"effektiviteten til åpen kildekode-løsninger, sammen med eksklusiv "
-"programvare and offentlig støtte fra Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Funksjoner i Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Mer informasjon om brukerkontoen din"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "E-postadresse"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Passord"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Glemt passord"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Feil"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Passord- og e-postfeltet kan ikke være tomt."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Lukk"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Velg ønsket versjon"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Din tilgang til PowerPack er over"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s er nå tilgjengelig, du kan oppgradere til:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Mageia Linux-distribusjonen med ennå mer programvare og offentlig støtte."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Den fritt tilgjengelige 100 %% åpen kildekode-distribusjonen."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Distribusjonsoppgradering"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -657,36 +446,177 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t– vis denne hjelpeteksten.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t– Mageia Update kjørt automatisk.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t– Kjør mnf-spesifike skript.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t– tekstversjon av Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t– logg hva som blir gjort.\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Klarte ikke oppdatere pakker fra oppdateringsmedium.\n"
 
+#~ 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 ""
+#~ "Grunnleggende vedlikehold for denne distribusjonen er ikke støtta. Siden "
+#~ "du abonnerer på utvida vedlikehold, får du likevel oppdateringer fram til "
+#~ "%s."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Du bør skaffe utvidet vedlikehold."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Du bør enten skaffe utvidet vedlikehold, eller oppgradere til en nyere "
+#~ "versjon av %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Utvidet vedlikehold"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Kjøp en vedlikeholdsutvidelse for denne versjonen (%s) og la den kjøre "
+#~ "fram til %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "De støttede produktene er %s, «%s» er ikke på lista.\n"
+
+#~ 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."
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Feil ved henting av distribusjonsliste:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia tilbyr tolv måneder med skrivebordsoppdateringer (fram til %s) og "
+#~ "atten måneder med baseoppdateringer (fram til %s) for distribusjoner."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Utvidet vedlikehold er nå tilgjengelig for å få atten måneder med "
+#~ "ytterligere oppdateringer (fram til %s)."
+
+#~ 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:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Livstidspolitikk"
+
+#~ msgid "Online subscription"
+#~ msgstr "Nettbasert abonnement"
+
+#~ msgid "An error occurred"
+#~ msgstr "Det oppsto en feil"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Mageia-kontoen din har ikke et nedlastingsabonnement for %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Feil under forsøk på å legge til medium"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "La til medium."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Medium %s ble lagt til."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Et ekstra pakkemedium er tilgjengelig for distribusjonen din."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Legg til ekstra pakkemedium"
+
+#~ msgid "New medium available"
+#~ msgstr "Nytt medium tilgjengelig"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr "Du benytter «%s» og har derfor tilgang til mer programvare."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Vil du legge til dette nye programvarelageret?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Se etter «%s»-medium som mangler"
+
+#~ msgid "Restricted"
+#~ msgstr "Begrenset"
+
+#~ msgid "Enterprise"
+#~ msgstr "Bedrift"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Linux gir deg den beste opplevelsen for skrivebordet. Stabilitet "
+#~ "og effektiviteten til åpen kildekode-løsninger, sammen med eksklusiv "
+#~ "programvare and offentlig støtte fra Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Funksjoner i Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Velg ønsket versjon"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Din tilgang til PowerPack er over"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s er nå tilgjengelig, du kan oppgradere til:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Mageia Linux-distribusjonen med ennå mer programvare og offentlig støtte."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/nl.po b/po/nl.po
index 4b2197b0..14041c76 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2008-12-10 23:10+0100\n"
 "Last-Translator: Reinout van Schouwen <reinouts@gnome.org>\n"
 "Language-Team: Nederlands\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Volgende controle op herzieningen om %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Uw systeem is bijgewerkt"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,47 +40,42 @@ msgstr ""
 "Dienst-instellingsprobleem. Verifieer uw logboeken en stuur een e-mail naar "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Even geduld, bezig met opzoeken van beschikbare pakketten…"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Er zijn nieuwe herzieningen beschikbaar voor uw systeem"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Er is een nieuwe versie van Mageia Linux uitgebracht"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Netwerk niet actief. Configureer uw netwerk"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dienst niet geactiveerd. Klik alstublieft op \"Webpagina\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-database gesloten"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Uitgave niet ondersteund (te oud, of een ontwikkelingsuitgave)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -88,7 +83,7 @@ msgstr ""
 "Geen medium gevonden. U dient er één of meer toe te voegen via ‘Software "
 "Mediabeheer’."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -105,168 +100,129 @@ msgstr ""
 "\n"
 "Daarna herstart u ‘%s’."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Er is een fout opgetreden bij het bijwerken van de media"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Herzieningen installeren"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Een extra pakketmedium toevoegen"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Herzieningen nagaan"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Netwerk configureren"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Het systeem bijwerken"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect wordt gestart\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nieuwe versie van Mageia Linux-distributie"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Er is een nieuwe versie van de Mageia Linux-distributie uitgebracht."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Meer informatie over deze nieuwe versie"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Wilt u opwaarderen naar de distributie ‘%s’?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Volgende keer niet meer vragen"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Volgende"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Wilt u opwaarderen naar de distributie ‘%s’?"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -275,19 +231,19 @@ msgstr ""
 "Deze opwaardering vereist een netwerkverbinding met hoge bandbreedte (kabel, "
 "ADSL, …) en kan enkele uren in beslag nemen."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "De geschatte downloadgegevens zijn %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -296,338 +252,184 @@ msgstr ""
 "U dient uw laptop op netstroom aan te sluiten en zo mogelijk een "
 "ethernetverbinding de voorkeur te geven boven wifi."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate wordt gestart\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Nieuwe herzieningen nagaan…\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systeem is bijgewerkt\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Controle van het netwerk: lijkt uitgeschakeld te zijn\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright © %s van %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online geeft toegang tot webdiensten van Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "C. Verschuuren\n"
 "Reinout van Schouwen <reinout@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Meer informatie"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Media toevoegen"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Info…"
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Lezen instellingen\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Altijd starten bij systeemstart"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nieuw medium beschikbaar"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"U gebruikt de distributie ‘%s’ en heeft daarom bevoorrechte toegang tot "
-"extrasoftware."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Wilt u dit extra softwaredepot installeren?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Toevoegen van extra pakketmedium…"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fout"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Computeromschrijving:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Er is een fout opgetreden"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Uw Mageia-account bevat geen %s-downloadabonnement."
-
-#: ../mdkapplet-add-media-helper:226
-#, 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:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "Media %s met succes toegevoegd"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Media %s met succes toegevoegd"
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Meer informatie over uw gebruikersaccount"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Uw e-mailadres"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Uw wachtwoord"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Wachtwoord vergeten"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fout"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Wachtwoord en e-mailadres mogen niet leeg zijn."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Distributie-opwaardering"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -641,36 +443,89 @@ msgstr ""
 "\n"
 "gebruik:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- deze gebruiksaanwijzing.tonen\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update automatisch starten.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- specifieke mnf scripts starten.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- tekstmodus van Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- in logboek bijhouden wat er gebeurt\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 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 "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"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Computeromschrijving:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Er is een fout opgetreden"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Uw Mageia-account bevat geen %s-downloadabonnement."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Er is een fout opgetreden bij het toevoegen van het medium"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "Media %s met succes toegevoegd"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Media %s met succes toegevoegd"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Er is een extra pakketmedium beschikbaar voor uw distributie."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Een extra pakketmedium toevoegen"
+
+#~ msgid "New medium available"
+#~ msgstr "Nieuw medium beschikbaar"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "U gebruikt de distributie ‘%s’ en heeft daarom bevoorrechte toegang tot "
+#~ "extrasoftware."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Wilt u dit extra softwaredepot installeren?"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
diff --git a/po/nn.po b/po/nn.po
index ad0e9635..de0f0406 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 07:54+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Vil sjå etter oppdateringar %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Systemet ditt er oppdatert."
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,54 +35,49 @@ msgstr ""
 "Feil ved oppsett av tenesta. Kontroller loggane og kontakt "
 "support@mageiaonline.com."
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Ser etter tilgjengelege pakkar. Vent litt …"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Det finst nye oppdateringar for systemet ditt."
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Ein ny versjon av Mageia Linux er no ute."
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 "Nettverket er ikkje tilgjengeleg. Kontroller at nettverksoppsettet fungerer."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tenesta er ikkje starta. Vel «Heimeside»."
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-databasen er låst."
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 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:156
+#: ../mgaapplet:140
 #, 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:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -98,121 +93,104 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Feil ved oppdatering av medie"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installer oppdateringane"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Legg til ekstra pakkemedium"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Sjå etter oppdateringar"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Set opp nettverket"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Oppgrader systemet"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Grunnleggjande vedlikehald for denne distribusjonen er ikkje støtta. Sidan "
-"du abonnerer på utvida vedlikehald, får du likevel oppdateringar fram til %s."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Fekk SIGHUP-signal (sannsynlegvis er ei oppgradering ferdig). Startar "
 "programmet på nytt."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Køyrer drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Ny versjon av Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Ein ny versjon av Mageia Linux er no ute."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Meir informasjon om denne nye versjonen"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Ønskjer du å oppgradera til «%s»?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Spør ikkje igjen"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Last ned alle pakkane først"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Åtvaring: Du treng då mykje ledig diskplass.)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Lagra pakkane i mappa:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Neste"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -221,55 +199,27 @@ msgstr ""
 "Vedlikehaldsplanen for denne utgåva av Mageia Linux er no over. Du vil ikkje "
 "få nokon nye oppdateringar framover."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "For å halda systemet sikkert, kan du:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Du bør skaffa utvida vedlikehald."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Du bør anten skaffa utvida vedlikehald, eller oppgradera til ein ny versjon "
-"av %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Distribusjonen er ikkje lenger støtta"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Utvida vedlikehald"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Kjøp ei vedlikehaldsutviding for denne versjonen (%s) for å få oppdateringar "
-"fram til %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -278,17 +228,17 @@ msgstr ""
 "Denne oppgraderinga krev eit raskt Internett-samband (kabelmodus, xDSL, …), "
 "og kan ta fleire timar å fullføra."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Estimert nedlastingsdata: %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -297,345 +247,182 @@ msgstr ""
 "Du bør kopla den berbare maskina til straumuttaket, og om mogleg bruka "
 "kabeltilkopling i staden for trådlaust samband."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Køyrer MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Granskar nye oppdateringar …\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet er oppdatert\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerer nettverk: Ser avslått ut.\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright © %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online gjev deg tilgang til vevtenestene til Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Karl Ove Hufthammer <karl@huftis.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Meir informasjon"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Legg til medium"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Om …"
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Oppdateringsoppsett"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Køyr ved oppstart"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nytt medium tilgjengeleg"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Du brukar distribusjonen «%s», og har derfor tilgang til meir programvare."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Vil du leggja til dette nye programvarelageret?"
-
-# skip-rule: server
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Legg til nytt pakkemedium"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Dei støtta produkta er %s. «%s» er ikkje støtta.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Feil"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Feil ved henting av distribusjonslista:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia tilbyr 12 månader med generelle oppdateringar (fram til %s), samt 18 "
-"månader med grunnoppdateringar (fram til %s)."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Utvida vedlikehald er no tilgjengeleg, og gjev 18 månader meir med "
-"oppdateringar (fram til %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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>:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Oppdateringsperiodar"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Abonnement"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Det oppstod ein feil"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Mageia-kontoen din har ikkje eit nedlastingsabonnement for %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Klarte ikkje leggja til nytt medium."
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "La til media."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "La til mediet «%s»."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Her kan du setja opp oppdateringsprogrammet"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Oppdateringsfrekvens (timar)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Pause før første sjekk (minutt)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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
-#, c-format
-msgid "Restricted"
-msgstr "Avgrensa"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Bedrift"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack gjev deg den beste Linux-opplevinga – stabilitet og "
-"effektivitet, med løysingar baserte på fri programvare saman med eksklusive "
-"Mageia-program, og med offisiell kundestøtte."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Funksjonar i Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Meir informasjon om brukarkontoen din"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "E-postadresse"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Passord"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Gløymt passord"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Feil"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Passord- og e-postfelta kan ikkje stå tomme."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Lukk"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Vel oppgraderingsversjon"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Du har ikkje lenger tilgang til Powerpack"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%1 er no tilgjengeleg. Du kan oppgradera til:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Mageia Linux-distribusjonen med endå fleire program, og med kundestøtte."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Distribusjonen med 100 % fri programvare."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Oppgradering av distribusjon"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -649,36 +436,179 @@ msgstr ""
 "\n"
 "Bruk:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help         – Vis denne hjelpeteksten.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto         – Mageia Update køyrd automatisk.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf          – Køyr mnf-spesifikke skript.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX          – Tekstutgåva av Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t– Logg over kva som vert gjort.\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 
+#~ 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 ""
+#~ "Grunnleggjande vedlikehald for denne distribusjonen er ikkje støtta. "
+#~ "Sidan du abonnerer på utvida vedlikehald, får du likevel oppdateringar "
+#~ "fram til %s."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Du bør skaffa utvida vedlikehald."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Du bør anten skaffa utvida vedlikehald, eller oppgradera til ein ny "
+#~ "versjon av %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Utvida vedlikehald"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Kjøp ei vedlikehaldsutviding for denne versjonen (%s) for å få "
+#~ "oppdateringar fram til %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Dei støtta produkta er %s. «%s» er ikkje støtta.\n"
+
+#~ 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."
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Feil ved henting av distribusjonslista:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia tilbyr 12 månader med generelle oppdateringar (fram til %s), samt "
+#~ "18 månader med grunnoppdateringar (fram til %s)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Utvida vedlikehald er no tilgjengeleg, og gjev 18 månader meir med "
+#~ "oppdateringar (fram til %s)."
+
+#~ 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>:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Oppdateringsperiodar"
+
+#~ msgid "Online subscription"
+#~ msgstr "Abonnement"
+
+#~ msgid "An error occurred"
+#~ msgstr "Det oppstod ein feil"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Mageia-kontoen din har ikkje eit nedlastingsabonnement for %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Klarte ikkje leggja til nytt medium."
+
+#~ msgid "Successfully added media!"
+#~ msgstr "La til media."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "La til mediet «%s»."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Eit ekstra pakkemedium er tilgjengeleg for distribusjonen din."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Legg til ekstra pakkemedium"
+
+#~ msgid "New medium available"
+#~ msgstr "Nytt medium tilgjengeleg"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Du brukar distribusjonen «%s», og har derfor tilgang til meir programvare."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Vil du leggja til dette nye programvarelageret?"
+
+# skip-rule: server
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Sjå etter «%s»-medium som manglar"
+
+#~ msgid "Restricted"
+#~ msgstr "Avgrensa"
+
+#~ msgid "Enterprise"
+#~ msgstr "Bedrift"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack gjev deg den beste Linux-opplevinga – stabilitet og "
+#~ "effektivitet, med løysingar baserte på fri programvare saman med "
+#~ "eksklusive Mageia-program, og med offisiell kundestøtte."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Funksjonar i Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Vel oppgraderingsversjon"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Du har ikkje lenger tilgang til Powerpack"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%1 er no tilgjengeleg. Du kan oppgradera til:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Mageia Linux-distribusjonen med endå fleire program, og med kundestøtte."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 8d2d271b..30d6c256 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -17,17 +17,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "ਨਵੀਨੀਕਰਨ ਪੜਤਾਲ"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "ਤੁਹਾਡਾ ਸਿਸਟਮ ਨਵੀਨ ਹੈ"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -36,53 +36,48 @@ msgstr ""
 "ਸੇਵਾ ਸੰਰਚਨਾ ਸਮੱਸਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਲਾਗ ਦੀ ਪੜਤਾਲ ਕਰੋ ਅਤੇ support@mageiaonline.com ਨੂੰ "
 "ਚਿੱਠੀ ਪਾਓ।"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ, ਉਪਲੱਬਧ ਪੈਕੇਜ ਖੋਜੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਨਵੇਂ ਨਵੀਨੀਕਰਨ ਉਪਲੱਬਧ ਹਨ"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ਨੈਟਵਰਕ ਬੰਦ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਨੈਟਵਰਕ ਦੀ ਸੰਰਚਨਾ ਕਰੋ"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "ਸੇਵਾ ਸਰਗਰਮ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ \"ਆਨਲਾਇਨ ਵੈਬਸਾਇਟ\" ਦਬਾਓ"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi ਡਾਟਾਬੇਸ ਤਾਲਾਬੰਦ ਹੈ"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "ਜਾਰੀ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ (ਬਹੁਤ ਪੁਰਾਣਾ ਵਰਜਨ ਹੈ ਜਾਂ ਵਿਕਾਸ ਜਾਰੀ ਹੈ)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -99,518 +94,328 @@ msgstr ""
 "\n"
 "ਤਦ, %s ਮੁੜ ਚਲਾਓ।"
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "ਯੋਗ"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "ਨਵੀਨੀਕਰਨ ਇੰਸਟਾਲ"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "ਨਵੀਨੀਕਰਨ ਜਾਂਚ"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "ਨੈਟਵਰਕ ਸੰਰਚਨਾ"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "ਨਵੇਂ ਨਵੀਨੀਕਰਨ ਲਈ ਗਣਨਾ ਜਾਰੀ ਹੈ...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "ਸਿਸਟਮ ਨਵੀਨ ਹੈ।\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ਨੈਟਵਰਕ ਪੜਤਾਲ: ਆਯੋਗ ਜਾਪਦਾ ਹੈ\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "ਆਨਲਾਇਨ ਵੈੱਬਸਾਇਟ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "ਇਸ ਬਾਰੇ..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "ਸੰਰਚਨਾ ਪੜੀ ਜਾ ਰਹੀ ਹੈ\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਹਮੇਸ਼ਾ ਚਾਲੂ ਕਰੋ"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "ਗਲਤੀ"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਫਲ"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "ਠੀਕ ਹੈ"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ:"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "ਗਲਤ ਗੁਪਤ-ਕੋਡ:"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "ਗਲਤੀ"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -623,37 +428,59 @@ msgstr ""
 "\n"
 "ਵਰਤੋਂ:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, fuzzy, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help         - print this help message.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto         - Mageia Update launched automatically.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - launch Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨੀਕਰਨ ਲਈ ਅਸਫਲ ਹੈ।\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "ਮਸ਼ੀਨ ਨਾਂ: "
+
+#~ msgid "An error occurred"
+#~ msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਫਲ"
+
+#~ msgid "Ok"
+#~ msgstr "ਠੀਕ ਹੈ"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
diff --git a/po/pl.po b/po/pl.po
index 5deffa12..55290862 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 08:58+0100\n"
 "Last-Translator: Marek Walczak <kubdat@poczta.fm>\n"
 "Language-Team:  <pl@li.org>\n"
@@ -27,17 +27,17 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Aktualizacje zostaną sprawdzone o %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Oprogramowanie systemu jest aktualne"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -46,54 +46,49 @@ msgstr ""
 "Problem z konfiguracją usługi. Sprawdź logi i wyślij e-mail'a pod adres "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Dostępne są nowe aktualizacje dla Twojego systemu"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Udostępniono nową wersję dystrybucji Mageia Linux"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieć jest wyłączona. Skonfiguruj sieć"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Usługa jest nieaktywna. Kliknij na Witryna internetowa\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza danych zablokowana"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Nieobsługiwane wydanie (za stare, lub wydanie rozwojowe)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, 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:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,121 +105,104 @@ msgstr ""
 "\n"
 "Następnie uruchom ponownie \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Błąd w trakcie aktualizowania nośnika"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Zainstaluj aktualizacje"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Dodaj dodatkowy nośnik z pakietami"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Sprawdź aktualizacje"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Skonfiguruj sieć"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Zaktualizuj system do nowej wersji"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Podstawowe wsparcie dla tej dystrybucji wygasło. Dziękujemy za Twój "
-"abonament rozszerzonego wsparcia, system będzie uaktualniany do dnia %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Otrzymano SIGHUP (prawdopodobnie zakończyła się aktualizacja), ponowne "
 "uruchomienie apletu."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Uruchamianie programu drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nowa wersja dystrybucji Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Udostępniono nową wersję dystrybucji Mageia Linux."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Więcej informacji na temat nowej wersji"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Czy chcesz zaktualizować system do wersji %s?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Nie pytaj mnie ponownie"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Pobierz wszystkie pakiety naraz"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Ostrzeżenie: Będziesz potrzebował sporo wolnego miejsca)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Gdzie można pobrać pakiety:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Dalej"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -233,53 +211,27 @@ msgstr ""
 "Wsparcie dla tej wersji Mageia Linux wygasło. Aktualizacje dla tego systemu "
 "nie będą dostarczane."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Aby utrzymać system bezpiecznym, możesz:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Powinieneś otrzymać rozszerzone wsparcie."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Powinieneś przedłużyć abonament rozszerzonego wsparcia lub dokonać "
-"aktualizacji do nowszej wersji %s dystrybucji."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Powinieneś zaktualizować system do nowszej wersji %s dystrybucji."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Twoja dystrybucja nie jest już wspierana"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Rozszerzone Wsparcie"
-
-#: ../mdkapplet:552
-#, 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:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -288,19 +240,19 @@ msgstr ""
 "Aktualizacja wymaga łącza internetowego o wysokiej przepustowości (kablówka, "
 "xDSL, ...) i może potrwać kilka godzin."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Przewidywana ilość danych do pobrania to %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -309,346 +261,182 @@ msgstr ""
 "Podłącz notebooka do zasilania oraz połącz się z internetem z wykorzystaniem "
 "połączenia kablowego zamiast bezprzewodowego, np. wifi."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Uruchamianie polecenia MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Przetwarzanie nowych aktualizacji...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "System jest aktualny\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sprawdzanie sieci: wygląda na wyłączoną\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online umożliwia korzystanie z usług sieciowych Mandrivy."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Marek Walczak <kubdat@poczta.pl>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Więcej informacji"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Dodaj nośnik"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "O programie..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Konfiguracja aktualizacji"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Uruchamiaj przy starcie"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Udostępniono nowy nośnik"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Używasz dystrybucji %s i w związku z tym masz uprzywilejowany dostęp do "
-"dodatkowego oprogramowania."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Czy chcesz zainstalować dodatkowy nośnik z pakietami?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Dodawanie dodatkowego nośnika z pakietami"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Produktów %s, '%s' nie ma na liście wsparcia.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Błąd"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Nieudane pobranie listy dystrybucji:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia przez 12 miesięcy dostarcza aktualizacje (aż do %s) i 18 miesięcy "
-"aktualizuje bazę (aż do %s) dla dystrybucji."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Rozszerzone wsparcie jest dostępne, przez 18 miesięcy dostaniesz dodatkowe "
-"aktualizacje (aż do %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Subskrybuj <b>teraz</b> by otrzymać rozszerzone wsparcie:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Polityka czasu ważności"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Subskrypcja online"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Wystąpił błąd"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia 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:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Wystąpił błąd podczas dodawania nośnika"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Nośnik został pomyślnie dodany!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Nośnik %s został dodany."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Tutaj możesz skonfigurować aplet aktualizacji"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Częstotliwość aktualizacji (godziny)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Opóźnienie pierwszego sprawdzenia (minuty)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Sprawdź czy są nowsze \"%s\" edycje"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Sprawdź czy nie brakuje \"%s\"  nośników"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Ograniczone"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack dostarcza najlepsze rozwiązania Linuksa dla komputerów: "
-"stabilniejsze i wydajniejsze rozwiązanie open source na zasadach wyłączności "
-"oraz oficjalne wsparcie Mandrivy."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Możliwości Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Więcej informacji jest dostępna w panelu Twojego konta"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Twój e-mail"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Twoje hasło"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Zapomniałem hasła"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Błąd"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Pola hasła i adresu e-mail nie mogą być puste."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zamknij"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Wybierz aktualną wersję"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Twój dostęp do Powerpack zakończył się"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "% jest teraz dostępna, możesz uaktualnić do:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Dystrybucja Mageia Linux z najbogatszym oprogramowaniem i oficjalnym "
-"wsparciem."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Ogólnodostępna 100%% dystrybucja Open Source."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Aktualizacja dystrybucji"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -662,36 +450,177 @@ msgstr ""
 "\n"
 "użycie:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- wyświetla ten komunikat pomocy.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- automatyczne uruchamiane Mageia Update .\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- uruchom skrypty dla mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update pracujący w trybie tekstowym.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- zapisuj wykonane operacje\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 
+#~ 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 ""
+#~ "Podstawowe wsparcie dla tej dystrybucji wygasło. Dziękujemy za Twój "
+#~ "abonament rozszerzonego wsparcia, system będzie uaktualniany do dnia %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Powinieneś otrzymać rozszerzone wsparcie."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Powinieneś przedłużyć abonament rozszerzonego wsparcia lub dokonać "
+#~ "aktualizacji do nowszej wersji %s dystrybucji."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Rozszerzone Wsparcie"
+
+#~ 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."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Produktów %s, '%s' nie ma na liście wsparcia.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Nieudane pobranie listy dystrybucji:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia przez 12 miesięcy dostarcza aktualizacje (aż do %s) i 18 miesięcy "
+#~ "aktualizuje bazę (aż do %s) dla dystrybucji."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Rozszerzone wsparcie jest dostępne, przez 18 miesięcy dostaniesz "
+#~ "dodatkowe aktualizacje (aż do %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Subskrybuj <b>teraz</b> by otrzymać rozszerzone wsparcie:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Polityka czasu ważności"
+
+#~ msgid "Online subscription"
+#~ msgstr "Subskrypcja online"
+
+#~ msgid "An error occurred"
+#~ msgstr "Wystąpił błąd"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "Na Twoim koncie w systemie Mandrivy nie ma informacji na temat "
+#~ "subskrypcji %s'a."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Wystąpił błąd podczas dodawania nośnika"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Nośnik został pomyślnie dodany!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Nośnik %s został dodany."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Dodatkowy nośnik z pakietami jest dostępny dla Twojej dystrybucji."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Dodaj dodatkowy nośnik z pakietami"
+
+#~ msgid "New medium available"
+#~ msgstr "Udostępniono nowy nośnik"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Używasz dystrybucji %s i w związku z tym masz uprzywilejowany dostęp do "
+#~ "dodatkowego oprogramowania."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Czy chcesz zainstalować dodatkowy nośnik z pakietami?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Sprawdź czy nie brakuje \"%s\"  nośników"
+
+#~ msgid "Restricted"
+#~ msgstr "Ograniczone"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack dostarcza najlepsze rozwiązania Linuksa dla komputerów: "
+#~ "stabilniejsze i wydajniejsze rozwiązanie open source na zasadach "
+#~ "wyłączności oraz oficjalne wsparcie Mandrivy."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Możliwości Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Wybierz aktualną wersję"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Twój dostęp do Powerpack zakończył się"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "% jest teraz dostępna, możesz uaktualnić do:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Dystrybucja Mageia Linux z najbogatszym oprogramowaniem i oficjalnym "
+#~ "wsparciem."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/pt.po b/po/pt.po
index d0f2015a..dbc52923 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2011-05-25 03:09+0100\n"
 "Last-Translator: Zé <mmodem00@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
@@ -25,17 +25,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Verificará actualizações em %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "O seu sistema está actualizado"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,48 +44,43 @@ msgstr ""
 "Problema na configuração do serviço. Por favor verifique os registos e envie "
 "uma mensagem para support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Estão disponíveis novas actualizações para o seu sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Foi lançada uma nova versão da distribuição Mageia"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Está disponível uma média adicional para a sua distribuição."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "A rede não está a funcionar. Por favor configure a sua rede"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "O serviço não está activado. Por favor clique em \"Sítio Web Em-linha\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "base de dados urpmi trancada"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Lançamento não suportado (demasiado antigo ou de desenvolvimento)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -93,7 +88,7 @@ msgstr ""
 "Nenhuma média encontrada. Precisa adicionar alguma média através do 'Gestor "
 "de Médias de Programas'."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,122 +105,104 @@ msgstr ""
 "\n"
 "Depois, reinicie  a \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Erro ao actualizar média"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalar actualizações"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Adicionar média de pacotes adicional"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar Actualizações"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar Rede"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Actualizar o sistema"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Expirou a  manutenção básica da sua distribuição. Obrigado pela sua "
-"subscrição de extensão da manutenção, o seu sistema continuará actualizado "
-"até %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "SIGHUP recebido (provavelmente terminou uma actualização), a reiniciar a "
 "mini-aplicação."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "A lançar o drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nova versão da distribuição Mageia"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Procurar"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Foi lançada uma nova versão da distribuição Mageia."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Mais informação acerca desta nova versão"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Deseja actualizar para a distribuição '%s'?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Não perguntar novamente"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Transferir todos os pacotes de uma só vez"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, 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:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Para onde transferir os pacotes:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Próximo"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -234,55 +211,27 @@ msgstr ""
 "A manutenção para esta versão Mageia terminou. Não serão entregues mais "
 "actualizações para este sistema."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Para manter o seu sistema seguro, pode:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Deve obter uma extensão de manutenção."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Deve obter uma extensão de manutenção ou actualizar para uma nova versão da "
-"distribuição %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "A sua distribuição já não é suportada."
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Manutenção Extendida"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Compre uma extensão de manutenção para esta versão(%s) e mantenha-a a correr "
-"até %s:"
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -291,17 +240,17 @@ msgstr ""
 "Esta actualização requer uma conexão com grande largura de banda (cabo, "
 "xDSL, ...) e pode levar algumas horas até terminar."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "A estimativa de transferência de dados será até %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Deve fechar todas as outras aplicações antes de continuar."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -310,345 +259,182 @@ 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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "A iniciar o  MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "A calcular novas actualizações...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está actualizado\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "A verificar a rede: parece desactivada\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Em-linha %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Direitos de Autor (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "A Mageia Em-linha dá acesso aos serviços 'web' Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Zé <ze@mandriva.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Mais informação"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Adicionar média"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Acerca..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configuração das Actualizações"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Executar sempre no arranque"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nova média disponível"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Usa a distribuição '%s', como tal tem acesso privilegiado a programas "
-"adicionais."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Deseja instalar este repositório de programas adicional?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Servidor Mageia Enterprise"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "A adicionar uma média de pacotes adicionais"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Os produtos suportados são %s, '%s' não está na lista.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Falha ao obter a lista de distribuição:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"A Mageia fornece 12 meses de actualizações do seu ambiente (até %s) "
-"e 18 meses de actualizações base (até %s) para distribuições."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"A manutenção extendida está agora disponível para obter 18 meses de "
-"actualizações adicionais (até %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Politica vitalícia"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Subscrição em-linha"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu um erro"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-"A sua conta Mageia não tem uma subscrição de transferência %s activada."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Ocorreu um erro ao adicionar a média"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Média adicionada com sucesso!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Média %s adicionada com sucesso."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Aqui pode configurar a mini-aplicação de actualizações"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Frequência de actualização (horas)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Atraso da primeira verificação (minutos)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"A Mageia Powerpack traz-lhe a melhor experiência Linux: estabilidade e "
-"eficiência de soluções em código livre juntamente com a exclusividade do "
-"suporte oficial Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr "Características Mageia"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Mais informação na sua conta de utilizador"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "O seu endereço electrónico"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "A sua senha"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Senha esquecida"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Erro"
+
+#: ../mgaapplet_gui.pm:213
 #, 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_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Escolha a sua versão de actualização"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "O seu acesso Powerpack terminou"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s está agora disponível, pode actualizar para:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "A distribuição Mageia ainda com mais programas e suporte oficial."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "A distribuição 100% código livre disponível gratuitamente."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Actualização da Distribuição"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -662,36 +448,177 @@ msgstr ""
 "\n"
 "uso:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- mostra esta mensagem de ajuda.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update executado automáticamente.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- executa scripts específicos mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- versão em modo texto do Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- registar o que é feito\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 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 ""
+#~ "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 ""
+#~ "Expirou a  manutenção básica da sua distribuição. Obrigado pela sua "
+#~ "subscrição de extensão da manutenção, o seu sistema continuará "
+#~ "actualizado até %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Deve obter uma extensão de manutenção."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Deve obter uma extensão de manutenção ou actualizar para uma nova versão "
+#~ "da distribuição %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Manutenção Extendida"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Compre uma extensão de manutenção para esta versão(%s) e mantenha-a a "
+#~ "correr até %s:"
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Os produtos suportados são %s, '%s' não está na lista.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Falha ao obter a lista de distribuição:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "A Mageia fornece 12 meses de actualizações do seu ambiente (até %s) e 18 "
+#~ "meses de actualizações base (até %s) para distribuições."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "A manutenção extendida está agora disponível para obter 18 meses de "
+#~ "actualizações adicionais (até %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Pode subscrever <b>agora</b> para obter manutenção extendida:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Politica vitalícia"
+
+#~ msgid "Online subscription"
+#~ msgstr "Subscrição em-linha"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ocorreu um erro"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "A sua conta Mageia não tem uma subscrição de transferência %s activada."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Ocorreu um erro ao adicionar a média"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Média adicionada com sucesso!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Média %s adicionada com sucesso."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Está disponível uma média adicional para a sua distribuição."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Adicionar média de pacotes adicional"
+
+#~ msgid "New medium available"
+#~ msgstr "Nova média disponível"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Usa a distribuição '%s', como tal tem acesso privilegiado a programas "
+#~ "adicionais."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Deseja instalar este repositório de programas adicional?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Servidor Mageia Enterprise"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Verificar médias \"%s\" em falta"
+
+#~ msgid "Restricted"
+#~ msgstr "Restricted"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "A Mageia Powerpack traz-lhe a melhor experiência Linux: estabilidade e "
+#~ "eficiência de soluções em código livre juntamente com a exclusividade do "
+#~ "suporte oficial Mageia."
+
+#~ msgid "Mageia Features"
+#~ msgstr "Características Mageia"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Escolha a sua versão de actualização"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "O seu acesso Powerpack terminou"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s está agora disponível, pode actualizar para:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr "A distribuição Mageia ainda com mais programas e suporte oficial."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 723c7ba4..41430b4f 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 16:00-0300\n"
 "Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
 "Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
@@ -24,17 +24,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Verificar atualizações as %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Seu sistema está atualizado"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -43,48 +43,42 @@ msgstr ""
 "Problema no serviço de configuração. Por favor, verifique os logs gerados e "
 "envie para support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Aguarde, procurando programas disponíveis..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Atualizações disponíveis para o seu sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Foi lançada uma nova versão da distribuição Mageia Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-"Uma mídia adicional de programas está disponível para a sua distribuição."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sem Conexão. Por favor, configure sua Rede"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "O serviço não está ativado. Por favor, clique em \"WebSite Online\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "Base de Dados do urpmi trancada"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Versão não suportada (versão muito antiga ou de desenvolvimento)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -92,7 +86,7 @@ msgstr ""
 "Nenhuma mídia encontrada. Adicione mídias pelo 'Configurar Mídias para "
 "Atualização e Instalação de Novos Programas'."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,122 +103,104 @@ msgstr ""
 "\n"
 "Depois, reinicie o \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Habilitada"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Erro ao Atualizar Mídia"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalar Atualizações"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Adicionar mídia com programas adicionais"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Verificar Atualizações"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configurar Rede"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Atualizar o Sistema"
 
-#: ../mdkapplet:394
-#, 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 ""
-"A manutenção básica para esta distribuição expirou. Obrigado por sua "
-"assinatura para obter manutenção estendida, seu sistema será mantido "
-"atualizado até %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Recebido o sinal SIGHUP (provavelmente uma atualização terminou), "
 "reiniciando applet"
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Lançando o Drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nova versão da Distribuição Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Navegar"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Foi lançada uma nova versão do Mageia Linux."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Mais Informações sobre esta nova Versão"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Você deseja atualizar para a distribuição '%s'?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Não perguntar na próxima vez"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Baixar todos os programas de uma vez"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, 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:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Para onde baixar os pacotes:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Próximo"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -233,55 +209,27 @@ msgstr ""
 "A manutenção deste sistema Mageia Linux chegou ao seu final. Isto significa "
 "que você não receberá mais atualizações de programas."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "A fim de manter seu sistema seguro, você pode:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Você deveria obter manutenção estendida."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Você deveria ou adquirir a manutenção estendida ou atualizar para uma versão "
-"mais nova da distribuição %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "A sua distribuição não é mais suportada"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Manutenção Estendida"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Compre a manutenção estendida para esta versão (%s) e mantenha-a rodando até "
-"%s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -290,17 +238,17 @@ msgstr ""
 "Esta atualização requer uma conexão de banda larga (Cabo, xDSL,...) e pode "
 "levar horas para completar."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Aproximadamente %s de dados será baixado"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Você deve fechar todos os outros programas antes de continuar."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -309,48 +257,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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Lançando o MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Computando novas atualizações...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "O sistema está atualizado\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Analisando Rede: Parece desativada\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online da Acesso para Serviços Web Mageia"
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -360,297 +308,136 @@ msgstr ""
 "com>,Felipe Arruda <felipemiguel@gmail.com>,Sergio Rafael Lemke "
 "<sergio@mandriva.com.br>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Mais Informações"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Adicionar Mídia"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Sobre.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configurar Atualizações"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Iniciar com o sistema"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nova Mídia Disponível"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Você usa a distribuição '%s' e com isso tem acesso privilegiado a programas "
-"extras."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Você deseja adicionar esta mídia com programas extras ?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Adicionando a mídia com programas extras"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Os produtos suportados são %s, '%s' não está na lista.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Erro"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Falha ao obter a lista de distribuições:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"A Mageia fornece 12 meses de atualizações de Ambiente de Trabalho (até %s) e "
-"18 meses de atualizações de sistema base (até o %s) para suas distribuições."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Manutenção Estendida está disponível para obter 18 meses extras de "
-"atualizações (até %s)"
-
-#: ../mdkapplet-add-media-helper:170
-#, 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:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Política de Suporte"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Assinatura Online"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ocorreu um Erro"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Sua conta Mageia não possui assinatura para download %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Ocorreu um Erro ao Adicionar Mídia"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Mídia adicionada!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Mídia %s Adicionada com Sucesso."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Configura o notificador de atualizações:"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Verificar a Cada (horas)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Primeira Verificação (minutos):"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Verificar por versões novas do \"%s\""
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Verificar por mídia \"%s\" faltante"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Restrita"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Empresa"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack traz para você o melhor da experiência Linux: estabilidade "
-"e eficiência em soluções de código aberto junto com programas exclusivos e "
-"suporte oficial Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Características Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Mais Informações sobre sua Conta de Usuário"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Seu E-Mail"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Sua Senha"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Esqueci Minha Senha :("
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Erro"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "E-Mail e senha não podem ser vazios."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Fechar"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Escolha sua versão de atualização"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "O seu acesso Powerpack encerrou"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "Agora disponível %s, você pode atualizar para:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"A distribuição Mageia Linux com ainda mais programas e suporte oficial."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "A distribuição 100%% de código aberto e gratuitamente disponível."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Atualização da Distribuição"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -663,36 +450,180 @@ msgstr ""
 ".\n"
 "uso:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- Exibe esta Mensagem de Ajuda.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Lançar Mageia Update Automaticamente.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- Roda scripts específicos do mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Versão Modo Texto do Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- Registra o que é Feito\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 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 ""
+#~ "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 ""
+#~ "A manutenção básica para esta distribuição expirou. Obrigado por sua "
+#~ "assinatura para obter manutenção estendida, seu sistema será mantido "
+#~ "atualizado até %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Você deveria obter manutenção estendida."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Você deveria ou adquirir a manutenção estendida ou atualizar para uma "
+#~ "versão mais nova da distribuição %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Manutenção Estendida"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Compre a manutenção estendida para esta versão (%s) e mantenha-a rodando "
+#~ "até %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Os produtos suportados são %s, '%s' não está na lista.\n"
+
+#~ 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"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Falha ao obter a lista de distribuições:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "A Mageia fornece 12 meses de atualizações de Ambiente de Trabalho (até "
+#~ "%s) e 18 meses de atualizações de sistema base (até o %s) para suas "
+#~ "distribuições."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Manutenção Estendida está disponível para obter 18 meses extras de "
+#~ "atualizações (até %s)"
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Você pode assinar <b>agora</b> para obter manutenção estendida:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Política de Suporte"
+
+#~ msgid "Online subscription"
+#~ msgstr "Assinatura Online"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ocorreu um Erro"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Sua conta Mageia não possui assinatura para download %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Ocorreu um Erro ao Adicionar Mídia"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Mídia adicionada!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Mídia %s Adicionada com Sucesso."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr ""
+#~ "Uma mídia adicional de programas está disponível para a sua distribuição."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Adicionar mídia com programas adicionais"
+
+#~ msgid "New medium available"
+#~ msgstr "Nova Mídia Disponível"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Você usa a distribuição '%s' e com isso tem acesso privilegiado a "
+#~ "programas extras."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Você deseja adicionar esta mídia com programas extras ?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Verificar por mídia \"%s\" faltante"
+
+#~ msgid "Restricted"
+#~ msgstr "Restrita"
+
+#~ msgid "Enterprise"
+#~ msgstr "Empresa"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack traz para você o melhor da experiência Linux: "
+#~ "estabilidade e eficiência em soluções de código aberto junto com "
+#~ "programas exclusivos e suporte oficial Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Características Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Escolha sua versão de atualização"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "O seu acesso Powerpack encerrou"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "Agora disponível %s, você pode atualizar para:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "A distribuição Mageia Linux com ainda mais programas e suporte oficial."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/ro.po b/po/ro.po
index d97972bc..e1a046ee 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -46,7 +46,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: https://qa.mandriva.com\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 13:23+0100\n"
 "Last-Translator: Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian <cooker-i18n@mandrivalinux.org>\n"
@@ -61,17 +61,17 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Se vor verifica actualizările la %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sistemul este la zi cu actualizările"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -80,49 +80,43 @@ msgstr ""
 "Problemă de configurare a serviciului. Verificați jurnalele și trimiteți un "
 "mesaj la support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Așteptați, se caută pachetele disponibile..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Noi actualizări sînt disponibile pentru sistemul vostru"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "O nouă versiune a distribuției Mageia Linux a fost lansată"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-"Un mediu de pachete adițional este disponibil pentru această distribuție."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Rețeaua nu funcționează. Configurați rețeaua"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serviciul nu este activat. Apăsați pe „Sit online”"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "baza de date urpmi este blocată"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Versiunea nu este suportată (este prea veche sau este versiune de dezvoltare)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -130,7 +124,7 @@ msgstr ""
 "Nu s-au găsit medii. Trebuie să adăugați medii prin „Gestionarul mediilor cu "
 "programe”. "
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -147,122 +141,104 @@ msgstr ""
 "\n"
 "Apoi reporniți „%s”."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Activat"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Eroare la actualizarea mediului"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instalare actualizări"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Adaugă un mediu de pachete adițional"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Verificare actualizări"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Configurare rețea"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Actualizare majoră a sistemului"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Mentenanța de bază pentru această distribuție a expirat. Datorită "
-"abonamentului vostru la mentenanța extinsă, sistemul va continua să fie "
-"actualizat pînă-n data de %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "S-a primit SIGHUP (probabil s-a terminat o catualizare), se repornește "
 "miniaplicația."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Se lansează drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Versiune nouă a distribuției Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Navigare"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "O nouă versiune a distribuției Mageia Linux a fost lansată."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Informații suplimentare despre această nouă versiune"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Doriți să avansați la distribuția „%s”? "
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Nu se cere confirmare data viitoare"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Descarcă toate pachetele odată"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, 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:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Unde se descarcă pachetele:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Înainte"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Anulează"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -271,55 +247,27 @@ msgstr ""
 "Mentenanța acestei versiuni de Mageia Linux s-a sfîrșit. Nu se vor mai "
 "produce actualizări pentru acest sistem."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Pentru a vă păstra sistemul securizat, puteți:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Ar trebui să achiziționați o mentenanță extinsă."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Ar trebui să achiziționați o mentenanță extinsă sau să avansați la o "
-"versiune mai recentă a distribuției %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Ar trebui să avansați la o versiune mai recentă a distribuției %s. "
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Distribuția voastră nu mai este suportată"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Mentenanță extinsă"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Achiziționați o mentenanță extinsă pentru această versiune (%s) și "
-"continuați s-o utilizați pînă în %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -328,18 +276,18 @@ msgstr ""
 "Această actualizare majoră necesită o conexiune rapidă (cablu, xDSL, ...) și "
 "poate dura cîteva ore pînă la finalizare."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Estimarea datelor de descărcat este de %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, 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:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -348,48 +296,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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Se lansează MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Se calculează actualizările...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemul este la zi cu actualizările\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verificarea rețelei: se pare că este dezactivată\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Drepturi de autor (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online permite accesul la serviciile web Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
@@ -402,300 +350,136 @@ msgstr ""
 "Cosmin HUMENIUC <cosmin@mandrivausers.ro>, 2008\n"
 "Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>, 2008, 2009, 2010\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Informații suplimentare"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Adaugă un mediu"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Despre..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Configurare actualizări"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lansează întotdeauna la pornire"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Terminare"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nou mediu disponibil"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Utilizați distribuția „%s” și de aceea aveți un acces privilegiat la "
-"programe adiționale."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, 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:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Se adaugă un mediu de pachete adițional"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Produsele suportate sînt %s, „%s” nu este pe listă.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-"Introduceți identificatorul contului vostru pentru a adăuga un mediu de "
-"pachete adițional"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Eroare"
-
-#: ../mdkapplet-add-media-helper:149
-#, 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:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia oferă 12 luni de actualizări pentru mediul de birou (pînă în %s) și "
-"18 luni de actualizări de bază (pînă în %s) pentru distribuții."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Mentenanța extinsă este acum disponibilă pentru a profita de 18 luni "
-"suplimentare de actualizări (pînă în %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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 achiziționa mentenanță extinsă:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Politica duratei de viață"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Abonare în direct"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "S-a produs o eroare"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-"Contul vostru Mageia nu are activat opțiunea de descărcare a versiunii %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "S-a produs o eroare la adăugarea mediului"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Mediu adăugat cu succes!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "S-a adăugat cu succes mediul %s."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Aici puteți configura miniaplicația de actualizări"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Frecvența actualizărilor (ore)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Perioada pînă la prima verificare (minute)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Verificați pentru versiune mai noi 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
-#, c-format
-msgid "Restricted"
-msgstr "Restrticționat"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Antrepriză"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack vă aduce cea mai bună experiență Linux pentru birou: "
-"stabilitatea și eficiența soluțiilor cu sursă deschisă împreună cu programe "
-"exclusive și suport oficial Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Funcționalitățile Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Informații suplimentare despre contul vostru de utilizator"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Adresa voastră electroniă"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Parola voastră"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Parolă uitată"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Eroare"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Parola și adresa electronică nu pot fi goale."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Închide"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Alegeți la ce versiune avansați"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Accesul vostru Powerpack s-a terminat"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s este acum disponibilă, puteți avansa la:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "Distribuția Mageia Linux cu mult mai multe programe și suport oficial."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Distribuția 100%% cu sursă deschisă disponibilă gratuit."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Actualizare majoră de distribuție"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -708,36 +492,182 @@ msgstr ""
 "\n"
 "Utilizare:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- afișează acest mesaj de ajutor.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update este lansat automat.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- lansare scripturi specifice mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- mod text pentru Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- înregistrează activitatea în jurnal\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nu se pot actualiza pachetele de pe mediul update_source.\n"
 
+#~ 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 ""
+#~ "Mentenanța de bază pentru această distribuție a expirat. Datorită "
+#~ "abonamentului vostru la mentenanța extinsă, sistemul va continua să fie "
+#~ "actualizat pînă-n data de %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Ar trebui să achiziționați o mentenanță extinsă."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Ar trebui să achiziționați o mentenanță extinsă sau să avansați la o "
+#~ "versiune mai recentă a distribuției %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Mentenanță extinsă"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Achiziționați o mentenanță extinsă pentru această versiune (%s) și "
+#~ "continuați s-o utilizați pînă în %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Produsele suportate sînt %s, „%s” nu este pe listă.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "Introduceți identificatorul contului vostru pentru a adăuga un mediu de "
+#~ "pachete adițional"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Eroare la preloarea listei de distribuții:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia oferă 12 luni de actualizări pentru mediul de birou (pînă în %s) "
+#~ "și 18 luni de actualizări de bază (pînă în %s) pentru distribuții."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Mentenanța extinsă este acum disponibilă pentru a profita de 18 luni "
+#~ "suplimentare de actualizări (pînă în %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr ""
+#~ "Vă puteți abona <b>chiar acum</b> pentru a achiziționa mentenanță extinsă:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Politica duratei de viață"
+
+#~ msgid "Online subscription"
+#~ msgstr "Abonare în direct"
+
+#~ msgid "An error occurred"
+#~ msgstr "S-a produs o eroare"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "Contul vostru Mageia nu are activat opțiunea de descărcare a versiunii %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "S-a produs o eroare la adăugarea mediului"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Mediu adăugat cu succes!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "S-a adăugat cu succes mediul %s."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr ""
+#~ "Un mediu de pachete adițional este disponibil pentru această distribuție."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Adaugă un mediu de pachete adițional"
+
+#~ msgid "New medium available"
+#~ msgstr "Nou mediu disponibil"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Utilizați distribuția „%s” și de aceea aveți un acces privilegiat la "
+#~ "programe adiționale."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Doriți să instalați acest depozit de programe adiționale?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Verificați dacă mediile „%s” sînt absente"
+
+#~ msgid "Restricted"
+#~ msgstr "Restrticționat"
+
+#~ msgid "Enterprise"
+#~ msgstr "Antrepriză"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack vă aduce cea mai bună experiență Linux pentru birou: "
+#~ "stabilitatea și eficiența soluțiilor cu sursă deschisă împreună cu "
+#~ "programe exclusive și suport oficial Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Funcționalitățile Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Alegeți la ce versiune avansați"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Accesul vostru Powerpack s-a terminat"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s este acum disponibilă, puteți avansa la:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Distribuția Mageia Linux cu mult mai multe programe și suport oficial."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/ru.po b/po/ru.po
index 560ef2b3..6e91ea46 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-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-14 19:16+0300\n"
 "Last-Translator: Alexander Kazancev <kazancas@mandriva.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -25,17 +25,17 @@ msgstr ""
 "X-Language: ru_RU\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Проверка обновлений будет выполнена в %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Система не нуждается в обновлении"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -44,47 +44,42 @@ msgstr ""
 "Проблема настройки службы. Проверьте журнал и отправьте письмо на "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Подождите. Выполняется поиск доступных пакетов..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Для системы доступны новые обновления"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Выпущена новая версия дистрибутива Mageia Linux"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Для данного дистрибутива доступен дополнительный источник пакетов."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Сеть недоступна. Настройте сеть"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Служба не включена. Выберите команду «Открыть веб-сайт»"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "База данных urpmi заблокирована"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версия не поддерживается (слишком старый или разрабатываемый релиз)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -92,7 +87,7 @@ msgstr ""
 "Источник не найден. Нужно добавить хотя бы один источник с помощью менеджера "
 "источников программ."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -108,122 +103,105 @@ msgstr ""
 "\n"
 "А затем перезапустите «%s»."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Включён"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Не удалось обновить источник"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Установить обновления"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Добавить дополнительный источник пакетов"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Проверить обновления"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Настроить сеть"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Обновление системы"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Базовая поддержка для этого дистрибутива завершена. Подписавшись на "
-"расширенную поддержку вы сможете получать обновления до %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Получен сигнал SIGHUP (скорее всего обновление закончено), перезапускаем "
 "аплет."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запуск drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Новая версия дистрибутива Mageia Linux"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Обзор"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Выпущена новая версия дистрибутива Mageia Linux."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Подробная информация об этой новой версии"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Выполнить обновление до версии «%s»?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Не спрашивать в следующий раз"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Скачать все пакеты одновременно"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 "(Предупреждение: Вам потребуется достаточно много свободного места на диске)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Куда скачиваются пакеты:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Далее"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -232,56 +210,28 @@ msgstr ""
 "Поддержка этого дистрибутива завершена. Для него больше не будет выпускаться "
 "никаких обновлений."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 "Для того чтобы продолжать держать вашу систему в безопасности, вы должны:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Вы должны заказать расширенную поддержку."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Вы должны или заказать расширеную поддержку или обновиться до более новой "
-"версии дистрибутива  %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Вы должны обновиться до новой версии дистрибутива: %s."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ваш дистрибутив больше не поддерживается."
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Расширенная поддержка"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Купите расширенную поддержку для этой версии (%s) и продолжайте ее "
-"использовать до %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -290,17 +240,17 @@ msgstr ""
 "Для данного обновления требуется высокоскоростное подключение к Интернету "
 "(кабельное, xDSL и т.п.), и это может занять продолжительное время."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Вычисленный объем данных для загрузки: %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Сначала необходимо закрыть все запущенные приложения."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -309,347 +259,184 @@ msgstr ""
 "Ноутбук следует подключить к источнику постоянного тока и по возможности "
 "использовать проводное подключение вместо беспроводного."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Запуск Mageia Update\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Определяются новые обновления...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система не нуждается в обновлении\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Проверка сети: похоже отключена\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online предоставляет доступ к веб-службам Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Открыть веб-сайт"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Павел Марьянов <acid_jack@ukr.net>\n"
 "Александр Казанцев <kazancas@mandriva.ru>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Дополнительные сведения"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Добавление источника"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "О программе..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Настройка обновлений"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Всегда запускать при старте"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Выход"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Доступен новый источник"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Вы используете дистрибутив «%s», поэтому у вас есть доступ к дополнительным "
-"программам."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Установить этот дополнительный источник пакетов?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Добавление дополнительного источника пакетов"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Поддерживаемые продукты это %s, '%s' нет в этом списке.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-"Для добавления дополнительного источника пакетов ведите логин своей учётной "
-"записи"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Ошибка"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Сбой при получении списка дистрибутивов:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia предоставляет для вашего дистрибутива 12 месяцев обновлений ПО (до "
-"%s) и 18 месяцев базовых обновлений (до %s)."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Расширенная поддержка дает вам дополнительно 18 месяцев обновлений (до %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Вы можете подписаться на расширенную поддержку <b>прямо сейчас</b>:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Политика обновлений ПО"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Онлайн подписка"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Возникла ошибка"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Для вашей учётной записи Mageia не включена подписка на загрузку %s."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "При добавлении источника возникла ошибка"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Источник успешно добавлен!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Источник «%s» успешно добавлен."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "ОК"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Настройка аплета обновлений"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Частота обновлений (часы)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Задержка перед первой проверкой (минуты)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack привнесет лучшее из Linux на ваш ПК: стабильность и "
-"эффективность решений с открытым исходным кодом вместе с эксклюзивным ПО и "
-"официальной поддержкой Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Особенности Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Дополнительные сведения об учётной записи"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Адрес электронной почты"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Пароль"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Забыли пароль?"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Ошибка"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Введите пароль и адрес электронной почты"
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Выберите версию для обновления"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Ваша подписка Powerpack закончилась"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "Уже доступен %s и вы можете обновиться:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Дистрибутив Mageia Linux с еще большим количеством программ и официальной "
-"поддержкой."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Доступен 100%% свободный дистрибутив."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Обновление дистрибутива"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -663,36 +450,180 @@ msgstr ""
 "\n"
 "использование:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- показать эту справку\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- автоматически запускать Mageia Update\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- запустить скрипты mnf\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- текстовая версия Mageia Update\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- заносить в журнал выполняемые действия\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не удаётся обновить пакеты из источника update_source.\n"
 
+#~ 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 ""
+#~ "Базовая поддержка для этого дистрибутива завершена. Подписавшись на "
+#~ "расширенную поддержку вы сможете получать обновления до %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Вы должны заказать расширенную поддержку."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Вы должны или заказать расширеную поддержку или обновиться до более новой "
+#~ "версии дистрибутива  %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Расширенная поддержка"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Купите расширенную поддержку для этой версии (%s) и продолжайте ее "
+#~ "использовать до %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Поддерживаемые продукты это %s, '%s' нет в этом списке.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "Для добавления дополнительного источника пакетов ведите логин своей "
+#~ "учётной записи"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Сбой при получении списка дистрибутивов:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia предоставляет для вашего дистрибутива 12 месяцев обновлений ПО (до "
+#~ "%s) и 18 месяцев базовых обновлений (до %s)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Расширенная поддержка дает вам дополнительно 18 месяцев обновлений (до "
+#~ "%s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Вы можете подписаться на расширенную поддержку <b>прямо сейчас</b>:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Политика обновлений ПО"
+
+#~ msgid "Online subscription"
+#~ msgstr "Онлайн подписка"
+
+#~ msgid "An error occurred"
+#~ msgstr "Возникла ошибка"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "Для вашей учётной записи Mageia не включена подписка на загрузку %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "При добавлении источника возникла ошибка"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Источник успешно добавлен!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Источник «%s» успешно добавлен."
+
+#~ msgid "Ok"
+#~ msgstr "ОК"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Для данного дистрибутива доступен дополнительный источник пакетов."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Добавить дополнительный источник пакетов"
+
+#~ msgid "New medium available"
+#~ msgstr "Доступен новый источник"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Вы используете дистрибутив «%s», поэтому у вас есть доступ к "
+#~ "дополнительным программам."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Установить этот дополнительный источник пакетов?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Проверить на наличие пропущенных источников \"%s\""
+
+#~ msgid "Restricted"
+#~ msgstr "Ограниченные"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack привнесет лучшее из Linux на ваш ПК: стабильность и "
+#~ "эффективность решений с открытым исходным кодом вместе с эксклюзивным ПО "
+#~ "и официальной поддержкой Mageia."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Особенности Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Выберите версию для обновления"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Ваша подписка Powerpack закончилась"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "Уже доступен %s и вы можете обновиться:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Дистрибутив Mageia Linux с еще большим количеством программ и официальной "
+#~ "поддержкой."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/sc.po b/po/sc.po
index fd2e8a46..122a16bb 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-09-05 19:00+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -21,17 +21,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Controlla is ajorronus"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Su sistema est ajorronau"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -40,53 +40,48 @@ msgstr ""
 "Probrema de assètiu de serbìtziu. Controlla is log e manda una missada a "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Abeta, agatu is pakitus a disposta..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Ajorronus a disposta po su sistema tuu"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "S'arretza no andat. Assètia s'arretza tua."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Serbìtziu no abivau. Craca \"Jassus Online\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "su database de urpmi est serrau"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Release no suportada (tropu beça, o de adelantamentu)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "Apustis, torra a allui %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Abivau"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Aposenta is ajorronus"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Controlla is Ajorronus"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Assètia Arretza"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Seu alluendi drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Sighi"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Annudda"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Seu alluendi MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Seu carculendi atrus ajorronus...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Su sistema est ajorronau\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Seu controllendi s'arretza: parit disabivada\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Atentu"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Apitzus de..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Seu ligendi s'assètiu\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Lança sempri a s'alluidura"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Bessi"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Faddina"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Nòmini màkina:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Faddina"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Faddina açungendi su mèdiu."
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Password sballiada"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Password sballiada"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Faddina"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Serra"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -627,37 +432,59 @@ msgstr ""
 "\n"
 "impreu:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- imprenta custa missada de ajudu.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update lançau in automàtigu.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- lança is script mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- versioni in modalidadi scriturali de Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Nòmini màkina:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Faddina"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Faddina açungendi su mèdiu."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/sk.po b/po/sk.po
index fc958573..06abde8c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -17,17 +17,17 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Skontrolovať aktualizácie"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Váš systém je dostatočne aktualizovaný"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -36,54 +36,49 @@ msgstr ""
 "Nastal problém v konfigurácii služby. Prosím skontrolujte log súbory a "
 "pošlite e-mail na support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Prosím čakajte, hľadajú sa dostupné balíky..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sú dostupné nové aktualizácie pre váš systém"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Sieť je nedostupná. Prosím skontrolujte vašu sieť"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Služba nie je aktivovaná. Prosím kliknite na \"Online web\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi databáza je uzamknutá"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 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:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -99,518 +94,328 @@ msgstr ""
 "\n"
 "Potom reštartujte %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Inštalácia aktualizácií"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Skontrolovať aktualizácie"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Nastaviť sieť"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Spúšťanie drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Ďalej"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Spúšťanie MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Hľadanie nových aktualizácií...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Váš systém je dostatočne aktualizovaný\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrolovanie siete: zrejme je vypnutá\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Varovanie"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "O.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Načítavanie konfigurácie\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Spustiť po štarte"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Chyba"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Meno počítača:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Vyskytla sa chyba"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Chyba pri pridávaní zdroja"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Nesprávne heslo"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Nesprávne heslo"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Chyba"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -623,37 +428,59 @@ msgstr ""
 "\n"
 "použitie:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- vypíše túto pomoc.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update spustený automaticky.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- spustiť špecifické skripty pre mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- textová verzia Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Meno počítača:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Vyskytla sa chyba"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Chyba pri pridávaní zdroja"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/sl.po b/po/sl.po
index 307fc212..953f6754 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2012-07-08 21:06+0200\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
@@ -28,17 +28,17 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Preverjanje posodobitev ob %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Vaš sistem je ažuren"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -47,47 +47,42 @@ msgstr ""
 "Težava z nastavitvijo storitve. Preverite dnevnike in pošljite pošto na "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Počakajte, poteka iskanje razpoložljivih paketov ..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Za vaš sistem so na voljo nove posodobitve"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Izdana je bila nova različica distribucije Mageia"
 
-#: ../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."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ni povezave z omrežjem. Nastavite omrežje"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Storitev ni aktivirana. Kliknite na »Spletna stran«"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "Podatkovna zbirka urpmi je zaklenjena"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Izdaja ni podprta (prestara ali razvojna različica)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -95,7 +90,7 @@ msgstr ""
 "Ni mogoče najti virov. Dodate jih lahko s pomočjo »Upravljalnika virov "
 "programske opreme«."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -112,122 +107,104 @@ msgstr ""
 "\n"
 "Potem ponovno zaženite »%s«."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Omogočen"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Napaka pri posodabljanju"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Namesti posodobitve"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Dodaj dodatni vir paketov"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Pregled posodobitev"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Nastavitev omrežja"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Nadgradi sistem"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Osnovno vzdrževanje za to različico je poteklo. Zahvaljujemo se vam za "
-"naročnino na podaljšano vzdrževanje. Posodobitve za vaš sistem bodo na voljo "
-"do %s."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Sprejet signal SIGHUP (verjetno se je zaključila nadgradnja), aplet se "
 "ponovno zaganja."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Program »drakconnect« se zaganja\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Nova različica distribucije Mageia"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Brskaj"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Izdana je bila nova različica distribucije Mageia."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Več podatkov o novi različici"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Ali želite nadgraditi na različico »%s«?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Ne sprašuj več"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Prenesi vse pakete naenkrat"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Opozorilo: potrebno bo precej prostega prostora)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Kam naj se prenesejo paketi:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Naprej"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -236,54 +213,27 @@ msgstr ""
 "Vzdrževanje te različice distribucije Mageia se je izteklo. Zanjo ne bo več "
 "na voljo nobenih posodobitev."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Da ohranite svoj sistem varen, priporočamo:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Da si priskrbite podaljšano vzdrževanje."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Da si priskrbite podaljšano vzdrževanje, ali pa nadgradite na novejšo "
-"različico distribucije %s."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, 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:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ta distribucija ni več podprta"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Podaljšano vzdrževanje"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Kupite podaljšanje vzdrževanja za to različico (%s) in jo uporabljajte do %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -292,17 +242,17 @@ msgstr ""
 "Za to nadgradnjo je potrebna širokopasovna povezava (kabel, xDSL, ...) in "
 "lahko traja več ur."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Ocenjena velikost prenesenih podatkov bo %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Pred nadaljevanjem je priporočljivo, da zaprete vse zagnane programe."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -311,344 +261,184 @@ 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:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "»MageiaUpdate« se zaganja\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Procesiranje novih posodobitev ...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistem je posodobljen\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Preverjanje omrežja: zdi se onemogočeno\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Avtorske pravice © %s, %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online omogoča dostop do spletnih storitev Mageia"
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Jure Repinc <jlp@holodeck1.com>,\n"
 "Filip Komar <filip.komar@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Več podatkov"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Dodaj vir"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "O ..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Nastavitev posodobitev"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Vedno zaženi ob zagonu"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Na voljo je nov vir"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Uporabljate distribucijo »%s« in imate zato privilegij dostopati do dodatnih "
-"programov."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Ali želite dodati to dodatno skladišče programov?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Dodajanje dodatnega vira paketov"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Podprti izdelki so %s. Na seznamu ni »%s«.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, 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:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Napaka"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Napaka pri pridobivanju seznama distribucij:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia za distribucije zagotavlja 12 mesecev posodobitev za namizje (do %s) "
-"in 18 mesecev posodobitev za osnovo (do %s)."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Na voljo je podaljšano vzdrževanje, ki zagotavlja 18 mesecev dodatnih "
-"posodobitev (do %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, 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>:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Politika glede življenjske dobe"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Spletna naročnina"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Prišlo je do napake"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Vaš račun Mageia nima omogočene naročnine za prenos %s-a."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Prišlo je do napake pri dodajanju vira"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Vir je bil uspešno dodan!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Vir %s je bil uspešno dodan."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "V redu"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Tu lahko nastavite aplet za posodabljanje"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Čas med posodobitvami (v urah)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Zamik prve posodobitve (v minutah)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Preveri za nove različice »%s«"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Preveri za manjkajoč vir za »%s«"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Omejeno"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia vam prinaša najboljšo izkušenjo Linuxa za namizje: stabilnost in "
-"učinkovitost odprtokodnih rešitev skupaj z ekskluzivno programsko opremo in "
-"uradna podpora Mageia."
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr "Zmožnosti distribucije Mageia"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Več podatkov o vašem uporabniškem računu"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Vaša e-pošta"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Vaše geslo"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Pozabljeno geslo"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Napaka"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Polje za geslo in e-pošto ne smeta biti prazna."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zapri"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Izberite svojo različico nadgradnje"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Vaš dostop do Powerpacka se je končal"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "Na voljo je %s, lahko nadgradite na:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "Distribucija Mageia s še več programske opreme in uradno podporo."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "100%% odprtokodna distribucija je na voljo."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Nadgradnja distribucije"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -661,36 +451,174 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- izpiši to sporočilo s pomočjo.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update se zažene samodejno.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- poženi skripte specifične za mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update v besedilnem načinu.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- zapisuj, kaj je opravljeno\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 
+#~ 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 ""
+#~ "Osnovno vzdrževanje za to različico je poteklo. Zahvaljujemo se vam za "
+#~ "naročnino na podaljšano vzdrževanje. Posodobitve za vaš sistem bodo na "
+#~ "voljo do %s."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Da si priskrbite podaljšano vzdrževanje."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Da si priskrbite podaljšano vzdrževanje, ali pa nadgradite na novejšo "
+#~ "različico distribucije %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Podaljšano vzdrževanje"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Kupite podaljšanje vzdrževanja za to različico (%s) in jo uporabljajte do "
+#~ "%s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Podprti izdelki so %s. Na seznamu ni »%s«.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "Za dodajanje dodatnega vira paketov vnesite ID svojega računa"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Napaka pri pridobivanju seznama distribucij:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia za distribucije zagotavlja 12 mesecev posodobitev za namizje (do "
+#~ "%s) in 18 mesecev posodobitev za osnovo (do %s)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Na voljo je podaljšano vzdrževanje, ki zagotavlja 18 mesecev dodatnih "
+#~ "posodobitev (do %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Podaljšano vzdrževanje si lahko zagotovite <b>takoj sedaj</b>:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Politika glede življenjske dobe"
+
+#~ msgid "Online subscription"
+#~ msgstr "Spletna naročnina"
+
+#~ msgid "An error occurred"
+#~ msgstr "Prišlo je do napake"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Vaš račun Mageia nima omogočene naročnine za prenos %s-a."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Prišlo je do napake pri dodajanju vira"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Vir je bil uspešno dodan!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Vir %s je bil uspešno dodan."
+
+#~ msgid "Ok"
+#~ msgstr "V redu"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Za vašo distribucijo je na voljo dodaten vir paketov."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Dodaj dodatni vir paketov"
+
+#~ msgid "New medium available"
+#~ msgstr "Na voljo je nov vir"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Uporabljate distribucijo »%s« in imate zato privilegij dostopati do "
+#~ "dodatnih programov."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Ali želite dodati to dodatno skladišče programov?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Preveri za manjkajoč vir za »%s«"
+
+#~ msgid "Restricted"
+#~ msgstr "Omejeno"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia vam prinaša najboljšo izkušenjo Linuxa za namizje: stabilnost in "
+#~ "učinkovitost odprtokodnih rešitev skupaj z ekskluzivno programsko opremo "
+#~ "in uradna podpora Mageia."
+
+#~ msgid "Mageia Features"
+#~ msgstr "Zmožnosti distribucije Mageia"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Izberite svojo različico nadgradnje"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Vaš dostop do Powerpacka se je končal"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "Na voljo je %s, lahko nadgradite na:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr "Distribucija Mageia s še več programske opreme in uradno podporo."
+
 #~ msgid "Continue and Authenticate!"
 #~ msgstr "Nadaljuj in overi"
 
diff --git a/po/sq.po b/po/sq.po
index a0e9d53b..56833e55 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 0.15 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\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"
@@ -18,29 +18,29 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Azhurnimet e sigurisë"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "Për çdo problem na dërgoni një e-mail në suppport@mageiaonline.com\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Një moment ju lutemi, gjetja e pakove të lira..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -49,43 +49,38 @@ msgstr ""
 "%s\n"
 "janë lidhur direkt në sistemin tuaj.\n"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "baza e të dhënave urpmi është e mbyllur"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,518 +97,328 @@ msgstr ""
 "\n"
 "Dhe, riniseni %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Aktivizuar"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instaloi azhurnimet"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Azhurnimi"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Konfigurim i rrjetin"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Nise userdrake"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Tjetër"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "Lidhje e ballafaquar"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Modë i sistemit"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Kujdes"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Në lidhje me..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Lexim i konfiguracionit\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Dalje"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Gabim"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Emri i Makinës:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Një gabim është paraqitur"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Një gabim është paraqitur"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Parulla e gabuar"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Parulla e gabuar"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Gabim"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Mbylle"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr "Caktoni lokalitetin tuaj gjeografik"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -626,37 +431,63 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- çfaqe këtë lajm ndihmues.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- azhurnoi të gjitha informacionet.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Emri i Makinës:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Një gabim është paraqitur"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Një gabim është paraqitur"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Caktoni lokalitetin tuaj gjeografik"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/sr.po b/po/sr.po
index 9c84c220..e6b4435b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Сигурносне надоградње"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,12 +39,12 @@ msgstr ""
 "Уколико имате било какав проблем пошаљите e-mail на support@mandrivaonline."
 "net\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Молим Вас сачекајте, проналазим доступне пакете..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -53,43 +53,38 @@ msgstr ""
 "%s\n"
 "су директно повезани на ваш систем.\n"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi база података закључана"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -107,518 +102,328 @@ msgstr ""
 "\n"
 "Затим  рестартујте  %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Укључи"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Инсталирај update-ове"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ажурирање"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Подеси мрежу"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Покрени userdrake"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Следећа"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Поништи"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Системски мод"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Сва права (C) %s задржава Мандрива"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "О..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Поново уносим конфигурацију: "
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Заврши"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Грешка"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Минице"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Хм,појавила се грешка"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Грешка при убацивању медија"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "У реду"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Без лозинке"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Без лозинке"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Грешка"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Затвори"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -632,37 +437,59 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- приказује ову поруку.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- ажурира све информације.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Не могу да ажурирам пакете са update_source медија.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Минице"
+
+#~ msgid "An error occurred"
+#~ msgstr "Хм,појавила се грешка"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Грешка при убацивању медија"
+
+#~ msgid "Ok"
+#~ msgstr "У реду"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index bac3809d..a8be7ffd 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Sigurnosne nadogradnje"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,12 +39,12 @@ msgstr ""
 "Ukoliko imate bilo kakav problem pošaljite e-mail na support@mandrivaonline."
 "net\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Molim Vas sačekajte, pronalazim dostupne pakete..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr ""
@@ -53,43 +53,38 @@ msgstr ""
 "%s\n"
 "su direktno povezani na vaš sistem.\n"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi baza podataka zaključana"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -107,518 +102,328 @@ msgstr ""
 "\n"
 "Zatim  restartujte  %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Uključi"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Instaliraj update-ove"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "Ažuriranje"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "Podesi mrežu"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "Pokreni userdrake"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Sledeća"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Poništi"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr ""
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "Sistemski mod"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Sva prava (C) %s zadržava %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "O..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Ponovo unosim konfiguraciju: "
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Završi"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Minice"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Hm,pojavila se greška"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Greška pri ubacivanju medija"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "U redu"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Bez lozinke"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Bez lozinke"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Greška"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -632,37 +437,59 @@ msgstr ""
 "\n"
 "upotreba:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- prikazuje ovu poruku.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- ažurira sve informacije.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - ažurira sve informacije.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Minice"
+
+#~ msgid "An error occurred"
+#~ msgstr "Hm,pojavila se greška"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Greška pri ubacivanju medija"
+
+#~ msgid "Ok"
+#~ msgstr "U redu"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/sv.po b/po/sv.po
index d2fb4a41..6ea79721 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2011-56-24 22:30+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mageia.org>\n"
 "Language-Team: Swedish <mageia-i18n@mageia.org>\n"
@@ -26,17 +26,17 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Kontrollerar om det finns uppdateringar vid %s"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ditt system är uppdaterat"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -45,48 +45,43 @@ msgstr ""
 "Problem med tjänstens konfiguration. Var vänlig kontrollera loggar och "
 "skicka e-post till support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vänta, hittar tillgängliga paket..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Nya uppdateringar finns tillgängliga för ditt system"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "En ny distribution av Mageia har släppts"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Ett tilläggsmedium är tillgängligt för din distribution."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Nätverket är nere. Var vänlig konfigurera ditt nätverk."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Tjänsten är ej aktiverad. Klicka på \"Online webbsajt\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi-databas låst"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Denna version stöds inte (för gammal version, eller utvecklingsversion)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -94,7 +89,7 @@ msgstr ""
 "Inget medium hittat. Du måste lägga till något media i 'Programhanteraren "
 "för källor'."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,119 +105,102 @@ msgstr ""
 "\n"
 "Starta sedan om \"%s\"."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Fel vid uppdatering av media"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Installera uppdateringar"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Ett tilläggsmedium"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Kontrollera om det finns uppdateringar"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Konfigurera nätverket"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Uppgradera systemet"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Basunderhåll för denna distribution har upphört. Tack vare din prenumeration "
-"på förlängt underhåll kommer ditt system att hållas uppdaterat till %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr "Mottog SIGHUP (en uppgradering blev troligen klar), startar om applet."
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Startar drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Ny version av Mageia distribution"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Bläddra"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "En ny version av Mageia distributionen har släppts."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Mera info om denna nya version"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Vill du uppgradera till '%s' distributionen?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Fråga inte nästa gång"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Ladda ner alla paket på en gång"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Varning: Du behöver en massa extra ledigt rum)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Ladda ner filer till:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Nästa"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -231,55 +209,27 @@ msgstr ""
 "Underhåll av denna Mageia version har upphört. Inga mera uppdateringar "
 "kommer att distribueras till detta system."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "För att hålla ditt system säkert kan du:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Du borde skaffa förlängt underhåll."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Du borde antingen skaffa förlängt underhåll, eller uppgradera till en nyare "
-"version av %s distributionen."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Du borde uppgradera till en nyare version av %s distributionen."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Din distribution stöds inte längre"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Förlängt underhåll"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Köp en förlängning av underhållet för denna version (%s) och du kan hålla "
-"systemet uppdaterat till %s."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -288,17 +238,17 @@ msgstr ""
 "Denna uppgradering kräver en snabb nätförbindelse (kabel, xDSL, ...) och kan "
 "ta flera timmar innan det är färdigt."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Uppskattad nerladdad data kommer att vara %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Du bör stänga alla andra applikationer förrän du fortsätter."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -307,344 +257,183 @@ msgstr ""
 "Du borde koppla din bärbara till väggströmen och fast nätanslutning i "
 "stället för trådlöst om det är tillgängligt."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Startar MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Beräknar nya uppdateringar...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Systemet är uppdaterat\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kontrollerar nätverk: verkar avaktiverat\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s, %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online ger tillgång till Mageia webtjänster."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Online webbsajt"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Thomas Backlund <tmb@mandriva.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Varning"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Mera information"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Lägg till media"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Om.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Konfiguration av uppdateringar"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Kör alltid vid uppstart"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Nytt media tillgängligt"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Du använder '%s' distributionen och har därför priviligerad åtkomst till "
-"tilläggs-programvara."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Vill du lägga till detta tilläggs-media ?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Lägger till ett extra media med paket"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Stödda produkter är %s, '%s' är inte med på listan.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Vänligen fyll i ditt konto ID för att lägga till ett extra media"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Fel"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Fel vid hämtning av distributionslista:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia tillhandahåller 12 månader av uppdateringar för skrivbordet (till %s) "
-"och 18 månader för bassystemet (fram till %s) för distributioner."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Förlängt underhåll är nu tillgängligt för att få underhåll under 18 månader "
-"extra (fram till %s)."
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Du kan prenumerera <b>direkt</b> för att få förlängt underhåll:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Livstidspolicy"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Online prenumeration"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Ett fel inträffade"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Ditt Mageia konto har ingen %s nerladdingsprenumeration aktiverad."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Ett fel inträffade vid tillägg av media"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Tillägg av media lyckades!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Tillägg av media %s lyckades."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Här kan du konfigurera uppdaterings-programmet"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Uppdaterings-frekvens (timmar)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Fördröjning vid första kontroll (minuter)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Kontrollera efter nyare \"%s\" distributioner"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Kontrollera saknade \"%s\" media"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Begränsad"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Företag"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack ger dig det bästa av Linux upplevelser för skrivbordet: "
-"stabilitet och effektivitet av lösningar baserade på öppen källkod "
-"tillsammans med exklusiva programvaror och Mageias officiella support."
-
-#: ../mdkapplet_gui.pm:94
-#, c-format
-msgid "Mageia Features"
-msgstr "Mageia Egenskaper"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Mera information om ditt användarkonto"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Din e-post"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Ditt lösenord"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Glömt lösenord"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Fel"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Lösenord och e-post kan inte vara tomma."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Stäng"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Välj den version du vill uppgradera till"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Din Powerpack tillgång har tagit slut"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s är nu tillgänglig, du kan uppgradera till:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-"Mageia distributionen med ännu mera programvara och officiell support."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 "Distributionen baserad på 100%% öppen källkod som är fritt tillgänglig."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Uppgradering av distribution"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -657,36 +446,175 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- visa det här hjälpmeddelandet.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update startas automatiskt.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- kör mnf specifika script.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- textversion av Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- logga vad som görs\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 
+#~ 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 ""
+#~ "Basunderhåll för denna distribution har upphört. Tack vare din "
+#~ "prenumeration på förlängt underhåll kommer ditt system att hållas "
+#~ "uppdaterat till %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Du borde skaffa förlängt underhåll."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Du borde antingen skaffa förlängt underhåll, eller uppgradera till en "
+#~ "nyare version av %s distributionen."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Förlängt underhåll"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Köp en förlängning av underhållet för denna version (%s) och du kan hålla "
+#~ "systemet uppdaterat till %s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Stödda produkter är %s, '%s' är inte med på listan.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "Vänligen fyll i ditt konto ID för att lägga till ett extra media"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Fel vid hämtning av distributionslista:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia tillhandahåller 12 månader av uppdateringar för skrivbordet (till "
+#~ "%s) och 18 månader för bassystemet (fram till %s) för distributioner."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Förlängt underhåll är nu tillgängligt för att få underhåll under 18 "
+#~ "månader extra (fram till %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Du kan prenumerera <b>direkt</b> för att få förlängt underhåll:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Livstidspolicy"
+
+#~ msgid "Online subscription"
+#~ msgstr "Online prenumeration"
+
+#~ msgid "An error occurred"
+#~ msgstr "Ett fel inträffade"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Ditt Mageia konto har ingen %s nerladdingsprenumeration aktiverad."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Ett fel inträffade vid tillägg av media"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Tillägg av media lyckades!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Tillägg av media %s lyckades."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Ett tilläggsmedium är tillgängligt för din distribution."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Ett tilläggsmedium"
+
+#~ msgid "New medium available"
+#~ msgstr "Nytt media tillgängligt"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Du använder '%s' distributionen och har därför priviligerad åtkomst till "
+#~ "tilläggs-programvara."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Vill du lägga till detta tilläggs-media ?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Kontrollera saknade \"%s\" media"
+
+#~ msgid "Restricted"
+#~ msgstr "Begränsad"
+
+#~ msgid "Enterprise"
+#~ msgstr "Företag"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack ger dig det bästa av Linux upplevelser för skrivbordet: "
+#~ "stabilitet och effektivitet av lösningar baserade på öppen källkod "
+#~ "tillsammans med exklusiva programvaror och Mageias officiella support."
+
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Egenskaper"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Välj den version du vill uppgradera till"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Din Powerpack tillgång har tagit slut"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s är nu tillgänglig, du kan uppgradera till:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr ""
+#~ "Mageia distributionen med ännu mera programvara och officiell support."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/ta.po b/po/ta.po
index 93b93092..e5b87ba7 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2002-08-23 20:02-0400\n"
 "Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil\n"
@@ -18,70 +18,65 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "பாதுகாப்பு புதுப்பித்தல்"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "பிழைகளை ஆங்கிலத்தில் ெதரிவிக்க support@mageiaonline.com\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "தயவுசெய்து காத்திருக்கவும்..இருக்கும் பொதிகளை கண்டுபிடிக்கப் படுகிறது"
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, fuzzy, c-format
 msgid "New updates are available for your system"
 msgstr "வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,518 +87,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "ெசயல்படுத்தப்பட்டுள்ளதா"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "உருகருக்களை நிறுவுங்கள்"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, fuzzy, c-format
 msgid "Check Updates"
 msgstr "புதுப்பித்தல்கள்"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "வலையமைப்பாக்கங்களை வடிவமையுங்கள்"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, fuzzy, c-format
 msgid "Launching drakconnect\n"
 msgstr "டிரேக்பயனரை துவக்கு"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "அடுத்து"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "நீக்கு"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "மாண்ட்ேரக்இணைய"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, fuzzy, c-format
 msgid "System is up-to-date\n"
 msgstr "இயக்க முறைமை"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "மாண்ட்ேரக்இணைய"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "எச்சரிக்ைக"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "பற்றி..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "வெளிச்செல்"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "பிழை"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "கணிணியின் பெயர்"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "சரி"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "மாண்ட்ேரக்இணைய"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "தவறான கடவுச்சொல்"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "தவறான கடவுச்சொல்"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "பிழை"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "மூடு"
 
-#: ../mdkapplet_gui.pm:302
-#, fuzzy, c-format
-msgid "Choose your upgrade version"
-msgstr " உங்கள் பகுதியை தேர்ந்தெடுக்க"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "மாண்ட்ேரக்இணைய"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "மாண்ட்ேரக்இணைய"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "மாண்ட்ேரக்இணைய"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "மாண்ட்ேரக்இணைய"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "மாண்ட்ேரக்இணைய"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -616,37 +421,63 @@ msgstr ""
 "\n"
 "பயன்பாடு\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- இந்த உதவியை காட்டு.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t-அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       -அைனத்து விவரங்களையும் புதுப்பிக்கவும்\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்திலிருந்து ெமன்ெபாருைள புதுப்பிக்க முடியவில்ைல\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "கணிணியின் பெயர்"
+
+#~ msgid "An error occurred"
+#~ msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "பிழை நேர்ந்துள்ளது மன்னிக்கவும்"
+
+#~ msgid "Ok"
+#~ msgstr "சரி"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "மாண்ட்ேரக்இணைய"
+
+#, fuzzy
+#~ msgid "Choose your upgrade version"
+#~ msgstr " உங்கள் பகுதியை தேர்ந்தெடுக்க"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "மாண்ட்ேரக்இணைய"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "மாண்ட்ேரக்இணைய"
 
diff --git a/po/tg.po b/po/tg.po
index f474410b..4f4c604d 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-09-17 16:22+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -26,17 +26,17 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Навкуниҳоро тафтиш кунед"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Системаи навкуниро талаб намекунад"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -45,53 +45,48 @@ msgstr ""
 "Мушкилии танзими хидмат.Марҳамат карда номнависҳоро санҷед ва ба "
 "support@mageiaonline.com пайём фиристед"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Интизор шавед, ёфтани қуттиҳои дастрас..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Барои системаи шумо навсозиҳои дастрасанд"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Шабака дастрас нест. Марҳамат кардашабакаи худро танзим кунед"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Хидмат фаъол нагаштааст. Ба \"Пойгоҳи шабакавӣ\" ангушт занед"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi манбаи маълумот дастнорас аст"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Барориш пуштибонӣ намегардад (барориши хеле кӯҳна, ё коркарди барориш)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -109,518 +104,328 @@ msgstr ""
 "\n"
 "Сониян, %s-ро дуюм маротиба ба кор дароред."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Даргирифта"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Кор гузоштани навигариҳо"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Тафтиши Навкуниҳо"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Танзимкунии Шабака"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Сардиҳии drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Навбатӣ"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Сардиҳии MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Ҳисобкунии навозиҳои тоза...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Системаи навкуниро талаб намекунад\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тафтиши Шабака: эҳтимолан хомӯш карда шудааст\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "WebПойгоҳи Ғайрихудмухтор"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Огоҳӣ"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Дар бораи..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Танзимдарорӣ хонда шуда истодааст\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Ҳамеша дар оғозёбӣ сар додан"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Баромадан"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Хатогӣ"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Номи мошина:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Хатогӣ рух дод"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Нокомӣ ҳангоми иловакунии муҳит"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Гузарвожаи нодуруст"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Гузарвожаи нодуруст"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Хатогӣ"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Пӯшидан"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -634,37 +439,59 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- чопи ин пайғоми ёрӣ.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update ба таври худкор сар дода мешавад.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- навкунии ривояти Mageia бо усули матнӣ.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Навсозии бастаҳо аз муҳити update_source ғайри имкон аст.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Номи мошина:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Хатогӣ рух дод"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Нокомӣ ҳангоми иловакунии муҳит"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/th.po b/po/th.po
index 4154e40a..f97a04a8 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2003-02-28 05:55+0900\n"
 "Last-Translator: Pramote Khuwijitjaru <kmote@hotmail.com>\n"
 "Language-Team: Thai <en@li.org>\n"
@@ -19,70 +19,65 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr ""
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr ""
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "หากมีปัญหาใดๆ ให้ส่งอีเมล์ไปยัง support@mageiaonline.com\n"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "กำลังหาเพกเกจที่มีอยู่, กรุณารอสักครู่..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr ""
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr ""
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "ฐานข้อมูล urpmi ถูกล็อก"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -93,518 +88,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "เปิดใช้"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, fuzzy, c-format
 msgid "Install updates"
 msgstr "ติดตั้งระบบ"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr ""
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, fuzzy, c-format
 msgid "Configure Network"
 msgstr "คอนฟิกระบบเน็ตเวิร์ก"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr ""
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "ถัดไป"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr ""
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, fuzzy, c-format
 msgid "Computing new updates...\n"
 msgstr "ปัญหาการคอนเน็ค"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr ""
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr ""
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "เกี่ยวกับ..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "กำลังส่งการปรับแต่ง..."
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr ""
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "ออก"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "ข้อผิดพลาด"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "มีปัญหาเกิดขึ้น"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "มีปัญหาเกิดขึ้น"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "ตกลง"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "รหัสผ่าน:"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "รหัสผ่าน:"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "ข้อผิดพลาด"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "ปิด"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -617,36 +422,54 @@ msgstr ""
 "\n"
 "วิธีใช้:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- แสดงข้อความช่วยเหลือ\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- อัพเดทข้อมูลทั้งหมด\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "ไม่สามารถอัพเดทแพ็จเกจจากมีเดียของ update_source \n"
 
+#~ msgid "An error occurred"
+#~ msgstr "มีปัญหาเกิดขึ้น"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "มีปัญหาเกิดขึ้น"
+
+#~ msgid "Ok"
+#~ msgstr "ตกลง"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
 #, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
diff --git a/po/tl.po b/po/tl.po
index a76c6738..3e4ce499 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-02-05 00:43+0000\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salin@pandaypinoy.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Suriin ang mga update"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Ang iyong sistema ay ayon sa bago"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,54 +39,49 @@ msgstr ""
 "Problema sa pag-configure ng serbisyo. Pakisuri ang mga log at ipadala sa "
 "sulat na support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Pakihintay, naghahanap ng mga available na package..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "May mga bagong update para sa iyong sistema"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Bagsak ang network. Paki-configure ang iyong network"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Ang serbisyo ay hindi nakaandar. Paki-click ang \"Online Website\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "urpmi database ay naka-lock"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Hindi suportado ang pagpapalabas (luma na, o panglinang na pagpapalabas)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,518 +98,328 @@ msgstr ""
 "\n"
 "Pagkatapos, simulan muli ang %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Gumagana"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "I-install ang mga update"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Suriin ang mga Update"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "I-configure ang Network"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Inilulunsad ang drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Kasunod"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Inilulunsad ang MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Naghahanap ng mga bagong update...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Ang Sistema ay naka-update\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Sinusuri ang Network: tila naka-disable\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Babala"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Tungkol sa.."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Binabasa ang configuration\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Parating ilunsad sa pagsimula"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Quit"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Error"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Pangalan ng makina:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "May \"error\" na nangyari"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Kabiguan kung nagdadagdag ng medium"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Maling password"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Maling password"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Error"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Isara"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -628,37 +433,59 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- i-print ang mensaheng tulong na ito.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update ay nakalunsad ng automatic.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - ilunsad ang Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Pangalan ng makina:"
+
+#~ msgid "An error occurred"
+#~ msgstr "May \"error\" na nangyari"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Kabiguan kung nagdadagdag ng medium"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/tr.po b/po/tr.po
index 5b76b8c7..5d7b34bf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2010-06-08 18:48+0200\n"
 "Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
 "Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
@@ -26,17 +26,17 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Güncellemeler %s itibarî ile kontrol edilecek"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Sisteminiz güncel"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -45,47 +45,42 @@ msgstr ""
 "Hizmet yapılandırma sorunu. Lütfen kayıtları denetleyin ve "
 "support@mageiaonline.com adresine e-posta gönderin"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Lütfen bekleyin, güncellemeler denetleniyor..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Sisteminiz için yeni güncellemeler mevcut"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia Linux' un yeni bir sürümü yayınlanmış"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Dağıtımınız için ek bir paket veri kaynağı mevcut"
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Ağınız çalışmıyor. Lütfen ağ yapılandırmanızı kontrol edin"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Hizmet etkin değil. Lütfen \"Çevrimiçi Website\"bağlantısına tıklayın"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi veri tabanı kilitli "
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Sürüm Desteklenmiyor (Çok eski ya da deneme sürümü)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -93,7 +88,7 @@ msgstr ""
 "Yazılım ortamı bulunamadı. 'Yazılım Ortam Yöneticisi' nden geçerli bir "
 "yazılım ortamı ekleyin."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,122 +105,104 @@ msgstr ""
 "\n"
 "Sonra, \"%s\" yeniden başlatın."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Etkin"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Kaynak güncelleme hatası"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Güncellemeleri Kur"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "Ek bir paket veri kaynağı ekle"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Güncellemeleri Denetle"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Ağı Yapılandır"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Sistemi yükselt"
 
-#: ../mdkapplet:394
-#, 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 ""
-"Bu dağıtım için temel bakım sona erdi. Genişletilmiş bakım kaydı "
-"yaptırdığınız için teşekkürler. Sisteminiz %s tarihine kadar güncel "
-"tutulacak."
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Bir SIGHUP iletisi alındı. Muhtemelen bir yükseltme işlemi tamamlanmış. "
 "Programcık yeniden başlatılıyor"
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnect başlatılıyor\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia Linux dağıtımının yeni sürümü"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Göz at"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia Linux' un yeni bir sürümü yayınlanmış"
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Bu sürüm hakkında daha fazla bilgi"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "'%s' dağıtımına yükseltmek ister misiniz?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Bir daha sorma"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Tüm paketleri tek seferde indir"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Uyarı: Oldukça fazla boş alana gereksinimizi olacak)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Paketlerin indirileceği konum:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "İleri"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -234,55 +211,27 @@ msgstr ""
 "Bu Mageia Linux sürümü için bakım süreci sona erdi. Bu sistem için daha "
 "fazla güncelleme yapılmayacak."
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Sisteminizi güvenli tutabilmek için yapabilecekleriniz:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Genişletilmiş bakım edinmelisiniz."
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Genişletilmiş bakım almalı veya %s dağıtımının daha yeni bir sürümüne "
-"yükseltme yapmalısınız."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "'%s' dağıtımının daha yeni bir sürümüne yükseltmelisiniz."
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Dağıtımınız artık desteklenmemektedir."
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Genişletilmiş Bakım"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Bu sürüm (%s)  için bir bakım eklentisi satın alın ve %s tarihine kadar "
-"güncel kalsın."
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -290,17 +239,17 @@ msgid ""
 msgstr ""
 "Bu yükseltme yüksek hızda ağ bağlantısı (kablo, xDSL v.b.) gerektirir ve 
birkaç saat sürebilir."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "İndirilecek yaklaşık veri miktarı %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Devam etmeden önce, çalışan tüm uygulamaları kapatmalısınız."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -308,344 +257,182 @@ msgid ""
 msgstr ""
 "Dizüstü bilgisayarınızı doğrudan fişe takmalı ve mümkünse, kablosuz bağlantı 
yerine ethernet bağlantısını tercih etmelisiniz."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Mageia Güncelleme Başlatılıyor.\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Yeni güncellemeler hesaplanıyor...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Sisteminiz güncel \n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Ağ Denetleniyor: etkinleştirilmemiş\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s bir %s ürünüdür"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online, Mageia web hizmetlerine erişim sağlar."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Çevrimiçi Website"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Daha Fazla Bilgi"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Kurulum kaynağı ekle"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Hakkında..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Güncelleme Ayarları"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Her zaman başlangıçta çalıştır"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Çıkış"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Yeni veri kaynağı mevcut"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"'%s' dağıtımını kullanıyorsunuz ve bu sebeple ek yazılımlara erişim izniniz "
-"var."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Bu ek paket veri kaynağını eklemek ister misiniz?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Ek bir paket veri kaynağı ekleniyor"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Desteklenen dağıtımlar %s, '%s' listede bulunmuyor.\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-"Lütfen ek bir paket veri kaynağı ekleyebilmek için hesap kimliğinizi doldurun"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Hata"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Dağıtım listesi alınırken hata oluştu:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia, her sürüm için 12 ay süreyle masaüstü güncellemeleri (%s tarihine "
-"kadar) ve 18 ay süreyle temel sistem güncellemeleri ( %s tarihine kadar) "
-"sunar."
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"18 ay boyunca ek güncelemeleri (%s tarihine kadar) edinebilmeniz için "
-"genişletilmiş bakım mümkün. "
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "Genişletilmiş bakım almak için <b>şu anda</b> kayıt olabilirsiniz:"
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Yaşam politikası"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "Çevrimiçi Kayıt"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Bir hata oluştu"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Mageia hesabınız %s üyeliği içermiyor."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Veri kaynağı eklenirken hata oluştu"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Veri kaynağı başarıyla eklendi!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "%s veri kaynağı başarıyla eklendi."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Tamam"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Burada güncelleme programcığını yapılandırabilirsiniz"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Güncelleme sıklığı (saat)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "İlk denetleme gecikmesi (dakika)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-config:89
 #, c-format
 msgid "Check for newer \"%s\" releases"
 msgstr "Yeni  \"%s\" sürümlerini denetle"
 
-#: ../mdkapplet-config:95 ../mdkapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Kayıp \"%s\" yazılım kaynağını denetle"
-
-#: ../mdkapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Kısıtlı"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Kuruluş"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack size bir masaüstünün en iyi Linux deneyimini sunar: açık "
-"kaynaklı çözümlerin verimi ve kararlılığı ile birlikte seçkin yazılımlar ve "
-"Mageia resmi desteği."
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux Özellikleri"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Kullanıcı hesabınızla ilgili ayrıntılı bilgi"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "E-posta adresiniz"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Parolanız"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Unutulan parola"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Hata"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Parola ve e-posta boş olamaz."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Kapat"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Yükseltme sürümünüzü seçin"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Powerpack erişiminiz sona erdi"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s erişilebilir durumda. Yükseltme yapabilirsiniz:"
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "Çok daha fazla yazılım ve resmi destek sunan Mageia Linux dağıtımı."
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Özgürce ulaşılabilen 100%% Açık Kaynaklı dağıtım."
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Dağıtım Yükseltmesi"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -658,36 +445,179 @@ msgstr ""
 "\n"
 "kullanımı:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- bu yardım mesajını görüntüler.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr " --auto\t\t- Mageia Güncelleme'yi otomatik çalıştır.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- mnf'ye özgü betikleri çalıştır.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Güncelleme'nin metin sürümü.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- kayıt tut\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source yazılım kaynağından paketler güncellenemiyor.\n"
 
+#~ 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 ""
+#~ "Bu dağıtım için temel bakım sona erdi. Genişletilmiş bakım kaydı "
+#~ "yaptırdığınız için teşekkürler. Sisteminiz %s tarihine kadar güncel "
+#~ "tutulacak."
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Genişletilmiş bakım edinmelisiniz."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Genişletilmiş bakım almalı veya %s dağıtımının daha yeni bir sürümüne "
+#~ "yükseltme yapmalısınız."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Genişletilmiş Bakım"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Bu sürüm (%s)  için bir bakım eklentisi satın alın ve %s tarihine kadar "
+#~ "güncel kalsın."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Desteklenen dağıtımlar %s, '%s' listede bulunmuyor.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "Lütfen ek bir paket veri kaynağı ekleyebilmek için hesap kimliğinizi "
+#~ "doldurun"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Dağıtım listesi alınırken hata oluştu:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia, her sürüm için 12 ay süreyle masaüstü güncellemeleri (%s tarihine "
+#~ "kadar) ve 18 ay süreyle temel sistem güncellemeleri ( %s tarihine kadar) "
+#~ "sunar."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "18 ay boyunca ek güncelemeleri (%s tarihine kadar) edinebilmeniz için "
+#~ "genişletilmiş bakım mümkün. "
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "Genişletilmiş bakım almak için <b>şu anda</b> kayıt olabilirsiniz:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Yaşam politikası"
+
+#~ msgid "Online subscription"
+#~ msgstr "Çevrimiçi Kayıt"
+
+#~ msgid "An error occurred"
+#~ msgstr "Bir hata oluştu"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Mageia hesabınız %s üyeliği içermiyor."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Veri kaynağı eklenirken hata oluştu"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Veri kaynağı başarıyla eklendi!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "%s veri kaynağı başarıyla eklendi."
+
+#~ msgid "Ok"
+#~ msgstr "Tamam"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Dağıtımınız için ek bir paket veri kaynağı mevcut"
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Ek bir paket veri kaynağı ekle"
+
+#~ msgid "New medium available"
+#~ msgstr "Yeni veri kaynağı mevcut"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "'%s' dağıtımını kullanıyorsunuz ve bu sebeple ek yazılımlara erişim "
+#~ "izniniz var."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Bu ek paket veri kaynağını eklemek ister misiniz?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Kayıp \"%s\" yazılım kaynağını denetle"
+
+#~ msgid "Restricted"
+#~ msgstr "Kısıtlı"
+
+#~ msgid "Enterprise"
+#~ msgstr "Kuruluş"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack size bir masaüstünün en iyi Linux deneyimini sunar: açık "
+#~ "kaynaklı çözümlerin verimi ve kararlılığı ile birlikte seçkin yazılımlar "
+#~ "ve Mageia resmi desteği."
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux Özellikleri"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Yükseltme sürümünüzü seçin"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Powerpack erişiminiz sona erdi"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s erişilebilir durumda. Yükseltme yapabilirsiniz:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr "Çok daha fazla yazılım ve resmi destek sunan Mageia Linux dağıtımı."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/uk.po b/po/uk.po
index 96fb8560..3ac8a188 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 11:20+0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2012-06-02 11:22+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
@@ -61,32 +61,27 @@ msgstr "Є нові поновлення для вашої системи"
 msgid "A new version of Mageia distribution has been released"
 msgstr "Випущено нову версію дистрибутива Mageia"
 
-#: ../mgaapplet:120 ../mgaapplet:162
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Для вашого дистрибутива доступний додатковий носій з пакунками."
-
-#: ../mgaapplet:125
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Мережу вимкнено. Будь ласка, налаштуйте мережу"
 
-#: ../mgaapplet:131
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Служба не ввімкнена. Натисніть на \"Online Website\""
 
-#: ../mgaapplet:136 ../mgaapplet:142
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "база даних urpmi заблокована "
 
-#: ../mgaapplet:147
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Версія не підтримується (занадто стара або в розробці)"
 
-#: ../mgaapplet:157
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -94,7 +89,7 @@ msgstr ""
 "Носіїв не знайдено. Ви повинні додати носії з допомогою 'Software Media "
 "Manager'."
 
-#: ../mgaapplet:167
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -110,121 +105,103 @@ msgstr ""
 "\n"
 "Після цього перезапустіть \"%s\"."
 
-#: ../mgaapplet:172
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Доступний"
 
-#: ../mgaapplet:185
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Помилка оновлення носія"
 
-#: ../mgaapplet:225 ../mgaapplet:928
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Встановити поновлення"
 
-#: ../mgaapplet:226 ../mgaapplet:227
-#, c-format
-msgid "Add additional package medium"
-msgstr "Додати додатковий носій з пакунками"
-
-#: ../mgaapplet:228
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Перевірити поновлення"
 
-#: ../mgaapplet:229
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Налаштувати мережу"
 
-#: ../mgaapplet:230
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Оновити систему"
 
-#: ../mgaapplet:391
-#, 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 ""
-"Термін базового супроводу цього дистрибутива вичерпано. Оскільки вами "
-"оформлено передплату на додатковий супровід, ваш дистрибутив "
-"підтримуватиметься у актуальному стані до %s"
-
-#: ../mgaapplet:436
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 "Отримано SIGHUP (можливо, оновлення завершено), аплет перезапускається."
 
-#: ../mgaapplet:443
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Запускається drakconnect\n"
 
-#: ../mgaapplet:455 ../mgaapplet:628
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr "Нове версія дистрибутива Mageia"
 
-#: ../mgaapplet:460
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Навігація"
 
-#: ../mgaapplet:469
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Випущено нову версію дистрибутива Mageia."
 
-#: ../mgaapplet:471 ../mgaapplet:567
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Додаткова інформація про нову версію"
 
-#: ../mgaapplet:473 ../mgaapplet:561
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Ви хочете поновити систему до %s?"
 
-#: ../mgaapplet:475 ../mgaapplet:571 ../mgaapplet:1015 ../mgaapplet:1045
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Не запитувати наступного разу"
 
-#: ../mgaapplet:477
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Звантажити всі пакунки одразу"
 
-#: ../mgaapplet:478
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Попередження: вам знадобиться досить багато вільного місця на диску)"
 
-#: ../mgaapplet:484
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Тека, куди слід звантажити пакунки:"
 
-#: ../mgaapplet:488 ../mgaapplet:576 ../mgaapplet:654 ../mgaapplet:1016
-#: ../mgaapplet:1046 ../mgaapplet_gui.pm:228 ../mgaapplet_gui.pm:309
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Далі"
 
-#: ../mgaapplet:488 ../mgaapplet:576 ../mgaapplet:654 ../mgaapplet:1016
-#: ../mgaapplet:1046 ../mgaapplet_gui.pm:228 ../mgaapplet_gui.pm:309
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../mgaapplet:503
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
@@ -233,54 +210,27 @@ msgstr ""
 "Строк супроводу цієї версії Mageia вичерпано. Оновлень для цієї системи "
 "більше не буде."
 
-#: ../mgaapplet:509
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "З метою підтримання безпеки системи ви можете:"
 
-#: ../mgaapplet:515
+#: ../mgaapplet:453
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#: ../mgaapplet:521
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "Вам слід оформити передплату на додатковий супровід."
-
-#: ../mgaapplet:523
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Ця версія дистрибутива вже не підтримується. Подальших оновлень не буде. Вам "
-"слід оновити систему до версії %s."
-
-#: ../mgaapplet:527
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Вам слід встановити новішу версію дистрибутива %s."
 
-#: ../mgaapplet:537
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Ваш дистрибутив вже не підтримується"
 
-#: ../mgaapplet:542
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Додатковий супровід"
-
-#: ../mgaapplet:547
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-"Придбати додатковий супровід для цієї версії (%s) і користуватися нею до %s."
-
-#: ../mgaapplet:645
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -289,17 +239,17 @@ msgstr ""
 "Це оновлення вимагає швидкісного з'єднання з мережею (cable, xDSL, ...) і "
 "може тривати кілька годин до завершення."
 
-#: ../mgaapplet:647
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Приблизний час звантаження становить %s"
 
-#: ../mgaapplet:648
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Вам потрібно закрити всі програми перед тим, як продовжувати."
 
-#: ../mgaapplet:651
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -308,202 +258,92 @@ msgstr ""
 "Вам потрібно увімкнути лептоп в електричну мережу і віддати перевагу "
 "з'єднанню через ethernet, ніж через wifi."
 
-#: ../mgaapplet:683
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Запускається MageiaUpdate\n"
 
-#: ../mgaapplet:716
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Перевіряються нові поновлення...\n"
 
-#: ../mgaapplet:818
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Система поновлена\n"
 
-#: ../mgaapplet:847
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Перевірка мережі: здається, вимкнена\n"
 
-#: ../mgaapplet:874
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mgaapplet:875 ../mgaapplet:876
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "© %s, %s"
 
-#: ../mgaapplet:879
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online надає доступ до веб-послуг Мандріви."
 
-#: ../mgaapplet:881
+#: ../mgaapplet:769
 #, 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>")
-#: ../mgaapplet:886
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Taras Boychuk <btr0001@ukr.net>\n"
 
-#: ../mgaapplet:914
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../mgaapplet:917 ../mgaapplet:922 ../mgaapplet:930 ../mgaapplet:932
-#: ../mgaapplet_gui.pm:260
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Детальніша інформація"
 
-#: ../mgaapplet:934
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Додати джерело"
 
-#: ../mgaapplet:949
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Про..."
 
-#: ../mgaapplet:951 ../mgaapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Налаштування поновлень"
 
-#: ../mgaapplet:953
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Завжди виконувати при завантаженні"
 
-#: ../mgaapplet:955
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../mgaapplet:1005 ../mgaapplet:1010 ../mgaapplet:1035 ../mgaapplet:1040
-#, c-format
-msgid "New medium available"
-msgstr "Новий носій доступний"
-
-#: ../mgaapplet:1012 ../mgaapplet:1042
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Ви використовуєте дистрибутив '%s', тому маєте доступ до додаткових програм."
-
-#: ../mgaapplet:1014 ../mgaapplet:1044
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Ви хочете додати це додаткове сховище програмного забезпечення?"
-
-#: ../mgaapplet:1043 ../mgaonline.pm:171
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mgaapplet-add-media-helper:84 ../mgaapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Додається додатковий носій з пакунками"
 
-#: ../mgaapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "Продуктами, що підтримуються, і є %s, '%s' немає в списку.\n"
-
-#: ../mgaapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Будь ласка, заповніть свій рахунок, щоб додати носій з пакунками"
-
-#: ../mgaapplet-add-media-helper:148 ../mgaapplet-add-media-helper:193
-#: ../mgaapplet-add-media-helper:225 ../mgaapplet_gui.pm:240
-#, c-format
-msgid "Error"
-msgstr "Помилка"
-
-#: ../mgaapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "Не вдалося отримати список дистрибутивів:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mgaapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"У Mageia передбачено 12 місяців оновлень стільничного дистрибутива (до %s) і "
-"18 місяців базових оновлень (до %s)."
-
-#: ../mgaapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-"Доступний додатковий супровід для отримання 18 місяців додаткових оновлень "
-"(до %s)."
-
-#: ../mgaapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-"Ви можете оформити передплату <b>зараз</b>, щоб отримати додатковий супровід:"
-
-#: ../mgaapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "Правила зміни версій"
-
-#: ../mgaapplet-add-media-helper:175 ../mgaapplet_gui.pm:101
-#, c-format
-msgid "Online subscription"
-msgstr "Мережева передплата"
-
-#: ../mgaapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Сталася помилка"
-
-#: ../mgaapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Ваш рахунок на Mageia не має активованої підписки на звантаження %s."
-
-#: ../mgaapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "При додаванні джерела сталася помилка"
-
-#: ../mgaapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "Джерело успішно додано."
-
-#: ../mgaapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Джерело %s успішно додано."
-
-#: ../mgaapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Гаразд"
-
 #: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -524,122 +364,67 @@ msgstr "Затримка першої перевірки (хвилини)"
 msgid "Check for newer \"%s\" releases"
 msgstr "Виконати пошук новіших випусків «%s»"
 
-#: ../mgaapplet-config:95 ../mgaapplet-config:101
-#, c-format
-msgid "Check for missing \"%s\" media"
-msgstr "Виконати пошук носія «%s», якого не вистачає"
-
-#: ../mgaapplet-config:95
-#, c-format
-msgid "Restricted"
-msgstr "Restricted"
-
-#: ../mgaapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mgaapplet_gui.pm:83
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack надає Вам передові досягнення лікакса для настільних "
-"комп’ютерів: стабільність і ефективність рішень з відкритим кодом поруч з "
-"комерційними програмами і офіційною підтримкою Mageia."
-
-#: ../mgaapplet_gui.pm:90
-#, c-format
-msgid "Mageia Linux Features"
-msgstr "Можливості Mageia Linux"
-
-#: ../mgaapplet_gui.pm:209
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Додаткова інформація про рахунок"
 
-#: ../mgaapplet_gui.pm:216
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Електронна пошта"
 
-#: ../mgaapplet_gui.pm:217
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Пароль"
 
-#: ../mgaapplet_gui.pm:224
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Забутий пароль"
 
-#: ../mgaapplet_gui.pm:241
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Помилка"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Пароль і поштова адреса не можуть бути порожніми."
 
-#: ../mgaapplet_gui.pm:263
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Закрити"
 
-#: ../mgaapplet_gui.pm:298
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "Виберіть версію для оновлення"
-
-#: ../mgaapplet_gui.pm:302
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "Ваша передплата Powerpack завершилася"
-
-#: ../mgaapplet_gui.pm:305
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "зараз доступний %s, Ви можете оновитися до:"
-
-#: ../mgaonline.pm:166
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mgaonline.pm:167 ../mgaonline.pm:187
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mgaonline.pm:168
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mgaonline.pm:169
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mgaonline.pm:170 ../mgaonline.pm:183
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mgaonline.pm:184
-#, c-format
-msgid ""
-"The Mageia Linux distribution with even more softwares and official support."
-msgstr ""
-"Дистрибутив Mageia Linux з ширшим переліком програмного забезпечення та "
-"офіційною "
-"підтримкою."
-
-#: ../mgaonline.pm:188
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "Збірка із 100%% доступних вільно програм з відкритим кодом."
 
-#: ../mgaonline.pm:202
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Оновлення дистрибутива"
@@ -693,6 +478,150 @@ msgstr "  --debug\t\t\t- створювати журнал\n"
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Неможливо поновити пакунки з джерела update_source.\n"
 
+#~ 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 ""
+#~ "Термін базового супроводу цього дистрибутива вичерпано. Оскільки вами "
+#~ "оформлено передплату на додатковий супровід, ваш дистрибутив "
+#~ "підтримуватиметься у актуальному стані до %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "Вам слід оформити передплату на додатковий супровід."
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Ця версія дистрибутива вже не підтримується. Подальших оновлень не буде. "
+#~ "Вам слід оновити систему до версії %s."
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "Додатковий супровід"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr ""
+#~ "Придбати додатковий супровід для цієї версії (%s) і користуватися нею до "
+#~ "%s."
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "Продуктами, що підтримуються, і є %s, '%s' немає в списку.\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "Будь ласка, заповніть свій рахунок, щоб додати носій з пакунками"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "Не вдалося отримати список дистрибутивів:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "У Mageia передбачено 12 місяців оновлень стільничного дистрибутива (до "
+#~ "%s) і 18 місяців базових оновлень (до %s)."
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr ""
+#~ "Доступний додатковий супровід для отримання 18 місяців додаткових "
+#~ "оновлень (до %s)."
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr ""
+#~ "Ви можете оформити передплату <b>зараз</b>, щоб отримати додатковий "
+#~ "супровід:"
+
+#~ msgid "Lifetime policy"
+#~ msgstr "Правила зміни версій"
+
+#~ msgid "Online subscription"
+#~ msgstr "Мережева передплата"
+
+#~ msgid "An error occurred"
+#~ msgstr "Сталася помилка"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr ""
+#~ "Ваш рахунок на Mageia не має активованої підписки на звантаження %s."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "При додаванні джерела сталася помилка"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "Джерело успішно додано."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "Джерело %s успішно додано."
+
+#~ msgid "Ok"
+#~ msgstr "Гаразд"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Для вашого дистрибутива доступний додатковий носій з пакунками."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "Додати додатковий носій з пакунками"
+
+#~ msgid "New medium available"
+#~ msgstr "Новий носій доступний"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Ви використовуєте дистрибутив '%s', тому маєте доступ до додаткових "
+#~ "програм."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Ви хочете додати це додаткове сховище програмного забезпечення?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "Виконати пошук носія «%s», якого не вистачає"
+
+#~ msgid "Restricted"
+#~ msgstr "Restricted"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack надає Вам передові досягнення лікакса для настільних "
+#~ "комп’ютерів: стабільність і ефективність рішень з відкритим кодом поруч з "
+#~ "комерційними програмами і офіційною підтримкою Mageia."
+
+#~ msgid "Mageia Linux Features"
+#~ msgstr "Можливості Mageia Linux"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "Виберіть версію для оновлення"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "Ваша передплата Powerpack завершилася"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "зараз доступний %s, Ви можете оновитися до:"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#~ msgid ""
+#~ "The Mageia Linux distribution with even more softwares and official "
+#~ "support."
+#~ msgstr ""
+#~ "Дистрибутив Mageia Linux з ширшим переліком програмного забезпечення та "
+#~ "офіційною підтримкою."
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/ur.po b/po/ur.po
index f071266a..f7635998 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-02-22 06:57-0500\n"
 "Last-Translator: khushbakht  <khushbakht@gmail.com>\n"
 "Language-Team: URDU <C@li.org>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "تازه تریں معلومات كو دیكھیں"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "آپ كا سسٹم جدید هے"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,53 +35,48 @@ msgstr ""
 "خدمات كی ترتیب میں مسله۔ مهربانی فرما كر یاداشتوں میں دیكھیں اور "
 "support@mageiaonline.com كو میل بھیجیں"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr ""
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "آپ كے سسٹم كیلیے تازه تریں معلومات موجود هیں"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "نیٹورك بند ھے۔ مهربانی فرما كر اپنا نیٹورك ترتیب دیں"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "خدمت چالو نهیں هے۔ مهربانی فرما كر \"Online Website\" پر كلك كریں"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr ""
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "نشریه مواقف نهیں هے (بهت پرانا نشریه هے یا ترقی كا نشریه)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -92,518 +87,328 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr ""
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "جدید معلومات نصب كریں "
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "جدید معلومات كو دیكھیں"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "نیٹورك ترتیب دیں"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "ڈارك كے رابطے كا آغاز\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "مینڈریكآنلاءین"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, fuzzy, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "جدید تریں ایمڈی كے كا آغاز MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "جدید معلومات كا شمار كرنا\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "سسٹم جدید هے\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "نیٹورك كی تصدیق كرها هے: معزور دیكھاءی دیتا هے\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "مینڈریكآنلاءین"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "آنلاءین ویبساءیٹ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "انتباه"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "بارے میں۔۔۔"
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "اجزا یا اناصر كی ترتیب كو پڑھنا\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "همیشه سٹاٹ اپ پر آغازكار كریں"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "ختم كریں یا چھوڑ دیں"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "غلطی"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "مشین كا نام:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr ""
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "مینڈریكآنلاءین"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "غلط خفیه لفظ:"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "غلط خفیه لفظ:"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "غلطی"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "بند كریں"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "مینڈریكآنلاءین"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "مینڈریكآنلاءین"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "مینڈریكآنلاءین"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "مینڈریكآنلاءین"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "مینڈریكآنلاءین"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -617,37 +422,49 @@ msgstr ""
 " \n"
 "استعمال كار:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, fuzzy, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help         - print this help message.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, fuzzy, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto         - Mageia Update launched automatically.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr ""
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, fuzzy, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - launch Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, fuzzy, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے نه كے ایك جگه\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "مشین كا نام:"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "مینڈریكآنلاءین"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "مینڈریكآنلاءین"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "مینڈریكآنلاءین"
 
diff --git a/po/uz.po b/po/uz.po
index 9eb4f4c2..fa996735 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2009-12-20 19:03+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Yangilanishlarni tekshirish %s da amalga oshiriladi"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Tizim yangilashga muhtoe emas"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,49 +39,44 @@ msgstr ""
 "Xizmatni sozlashda muammo. Iltmos log jurnallarini tekshiring va  "
 "support@mageiaonline.com manziliga xat joʻnating"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Mavjud boʻlgan paketlar qidirilmoqda, iltimos kutib turing..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Tizimingiz uchun yangilanish mavjud"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia Linux distributivining yangi versiyasi chiqdi"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Ushbu distributiv uchun qoʻshimcha paketlar toʻplami mavjud."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Tarmoq mavjud emas. Iltimos tarmoqni sozlang"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Xizmat aktivlashtirilmagan. Iltimos \"Online Website\"ni bosing"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi maʼlumot bazasi qulflangan"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Ushbu versiya qoʻllab-quvvatlanmaydi (juda eski versiya yoki ushbu versiya "
 "ustida ishlanmoqda)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -89,7 +84,7 @@ msgstr ""
 "Toʻplam topilmadi. 'Dastur toʻplami boshqaruvchisi' yordamida toʻplam "
 "qoʻshishingiz kerak."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -100,171 +95,129 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Yoqilgan"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Toʻplamni yangilab boʻlmadi"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Yangilanishlarni oʻrnatish"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "QOʻshimcha paketlar toʻplamini qoʻshish"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Yangilanishlarni tekshirish"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Tarmoqni moslash"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Tizimni yangilash"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect'ni ishga tushirish\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia Linux distributivining yangi versiyasi"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Tanlash"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia Linux distributivining yangi versiyasi chiqdi."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Ushbu yangi versiya haqida kengroq maʼlumot"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "'%s' versiyaga yangilashni istaysizmi?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Boshqa soʻralmasin"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Birdan barcha paketlarni yozib olish"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Diqqat: Sizga diskda yana koʻproq kerak)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Paketlar qaerga yozib olinadi:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Keyingisi"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, fuzzy, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Ushbu versiya boshqa qoʻllab-quvvatlanmaydi. Bu ushbu versiya uchun boshqa "
-"yangilanishlar chiqmasligini anglatadi. Ushbu versiyani, %s versiyaga "
-"almashtirishingiz kerak."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "'%s' versiyaga yangilashni istaysizmi?"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -273,17 +226,17 @@ msgstr ""
 "Ushbu yangilanish uchun yuqori tezlikdagi internet ulanishi (kabelli, "
 "xDSL, ...) talab qilinadi va yangilanishga bir necha soat ketishi mumkin."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Davom etishdan oldin barcha ishlab turgan dasturlarni yoping."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -292,337 +245,182 @@ msgstr ""
 "Noutbukni doimiy elektr quvvatiga ulang va wifi oʻrniga simli ulanishdan "
 "foydalaning."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate ishga tushirilmoqda\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Yangi yangilanishlar hisoblanmoqda...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Tizim yangilashga muhtoe emas\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Tarmoq tekshirilmoqda: oʻchirilgan koʻrinadi\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online, Mageia veb xizmatlariga ulanish imkoniyatini beradi."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Nurali Abdurahmonov <mavnur@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Qoʻshimcha maʼlumotlar"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Toʻplam qoʻshish"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Dastur haqida..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Yangilash moslamalari"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Tizimga kirganda ishga tushirish"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Chiqish"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Yangi toʻplam mavjud"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Siz '%s' distributividan foydalanyapsiz va sizga qoʻshimcha dasturlarga "
-"ruxsat bor."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Ushbu qoʻshimcha dasturlar repozitoriysini oʻrnatishni istaysizmi?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Qoʻshimcha paketlar toʻplamini qoʻshish"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-"Qoʻshimcha paketlar toʻplamini qoʻshish uchun oʻz hisobingiz loginini "
-"kiriting"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Xato"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Kompyuterning nomi:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Xato roʻy berdi"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Sizning Mageia hisobingizda %s yozib olish yoqilmagan."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Toʻplamni qoʻshish muvaffaqiyatsiz tugadi"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "%s toʻplami muvaffaqiyatli qoʻshildi."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "%s toʻplami muvaffaqiyatli qoʻshildi."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ok"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Bu yerdan yangilash apletini sozlashingiz mumkin"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Yangilash oraligʻi (soatda)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Birinchi tekshirish oraligʻi (daqiqada)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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 "Himoyalangan"
-
-#: ../mdkapplet-config:101
-#, c-format
-msgid "Enterprise"
-msgstr "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Hisobning qoʻshimcha maʼlumotlari"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Elektron pochta"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Maxfiy soʻz"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Maxfiy soʻzni unutdingizmi"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Xato"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Maxfiy soʻz va el.pochta boʻsh boʻlishi mumkin emas."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Yopish"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Distributivni yangilash"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -635,36 +433,108 @@ msgstr ""
 "\n"
 "Foydalanish:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- shu yordam xabarini koʻrsatish.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update avtomatik ishga tushadi.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- mnf skriptini ishga tushirish.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update matn usuli.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- bajarilgan ishlar boʻyicha log jurnali\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Ushbu versiya boshqa qoʻllab-quvvatlanmaydi. Bu ushbu versiya uchun "
+#~ "boshqa yangilanishlar chiqmasligini anglatadi. Ushbu versiyani, %s "
+#~ "versiyaga almashtirishingiz kerak."
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "Qoʻshimcha paketlar toʻplamini qoʻshish uchun oʻz hisobingiz loginini "
+#~ "kiriting"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Kompyuterning nomi:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Xato roʻy berdi"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Sizning Mageia hisobingizda %s yozib olish yoqilmagan."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Toʻplamni qoʻshish muvaffaqiyatsiz tugadi"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "%s toʻplami muvaffaqiyatli qoʻshildi."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "%s toʻplami muvaffaqiyatli qoʻshildi."
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Ushbu distributiv uchun qoʻshimcha paketlar toʻplami mavjud."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "QOʻshimcha paketlar toʻplamini qoʻshish"
+
+#~ msgid "New medium available"
+#~ msgstr "Yangi toʻplam mavjud"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Siz '%s' distributividan foydalanyapsiz va sizga qoʻshimcha dasturlarga "
+#~ "ruxsat bor."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Ushbu qoʻshimcha dasturlar repozitoriysini oʻrnatishni istaysizmi?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Restricted"
+#~ msgstr "Himoyalangan"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 33823558..a4e5098d 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2009-12-20 19:03+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -20,17 +20,17 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "Янгиланишларни текшириш %s да амалга оширилади"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Тизим янгилашга муҳтоэ эмас"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -39,49 +39,44 @@ msgstr ""
 "Хизматни созлашда муаммо. Илтмос лог журналларини текширинг ва  "
 "support@mageiaonline.com манзилига хат жўнатинг"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Мавжуд бўлган пакетлар қидирилмоқда, илтимос кутиб туринг..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Тизимингиз учун янгиланиш мавжуд"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia Linux дистрибутивининг янги версияси чиқди"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "Ушбу дистрибутив учун қўшимча пакетлар тўплами мавжуд."
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Тармоқ мавжуд эмас. Илтимос тармоқни созланг"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Хизмат активлаштирилмаган. Илтимос \"Online Website\"ни босинг"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi маълумот базаси қулфланган"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Ушбу версия қўллаб-қувватланмайди (жуда эски версия ёки ушбу версия устида "
 "ишланмоқда)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -89,7 +84,7 @@ msgstr ""
 "Тўплам топилмади. 'Дастур тўплами бошқарувчиси' ёрдамида тўплам қўшишингиз "
 "керак."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -100,171 +95,129 @@ msgid ""
 "Then, restart \"%s\"."
 msgstr ""
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Ёқилган"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Тўпламни янгилаб бўлмади"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Янгиланишларни ўрнатиш"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "ҚЎшимча пакетлар тўпламини қўшиш"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Янгиланишларни текшириш"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Тармоқни мослаш"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "Тизимни янгилаш"
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "drakconnect'ни ишга тушириш\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia Linux дистрибутивининг янги версияси"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "Танлаш"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia Linux дистрибутивининг янги версияси чиқди."
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "Ушбу янги версия ҳақида кенгроқ маълумот"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "'%s' версияга янгилашни истайсизми?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Бошқа сўралмасин"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "Бирдан барча пакетларни ёзиб олиш"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Диққат: Сизга дискда яна кўпроқ керак)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "Пакетлар қаерга ёзиб олинади:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Кейингиси"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, fuzzy, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-"Ушбу версия бошқа қўллаб-қувватланмайди. Бу ушбу версия учун бошқа "
-"янгиланишлар чиқмаслигини англатади. Ушбу версияни, %s версияга "
-"алмаштиришингиз керак."
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, fuzzy, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "'%s' версияга янгилашни истайсизми?"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -273,17 +226,17 @@ msgstr ""
 "Ушбу янгиланиш учун юқори тезликдаги интернет уланиши (кабелли, xDSL, ...) "
 "талаб қилинади ва янгиланишга бир неча соат кетиши мумкин."
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Давом этишдан олдин барча ишлаб турган дастурларни ёпинг."
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -292,335 +245,182 @@ msgstr ""
 "Ноутбукни доимий электр қувватига уланг ва wifi ўрнига симли уланишдан "
 "фойдаланинг."
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "MageiaUpdate ишга туширилмоқда\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Янги янгиланишлар ҳисобланмоқда...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Тизим янгилашга муҳтоэ эмас\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Тармоқ текширилмоқда: ўчирилган кўринади\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online, Mageia веб хизматларига уланиш имкониятини беради."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, 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:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Нурали Абдураҳмонов <mavnur@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "Қўшимча маълумотлар"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "Тўплам қўшиш"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Дастур ҳақида..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Янгилаш мосламалари"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Тизимга кирганда ишга тушириш"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Чиқиш"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "Янги тўплам мавжуд"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-"Сиз '%s' дистрибутивидан фойдаланяпсиз ва сизга қўшимча дастурларга рухсат "
-"бор."
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "Ушбу қўшимча дастурлар репозиторийсини ўрнатишни истайсизми?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Қўшимча пакетлар тўпламини қўшиш"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Қўшимча пакетлар тўпламини қўшиш учун ўз ҳисобингиз логинини киритинг"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Хато"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Компьютернинг номи:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Хато рўй берди"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "Сизнинг Mageia ҳисобингизда %s ёзиб олиш ёқилмаган."
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Тўпламни қўшиш муваффақиятсиз тугади"
-
-#: ../mdkapplet-add-media-helper:234
-#, fuzzy, c-format
-msgid "Successfully added media!"
-msgstr "%s тўплами муваффақиятли қўшилди."
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "%s тўплами муваффақиятли қўшилди."
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "Ок"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "Бу ердан янгилаш аплетини созлашингиз мумкин"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "Янгилаш оралиғи (соатда)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "Биринчи текшириш оралиғи (дақиқада)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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 "Enterprise"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "Ҳисобнинг қўшимча маълумотлари"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "Электрон почта"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "Махфий сўз"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "Махфий сўзни унутдингизми"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Хато"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "Махфий сўз ва эл.почта бўш бўлиши мумкин эмас."
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Ёпиш"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Дистрибутивни янгилаш"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -633,36 +433,107 @@ msgstr ""
 "\n"
 "Фойдаланиш:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- шу ёрдам хабарини кўрсатиш.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Mageia Update автоматик ишга тушади.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- mnf скриптини ишга тушириш.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia Update матн усули.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- бажарилган ишлар бўйича лог журнали\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "update_source тўпламидан пакетларни янгилаб бўлмади.\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr ""
+#~ "Ушбу версия бошқа қўллаб-қувватланмайди. Бу ушбу версия учун бошқа "
+#~ "янгиланишлар чиқмаслигини англатади. Ушбу версияни, %s версияга "
+#~ "алмаштиришингиз керак."
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr ""
+#~ "Қўшимча пакетлар тўпламини қўшиш учун ўз ҳисобингиз логинини киритинг"
+
+#, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Компьютернинг номи:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Хато рўй берди"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "Сизнинг Mageia ҳисобингизда %s ёзиб олиш ёқилмаган."
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Тўпламни қўшиш муваффақиятсиз тугади"
+
+#, fuzzy
+#~ msgid "Successfully added media!"
+#~ msgstr "%s тўплами муваффақиятли қўшилди."
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "%s тўплами муваффақиятли қўшилди."
+
+#~ msgid "Ok"
+#~ msgstr "Ок"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "Ушбу дистрибутив учун қўшимча пакетлар тўплами мавжуд."
+
+#~ msgid "Add additional package medium"
+#~ msgstr "ҚЎшимча пакетлар тўпламини қўшиш"
+
+#~ msgid "New medium available"
+#~ msgstr "Янги тўплам мавжуд"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr ""
+#~ "Сиз '%s' дистрибутивидан фойдаланяпсиз ва сизга қўшимча дастурларга "
+#~ "рухсат бор."
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "Ушбу қўшимча дастурлар репозиторийсини ўрнатишни истайсизми?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Restricted"
+#~ msgstr "Ҳимояланган"
+
+#~ msgid "Enterprise"
+#~ msgstr "Enterprise"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux"
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/vi.po b/po/vi.po
index 0f94709a..f8cc717f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline 0.15\n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2005-02-12 19:53+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Kiểm tra cập nhật"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Hệ thống của bạn đã cập nhật"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -35,53 +35,48 @@ msgstr ""
 "Trục trặc về cấu hình dịch vụ. Hãy xem log và gửi email tới "
 "support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "Có cập nhật mới cho hệ thống của bạn"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Network chưa có. Hãy cấu hình network !"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Dịch vụ chưa được kích hoạt. Hãy nhấn chuột lên \"Website Trực Tuyến\""
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, fuzzy, c-format
 msgid "urpmi database locked"
 msgstr "cơ sở dữ liệu urpmi bị khóa"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "Không hỗ trợ phát hành này (phát hành quá cũ hay là bản phát triển)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr ""
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -98,518 +93,328 @@ msgstr ""
 "\n"
 "Sau đó chạy lại %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "Bật chạy"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr ""
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Cài đặt các cập nhật"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Kiểm tra cập nhật"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Cấu hình network"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Chạy drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Tiếp theo"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Chạy MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Tính toán các cập nhật mới...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Hệ thống đã cập nhật mới\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Kiểm tra mạng: có lẽ chưa bật chạy\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, fuzzy, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr ""
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "WebSite Trực Tuyến"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Giới thiệu"
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Đang đọc cấu hình\n"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "Luôn chạy khi khởi động"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr ""
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Lỗi"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Tên máy tính:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Lỗi xảy ra"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Lỗi khi thêm phương tiện"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "OK"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Sai mật khẩu"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Sai mật khẩu"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Lỗi"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Đóng"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -623,37 +428,59 @@ msgstr ""
 "\n"
 "cách dùng:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- in ra thông điệp trợ giúp này.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- Tự động chạy Mageia Update.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- chạy mnf specific scripts.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- phiên bản text mode của Mageia Update.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr ""
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "Không thể cập nhật các gói từ phương tiện update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Tên máy tính:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Lỗi xảy ra"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Lỗi khi thêm phương tiện"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online"
 
diff --git a/po/wa.po b/po/wa.po
index 6b11640a..62b7ba20 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2004-08-11 20:48+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -19,17 +19,17 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, fuzzy, c-format
 msgid "Will check updates at %s"
 msgstr "Verifyî les metaedjes a djoû"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "Li sistinme da vosse est a djoû"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -38,48 +38,43 @@ msgstr ""
 "Åk n' a nén stî tot-z apontiant l' siervice. Loukîz les djournås eyet emilez "
 "po dire li problinme a support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "I gn des noveas metaedjes a djoû po vosse sistinme"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr ""
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr ""
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "Li rantoele est djus. Apontyîz l' rantoele s' i vs plait."
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "Siervice nén èn alaedje. Clitchîz so «Waibe»"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "båze di dnêyes urpmi serêye"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 "Modêye nén sopoirtêye (modêye pår trop viye, ou modêye di diswalpaedje)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -87,7 +82,7 @@ msgstr ""
 "Nou sopoirt di trové. Vos ndè dvoz radjouter onk avou l' «Manaedjeu des "
 "sopoirts d' astalaedje»."
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -104,520 +99,330 @@ msgstr ""
 "\n"
 "Poy, renondez %s."
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "En alaedje"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "Åk n' a nén stî tot metant a djoû les sopoirts"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "Astaler les metaedjes a djoû"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr ""
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "Verifyî les metaedjes a djoû"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "Apontyî l' rantoele"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr ""
 
-#: ../mdkapplet:394
-#, 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:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Enondant drakconnect\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, c-format
 msgid "New version of Mageia distribution"
 msgstr ""
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr ""
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr ""
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr ""
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr ""
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr ""
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr ""
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr ""
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr ""
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "Shuvant"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr ""
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr ""
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr ""
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr ""
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr ""
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr ""
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr ""
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr ""
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr ""
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr ""
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr ""
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr ""
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "Enondant «MageiaUpdate»\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Carculaedje des metaedjes a djoû...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Li sistinme est a djoû\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Verifiaedje del rantoele: i shonnreut k' ele ni soeye nén en alaedje\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright © %s pa %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 "Mageia Online (Mageia so les fyis) vos dene accès åzès siervices waibe da "
 "Mageia."
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "Waibe"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "Adviertixhmint"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr ""
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr ""
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "Åd fwait..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, fuzzy, c-format
 msgid "Updates Configuration"
 msgstr "Evoyî l' apontiaedje"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "El drovi tofer a l' enondaedje"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "Cwiter"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, fuzzy, c-format
-msgid "New medium available"
-msgstr "Nén disponibe"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr ""
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr ""
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr ""
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "Aroke"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr ""
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, fuzzy, c-format
-msgid "Online subscription"
-msgstr "Discrijhaedje di l' éndjole:"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "Dj' aroke so ene sacwè"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:226
-#, fuzzy, c-format
-msgid "An error occurred while adding medium"
-msgstr "Åk n' a nén stî tot radjoutant l' sopoirt"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr ""
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "'l est bon"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr ""
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr ""
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr ""
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Online %s"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr ""
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, fuzzy, c-format
 msgid "Your password"
 msgstr "Måva scret"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, fuzzy, c-format
 msgid "Forgotten password"
 msgstr "Måva scret"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "Aroke"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr ""
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "Clôre"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr ""
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr ""
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, fuzzy, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, fuzzy, c-format
 msgid "Mageia Free"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, fuzzy, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, fuzzy, c-format
 msgid "Mageia One"
 msgstr "Mageia Online %s"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, fuzzy, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia Online"
-
-#: ../mdkonline.pm:195
-#, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr ""
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr ""
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr ""
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -631,38 +436,64 @@ msgstr ""
 "\n"
 "Po s' è siervi:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr " --help           - mostere ci messaedje d' aidance chal.\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr " --auto           - enonder les metaedjes a djoû otomaticmint.\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr " --mnf            - enonder les scripes especifikes mnf.\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr " --noX            - enonder l' modêye e môde tecse.\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug         - fé on djournå di çou k' est fwait\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr ""
 "Dji n' a nén savou mete a djoû les pacaedjes foû do sopoirt update_source.\n"
 
 #, fuzzy
+#~ msgid "Online subscription"
+#~ msgstr "Discrijhaedje di l' éndjole:"
+
+#~ msgid "An error occurred"
+#~ msgstr "Dj' aroke so ene sacwè"
+
+#, fuzzy
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "Åk n' a nén stî tot radjoutant l' sopoirt"
+
+#~ msgid "Ok"
+#~ msgstr "'l est bon"
+
+#, fuzzy
+#~ msgid "New medium available"
+#~ msgstr "Nén disponibe"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Online %s"
+
+#, fuzzy
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia Online"
+
+#, fuzzy
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Online %s"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a8659ed6..86233fc5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2008-03-29 21:34+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mageia Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -18,70 +18,65 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "将在 %s 检查更新"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系统已为最新"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mageiaonline.com"
 msgstr "服务配置问题。请检查日志并发送邮件到 support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "您的系统现有可用的更新"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia Linux 发行版已经发布了新版本"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "您的发行版有额外的软件包介质可用。"
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "网络已掉线。请配置您的网络"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服务未激活。请点击“在线网站”"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支持(太旧，或者为开发版本)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "未找到介质。您必须通过“软件介质管理器”添加介质。"
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -97,523 +92,328 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "启用"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "更新介质出错"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "安装更新"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "添加额外的软件包介质"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "检查更新"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "升级系统"
 
-#: ../mdkapplet:394
-#, 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 ""
-"此发行版的基本维护已经过期。感谢您购买延保服务，您的系统将持续更新至 %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr ""
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "调用 Mageia 网络中心\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "新版本的 Mageia Linux 发行版"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "浏览"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia Linux 发行版已经发布了新版本。"
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "关于此版本的更多信息"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您是否想要升级到“%s”发行版?"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下次不要再询问"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "立即下载全部软件包"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(警告：您需要大量剩余空间)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "从何处下载软件包:"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr "此版本的 Mageia Linux 维护已经结束。此系统不会发放任何更新。"
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "为了保持您的系统安全，您可以:"
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "您应该购买延保服务。"
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr "您应该购买延保服务，或者升级到 %s 发行版的新版本。"
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "您与该升级到 %s 发行版的新版本。"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "您的版本已经不再支持"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "延保服务"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr "购买此版本(%s)的延保服务可持续更新至 %s。"
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
 "and may take several hours to complete."
 msgstr "本升级需要宽带连接，可能需要几小时才能完成。"
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "估计将下载数据为 %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "在继续之前，您应该关闭正在运行的其它应用程序。"
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
 "available."
 msgstr "如果可能的话，您应该将您的笔记本转为用电源供电，并且使用高速有线连接。"
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "调用 MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "正在检查更新...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系统已为最新\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "检查网络：似乎已禁用\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "版权 (C) %s %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online 可让您访问 Mageia 的 Web 服务。"
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "在线网站"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "汤诗语 <shiyu@mandriva.org>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "更多信息"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "添加介质"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "关于..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新配置"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "在启动时自动调用"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "有新介质"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr "您正在使用“%s”发行版，所以有权访问额外的软件。"
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "您是否想要安装这一额外的软件仓库?"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia 企业服务器"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "添加额外的软件包介质"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "支持的产品是 %s，而“%s”不在列表中。\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "请填入您的账户 ID，以便添加额外的软件包介质"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "错误"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "获取发行版列失败:"
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia 为桌面提供了十二个月的更新(直至 %s)，为基本系统提供了十八个月的更新(直"
-"至 %s)。"
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr "而延保服务可另外再获取十八个月的更新(直至 %s)。"
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "您可以<b>立即</b>订阅延保服务："
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "生命周期策略"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "在线订阅"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "发生了错误"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "您的 Mageia 账户没有启用 %s 下载订阅服务。"
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "添加介质时发生了错误"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "成功添加了介质!"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "成功添加了介质 %s。"
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "确定"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "您可以在此配置更新小程序"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "更新频率(小时)"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "第一次检查延迟(分钟)"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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 "企业"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack 为您提供了绝佳的 Linux 桌面体验：既有开放源代码解决方案的稳"
-"定和高效，又有丰富软件和 Mageia 的官方支持。"
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux 特性"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "关于您用户账户的更多信息"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "您的电子邮件"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "您的密码"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "忘记密码"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "错误"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "密码和电子邮件不能为空。"
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "选择您的升级版本"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "您的 Powerpack 访问已经终止"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s 现已发布，您可以升级到："
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "Mageia Linux 发行版为您提供了更多软件和官方支持。"
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "百分之百的开放源代码发行版。"
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "发行版升级"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -626,36 +426,165 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- 打印本帮助信息。\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- 自动调用 Mageia Update。\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- 调用 mnf 指定的脚本。\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- Mageia 更新的文本模式版本。\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- 记录所执行的操作\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "无法从 update_source 介质更新软件包。\n"
 
+#~ 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 ""
+#~ "此发行版的基本维护已经过期。感谢您购买延保服务，您的系统将持续更新至 %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "您应该购买延保服务。"
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr "您应该购买延保服务，或者升级到 %s 发行版的新版本。"
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "延保服务"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr "购买此版本(%s)的延保服务可持续更新至 %s。"
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "支持的产品是 %s，而“%s”不在列表中。\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "请填入您的账户 ID，以便添加额外的软件包介质"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "获取发行版列失败:"
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia 为桌面提供了十二个月的更新(直至 %s)，为基本系统提供了十八个月的更新"
+#~ "(直至 %s)。"
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr "而延保服务可另外再获取十八个月的更新(直至 %s)。"
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "您可以<b>立即</b>订阅延保服务："
+
+#~ msgid "Lifetime policy"
+#~ msgstr "生命周期策略"
+
+#~ msgid "Online subscription"
+#~ msgstr "在线订阅"
+
+#~ msgid "An error occurred"
+#~ msgstr "发生了错误"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "您的 Mageia 账户没有启用 %s 下载订阅服务。"
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "添加介质时发生了错误"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "成功添加了介质!"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "成功添加了介质 %s。"
+
+#~ msgid "Ok"
+#~ msgstr "确定"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "您的发行版有额外的软件包介质可用。"
+
+#~ msgid "Add additional package medium"
+#~ msgstr "添加额外的软件包介质"
+
+#~ msgid "New medium available"
+#~ msgstr "有新介质"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr "您正在使用“%s”发行版，所以有权访问额外的软件。"
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "您是否想要安装这一额外的软件仓库?"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia 企业服务器"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "检查缺少的“%s”介质"
+
+#~ msgid "Restricted"
+#~ msgstr "限制"
+
+#~ msgid "Enterprise"
+#~ msgstr "企业"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack 为您提供了绝佳的 Linux 桌面体验：既有开放源代码解决方案的"
+#~ "稳定和高效，又有丰富软件和 Mageia 的官方支持。"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux 特性"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "选择您的升级版本"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "您的 Powerpack 访问已经终止"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s 现已发布，您可以升级到："
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr "Mageia Linux 发行版为您提供了更多软件和官方支持。"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b8bfbfd7..9b9a56e1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mgaonline-zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-07 16:23-0300\n"
+"POT-Creation-Date: 2012-09-06 18:01+0200\n"
 "PO-Revision-Date: 2008-11-25 14:53+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -24,17 +24,17 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
-#: ../mdkapplet:71
+#: ../mgaapplet:72
 #, c-format
 msgid "Will check updates at %s"
 msgstr "將於 %s 檢查更新"
 
-#: ../mdkapplet:79
+#: ../mgaapplet:80
 #, c-format
 msgid "Your system is up-to-date"
 msgstr "您的系統處於最新的狀態"
 
-#: ../mdkapplet:84
+#: ../mgaapplet:85
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
@@ -42,53 +42,48 @@ msgid ""
 msgstr ""
 "服務設定發生問題，請檢查錯誤紀錄並寄封電子郵件至 support@mageiaonline.com"
 
-#: ../mdkapplet:90
+#: ../mgaapplet:91
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
 
-#: ../mdkapplet:95
+#: ../mgaapplet:96
 #, c-format
 msgid "New updates are available for your system"
 msgstr "有適用於您系統的更新"
 
-#: ../mdkapplet:101
+#: ../mgaapplet:102
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released"
 msgstr "Mageia Linux 的新版本已經釋出了"
 
-#: ../mdkapplet:119 ../mdkapplet:161
-#, c-format
-msgid "An additional package medium is available for your distribution."
-msgstr "有可供您發行版使用之額外的套件媒介。"
-
-#: ../mdkapplet:124
+#: ../mgaapplet:113
 #, c-format
 msgid "Network is down. Please configure your network"
 msgstr "網路沒有啟動，請設定您的網路連線"
 
-#: ../mdkapplet:130
+#: ../mgaapplet:119
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr "服務沒有啟動。請點選「線上網站」"
 
-#: ../mdkapplet:135 ../mdkapplet:141
+#: ../mgaapplet:124 ../mgaapplet:130
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 資料庫被鎖住了"
 
-#: ../mdkapplet:146
+#: ../mgaapplet:135
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr "版本不支援 (您使用的版本過舊或是開發中版本)"
 
-#: ../mdkapplet:156
+#: ../mgaapplet:140
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
 msgstr "找不到媒體。您必須經由「套件媒體管理員」新增一些媒體。"
 
-#: ../mdkapplet:166
+#: ../mgaapplet:145
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -103,169 +98,129 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../mdkapplet:171
+#: ../mgaapplet:150
 #, c-format
 msgid "Enabled"
 msgstr "是否啟用？"
 
-#: ../mdkapplet:184
+#: ../mgaapplet:163
 #, c-format
 msgid "Error updating media"
 msgstr "更新媒體時發生錯誤"
 
-#: ../mdkapplet:224 ../mdkapplet:946
+#: ../mgaapplet:193 ../mgaapplet:816
 #, c-format
 msgid "Install updates"
 msgstr "安裝更新"
 
-#: ../mdkapplet:225 ../mdkapplet:226
-#, c-format
-msgid "Add additional package medium"
-msgstr "新增額外的套件媒介"
-
-#: ../mdkapplet:227
+#: ../mgaapplet:194
 #, c-format
 msgid "Check Updates"
 msgstr "檢查更新"
 
-#: ../mdkapplet:228
+#: ../mgaapplet:195
 #, c-format
 msgid "Configure Network"
 msgstr "設定網路連線"
 
-#: ../mdkapplet:229
+#: ../mgaapplet:196
 #, c-format
 msgid "Upgrade the system"
 msgstr "升級系統"
 
-#: ../mdkapplet:394
-#, 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 ""
-"本發行版的基本維護已經結束。感謝您訂購了延伸維護，您的系統將持續更新至 %s"
-
-#: ../mdkapplet:439
+#: ../mgaapplet:374
 #, c-format
 msgid "Received SIGHUP (probably an upgrade has finished), restarting applet."
 msgstr "收到 SIGHUP（可能是更新已完成），重新啟動中。"
 
-#: ../mdkapplet:446
+#: ../mgaapplet:381
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "啟動 drakconnect 連線程式\n"
 
-#: ../mdkapplet:459 ../mdkapplet:632
+#: ../mgaapplet:393 ../mgaapplet:468 ../mgaapplet:528
 #, fuzzy, c-format
 msgid "New version of Mageia distribution"
 msgstr "Mageia Linux 有新版本"
 
-#: ../mdkapplet:464
+#: ../mgaapplet:398
 #, c-format
 msgid "Browse"
 msgstr "瀏覽"
 
-#: ../mdkapplet:473
+#: ../mgaapplet:407
 #, fuzzy, c-format
 msgid "A new version of Mageia distribution has been released."
 msgstr "Mageia Linux 的新版本已經釋出了。"
 
-#: ../mdkapplet:475 ../mdkapplet:572
+#: ../mgaapplet:409 ../mgaapplet:480
 #, c-format
 msgid "More info about this new version"
 msgstr "更多關於新版本的資訊"
 
-#: ../mdkapplet:477 ../mdkapplet:566
+#: ../mgaapplet:411 ../mgaapplet:474
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "您想要升級到 '%s' 發行版嗎？"
 
-#: ../mdkapplet:479 ../mdkapplet:576 ../mdkapplet:1033 ../mdkapplet:1063
+#: ../mgaapplet:413 ../mgaapplet:484
 #, c-format
 msgid "Do not ask me next time"
 msgstr "下一次不用詢問我"
 
-#: ../mdkapplet:482
+#: ../mgaapplet:415
 #, c-format
 msgid "Download all packages at once"
 msgstr "一次下載全部套件"
 
-#: ../mdkapplet:483
+#: ../mgaapplet:416
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(警告：您會需要非常大的可用空間)"
 
-#: ../mdkapplet:489
+#: ../mgaapplet:422
 #, c-format
 msgid "Where to download packages:"
 msgstr "從哪裡下載套件："
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Next"
 msgstr "下一步"
 
-#: ../mdkapplet:493 ../mdkapplet:581 ../mdkapplet:658 ../mdkapplet:1034
-#: ../mdkapplet:1064 ../mdkapplet_gui.pm:232 ../mdkapplet_gui.pm:313
+#: ../mgaapplet:426 ../mgaapplet:489 ../mgaapplet:554 ../mgaapplet_gui.pm:200
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../mdkapplet:508
+#: ../mgaapplet:441
 #, fuzzy, c-format
 msgid ""
 "Maintenance for this Mageia version has ended. No more updates will be "
 "delivered for this system."
 msgstr "這個 Mageia Linux 版本的維護已經結束了。不會有更新再提供給這個系統。"
 
-#: ../mdkapplet:514
+#: ../mgaapplet:447
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "為了保持您系統的安全，您可以："
 
-#: ../mdkapplet:520
+#: ../mgaapplet:453
 #, fuzzy, c-format
 msgid "Mageia"
 msgstr "Mageia One"
 
-#: ../mdkapplet:526
-#, c-format
-msgid "You should get extended maintenance."
-msgstr "您應該取得延伸維護。"
-
-#: ../mdkapplet:528
-#, c-format
-msgid ""
-"You should either get extended maintenance or upgrade to a newer version of "
-"the %s distribution."
-msgstr "您應該取得延伸維護或升級到新的 %s 發行版版本。"
-
-#: ../mdkapplet:532
+#: ../mgaapplet:454
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "您應該升級到更新的 %s 發行版"
 
-#: ../mdkapplet:542
+#: ../mgaapplet:463
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "您的發行版已經不被支援了"
 
-#: ../mdkapplet:547
-#, c-format
-msgid "Extended Maintenance"
-msgstr "延伸維護"
-
-#: ../mdkapplet:552
-#, c-format
-msgid ""
-"Purchase a maintenance extension for this version (%s) and keep it running "
-"until %s."
-msgstr "購買這個版本 (%s) 的延伸維護並一直使用它直到 %s。"
-
-#: ../mdkapplet:649
+#: ../mgaapplet:545
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -273,17 +228,17 @@ msgid ""
 msgstr ""
 "這個更新需要寬頻網路聯結 (cable、xDSL、...) 而且可能需要數小時才能完成，"
 
-#: ../mdkapplet:651
+#: ../mgaapplet:547
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "預計下載的資料為 %s"
 
-#: ../mdkapplet:652
+#: ../mgaapplet:548
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "您應該在繼續之前先關閉所有其他的應用程式。"
 
-#: ../mdkapplet:655
+#: ../mgaapplet:551
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -292,339 +247,184 @@ msgstr ""
 "您應該將您的筆記型電腦接上 AC 電源，如果可以的話，乙太網路也會優於無線網路連"
 "線。"
 
-#: ../mdkapplet:687
+#: ../mgaapplet:583
 #, c-format
 msgid "Launching MageiaUpdate\n"
 msgstr "啟動 MageiaUpdate\n"
 
-#: ../mdkapplet:719
+#: ../mgaapplet:616
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "計算新的更新...\n"
 
-#: ../mdkapplet:826
+#: ../mgaapplet:706
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "系統已經在最新狀態了\n"
 
-#: ../mdkapplet:866
+#: ../mgaapplet:735
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "檢查網路狀態中：似乎已停用\n"
 
-#: ../mdkapplet:893
+#: ../mgaapplet:762
 #, c-format
 msgid "Mageia Online %s"
 msgstr "Mageia Online %s"
 
-#: ../mdkapplet:894
+#: ../mgaapplet:763 ../mgaapplet:764
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C) %s by %s"
 
-#: ../mdkapplet:897
+#: ../mgaapplet:767
 #, c-format
 msgid "Mageia Online gives access to Mageia web services."
 msgstr "Mageia Online 將引導您連結到 Mageia 網頁服務。"
 
-#: ../mdkapplet:899
+#: ../mgaapplet:769
 #, c-format
 msgid "Online WebSite"
 msgstr "線上網站"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:904
+#: ../mgaapplet:774
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Shiva Huang <shivahuang@gmail.com>\n"
 "You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 
-#: ../mdkapplet:932
+#: ../mgaapplet:802
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../mdkapplet:935 ../mdkapplet:940 ../mdkapplet:948 ../mdkapplet:950
-#: ../mdkapplet_gui.pm:264
+#: ../mgaapplet:805 ../mgaapplet:810 ../mgaapplet_gui.pm:232
 #, c-format
 msgid "More Information"
 msgstr "更多資訊"
 
-#: ../mdkapplet:952
+#: ../mgaapplet:818
 #, c-format
 msgid "Add media"
 msgstr "新增媒體"
 
-#: ../mdkapplet:967
+#: ../mgaapplet:833
 #, c-format
 msgid "About..."
 msgstr "關於..."
 
-#: ../mdkapplet:969 ../mdkapplet-config:68
+#: ../mgaapplet:835 ../mgaapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "更新組態設定"
 
-#: ../mdkapplet:971
+#: ../mgaapplet:837
 #, c-format
 msgid "Always launch on startup"
 msgstr "總是在啟動時執行"
 
-#: ../mdkapplet:973
+#: ../mgaapplet:839
 #, c-format
 msgid "Quit"
 msgstr "結束"
 
-#: ../mdkapplet:1023 ../mdkapplet:1028 ../mdkapplet:1053 ../mdkapplet:1058
-#, c-format
-msgid "New medium available"
-msgstr "有可用的新媒介"
-
-#: ../mdkapplet:1030 ../mdkapplet:1060
-#, c-format
-msgid ""
-"You use '%s' distribution and therefore have privileged access to additional "
-"software."
-msgstr "您使用 '%s' 套件，因此可以取得額外的軟體。"
-
-#: ../mdkapplet:1032 ../mdkapplet:1062
-#, c-format
-msgid "Do you want to install this additional software repository?"
-msgstr "您要安裝此額外的套件庫嗎？"
-
-#: ../mdkapplet:1061 ../mdkonline.pm:182
-#, c-format
-msgid "Mageia Enterprise Server"
-msgstr "Mageia Enterprise Server"
-
-#: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
+#: ../mgaapplet-config:43
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "新增一個額外的套件媒介"
 
-#: ../mdkapplet-add-media-helper:128
-#, c-format
-msgid "Supported products are %s, '%s' is not on the list.\n"
-msgstr "支援的產品為 %s，'%s' 並不在這個清單中。\n"
-
-#: ../mdkapplet-add-media-helper:138
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "請輸入您的帳號 ID 以新增額外的套件媒介"
-
-#: ../mdkapplet-add-media-helper:148 ../mdkapplet-add-media-helper:193
-#: ../mdkapplet-add-media-helper:225 ../mdkapplet_gui.pm:244
-#, c-format
-msgid "Error"
-msgstr "錯誤"
-
-#: ../mdkapplet-add-media-helper:149
-#, c-format
-msgid "Failure while retrieving distributions list:"
-msgstr "取得發行版本清單時失敗："
-
-#. -PO: Here '%s' will be a localized date (eg:
-#: ../mdkapplet-add-media-helper:161
-#, c-format
-msgid ""
-"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-"base updates (up to the %s) for distributions."
-msgstr ""
-"Mageia 提供發行版本 12 個月的桌面更新 (直到 %s) 與 18 個月的基礎更新 (直到 "
-"%s)。"
-
-#: ../mdkapplet-add-media-helper:167
-#, c-format
-msgid ""
-"Extended maintenance is now available to get 18 months of additional updates "
-"(until %s)."
-msgstr "現在有延伸維護可以取得 18 個月的額外更新 (直到 %s)。"
-
-#: ../mdkapplet-add-media-helper:170
-#, c-format
-msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-msgstr "您可以<b>立即</b>訂購以獲得延伸維護："
-
-#: ../mdkapplet-add-media-helper:174
-#, c-format
-msgid "Lifetime policy"
-msgstr "生命週期政策"
-
-#: ../mdkapplet-add-media-helper:175 ../mdkapplet_gui.pm:105
-#, c-format
-msgid "Online subscription"
-msgstr "線上訂購"
-
-#: ../mdkapplet-add-media-helper:194
-#, c-format
-msgid "An error occurred"
-msgstr "發生一個錯誤"
-
-#: ../mdkapplet-add-media-helper:200
-#, c-format
-msgid "Your Mageia account does not have %s download subscription enabled."
-msgstr "您的 Mageia 帳號並沒有下載 %s 的權限。"
-
-#: ../mdkapplet-add-media-helper:226
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "新增媒體來源時發生錯誤"
-
-#: ../mdkapplet-add-media-helper:234
-#, c-format
-msgid "Successfully added media!"
-msgstr "成功加入媒體來源！"
-
-#: ../mdkapplet-add-media-helper:236
-#, c-format
-msgid "Successfully added media %s."
-msgstr "成功加入媒體來源 %s。"
-
-#: ../mdkapplet-add-media-helper:238
-#, c-format
-msgid "Ok"
-msgstr "確定"
-
-#: ../mdkapplet-config:69
+#: ../mgaapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
 msgstr "您可以在此設定系統列中的更新通知程式"
 
-#: ../mdkapplet-config:71
+#: ../mgaapplet-config:71
 #, c-format
 msgid "Update frequency (hours)"
 msgstr "更新頻率（小時）"
 
-#: ../mdkapplet-config:80
+#: ../mgaapplet-config:80
 #, c-format
 msgid "First check delay (minutes)"
 msgstr "第一次檢查延遲（分）"
 
-#: ../mdkapplet-config:89
+#: ../mgaapplet-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 "企業"
-
-#: ../mdkapplet_gui.pm:87
-#, c-format
-msgid ""
-"Mageia Powerpack brings you the best of Linux experience for desktop: "
-"stability and efficiency of open source solutions together with exclusive "
-"softwares and Mageia official support."
-msgstr ""
-"Mageia Powerpack 帶給您最好的 Linux 桌面體驗：開放原始碼的穩定、效率，以及其"
-"他獨家軟體和 Mageia 的正式支援。"
-
-#: ../mdkapplet_gui.pm:94
-#, fuzzy, c-format
-msgid "Mageia Features"
-msgstr "Mageia Linux 特色"
-
-#: ../mdkapplet_gui.pm:213
+#: ../mgaapplet_gui.pm:181
 #, c-format
 msgid "More information on your user account"
 msgstr "關於您使用者帳號的更多資訊"
 
-#: ../mdkapplet_gui.pm:220
+#: ../mgaapplet_gui.pm:188
 #, c-format
 msgid "Your email"
 msgstr "您的電子郵件"
 
-#: ../mdkapplet_gui.pm:221
+#: ../mgaapplet_gui.pm:189
 #, c-format
 msgid "Your password"
 msgstr "您的密碼"
 
-#: ../mdkapplet_gui.pm:228
+#: ../mgaapplet_gui.pm:196
 #, c-format
 msgid "Forgotten password"
 msgstr "忘記密碼"
 
-#: ../mdkapplet_gui.pm:245
+#: ../mgaapplet_gui.pm:212
+#, c-format
+msgid "Error"
+msgstr "錯誤"
+
+#: ../mgaapplet_gui.pm:213
 #, c-format
 msgid "Password and email cannot be empty."
 msgstr "密碼及電子郵件信箱欄位不能是空白的。"
 
-#: ../mdkapplet_gui.pm:267
+#: ../mgaapplet_gui.pm:235
 #, c-format
 msgid "Close"
 msgstr "關閉"
 
-#: ../mdkapplet_gui.pm:302
-#, c-format
-msgid "Choose your upgrade version"
-msgstr "選擇您的升級版本"
-
-#: ../mdkapplet_gui.pm:306
-#, c-format
-msgid "Your Powerpack access has ended"
-msgstr "您的 Powerpack 存取已經截止"
-
-#: ../mdkapplet_gui.pm:309
-#, c-format
-msgid "%s is now available, you can upgrade to:"
-msgstr "%s 已經推出，您可以升級到："
-
-#: ../mdkonline.pm:177
+#: ../mgaonline.pm:145
 #, c-format
 msgid "Mageia Flash"
 msgstr "Mageia Flash"
 
-#: ../mdkonline.pm:178 ../mdkonline.pm:198
+#: ../mgaonline.pm:146 ../mgaonline.pm:160
 #, c-format
 msgid "Mageia Free"
 msgstr "Mageia Free"
 
-#: ../mdkonline.pm:179
+#: ../mgaonline.pm:147
 #, c-format
 msgid "Mageia Mini"
 msgstr "Mageia Mini"
 
-#: ../mdkonline.pm:180
+#: ../mgaonline.pm:148
 #, c-format
 msgid "Mageia One"
 msgstr "Mageia One"
 
-#: ../mdkonline.pm:181 ../mdkonline.pm:194
-#, c-format
-msgid "Mageia PowerPack"
-msgstr "Mageia PowerPack"
-
-#: ../mdkonline.pm:195
-#, fuzzy, c-format
-msgid "The Mageia distribution with even more softwares and official support."
-msgstr "能提供您更多軟體與官方支援的 Mageia Linux 發行版本。"
-
-#: ../mdkonline.pm:199
+#: ../mgaonline.pm:161
 #, c-format
 msgid "The 100%% Open Source distribution freely available."
 msgstr "可以自由取得的百分之百開放原始碼發行版本。"
 
-#: ../mdkonline.pm:213
+#: ../mgaonline.pm:175
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "升級發行版本"
 
-#: ../mdkupdate:59
-#, c-format
+#: ../mgaupdate:60
+#, fuzzy, c-format
 msgid ""
-"mdkupdate version %s\n"
+"mgaupdate version %s\n"
+"Copyright (C) %s Mandriva.\n"
 "Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
@@ -637,35 +437,164 @@ msgstr ""
 "\n"
 "用法：\n"
 
-#: ../mdkupdate:64
+#: ../mgaupdate:66
 #, c-format
 msgid "  --help\t\t- print this help message.\n"
 msgstr "  --help\t\t- 顯示本輔助說明。\n"
 
-#: ../mdkupdate:65
+#: ../mgaupdate:67
 #, c-format
 msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- 自動啟動 Mageia Update。\n"
 
-#: ../mdkupdate:66
+#: ../mgaupdate:68
 #, c-format
 msgid "  --mnf\t\t\t- launch mnf specific scripts.\n"
 msgstr "  --mnf\t\t\t- 啟動 mnf 指定的 script。\n"
 
-#: ../mdkupdate:67
+#: ../mgaupdate:69
 #, c-format
 msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- 文字介面版的 Mageia Update。\n"
 
-#: ../mdkupdate:68
+#: ../mgaupdate:70
 #, c-format
 msgid "  --debug\t\t\t- log what is done\n"
 msgstr "  --debug\t\t\t- 紀錄做了那些事情\n"
 
-#: ../mdkupdate:98
+#: ../mgaupdate:100
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
 msgstr "無法由 update_source 媒體更新套件。\n"
 
+#~ 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 ""
+#~ "本發行版的基本維護已經結束。感謝您訂購了延伸維護，您的系統將持續更新至 %s"
+
+#~ msgid "You should get extended maintenance."
+#~ msgstr "您應該取得延伸維護。"
+
+#~ msgid ""
+#~ "You should either get extended maintenance or upgrade to a newer version "
+#~ "of the %s distribution."
+#~ msgstr "您應該取得延伸維護或升級到新的 %s 發行版版本。"
+
+#~ msgid "Extended Maintenance"
+#~ msgstr "延伸維護"
+
+#~ msgid ""
+#~ "Purchase a maintenance extension for this version (%s) and keep it "
+#~ "running until %s."
+#~ msgstr "購買這個版本 (%s) 的延伸維護並一直使用它直到 %s。"
+
+#~ msgid "Supported products are %s, '%s' is not on the list.\n"
+#~ msgstr "支援的產品為 %s，'%s' 並不在這個清單中。\n"
+
+#~ msgid "Please fill in your account ID to add an additional package medium"
+#~ msgstr "請輸入您的帳號 ID 以新增額外的套件媒介"
+
+#~ msgid "Failure while retrieving distributions list:"
+#~ msgstr "取得發行版本清單時失敗："
+
+#~ msgid ""
+#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
+#~ "base updates (up to the %s) for distributions."
+#~ msgstr ""
+#~ "Mageia 提供發行版本 12 個月的桌面更新 (直到 %s) 與 18 個月的基礎更新 (直"
+#~ "到 %s)。"
+
+#~ msgid ""
+#~ "Extended maintenance is now available to get 18 months of additional "
+#~ "updates (until %s)."
+#~ msgstr "現在有延伸維護可以取得 18 個月的額外更新 (直到 %s)。"
+
+#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
+#~ msgstr "您可以<b>立即</b>訂購以獲得延伸維護："
+
+#~ msgid "Lifetime policy"
+#~ msgstr "生命週期政策"
+
+#~ msgid "Online subscription"
+#~ msgstr "線上訂購"
+
+#~ msgid "An error occurred"
+#~ msgstr "發生一個錯誤"
+
+#~ msgid "Your Mageia account does not have %s download subscription enabled."
+#~ msgstr "您的 Mageia 帳號並沒有下載 %s 的權限。"
+
+#~ msgid "An error occurred while adding medium"
+#~ msgstr "新增媒體來源時發生錯誤"
+
+#~ msgid "Successfully added media!"
+#~ msgstr "成功加入媒體來源！"
+
+#~ msgid "Successfully added media %s."
+#~ msgstr "成功加入媒體來源 %s。"
+
+#~ msgid "Ok"
+#~ msgstr "確定"
+
+#~ msgid "An additional package medium is available for your distribution."
+#~ msgstr "有可供您發行版使用之額外的套件媒介。"
+
+#~ msgid "Add additional package medium"
+#~ msgstr "新增額外的套件媒介"
+
+#~ msgid "New medium available"
+#~ msgstr "有可用的新媒介"
+
+#~ msgid ""
+#~ "You use '%s' distribution and therefore have privileged access to "
+#~ "additional software."
+#~ msgstr "您使用 '%s' 套件，因此可以取得額外的軟體。"
+
+#~ msgid "Do you want to install this additional software repository?"
+#~ msgstr "您要安裝此額外的套件庫嗎？"
+
+#~ msgid "Mageia Enterprise Server"
+#~ msgstr "Mageia Enterprise Server"
+
+#~ msgid "Check for missing \"%s\" media"
+#~ msgstr "檢查遺失的 \"%s\" 媒體"
+
+#~ msgid "Restricted"
+#~ msgstr "限制的"
+
+#~ msgid "Enterprise"
+#~ msgstr "企業"
+
+#~ msgid ""
+#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
+#~ "stability and efficiency of open source solutions together with exclusive "
+#~ "softwares and Mageia official support."
+#~ msgstr ""
+#~ "Mageia Powerpack 帶給您最好的 Linux 桌面體驗：開放原始碼的穩定、效率，以及"
+#~ "其他獨家軟體和 Mageia 的正式支援。"
+
+#, fuzzy
+#~ msgid "Mageia Features"
+#~ msgstr "Mageia Linux 特色"
+
+#~ msgid "Choose your upgrade version"
+#~ msgstr "選擇您的升級版本"
+
+#~ msgid "Your Powerpack access has ended"
+#~ msgstr "您的 Powerpack 存取已經截止"
+
+#~ msgid "%s is now available, you can upgrade to:"
+#~ msgstr "%s 已經推出，您可以升級到："
+
+#~ msgid "Mageia PowerPack"
+#~ msgstr "Mageia PowerPack"
+
+#, fuzzy
+#~ msgid ""
+#~ "The Mageia distribution with even more softwares and official support."
+#~ msgstr "能提供您更多軟體與官方支援的 Mageia Linux 發行版本。"
+
 #~ msgid "Mageia Linux"
 #~ msgstr "Mageia Linux"