sync with code

author: Thierry Vignaud <tv@mageia.org> 2012-09-06 17:29:08 +0000
committer: Thierry Vignaud <tv@mageia.org> 2012-09-06 17:29:08 +0000
commit: a213eba9c3df4cc4a41731d8fe37e530bb0729c0 (patch)
tree: f8034ca1998bbd59e862b292fca58bcf58bee7d4 /po
parent: 72cee4fa2100318e3a09fd00935b1e5381e7e464 (diff)
download: mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar
mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar.gz
mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar.bz2
mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar.xz
mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.zip
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
author	Thierry Vignaud <tv@mageia.org>	2012-09-06 17:29:08 +0000
committer	Thierry Vignaud <tv@mageia.org>	2012-09-06 17:29:08 +0000
commit	a213eba9c3df4cc4a41731d8fe37e530bb0729c0 (patch)
tree	f8034ca1998bbd59e862b292fca58bcf58bee7d4 /po
parent	72cee4fa2100318e3a09fd00935b1e5381e7e464 (diff)
download	mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar.gz mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar.bz2 mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.tar.xz mgaonline-a213eba9c3df4cc4a41731d8fe37e530bb0729c0.zip