po: sync with the code

1 files changed, 228 insertions, 237 deletions

diff --git a/po/et.po b/po/et.po
index e7d19f72..a17b7e7c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-03 18:40+0100\n"
+"POT-Creation-Date: 2010-05-26 19:01-0300\n"
 "PO-Revision-Date: 2010-02-03 20:33+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Teie süsteemile on uuendusi"
 msgid "A new version of Mandriva Linux distribution has been released"
 msgstr "Ilmunud on Mandriva Linuxi distributsiooni uus versioon"
 
-#: ../mdkapplet:119 ../mdkapplet:156
+#: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
 msgid "An additional package medium is available for your distribution."
 msgstr "Teie distributsioonile on saadaval täiendav andmekandja."
@@ -77,7 +77,7 @@ msgstr "urpmi andmebaas on lukus"
 msgid "Release not supported (too old release, or development release)"
 msgstr "Väljalase pole toetatud (liiga vana või arendusversioon)"
 
-#: ../mdkapplet:151
+#: ../mdkapplet:156
 #, c-format
 msgid ""
 "No medium found. You must add some media through 'Software Media Manager'."
@@ -85,7 +85,7 @@ msgstr ""
 "Andmekandjat ei leitud. Andmekandja tuleb lisada tarkvaraallikate halduri "
 "abil."
 
-#: ../mdkapplet:161
+#: ../mdkapplet:166
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -102,42 +102,42 @@ msgstr ""
 "\n"
 "Seejärel käivitage \"%s\" uuesti."
 
-#: ../mdkapplet:166
+#: ../mdkapplet:171
 #, c-format
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../mdkapplet:179
+#: ../mdkapplet:184
 #, c-format
 msgid "Error updating media"
 msgstr "Viga andmekandja uuendamisel"
 
-#: ../mdkapplet:219 ../mdkapplet:881
+#: ../mdkapplet:224 ../mdkapplet:938
 #, c-format
 msgid "Install updates"
 msgstr "Uuenduste paigaldamine"
 
-#: ../mdkapplet:220 ../mdkapplet:221
+#: ../mdkapplet:225 ../mdkapplet:226
 #, c-format
 msgid "Add additional package medium"
 msgstr "Täiendava andmekandja lisamine"
 
-#: ../mdkapplet:222
+#: ../mdkapplet:227
 #, c-format
 msgid "Check Updates"
 msgstr "Uuenduste kontrollimine"
 
-#: ../mdkapplet:223
+#: ../mdkapplet:228
 #, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
-#: ../mdkapplet:224
+#: ../mdkapplet:229
 #, c-format
 msgid "Upgrade the system"
 msgstr "Uuenda süsteemi"
 
-#: ../mdkapplet:379
+#: ../mdkapplet:393
 #, c-format
 msgid ""
 "Basic maintenance for this distribution has expired. Thanks to your "
@@ -147,74 +147,71 @@ msgstr ""
 "Selle distributsiooni põhihooldusperiood on läbi. Kuna olete tellinud "
 "hooldusperioodi pikendamise, hoitakse Teie süsteemi uuendatuna kuni %s"
 
-#: ../mdkapplet:400
+#: ../mdkapplet:438
 #, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnecti käivitamine\n"
 
-#: ../mdkapplet:413 ../mdkapplet:572
+#: ../mdkapplet:451 ../mdkapplet:624
 #, c-format
 msgid "New version of Mandriva Linux distribution"
 msgstr "Mandriva Linuxi distributsiooni uus versioon"
 
-#: ../mdkapplet:418
+#: ../mdkapplet:456
 #, c-format
 msgid "Browse"
 msgstr "Sirvi"
 
-#: ../mdkapplet:427
+#: ../mdkapplet:465
 #, c-format
 msgid "A new version of Mandriva Linux distribution has been released."
 msgstr "Ilmunud on Mandriva Linuxi distributsiooni uus versioon."
 
-#: ../mdkapplet:429 ../mdkapplet:518
+#: ../mdkapplet:467 ../mdkapplet:564
 #, c-format
 msgid "More info about this new version"
 msgstr "Rohkem teavet uue versiooni kohta"
 
-#: ../mdkapplet:431 ../mdkapplet:516
+#: ../mdkapplet:469 ../mdkapplet:558
 #, c-format
 msgid "Do you want to upgrade to the '%s' distribution?"
 msgstr "Kas soovite uuendada ja paigaldada '%s'?"
 
-#: ../mdkapplet:433 ../mdkapplet:526 ../mdkapplet:966 ../mdkapplet:992
+#: ../mdkapplet:471 ../mdkapplet:568 ../mdkapplet:1025 ../mdkapplet:1055
 #, c-format
 msgid "Do not ask me next time"
 msgstr "Rohkem ei küsita"
 
-#: ../mdkapplet:435
+#: ../mdkapplet:474
 #, c-format
 msgid "Download all packages at once"
 msgstr "Kõigi pakettide korraga allalaadimine"
 
-#: ../mdkapplet:436
+#: ../mdkapplet:475
 #, c-format
 msgid "(Warning: You will need quite a lot of free space)"
 msgstr "(Hoiatus: see vajab päris palju vaba ruumi)"
 
-#: ../mdkapplet:442
+#: ../mdkapplet:481
 #, c-format
 msgid "Where to download packages:"
 msgstr "Pakettide allalaadimise koht:"
 
-#: ../mdkapplet:446 ../mdkapplet:531 ../mdkapplet:598 ../mdkapplet:967
-#: ../mdkapplet:993 ../mdkapplet-enterprise-update-helper:89
-#: ../mdkapplet-extended-maintenance-helper:131
-#: ../mdkapplet-restricted-helper:95
+#: ../mdkapplet:485 ../mdkapplet:573 ../mdkapplet:650 ../mdkapplet:1026
+#: ../mdkapplet:1056 ../mdkapplet-extended-maintenance-helper:129
+#: ../mdkapplet_gui.pm:197
 #, c-format
 msgid "Next"
 msgstr "Edasi"
 
-#: ../mdkapplet:446 ../mdkapplet:531 ../mdkapplet:598 ../mdkapplet:967
-#: ../mdkapplet:993 ../mdkapplet-enterprise-update-helper:89
-#: ../mdkapplet-extended-maintenance-helper:131
-#: ../mdkapplet-restricted-helper:95 ../mdkapplet-upgrade-helper:131
-#: ../mdkapplet-upgrade-helper:150
+#: ../mdkapplet:485 ../mdkapplet:573 ../mdkapplet:650 ../mdkapplet:1026
+#: ../mdkapplet:1056 ../mdkapplet-extended-maintenance-helper:129
+#: ../mdkapplet_gui.pm:197
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../mdkapplet:461
+#: ../mdkapplet:500
 #, c-format
 msgid ""
 "Maintenance for this Mandriva Linux version has ended. No more updates will "
@@ -223,22 +220,22 @@ msgstr ""
 "Selle Mandriva Linuxi süsteemi hooldusperiood on läbi. See tähendab, et te "
 "ei saa enam tarkvara uuendusi."
 
-#: ../mdkapplet:467
+#: ../mdkapplet:506
 #, c-format
 msgid "In order to keep your system secure, you can:"
 msgstr "Hoidmaks süsteemi turvalisena, võite"
 
-#: ../mdkapplet:473
+#: ../mdkapplet:512
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
-#: ../mdkapplet:479
+#: ../mdkapplet:518
 #, c-format
 msgid "You should get extended maintenance."
 msgstr "Te võite hooldusperioodi pikendada."
 
-#: ../mdkapplet:481
+#: ../mdkapplet:520
 #, c-format
 msgid ""
 "You should either get extended maintenance or upgrade to a newer version of "
@@ -247,17 +244,23 @@ msgstr ""
 "Te võite hooldusperioodi pikendada või siis uuendada %si distributsiooni "
 "uuema versiooni peale."
 
-#: ../mdkapplet:485
+#: ../mdkapplet:524
 #, c-format
 msgid "You should upgrade to a newer version of the %s distribution."
 msgstr "Te võite uuendada %si distributsiooni uuema versiooni peale.?"
 
-#: ../mdkapplet:495
+#: ../mdkapplet:534
 #, c-format
 msgid "Your distribution is no longer supported"
 msgstr "Teie distributsioon ei ole enam toetatud"
 
-#: ../mdkapplet:505
+#: ../mdkapplet:539 ../mdkapplet-extended-maintenance-helper:98
+#: ../mdkapplet-extended-maintenance-helper:191
+#, c-format
+msgid "Extended Maintenance"
+msgstr "Hooldusperioodi pikendamine"
+
+#: ../mdkapplet:544
 #, c-format
 msgid ""
 "Purchase a maintenance extension for this version (%s) and keep it running "
@@ -266,7 +269,7 @@ msgstr ""
 "Osta selle versiooni hooldusperioodi pikendamise (%s) ja hoida oma süsteemi "
 "töös kuni %s."
 
-#: ../mdkapplet:589
+#: ../mdkapplet:641
 #, c-format
 msgid ""
 "This upgrade requires high bandwidth network connection (cable, xDSL, ...)  "
@@ -275,17 +278,17 @@ msgstr ""
 "See uuendus nõuab suure läbilaskevõimega võrguühendust (kaabel, xDSL...) ja "
 "võib vajada lõpetamiseks mitu tundi."
 
-#: ../mdkapplet:591
+#: ../mdkapplet:643
 #, c-format
 msgid "Estimated download data will be %s"
 msgstr "Tõmmatavaid andmeid on hinnanguliselt %s"
 
-#: ../mdkapplet:592
+#: ../mdkapplet:644
 #, c-format
 msgid "You should close all other running applications before continuing."
 msgstr "Enne jätkamist tuleks sulgeda kõik teised töötavad rakendused."
 
-#: ../mdkapplet:595
+#: ../mdkapplet:647
 #, c-format
 msgid ""
 "You should put your laptop on AC and favor ethernet connection over wifi, if "
@@ -294,96 +297,94 @@ msgstr ""
 "Sülearvuti oleks mõttekas panna seinatoitele ning võimaluse korral tasuks "
 "WiFi-le eelistada Ethernet-ühendust."
 
-#: ../mdkapplet:627
+#: ../mdkapplet:679
 #, c-format
 msgid "Launching MandrivaUpdate\n"
 msgstr "MandrivaUpdate'i käivitamine\n"
 
-#: ../mdkapplet:659
+#: ../mdkapplet:711
 #, c-format
 msgid "Computing new updates...\n"
 msgstr "Uuenduste kontrollimine...\n"
 
-#: ../mdkapplet:766
+#: ../mdkapplet:818
 #, c-format
 msgid "System is up-to-date\n"
 msgstr "Midagi pole uuendada\n"
 
-#: ../mdkapplet:806
+#: ../mdkapplet:858
 #, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "Võrgu kontroll: paistab, et võrk ei tööta\n"
 
-#: ../mdkapplet:833
+#: ../mdkapplet:885
 #, c-format
 msgid "Mandriva Online %s"
 msgstr "Mandriva Online %s"
 
-#: ../mdkapplet:834
+#: ../mdkapplet:886
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Autoriõigus (C) %s: Mandriva"
 
-#: ../mdkapplet:837
+#: ../mdkapplet:889
 #, c-format
 msgid "Mandriva Online gives access to Mandriva web services."
 msgstr "Mandriva Online võimaldab kasutada Mandriva veebiteenuseid."
 
-#: ../mdkapplet:839
+#: ../mdkapplet:891
 #, c-format
 msgid "Online WebSite"
 msgstr "Veebilehekülg"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../mdkapplet:844
+#: ../mdkapplet:896
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Marek Laane <bald@smail.ee>\n"
 
-#: ../mdkapplet:872
+#: ../mdkapplet:924
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../mdkapplet:875 ../mdkapplet:883 ../mdkapplet:885
-#: ../mdkapplet-enterprise-update-helper:150
-#: ../mdkapplet-extended-maintenance-helper:196
-#: ../mdkapplet-restricted-helper:156
+#: ../mdkapplet:927 ../mdkapplet:932 ../mdkapplet:940 ../mdkapplet:942
+#: ../mdkapplet-extended-maintenance-helper:196 ../mdkapplet_gui.pm:229
 #, c-format
 msgid "More Information"
 msgstr "Rohkem teavet"
 
-#: ../mdkapplet:887
+#: ../mdkapplet:944
 #, c-format
 msgid "Add media"
 msgstr "Lisa andmekandjad"
 
-#: ../mdkapplet:902
+#: ../mdkapplet:959
 #, c-format
 msgid "About..."
 msgstr "Info..."
 
-#: ../mdkapplet:904 ../mdkapplet-config:68
+#: ../mdkapplet:961 ../mdkapplet-config:68
 #, c-format
 msgid "Updates Configuration"
 msgstr "Uuendamise seadistamine"
 
-#: ../mdkapplet:906
+#: ../mdkapplet:963
 #, c-format
 msgid "Always launch on startup"
 msgstr "Käivitatakse alati käivitumisel"
 
-#: ../mdkapplet:908
+#: ../mdkapplet:965
 #, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../mdkapplet:956 ../mdkapplet:961 ../mdkapplet:982 ../mdkapplet:987
+#: ../mdkapplet:1015 ../mdkapplet:1020 ../mdkapplet:1045 ../mdkapplet:1050
 #, c-format
 msgid "New medium available"
 msgstr "Saadaval on uus andmekandja"
 
-#: ../mdkapplet:963 ../mdkapplet:989
+#: ../mdkapplet:1022 ../mdkapplet:1052
 #, c-format
 msgid ""
 "You use '%s' distribution and therefore have privileged access to additional "
@@ -392,28 +393,77 @@ msgstr ""
 "Te kasutate distributsiooni '%s' ja saate seepärast võimaluse paigaldada "
 "lisatarkvara."
 
-#: ../mdkapplet:965 ../mdkapplet:991
+#: ../mdkapplet:1024 ../mdkapplet:1054
 #, c-format
 msgid "Do you want to install this additional software repository?"
 msgstr "Kas soovite lisada täiendava andmekandja?"
 
-#: ../mdkapplet:990 ../mdkonline.pm:168
+#: ../mdkapplet:1053 ../mdkonline.pm:180
 #, c-format
 msgid "Mandriva Enterprise Server"
 msgstr "Mandriva Enterprise Server"
 
-#: ../mdkapplet-config:43 ../mdkapplet-enterprise-update-helper:61
-#: ../mdkapplet-enterprise-update-helper:74
-#: ../mdkapplet-enterprise-update-helper:140
-#: ../mdkapplet-enterprise-update-helper:145
-#: ../mdkapplet-extended-maintenance-helper:76
+#: ../mdkapplet-add-media-helper:68 ../mdkapplet-config:43
+#: ../mdkapplet-extended-maintenance-helper:77
 #: ../mdkapplet-extended-maintenance-helper:186
-#: ../mdkapplet-restricted-helper:68 ../mdkapplet-restricted-helper:80
-#: ../mdkapplet-restricted-helper:146 ../mdkapplet-restricted-helper:151
 #, c-format
 msgid "Adding an additional package medium"
 msgstr "Täiendava andmekandja lisamine"
 
+#: ../mdkapplet-add-media-helper:111
+#, c-format
+msgid "Supported products are %s, '%s' is not on the list.\n"
+msgstr ""
+
+#: ../mdkapplet-add-media-helper:120
+#, c-format
+msgid "Please fill in your account ID to add an additional package medium"
+msgstr "Palun sisestage täiendava andmekandja lisamiseks oma konto ID"
+
+#: ../mdkapplet-add-media-helper:134 ../mdkapplet-add-media-helper:162
+#: ../mdkapplet-extended-maintenance-helper:86
+#: ../mdkapplet-extended-maintenance-helper:141
+#: ../mdkapplet-extended-maintenance-helper:160
+#: ../mdkapplet-extended-maintenance-helper:204 ../mdkapplet_gui.pm:209
+#, c-format
+msgid "Error"
+msgstr "Viga"
+
+#: ../mdkapplet-add-media-helper:135
+#: ../mdkapplet-extended-maintenance-helper:160
+#, c-format
+msgid "An error occurred"
+msgstr "Tekkis viga"
+
+#: ../mdkapplet-add-media-helper:141
+#, c-format
+msgid "Your Mandriva account does not have %s download subscription enabled."
+msgstr "Teie Mandriva kontol ei ole %s allalaadimine tellitud."
+
+#: ../mdkapplet-add-media-helper:163
+#: ../mdkapplet-extended-maintenance-helper:204
+#, c-format
+msgid "An error occurred while adding medium"
+msgstr "Tekkis viga andmekandja lisamisel"
+
+#: ../mdkapplet-add-media-helper:170
+#, fuzzy, c-format
+msgid "Successfully added media!"
+msgstr "Andmekandja %s lisati edukalt."
+
+#: ../mdkapplet-add-media-helper:172
+#: ../mdkapplet-extended-maintenance-helper:178
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Successfully added media %s."
+msgstr "Andmekandja %s lisati edukalt."
+
+#: ../mdkapplet-add-media-helper:174
+#: ../mdkapplet-extended-maintenance-helper:179
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
+
 #: ../mdkapplet-config:69
 #, c-format
 msgid "Here you can configure the updates applet"
@@ -449,116 +499,13 @@ msgstr "Piiratud"
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: ../mdkapplet-enterprise-update-helper:75 ../mdkapplet-restricted-helper:81
-#, c-format
-msgid "Please fill in your account ID to add an additional package medium"
-msgstr "Palun sisestage täiendava andmekandja lisamiseks oma konto ID"
-
-#: ../mdkapplet-enterprise-update-helper:79
-#: ../mdkapplet-extended-maintenance-helper:121
-#: ../mdkapplet-restricted-helper:85
-#, c-format
-msgid "More information on your user account"
-msgstr "Rohkem teavet Teie kasutajakonto kohta"
-
-#: ../mdkapplet-enterprise-update-helper:82
-#: ../mdkapplet-extended-maintenance-helper:124
-#: ../mdkapplet-restricted-helper:88
-#, c-format
-msgid "Your email"
-msgstr "Teie e-posti aadress"
-
-#: ../mdkapplet-enterprise-update-helper:83
-#: ../mdkapplet-extended-maintenance-helper:125
-#: ../mdkapplet-restricted-helper:89
-#, c-format
-msgid "Your password"
-msgstr "Teie parool"
-
-#: ../mdkapplet-enterprise-update-helper:87
-#: ../mdkapplet-extended-maintenance-helper:129
-#: ../mdkapplet-restricted-helper:93
-#, c-format
-msgid "Forgotten password"
-msgstr "Olen parooli unustanud"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:91
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:103 ../mdkapplet-restricted-helper:122
-#: ../mdkapplet-restricted-helper:164 ../mdkapplet-upgrade-helper:82
-#: ../mdkapplet-upgrade-helper:125 ../mdkapplet-upgrade-helper:177
-#: ../mdkapplet-upgrade-helper:214
-#, c-format
-msgid "Error"
-msgstr "Viga"
-
-#: ../mdkapplet-enterprise-update-helper:97
-#: ../mdkapplet-extended-maintenance-helper:141
-#: ../mdkapplet-restricted-helper:103
-#, c-format
-msgid "Password and email cannot be empty."
-msgstr "Parool ja e-posti aadress tuleb kindlasti anda."
-
-#: ../mdkapplet-enterprise-update-helper:121
-#: ../mdkapplet-extended-maintenance-helper:160
-#: ../mdkapplet-restricted-helper:122
-#, c-format
-msgid "An error occurred"
-msgstr "Tekkis viga"
-
-#: ../mdkapplet-enterprise-update-helper:132
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:178
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:138 ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Successfully added media %s."
-msgstr "Andmekandja %s lisati edukalt."
-
-#: ../mdkapplet-enterprise-update-helper:133
-#: ../mdkapplet-extended-maintenance-helper:179
-#: ../mdkapplet-restricted-helper:139
-#, c-format
-msgid "Ok"
-msgstr "Olgu"
-
-#: ../mdkapplet-enterprise-update-helper:146
-#, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Teie Mandriva kontol ei ole %s allalaadimine tellitud."
-
-#: ../mdkapplet-enterprise-update-helper:152
-#: ../mdkapplet-extended-maintenance-helper:198
-#: ../mdkapplet-restricted-helper:158
-#, c-format
-msgid "Close"
-msgstr "Sulge"
-
-#: ../mdkapplet-enterprise-update-helper:158
-#: ../mdkapplet-extended-maintenance-helper:204
-#: ../mdkapplet-restricted-helper:164
-#, c-format
-msgid "An error occurred while adding medium"
-msgstr "Tekkis viga andmekandja lisamisel"
-
-#: ../mdkapplet-extended-maintenance-helper:91
+#: ../mdkapplet-extended-maintenance-helper:86
 #, c-format
 msgid "Failure while retrieving distributions list:"
 msgstr "Distributsiooni nimekirja hankimine nurjus:"
 
-#: ../mdkapplet-extended-maintenance-helper:101
-#: ../mdkapplet-extended-maintenance-helper:191
-#, c-format
-msgid "Extended Maintenance"
-msgstr "Hooldusperioodi pikendamine"
-
 #. -PO: Here '%s' will be a localized date (eg: "2009/11/28" in english but "28/11/2009" for brazil or "28 Nov. "2009" for french:
-#: ../mdkapplet-extended-maintenance-helper:107
+#: ../mdkapplet-extended-maintenance-helper:104
 #, c-format
 msgid ""
 "Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
@@ -567,7 +514,7 @@ msgstr ""
 "Mandriva pakub uuendusi töölauale 12 kuud (kuni %s) ja baassüsteemile 18 "
 "kuud (kuni %s)."
 
-#: ../mdkapplet-extended-maintenance-helper:110
+#: ../mdkapplet-extended-maintenance-helper:107
 #, c-format
 msgid ""
 "Extended maintenance is now available to get 18 months of additional updates "
@@ -576,7 +523,7 @@ msgstr ""
 "Nüüd on olemas võimalus ka hankida hooldusperioodi pikendamine 18 kuu võrra "
 "(kuni %s)."
 
-#: ../mdkapplet-extended-maintenance-helper:112
+#: ../mdkapplet-extended-maintenance-helper:109
 #, c-format
 msgid "You can subscribe <b>right now</b> to get extended maintenance:"
 msgstr "Te võite hooldusperioodi pikendamise <b>otsekohe tellida</b>:"
@@ -586,12 +533,12 @@ msgstr "Te võite hooldusperioodi pikendamise <b>otsekohe tellida</b>:"
 msgid "Lifetime policy"
 msgstr "Hooldusperioodi reeglid"
 
-#: ../mdkapplet-extended-maintenance-helper:115
+#: ../mdkapplet-extended-maintenance-helper:113
 #, c-format
 msgid "Online subscription"
 msgstr "Internetitellimus"
 
-#: ../mdkapplet-extended-maintenance-helper:117
+#: ../mdkapplet-extended-maintenance-helper:115
 #, c-format
 msgid ""
 "Please fill in your account ID to add an additional package medium once you "
@@ -600,106 +547,103 @@ msgstr ""
 "Palun sisestage oma konto ID täiendava andmekandja lisamiseks, kui olete "
 "otsustanud internetitellimuse kasuks"
 
-#: ../mdkapplet-extended-maintenance-helper:192
+#: ../mdkapplet-extended-maintenance-helper:119 ../mdkapplet_gui.pm:178
 #, c-format
-msgid ""
-"Your Mandriva account does not have Extended Maintenance subscription "
-"enabled."
-msgstr "Teie Mandriva kontol ei ole hooldusperioodi pikendamine tellitud."
+msgid "More information on your user account"
+msgstr "Rohkem teavet Teie kasutajakonto kohta"
 
-#: ../mdkapplet-restricted-helper:152
+#: ../mdkapplet-extended-maintenance-helper:122 ../mdkapplet_gui.pm:185
 #, c-format
-msgid ""
-"Your Mandriva account does not have Powerpack download subscription enabled."
-msgstr "Teie Mandriva kontol ei ole Powerpacki allalaadimine tellitud."
+msgid "Your email"
+msgstr "Teie e-posti aadress"
 
-#: ../mdkapplet-upgrade-helper:79
+#: ../mdkapplet-extended-maintenance-helper:123 ../mdkapplet_gui.pm:186
 #, c-format
-msgid ""
-"Your system does not have enough space left in %s for upgrade (%dMB < %dMB)"
-msgstr ""
-"Teie süsteemis ei ole asukohas %s uuendamiseks piisavalt ruumi (%dMB < %dMB)"
+msgid "Your password"
+msgstr "Teie parool"
 
-#: ../mdkapplet-upgrade-helper:129 ../mdkapplet-upgrade-helper:178
-#: ../mdkapplet-upgrade-helper:215
+#: ../mdkapplet-extended-maintenance-helper:127 ../mdkapplet_gui.pm:193
 #, c-format
-msgid "Installation failed"
-msgstr "Paigaldamine nurjus"
+msgid "Forgotten password"
+msgstr "Olen parooli unustanud"
 
-#: ../mdkapplet-upgrade-helper:130
+#: ../mdkapplet-extended-maintenance-helper:141 ../mdkapplet_gui.pm:210
 #, c-format
-msgid "Installation logs can be found in '%s'"
-msgstr "Paigaldamislogid leiab asukohast '%s'"
+msgid "Password and email cannot be empty."
+msgstr "Parool ja e-posti aadress tuleb kindlasti anda."
 
-#: ../mdkapplet-upgrade-helper:131
+#: ../mdkapplet-extended-maintenance-helper:192
 #, c-format
-msgid "Retry"
-msgstr "Proovi uuesti"
+msgid ""
+"Your Mandriva account does not have Extended Maintenance subscription "
+"enabled."
+msgstr "Teie Mandriva kontol ei ole hooldusperioodi pikendamine tellitud."
 
-#: ../mdkapplet-upgrade-helper:143
+#: ../mdkapplet-extended-maintenance-helper:198 ../mdkapplet_gui.pm:232
 #, c-format
-msgid "Congratulations"
-msgstr "Õnnitlused!"
+msgid "Close"
+msgstr "Sulge"
 
-#: ../mdkapplet-upgrade-helper:147
+#: ../mdkapplet_gui.pm:239
 #, c-format
-msgid "Upgrade to Mandriva %s release was successfull."
-msgstr "Uuendamine ja Mandriva väljalaske %s paigaldamine õnnestus."
+msgid "Would you like Powerpack?"
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:149
+#: ../mdkapplet_gui.pm:244
 #, c-format
-msgid "You must restart your system."
-msgstr "Nüüd tuleb süsteem uuesti käivitada."
+msgid ""
+"Since you don't have Powerpack rights you may visit mandriva store now and "
+"get Powerpack subscription."
+msgstr ""
 
-#: ../mdkapplet-upgrade-helper:150
-#, c-format
-msgid "Reboot"
-msgstr "Taaskäivitus"
+#: ../mdkapplet_gui.pm:252
+#, fuzzy, c-format
+msgid "Get Powerpack subscription!"
+msgstr "Internetitellimus"
 
-#: ../mdkapplet-upgrade-helper:180
+#: ../mdkapplet_gui.pm:257
 #, c-format
 msgid ""
-"Packages database is locked. Please close other applications\n"
-"working with packages database (do you have another media\n"
-"manager on another desktop, or are you currently installing\n"
-"packages as well?)."
+"Continue to use your new Powerpack account information to upgrade, or Cancel "
+"and upgrade to the Free Edition."
+msgstr ""
+
+#: ../mdkapplet_gui.pm:260
+#, c-format
+msgid "Continue and Authenticate!"
 msgstr ""
-"Tarkvarapakettide andmebaas on lukus. Palun sulgege kõik muud\n"
-"rakendused, mis seda kasutavad. (On Teil avatud mõni muu\n"
-"andmekandjatega tegelev rakendus mõnel muul töölaual või\n"
-"paigaldate parajasti mingeid tarkvarapakette?)"
 
-#: ../mdkapplet-upgrade-helper:216
+#: ../mdkapplet_gui.pm:261
 #, c-format
-msgid "Failure when adding medium"
-msgstr "Viga andmekandja lisamisel"
+msgid "Cancel, upgrade to Free Edition"
+msgstr ""
 
-#: ../mdkonline.pm:163
+#: ../mdkonline.pm:175
 #, c-format
 msgid "Mandriva Flash"
 msgstr "Mandriva Flash"
 
-#: ../mdkonline.pm:164
+#: ../mdkonline.pm:176
 #, c-format
 msgid "Mandriva Free"
 msgstr "Mandriva Free"
 
-#: ../mdkonline.pm:165
+#: ../mdkonline.pm:177
 #, c-format
 msgid "Mandriva Mini"
 msgstr "Mandriva Mini"
 
-#: ../mdkonline.pm:166
+#: ../mdkonline.pm:178
 #, c-format
 msgid "Mandriva One"
 msgstr "Mandriva One"
 
-#: ../mdkonline.pm:167
+#: ../mdkonline.pm:179
 #, c-format
 msgid "Mandriva PowerPack"
 msgstr "Mandriva PowerPack"
 
-#: ../mdkonline.pm:181
+#: ../mdkonline.pm:193
 #, c-format
 msgid "Distribution Upgrade"
 msgstr "Distributsiooni uuendamine"
@@ -752,6 +696,53 @@ msgid "Unable to update packages from update_source medium.\n"
 msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 
 #~ msgid ""
+#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "enabled."
+#~ msgstr "Teie Mandriva kontol ei ole Powerpacki allalaadimine tellitud."
+
+#~ msgid ""
+#~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
+#~ "dMB)"
+#~ msgstr ""
+#~ "Teie süsteemis ei ole asukohas %s uuendamiseks piisavalt ruumi (%dMB < %"
+#~ "dMB)"
+
+#~ msgid "Installation failed"
+#~ msgstr "Paigaldamine nurjus"
+
+#~ msgid "Installation logs can be found in '%s'"
+#~ msgstr "Paigaldamislogid leiab asukohast '%s'"
+
+#~ msgid "Retry"
+#~ msgstr "Proovi uuesti"
+
+#~ msgid "Congratulations"
+#~ msgstr "Õnnitlused!"
+
+#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgstr "Uuendamine ja Mandriva väljalaske %s paigaldamine õnnestus."
+
+#~ msgid "You must restart your system."
+#~ msgstr "Nüüd tuleb süsteem uuesti käivitada."
+
+#~ msgid "Reboot"
+#~ msgstr "Taaskäivitus"
+
+#~ msgid ""
+#~ "Packages database is locked. Please close other applications\n"
+#~ "working with packages database (do you have another media\n"
+#~ "manager on another desktop, or are you currently installing\n"
+#~ "packages as well?)."
+#~ msgstr ""
+#~ "Tarkvarapakettide andmebaas on lukus. Palun sulgege kõik muud\n"
+#~ "rakendused, mis seda kasutavad. (On Teil avatud mõni muu\n"
+#~ "andmekandjatega tegelev rakendus mõnel muul töölaual või\n"
+#~ "paigaldate parajasti mingeid tarkvarapakette?)"
+
+#~ msgid "Failure when adding medium"
+#~ msgstr "Viga andmekandja lisamisel"
+
+#~ msgid ""
 #~ "The version of Mandriva Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""